diff --git a/Manifest b/Manifest
index 0f64e3385d74..9ef4af3d738b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29266 BLAKE2B 2236fbff2cbe1b9e1c310f28998b6b6e70ddbfe031e372cba74d7c85fe9e27f844ae470f1c898df5d8def37d915f607a9d61c68c4cc1a1d50fe57ea3b76dc942 SHA512 8dcaaa605d40ae255beddd8a083a1ab12b511c893c92102054f060b2513a1025acf4880aca79c29ac8311338f18a4a8305802f9ca3e31e2413d39296ed17a15e
-TIMESTAMP 2021-06-04T04:39:10Z
+MANIFEST Manifest.files.gz 29252 BLAKE2B 99f299f0409b19875a8515fd65a446b7649150bf239d602345cdc724253f77467b7a3c058b7e3f21bcce599793f8af2a4cfaba57cb4318a386a9fa52eef317cd SHA512 b592e70b57f6609e13f7f1bd75da4cc9f2be174684a09a3f87357589d317a6b608223044935d78a4abafa54bb4b9b710169307f0eb44fe63ab2662d28c78632f
+TIMESTAMP 2021-06-07T14:08:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC5rm5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC+KHZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAIDRAAglCURtMrMAAreX5bRT0sBVzFoIVDzCwb4vq5MEplmzy0nWxzF2X3voPD
-GwQDdUVOZsASobdgoz5axnUGL3oVBVbPn+B3JfgbPqUxG+RAdi2NAPpf/VcKFPXZ
-lvASqUDhbAM7ARzeyFJ20t886U82strZtFmZCHgwEh5lz0TeO0Z4iJW4BAH7OGuS
-GUMLC3jMWiqDvXEaM0+UXyh3zBtziT85MaRkwXw+luqWb0FRB37+qQ1SH4/Alhr+
-Ppw2NcG7HD9UahchQIrlAMgSUZY3AxI3Su9cHIU9PRcQ6nX4VpBuwt7hWxanJYsE
-+Rgh6lYyecnmVlXr1D0zRdbtEgq9PyB4LuMJV4QgeWDdviko9lq8At6x2z7SUV3a
-SFSuLDof0P+/WLvFujSCzh6sx/skxeFj0tki166AloazEF5bxUvkizyLSYyn4Hsl
-x9Nl1Q7MafsDiqpyTOJG3O1xTBhMhL7iLAkaqJW0tl53oDrxfZP4/8881fXXr5DH
-6s6SoRqhKazODk1NpJUOg8ayMcFK153nKQbAMuGsHXCTNYVT9eXII5+hR1xugkff
-yiV4zduAH1IOEQBBu72cE5xzphMN8xl91Tu6KvKYGMpb1QkEoPyNw0Do2+S8GcB8
-a0mCiLuRI5ZOcrqPiii2NuUGtDwzr2p/gJMQ8ZkoYDkd1wajfrY=
-=oIca
+klABww//e0JysytH08FzEUX3PHxCcr/v92P/iPFrqM2Xh+whQHASPKC7GKysH7mu
+k2+HifeToMZ5U9M8+b6NLU8HlQuWDF3LxOd6uwFJerN6ay95DXSn1BEty8xrtoX5
+1ho7GjKGFvnRi9XPGfkBy3bJxNr/+Ik3/VvZyaO2DOVH+dVkqP8/LyiWXQx4fz3m
+bCXH65A7brZtvdKJAbBJXpsqQmPzmtEcMtHCx9Qk/G2pv66bEnPkrJbp+ZYt4UvI
+GAAAufLC4QNas//47rJtlqNdgaNVMGNrVeMq/f/jqBDYptaHyu7kyQ4nVCIPS1+E
+M4dSPAQ8tv4GzKjUao85gxOuZg1riLZmHJLYlzz41CsDrBZVg2x5bNtTIrQ5TG1r
+fBcUvlyrebu7/YX+7SjbxXgWoKtVH/Naw56+ZrjEkooJ0QZIL3oJQIT37lBOrKWE
+eM6qecYpoDYn7CT+1ho3GMrn4Q1hACTPUEOJgyse6MAQq1ig37ukN9xUYwytK9H6
++r+SmGCHzw6LwKqtiKpjGzbFfobOHkjY1R/7s4ANPLcz9/LIP/4TOGSq1MWP6Anr
+5Y17OCxtofDwaQvQ9qAbiHDbbN465LiFHHo32u3YrN8/BlnJPzzqE+JPnkrkixo0
+3n47hXWEHV2KoG1PMHiodqC6YqtRb4gYuuaPBEq9FOT34799dGM=
+=6vzP
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8664e4cd81fc..7f5768f0b29d 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 23a23114fe40..0f6363a6808e 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index f8526fb6f648..780a872d4ff1 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,4 +1,6 @@
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
 DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14
+DIST at-spi2-core-2.40.2.tar.xz 197476 BLAKE2B a3b6f1edb7beace2a54cc651f8bf5d002009a3d2791306f2b0a33c351c68d04e0a1003ab11f215333d498c50d17139b978e7f232df802f6c620bbe31997a8e1c SHA512 854fbba39064ba4b1d9728fc4943e811f0a9557f1096f32d7a6486bcb6c73379ab84c5fb8ce5288bf4dab1d1cd3e0664c492977450d4da503ce4b08abfc75fd9
 EBUILD at-spi2-core-2.40.1.ebuild 1384 BLAKE2B 228eb7444c10a142f85d16e78161dc73005ca47a5a37fbc8444812165cbcb0dd13f7da139c814f95ecb4f2a2a8195e8921e0c2788042e8f443c4a7e63567ea93 SHA512 fa0af448995e79332fa7c05e51fcd1306c2cafb2aca601d42f2f6dccac7bcb569140a7abb98a8c54c0a69bc1b82150427843ffef4aa5fb855063000e395575fe
+EBUILD at-spi2-core-2.40.2.ebuild 1391 BLAKE2B bdd686cb46427ef7f9561cb83db39c0c759112276cd16039bbced7fd40e00f5c4915e2be096b0eddac91d7640fa53a9ba59b5ee00ac972457103e58e89e1c7bc SHA512 ad93fa85da329ae638d51e5ca99ad08e3cb0e620d342f756cfbdb39c89e35990074d937afd864f5bb878a1d7b29d67745f69126aade1487ad068fa53c5477ae9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
new file mode 100644
index 000000000000..595c3594907e
--- /dev/null
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson-multilib systemd virtualx xdg
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="X gtk-doc +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
+		$(meson_native_use_bool gtk-doc docs)
+		-Dintrospection=$(multilib_native_usex introspection)
+		-Dx11=$(usex X)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ffc413479932..c3b6cdf2728f 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index eb402e7e9cf4..3d8008489cbc 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,5 @@
-DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
+DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cbdfb2ef97c2881bca60be5c23e3245262e15304a63431704d8b69fff56594e25517c0e5e1f2641b3eca5ad6a1e76e4d7b3 SHA512 b599b498a20b77cd3346f5b865b5a0436cdd835af250e8cc4ed20d61ac6a4929bf4ceef9a95c6e7b8e825c5f513d33ea32b24661c58e2f1d285db0569d71fc1b
 DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
-EBUILD ansible-base-2.10.4.ebuild 1671 BLAKE2B 15a11fb545630d1556f315b4d658919c4246c73fccd5bf0c43523ee237b014a5ddd0481367844c123fe2d16d160d12d8f9e77629d35334672e861424ce087f26 SHA512 a620337d5a5cf5deadc308d99dc52cb508cb5746a9be8d23f2f3c14a571e0e8ccfa537ada1503e29e5b63b4b60c2cbb17784dd9bf5a330e4ea1407dc129a1586
+EBUILD ansible-base-2.10.10.ebuild 1674 BLAKE2B 00a56fbe3fabbadfec92bc38e7a7af99468f2d55ac66362fb39958a343b3a1f863f722665ca2d48ba97b8e8a4735a405af010ca65ef35232dcd5bc6574acead5 SHA512 188194e7c129d2f8b4c071107cc20557d0f8f6b689eb74099d5e76b12a82ba8d572a612a3feb1fdc4c35cf9a8c9243337abab185107bd8f3c560e36dbf713ffc
 EBUILD ansible-base-2.10.9.ebuild 1671 BLAKE2B 15a11fb545630d1556f315b4d658919c4246c73fccd5bf0c43523ee237b014a5ddd0481367844c123fe2d16d160d12d8f9e77629d35334672e861424ce087f26 SHA512 a620337d5a5cf5deadc308d99dc52cb508cb5746a9be8d23f2f3c14a571e0e8ccfa537ada1503e29e5b63b4b60c2cbb17784dd9bf5a330e4ea1407dc129a1586
 MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible-base/ansible-base-2.10.4.ebuild b/app-admin/ansible-base/ansible-base-2.10.10.ebuild
similarity index 96%
rename from app-admin/ansible-base/ansible-base-2.10.4.ebuild
rename to app-admin/ansible-base/ansible-base-2.10.10.ebuild
index 431b7f154bdd..f7e9e5b567c5 100644
--- a/app-admin/ansible-base/ansible-base-2.10.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="test"
 # doc removed due to https://github.com/ansible/ansible/issues/71395
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index e385b965bc73..f7d3f68b7180 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,6 @@
 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
+DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
 EBUILD ansible-2.10.7.ebuild 1509 BLAKE2B 9f50b6ec95df3480a38db3f83dc74bb90101594f0b96f867eb6b4ddcfa0e4dbe7c9ab2d2d00b3d562e4e00e3ee0a78de309f1dca068529bbf05522c7ef904137 SHA512 44ade17e48e8210fed9f559fcdc6460c4a41508b863d35ade6470041956e12e19f73ab05cab971c3c0de8fea04016891711e0238182f7224ffdc99323a68c97f
-EBUILD ansible-9999.ebuild 1513 BLAKE2B 42deec0e0cb5d0370ac103269bf6ac9bbf17ee61c647459de73b8ef880677aae4d85618c8aa705ea1d98a43a5ee9a5a60ca3c778ade1e47a82beb0e7cb0737c2 SHA512 6f91b7c3360739db565bc1daee47b92c9d5da4a52658b19ff2644d68b678bb47859412c532a578800fdc52c55bc5bb2502d8c06c90622b7dad220e0ea1ba27da
+EBUILD ansible-2.11.1.ebuild 1562 BLAKE2B c1b0f300f086d248caf5e3c74062f6262d7a0cac72ddc7ad58762220de17deefd4fa21f3fa87da54b42063f4ef1b25ca520ceddf10730ddcb35bc6fcc5a1ac7c SHA512 0641b5fea00b6aeed24deb81569e516df32514f658971851da9a5e6610d560273eacfa7185814472fc605c6442731c6e67a162bd8673747b50ae9d68eb4ef889
+EBUILD ansible-9999.ebuild 1562 BLAKE2B c1b0f300f086d248caf5e3c74062f6262d7a0cac72ddc7ad58762220de17deefd4fa21f3fa87da54b42063f4ef1b25ca520ceddf10730ddcb35bc6fcc5a1ac7c SHA512 0641b5fea00b6aeed24deb81569e516df32514f658971851da9a5e6610d560273eacfa7185814472fc605c6442731c6e67a162bd8673747b50ae9d68eb4ef889
 MISC metadata.xml 725 BLAKE2B 3d7a1655261b538ceb1511d626df23c93d0c30a0ab3b1ba38e560b4b43ffe7a82c6e207d991680bc321f6698596b1a61ec2182ae1c42c296a91b9f98896cff70 SHA512 bb3b5e0d20f530c1961bf19060ce1e5d087384008c116c4bc0af3e86368e9e9fdbce84d22b6f7b4f6760f039b180805364478e8e3d98b9b4d4d2600f9de62e6f
diff --git a/app-admin/ansible/ansible-2.11.1.ebuild b/app-admin/ansible/ansible-2.11.1.ebuild
new file mode 100644
index 000000000000..1925abcf423d
--- /dev/null
+++ b/app-admin/ansible/ansible-2.11.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-core/${PN}-core-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+fi
+S="${WORKDIR}/${PN}-core-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+	!app-admin/ansible-base
+"
+DEPEND="
+	!app-admin/ansible-base
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index c50250cd5308..1925abcf423d 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -16,9 +16,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-core/${PN}-core-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 fi
+S="${WORKDIR}/${PN}-core-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 4950225c8ec0..23c48b42925a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -9,6 +9,7 @@ DIST awscli-1.19.84.tar.gz 2011045 BLAKE2B 581a7d1c22f7f92c434b6726cae34cdfde1f6
 DIST awscli-1.19.85.tar.gz 2014586 BLAKE2B 7d7ec1d8ece349875403258988ac1732e48a70293471b76b0b3e5278877d606b9390cf3a01166914b3db78696f31598d30c4de1a0f1e5dcc2cc3582bbcf9a493 SHA512 738d433997f7d9a21db2d9d236cf5c1cc0a61ebf601cc2a96f292e22f9fdd4bbb6e6377fb55d161814275b653f61974c13b399d450ecea888b26543c6e3cf955
 DIST awscli-1.19.86.tar.gz 2014916 BLAKE2B acebaf9c5d6b672333162ec578f29781f74e66c4eeda212be8b7722d05b30839ba835f03f4f4e9d780cdb4df3e7e9a5ad4a407a0660ddc4f6a8a60f7073c6440 SHA512 dcf9c23a6b11272a6ffdd04f8ba74bd85624692c5de28b6dc87ae75ac5d8b68a1b73d09cf02d29939f83d7d68860c21b2043d4cdc300b5664e0b221a47344956
 DIST awscli-1.19.87.tar.gz 2015321 BLAKE2B 02cc3f0cc2588c9e0d2c7b8d38248455692f3b30dfeaecc076edfc3ce072128c6e788e8503e110eedf4d45ec71f3309c5db7871fd75018da3aaa424ed9d5fe4c SHA512 5bb6fb4ae62a1c4c5e83f59f32840ceab656d17cdee80dfd5530606f2d24e7b77aa78b8d62a020ca44a74c6f73de2cb4f625da5af68de3a90e704d4020703d7a
+DIST awscli-1.19.88.tar.gz 2016344 BLAKE2B 09d29f2494cb540fcbd128197c0ac181c4106bc8aec651144f641b44d4ad0acb6d3c6381180f301508e8babe66f8cc800ce2932706a4efbf8042a525e433e583 SHA512 a5821af1af468fc1c02a9aaf9691346daffe09bc4b886b3b6ecc0a9e30420deb9e7bd3b3308c5dae2518cf76badb69602948566545473a59efd6eba1a329a728
 EBUILD awscli-1.19.47-r1.ebuild 1367 BLAKE2B bb8b7d8cd38bf771578ad146817be2570d4e17ad86073691c8233c4d5bdfb4804f51dda002eb4662e70ab226615876c829798fbffaeaf609b953d70dbac0c8d5 SHA512 9439c9fe91e9e965f9d43a5a6ea238884cf8f74fa8055ff5d15bad8be2798ba98dac5ba14cef9f32bd911d9dbbcaa90d2fcb2b99d6b4c53edb63efa4f36ef877
 EBUILD awscli-1.19.78.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
 EBUILD awscli-1.19.79.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
@@ -18,5 +19,6 @@ EBUILD awscli-1.19.83.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134
 EBUILD awscli-1.19.84.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
 EBUILD awscli-1.19.85.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
 EBUILD awscli-1.19.86.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.87.ebuild 1466 BLAKE2B 20609e694caabd167a4f1550f5c0b73775df9aa3bbc506e6865b16c3f0355493a227acfc51fbc33439bc7720f239e770bc294eec7472436ec9e0f39323da24a0 SHA512 00b276000eea24a00160a15b83130429ace1d9b0bfff69bee4f961437a31a9cd0c09143b2d13b2fd8ca4725e7d9396b350a8edc349e5307f38188b470215f45b
+EBUILD awscli-1.19.87.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.88.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.19.87.ebuild b/app-admin/awscli/awscli-1.19.87.ebuild
index 75b147981bf1..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.87.ebuild
+++ b/app-admin/awscli/awscli-1.19.87.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/app-admin/awscli/awscli-1.19.88.ebuild b/app-admin/awscli/awscli-1.19.88.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.19.88.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+	"${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	nosetests -v tests/{functional,unit} ||
+		die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 246b20f3dcd0..cd4e2fa99526 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Bitwarden-1.25.1-amd64.deb 58573904 BLAKE2B 109bec39c1a385127b00222752f6eac906cdea19df790dfede0f8dd6e2febdf35958b2b420737cf2dbfdd9648a85b93810ad1f8e2d6a222dcd07437d9333e7d7 SHA512 b20c5c3890a98f6990f7e7f1274027aba3011a416781b6fd76b6c37959ebf787cdb129dd16fe9b4601b5cbc39018dadc36efe680391c04ed0a4c763d221a3cbd
 DIST Bitwarden-1.26.4-amd64.deb 58223196 BLAKE2B 38726d9feb35f15130e81a479d74e5c80d344656d46dd9b9e82a7deab9d83b21b3d0a30dc2e8fc9a371b72f2dabe06234c955077fd16163f8e8ad551b49e98c6 SHA512 b0de7ed7b00b5308a2137b2632150bd288a7383a13295814c6c6af1a85f911a6790ad162f67af07844f8fca80044b95f58a37e6ab762429d061f3c9af3616e11
-EBUILD bitwarden-desktop-bin-1.25.1.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50
+DIST Bitwarden-1.26.5-amd64.deb 58215042 BLAKE2B 216e5042e925bc12a9feb1c038cacddc05b6c4aad8b76413ec50771cbfdab399c64e8388277d571708094e6b14b7d89b3c20ffd3d23d4010340b9d94068560cc SHA512 c2506a9f64d47138e6ce53bb7211e2562f9bb9847f4b48b059dd504eec312f6852571aaa550830f54488c0d67d02c0eb67bcac049a688098d1b8a55492b008f7
 EBUILD bitwarden-desktop-bin-1.26.4.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50
+EBUILD bitwarden-desktop-bin-1.26.5.ebuild 1542 BLAKE2B 11501d3da996b5cc3654875d7b63e4923d4c35e5a068ab06d90a3274a757d2a6a7fe9f450f2e15fe9d4f56aa2cda8b4eaa37071743ec7e05e4040e690d447a26 SHA512 c136b33d192e8cf381c9e52f6244fd8673f0ea9fb2040c1147b478baa548fb6fd92fd2203c40a9b987407c3fe9730b0e0a5b04737d2d1597a989bcec8c3cde50
 MISC metadata.xml 303 BLAKE2B d92d9a59d759d67d5c87577ad1b8255f016f1228044100ba18d6ec73a7ca054ca0403399d677f2470a782721e7179d693860eb2c52a35cace59e58348d38df93 SHA512 81073a2078b481982c3beffcb76a84e19521e4bc6255095848e5479fc13c5a60b8a0d861156b02ff26c80529111dade666758e22a341ba8a31f9a89304a215c1
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.25.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.5.ebuild
similarity index 100%
rename from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.25.1.ebuild
rename to app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.5.ebuild
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index f262975afcf3..b3ad0c4b92fe 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.30.0.tar.gz 5372917 BLAKE2B 2ceb1edf18296bdbaa14a0c4af541a224b0d8376a3afe528907962f278c7cba89761c868c739f97ebfbe7222bccee1c5dc6af4d1490155928cfbe4bf5f195507 SHA512 02c09a950f9b32d6c5804a8100dac8ef8cdb35f3f4d93237affd3c150e7cd00a01a8cadeea68edacf42f1925994bc73359b6d512666d919b74d6d06db2a43cb6
-EBUILD exo-1.30.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.31.0.tar.gz 5411379 BLAKE2B cc97c8f7aff6dd563aaec9701c19cfeed408f42b20ebb34ab90f15ec694e927c64f50dc3b5eda91af2a292609bf8b43ee005c6b5f1a152a0eb491d0f354618f2 SHA512 6f3a92210fb03cc0aa255bd91ffe884fb99d29f82e81919a1e9e82cfdfbfb09ee739e906032338494019656fc398cc49f2dfb48dbb01d68573fb6dab79afeb5c
+EBUILD exo-1.31.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.30.0.ebuild b/app-admin/exo/exo-1.31.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.30.0.ebuild
rename to app-admin/exo/exo-1.31.0.ebuild
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index bb90f030c79e..90c5770f5cc3 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
+DIST hcloud-1.23.0.tar.xz 1129416 BLAKE2B b91e0a5f24020cd250a0e50c4c2b049397575e884968652f6795e89340a90f43141deee7179944e2027992f6f722a75704c3cb8fb0b0e0653036e9b5c34258d4 SHA512 d16d5eb28873045ba1ed0b09a6a76b26c3e39fffd404fca233d79640c06cb75fe2a13db22d9c343890bfb5ebac0535c7e7fae8e37e96229ddd5d324b2a9d4c79
 EBUILD hcloud-1.22.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
+EBUILD hcloud-1.23.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.23.0.ebuild b/app-admin/hcloud/hcloud-1.23.0.ebuild
new file mode 100644
index 000000000000..77d54006fe99
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.23.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+	# For upstream a simple test is run 'hcloud version'
+	./hcloud version
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index 56f6d8031df3..7b1fb30e9f5f 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,4 +1,3 @@
 DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
-EBUILD pydf-12-r1.ebuild 757 BLAKE2B a15b1fec76456ba6e03c2997c357da635774611dccebd444ccea1b172be989b00bdff0e1d1b367e91d9383fa93f1ef503b605f3d0d11e8fda9fe50e8db297a03 SHA512 93cabc2f463e55262caa5bd3f32aedb78d06be82b5e2b7afb1d4a3ea06bea87e9d979e1b6187cf7e2417131158f20241c3de54f47f2ee18e92de26f343f6d814
-EBUILD pydf-12-r2.ebuild 759 BLAKE2B 111eb0e38292f8315720e43bcbb966ab82e5afe99eb882702014128287fc9e914a9827d0b06172b8278152e4670d5b115308699c9faeddb8f432a950255d5124 SHA512 6149cfa3d3f849cb39298558481ae021b4fb9d1c5b6e1b5ee6e78b6b769c7dfc13489a06ea4762b4ebd0e81c61f2550059faea2b132221f4579acbd8438124a1
+EBUILD pydf-12-r2.ebuild 758 BLAKE2B a33a2d3da7f9d8323df878f53eff5b1f63e6a05e04451ddf742f04486c129e07c9ee5c06b1662b9badc7f7fd41c902c1eee092097c6cb7be65c79445fe4e3fbc SHA512 f5842b8b85e62573ca485501818986c572aae778316e98d260b77586a63bff3a62f9a7977cada69e8523a9f5bb4a60fc44deb0c66291583c02ae4474015732cf
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
deleted file mode 100644
index 6ece6eed0353..000000000000
--- a/app-admin/pydf/pydf-12-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-r1
-
-DESCRIPTION="Enhanced df with colors"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s:/etc/pydfrc:${EPREFIX}/etc/pydfrc:" "${PN}" || die
-}
-
-src_install() {
-	python_foreach_impl python_doscript "${PN}"
-	insinto /etc
-	doins "${PN}rc"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-admin/pydf/pydf-12-r2.ebuild b/app-admin/pydf/pydf-12-r2.ebuild
index 49b94bf4f728..d7c8357b072c 100644
--- a/app-admin/pydf/pydf-12-r2.ebuild
+++ b/app-admin/pydf/pydf-12-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1ac12a282bd5..5a851f5a5e01 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -5,20 +5,10 @@ AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
-DIST rsyslog-8.2008.0.tar.gz 3051049 BLAKE2B abf9b7ec81cf62841c448f22c7aff45bc85ea6cdc7552e74295aac752c86380039bb28836e78e35e6eba3d0a062a0ae99ea22ba3d6e978175411a43ec9af6f9a SHA512 a077832de7076ac5e7d4c8f33edd044d0c18fd171a697ef68c1cd0f81f1938b3f008cddc1a61084181de512b643c15004744f0e79e6a44e9d239cec3d35f74fe
-DIST rsyslog-8.2010.0.tar.gz 3097606 BLAKE2B 06bfd54edc2126567ff9a460c272583d388a16a4db6f56603c8b9d2dd54bf4fe3b3b402eb4a9523b68e9d3a7602759fad57b35351d7cadab0b7f02771db5c40c SHA512 e3c8ed6b631053e38abfe8ce183a1544d04a0207dc988d36f5141a7ea8c987915f4c0429ccd094b7e374c277b7ee5b50e65e7205c156af01ffe9bdf8338831c8
-DIST rsyslog-8.2012.0.tar.gz 3118101 BLAKE2B 26550c90ff5502c051c30996f7a1eabfdd9e5ce229dbb33f91ac40f9af5c2d2b15f9dd8a3b0a31b00b1b510d91fe5ce177ceab5fa2af416a9de9acc4e4b24f6a SHA512 d279295c8d399be140bd5c30786c6a32b2ddfd0d90ca4cd285aa33622c66ad9e3a5b979c8041f6e736670fef8f2cd5571980eef1b1395d4ab30a112f2dd1270d
 DIST rsyslog-8.2102.0.tar.gz 3123684 BLAKE2B f5c4e00d68ec82ed3f7b89dd5e888bebda9c4eb38185dfd8ecd96c1bf77380385aaddac73ab1de8364e1239a3de746f160c18b0f135d006f473f9e40be2c18a1 SHA512 281b0e5d5cb548c39a6e514e5fd5b1bdbe8ca0bdd9234f4fea581ed7679f76d2d75b65d14c3c5e799f86f91600074ff75b467aa1ff27cdbec0f4197261c5aec0
 DIST rsyslog-8.2104.0.tar.gz 3175254 BLAKE2B ed772d4e460105b8406305574fdbe4aeca7ba57ba975b78f91d279460fee0faa767fcda3d2d8a4ba6d543bf9e920f9b7cf5ddf9e4d3ccfc9ae3b08c318a6c5b0 SHA512 15ded57f32259bb12b3378d10bc2d4d6eff39623f1195357dafa58e5c1154aedc0d60ff0746599707f380cf3bfc5ca955f15f1213572fa447cc333d479e0eefc
-DIST rsyslog-doc-8.2008.0.tar.gz 8378149 BLAKE2B 0f6bc116a03821899d33c7960e517725487b89ea2aabc7f5d0fbd4962d82a06558737bcee67af02105006c670ec736eb5ba0b7811b25a1e627a99555121b2999 SHA512 5b8bed19017c65469eb8ea7725ef162595b30f520605f37447498ab69b5cfe8f939cee7e7915ecbf3c025871408fd7af6d45ba960a83096f83a397df4cefef09
-DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6ac7fbfb23d661410feb39d7ddce332851e785bb447fb67dd2de8ff62e91fe865fbf7dec8bf62d7fe51181e3c6bbbe64db SHA512 072fb05a0117dc0970a4e5e302abbaf5dc065c2a0962c4160e7efb86fedad89a2caa546cd2bf4af07b7f5e2fa5267cf02889d911f7a6916725e6aea1760ab253
-DIST rsyslog-doc-8.2012.0.tar.gz 6417145 BLAKE2B d8377f40b0311e8e7dcca274c251c0de7706490e3048c8d69d479120e06ca1e0b3ec9fce0a04928984d440da3aef196965f8c1b45afe8931c893b4baa72f4e87 SHA512 5647f499230276066abced34c2ca352268ba24fbd00cb7b5e3d0a2494977dd6f781cf8d1e7c7a9210d23c451ff162acda81ee93afa3f8f08fd555123e9daeece
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
 DIST rsyslog-doc-8.2104.0.tar.gz 6451275 BLAKE2B cb8a38b28caec17babd190e463070b862071a75c4c63a7208e56f039f84ae7a5c6045112697c61635d328e56d9427f692e67a9d6fefc94b59ad28481210f1481 SHA512 6c898fa606190c5cf214822503f060b1692cd907731858736a395511b66d7b0d1cf6dfcc90c4cecbe21b099197ae2187db53d719f44f85f26a1bd34971539d36
-EBUILD rsyslog-8.2008.0.ebuild 12428 BLAKE2B 7bb0e28abe0b30f7761ac13d0e974dba4b27df763eddc844957515e11aa1e7bced1b8cf280078a161d11acd1596f8410a0fd6a5aafc4d6edbf9a0d287d110c98 SHA512 71b8bb4b2a984dbd600d60e58fd662ca753fcf8ae13348960c3d67eb1851f1c2f236cfeb753d9fb2df695140a4d88cba2704c090a9fb4e4c9b6177cfc34ba20a
-EBUILD rsyslog-8.2010.0.ebuild 12776 BLAKE2B 08ebe02ef4addd04ec2f36e5d5553deb0db1c89fb0c56e1b2e2ee01e8607c985c4b32e3afdb74cd03953dcd0749e61c691ec66e8abffd7c42b3c58f2dae9ef72 SHA512 701d0a91be68fc0ee6ce84eccfe58b6113c5f44e10c53e1aef86adb3bb892fee44c97d3be8a6a0c28efb68c9bf6eabed718ee7feb3065f1a3a4e320d94d333b8
-EBUILD rsyslog-8.2012.0-r1.ebuild 12836 BLAKE2B 54cd60b31f9d66a6be4ac468454eb84ba93ff17d0aa197a9f1b4e4236e09086162904a34db59b40369d16975d57211be23464dc7f07709ee31af85818561167c SHA512 4fbadeb0ab42de4a2896e5618f67c15db54309f73ede92d9f49830bc14c0947a439a8e833b9a6f9a4b0089b0c1e1f4076854b1d856ff50d4f45d47ee734d5443
-EBUILD rsyslog-8.2012.0.ebuild 12776 BLAKE2B 08ebe02ef4addd04ec2f36e5d5553deb0db1c89fb0c56e1b2e2ee01e8607c985c4b32e3afdb74cd03953dcd0749e61c691ec66e8abffd7c42b3c58f2dae9ef72 SHA512 701d0a91be68fc0ee6ce84eccfe58b6113c5f44e10c53e1aef86adb3bb892fee44c97d3be8a6a0c28efb68c9bf6eabed718ee7feb3065f1a3a4e320d94d333b8
 EBUILD rsyslog-8.2102.0.ebuild 12832 BLAKE2B f514b2f410ee6abf3273d5c5a299cbea087397e22d4559d6bdf9966de8fdd214cb53c3af05e60b48ce50845f7458cd59df8251c9a871732482acb28c46c97b86 SHA512 f0f10f141cea6694b9541729e26c8b13bf808a353bd029645970598d92e56e4e0d2ef2f847aea5bc5df6874d682e4f1cedc20108c3fefcc27e5df1dbc651a600
 EBUILD rsyslog-8.2104.0.ebuild 12868 BLAKE2B 5da76dd6fc4e5f74b8fba99aeed95fcff313c9ddf1893b459eca2ccff4396b58822dd3402b96ad56f705ba47a6072294e887eef9eb701a3e33070a0da7a08c74 SHA512 7e2e0a905548bec785bf86198ca6822528209e9f4faa51599ebaeb472d9ad78b847bf983ddbedc6ae03c1ee2fa85a88eeef8a75843d0a335cb0c30a9c2c0ed71
 MISC metadata.xml 3871 BLAKE2B 33e83d286bb5a62a851dc3ca10e8920071c9c16c9c7f54bde875a97d195e2b0c34615318adfc6d919df7cebd33e053b398267e4159753e597c97551b8ff0fbb7 SHA512 275939880de65c264e14b782169d760a61f0e5d9ae49e3f14861c9ddf5e66c0a78761cebc6c62e2f18426530ac4145bf8b8e71533eb103776be3164127c1b585
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
deleted file mode 100644
index 7bea21cad615..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 ~hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
deleted file mode 100644
index 82437e2752e3..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
deleted file mode 100644
index e2470ad673f1..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
+++ /dev/null
@@ -1,481 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
deleted file mode 100644
index 82437e2752e3..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
+++ /dev/null
@@ -1,479 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? ( www-servers/civetweb )
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-	)"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c65478dac181..0de363a1266c 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 1f28f706b004..ebd4b08fefac 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -17,5 +17,5 @@ EBUILD dpkg-1.20.0.ebuild 1919 BLAKE2B c7456dbda807d2195de6e0f19abab34c70eb6e768
 EBUILD dpkg-1.20.2.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
 EBUILD dpkg-1.20.3.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
 EBUILD dpkg-1.20.5.ebuild 2008 BLAKE2B 8303d63470637dc1df9a1db1c1f4499e8e4168d20ee17432b6d9b35fc5bd2b4a5dd25d4940543d0d382166258fe62219e6a307a33e1a10a6819df89cebcb4cf3 SHA512 1ca45b81c325f4963d61e4077404b1fb3016e66b1d23de000635fcd96e5dd691ac8ce4ad38e893bb32f0554807e8b04ac47b3ff65b0517694d3bc574392980a7
-EBUILD dpkg-1.20.7.1.ebuild 2003 BLAKE2B 5c6e2a46c248aeddc869ab5c15b9fde10d2bf5de5e51c8db115277b30c2f53ee33dc22befef8cdd953232ada08cb41d5a231ff5d6b9aaa82c200a4d78b58e0a5 SHA512 f1159c2ce53ec8359abf93a3f852d38b1fc02e330a850ce2fbaf03a36e4b5f4d315fe96e2ad8e955192d8ee15a9beee9f34ed38b14104110efe3ee02e67bb1d0
+EBUILD dpkg-1.20.7.1.ebuild 2002 BLAKE2B 52e2f821c92f6cf0f64bfe36d13c264a7860a845bf39dd1b57f347ce1c88dc48d2e4dc9c01533ea9d6cdc990a7e834a7dc9f4a93cb68442a78a499bdda0cc2e8 SHA512 e12646a5773edec84e9918922435d9bc0441d6f25f28041b79a0efbd4a36d47ff8cb4f768595e97149dd7a238ce67ad88931e04eb8b83aab3e8df2245ce93d46
 MISC metadata.xml 432 BLAKE2B 553e9f62e3a549d43f4e336d8ed7a73a3f87eb6cb7bd80bfd6f577acbb5ebaf78f58118540438feee04c58cdfde28ecb97e06b14db1ed6329c93bf84749bdd9c SHA512 7ff95b06796b982454546880b8761cbc9a618cbfff07694a4753f3f3e45f9ece8831908777fbda09896e9accc75bc6ebffe522e719eed4b484d3b301fd3f7932
diff --git a/app-arch/dpkg/dpkg-1.20.7.1.ebuild b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
index 951a67dcf01d..a286db6882db 100644
--- a/app-arch/dpkg/dpkg-1.20.7.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 6549f3b02563..92a7060af857 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
+DIST gnome-autoar-0.3.3.tar.xz 298536 BLAKE2B effbd3c15ab851c97f3c69f96bbf806f3639ce4865161df99b7f84ec2c4c8a3df9381517227d9a475b1006d88ac21eb02b4b474fd8bd27524959b56cf486e888 SHA512 41cda2670506e9b3f79c4995d2fdfbd5024777d8f8b3f85a2010af4e5f4303743d26ad9cad787c995362f83b65617ed5773d972c8aa2c7bdcd358d873cb86ec4
 EBUILD gnome-autoar-0.3.2.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
+EBUILD gnome-autoar-0.3.3.ebuild 941 BLAKE2B 6ae751624dac772991f506fa9162141cd1a6c7467a49aa31d515a348182ac40130cfb43ea2cc0b0218bed3901ea42d2c83d30d07efefdb0459886493a4da42ce SHA512 6a9271091797f149f8f1ccf1fc86702b4ea6e439223665f25bcef43e5d23bb5d83def3643dd9a2c99a5ca1f298d8e6d0b61478b4f2b4759f3d8032ac0b4fe360
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
new file mode 100644
index 000000000000..7da8c2332a5f
--- /dev/null
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Automatic archives creating and extracting library"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=app-arch/libarchive-3.4.0
+	>=dev-libs/glib-2.35.6:2
+	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable gtk)
+}
diff --git a/app-arch/makeself/Manifest b/app-arch/makeself/Manifest
index 89efa2728c17..432742c30c01 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,7 +1,9 @@
 AUX makeself-2.2.0-help-header.patch 6728 BLAKE2B 7d0211074f68346ead19fd58d9440976ee0e5f0367b0776c186ced0ee77769cca7597948f2894aee68e9d3f42fb6e0e19dcdc378ce0dfe714596ab8ad705d13b SHA512 5cdee18f5190086e8421d091406df5aeefdc9fe3aaee6c26aa990b1eb7d6f415c8c8ebf67137a1b2a22470c14749d394808ed9e5a4fc6f737cd87c32651e2a8c
 AUX makeself-unpack 2814 BLAKE2B cd96049b052b46a6d5273d78e27598f73046c1a29049af406f0f82c2c301e3b8f95c40534a18313eaffb6ac7ce68cbde1d988efa3503bb46f950936706e41590 SHA512 ebfe1dd13a11cd00a853e6a4e7d6094b5f923fbe987f6b5a778fec09e00e2b2daf1e5daab0eb04850d4471019fb95f88a5d2b9d88520f5738a29997d81f2c1c3
 DIST makeself-2.4.3.tar.gz 32613 BLAKE2B 2295b6d47a8105f2b495260abb0c9ae85875c821d0291a19b5af894c1cef669f338c4e10de8128fe38008e7e08079d1f29949884f202cab680c7fd62e2f00dd9 SHA512 d404c7920c7f69ae29c7168bcf76806b6e2aae2e8916bb7feed998d031ce8b2cd205b83ad960a90b01189c97f9242eb3ef574194ba3ee51c605fe99dafbd6c13
+DIST makeself-2.4.4.tar.gz 38889 BLAKE2B eac74fa28ac39cbc6b18d11671bfa32d6c0b04b55b3603c6c928483dd64af38d416936ef242f55aa4840affd4bf7fb91c2987f87afab093816331e50f16379ab SHA512 3d4d03458f7f11a8df46340d1b489ca60d413d5ed857cc67bb8ef15335ce2848e4675e080791c26fdf29423f813d468b4b797438fe0876dad54e85c6346b9b8b
 DIST release-2.2.0.tar.gz 21640 BLAKE2B 32b06157829864918d225a136043a5c9b7c6c543351e981c0e3cdce84cbbe4c52f00870bb04d29bfd79e715c1c708b51cc9958d495a9633afb9a8d342601c20d SHA512 11cd536baed2d56405103f18a8318a202092755a74baf10730aa58dc57032e327697b1c7f76bf9bf438927093ba9ac467ffa0c4564c7f6b1d3b2b3936f34fa73
 EBUILD makeself-2.2.0-r2.ebuild 695 BLAKE2B 24c8845a3765c0540fbc61a0d479a52aa48368c5992391b24a6e50d4d21df96973fd4c24dfb37d72eade758d1350b04dcce6061603e1e36df7aad1c461440cf7 SHA512 3686991760d6bdaca0ae09db9506f6337609550052041ec60a5d1da3321ed99a08f1f5e149c56228b0086f1a664531b8df81690496bf80774fe8f7546bb08022
 EBUILD makeself-2.4.3.ebuild 942 BLAKE2B c9853c874c7653c35ab3656b80357bef22ebcee730a9f2be6eecc857302dce32dcf90e4ad5e15874babcbbd44f6331440517089a086f8c225cc1c1e2f14d490f SHA512 8357031146ec48a52bdf7957c8faa50eab5ca9fa6e68ceb6462666da63c7f2bb61892efe8bfea4ae50659dd3b60c41b7dab3669de1b0ba2131ba8fb99ec36d0c
+EBUILD makeself-2.4.4.ebuild 1155 BLAKE2B d37a4fa673583444dc7674732bc96fc136477fd09f9517fbc1f549229c45e7f19d4bba96ab45903781b9db73d190c8cf0b34033d7e94ec5b776486105b21a5f8 SHA512 88a3ba8e2d5d31bb9c6248f5c6eabe8d0f80d4883f2517a6d19ddeedde4dc3ef6984f28b709c12360eb82f8ed0a490ce942fbbc07b24f49faa06a532e1f4b4e8
 MISC metadata.xml 513 BLAKE2B 25f348226db47085523f7e1f74b1b557982acf56ba2b33252e250cc45400137be2090e29dad3b009e7b11c2d2942e564e7c499c7566c857ad5b05849553014c0 SHA512 48b0f4efee7e7dd1dc3e5bc0b2585748a15e4e2e0e41eb764709b41b4eb45d6ef98b712fc5265c2892e70b6c99c00e15542430e854811961d3acb5a803c6d5c5
diff --git a/app-arch/makeself/makeself-2.4.4.ebuild b/app-arch/makeself/makeself-2.4.4.ebuild
new file mode 100644
index 000000000000..55fe1ca89293
--- /dev/null
+++ b/app-arch/makeself/makeself-2.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The test framework requires bashunit (which isn't a big deal), but the
+# tests themselves are not of great quality.  You should avoid running them
+# yourself as they like to run commands like gpg against your own ~/ settings.
+
+EAPI="7"
+
+inherit optfeature
+
+DESCRIPTION="Shell script that generates a self-extractible tar.gz"
+HOMEPAGE="http://www.megastep.org/makeself/"
+SRC_URI="https://github.com/megastep/makeself/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+	dobin makeself-header.sh makeself.sh
+	dosym makeself.sh /usr/bin/makeself
+	doman makeself.1
+	dodoc README.md makeself.lsm
+}
+
+pkg_postinst() {
+	optfeature "lz4 support" app-arch/lz4
+	optfeature "lzop support" app-arch/lzop
+	optfeature "pbzip2 support" app-arch/pbzip2
+	optfeature "pigz support" app-arch/pigz
+	optfeature "zstd support" app-arch/zstd
+
+	# Also bzip2 and xz are supported but they are in @system.
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a7c50dfdb052..2789b37e0391 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 95ec172f4788..998d745c9da4 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -16,11 +16,13 @@ AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-11.0.2.tar.gz 5982176 BLAKE2B 2da10e48b44ada189fb5d9ed48bac41232106721859df823309e7be63d16786ebaf95052d929ef67895fb993d019153d736125ec4fe5949591dd7dced0ee9835 SHA512 7e90352036a544b6a508547ae38660ca5d59b0bfd17126f346652e5c9977367ad9fe972e3f2823c10e7f8ffdcd1623ef24e8a82de030041762f0c0e09783e65c
 DIST bacula-11.0.3.tar.gz 5982505 BLAKE2B a09a4829cb4eeb6cfe3b082efcc45f7704ad7da0f882b746a2f4aeeb3233775ccc89d7924442970e9609c449fee96466b33286e7c6f700cbab7f2013f0267f53 SHA512 753ef3f53079fe36e69791a3ff0c4230d611d86257c5ecbc28c2ec593e950b76dc9fedf3525c196b0742cc029d0a8023d31505c83d8d42ff3f48c3273b77c540
+DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d
 EBUILD bacula-11.0.2.ebuild 11886 BLAKE2B 9b75fcb4f5a5251e9428e5406b64c4d16691f250df5e8a73464a6fad0d1e8dd92114f9f304e9761c2dc01a71abccb7ca4cec33a6544d63fcbb72c53fae87b332 SHA512 198760cb7179adc14c740d4e26274acf543041fa7fc4992f8560ae4222a71e37f2ff20134ebf9d4009598e894a213c935af878b728c2eb7436664f29bde61614
 EBUILD bacula-11.0.3.ebuild 11791 BLAKE2B 52f1c30b3ed65336004dfcb3defcc1f40ab13fcff9448e2309835177ec953849f38b7b8ed417d2796c03075d7bdcd07c955f756cbb262d08528edbf716eff73f SHA512 deb47dc53d3bd187122aac3ae8c6eb0d206ae85776b838881d7cd27ca2c1d6eba029d435085e40188d7e033497d6bf027ad398ba495ffb3e875167a72581521c
+EBUILD bacula-11.0.5.ebuild 11791 BLAKE2B 52f1c30b3ed65336004dfcb3defcc1f40ab13fcff9448e2309835177ec953849f38b7b8ed417d2796c03075d7bdcd07c955f756cbb262d08528edbf716eff73f SHA512 deb47dc53d3bd187122aac3ae8c6eb0d206ae85776b838881d7cd27ca2c1d6eba029d435085e40188d7e033497d6bf027ad398ba495ffb3e875167a72581521c
 EBUILD bacula-9.6.5.ebuild 12033 BLAKE2B 2abae986e8bdb9e358be317b619a3be15b18fdb2ad93d00d160c9acfeec3b7ee7e5b55e54be8f85ea2edf5ee8cfbd2df7ce5aa5d599fd543c8e7df0d69c7447b SHA512 5135d97f296e93343a2661d32bb76e6a21da25c2da3f858516a9affffd8831516c7f12adbe607afa68d675bef8dbbed2dff23b594437d0ac3d77fb999af308f2
 EBUILD bacula-9.6.6.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
 EBUILD bacula-9.6.7.ebuild 12036 BLAKE2B bb471939370d44d6124aecdf194b07635650dd38c1aa22cb90cbba48da310ce4c04bb5b6f9d0e8c7814f1f0efb46b37a25a81460a3fca3195f534aad0af75b28 SHA512 a436a73aa97e3491a95c27c7e2ad7f9f20f12a0b408ecb64f51c82f78d8221b2d6adfccc61054104ce6afb5432b25cef80a2735ea55adf61c0611738a8ae7838
diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
new file mode 100644
index 000000000000..b2738be8a8a5
--- /dev/null
+++ b/app-backup/bacula/bacula-11.0.5.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index b862609d6d93..091469186e13 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -3,5 +3,5 @@ AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f70446683
 DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
 EBUILD rdiff-backup-2.0.0.ebuild 887 BLAKE2B 46b346a08129103218be532919628a535a3191bebb0f113e295dd4d5d960f35e1512606995c9a591a975606a59e3d8e99413526daa4171e7264f49802f691fa4 SHA512 704dc8aeae4550d0582554df8d6c2de73ceb68739b3bc3fafbb34d1ccce76b147356a230b7f0504c683971ac9874e7d8c463bf7940c18a5c93ca7c6627a1e1a3
-EBUILD rdiff-backup-2.0.5-r1.ebuild 922 BLAKE2B bb92093d9388de051bb4ab10abc945de0a971c8fc07356426fb6500871f1348a47c9c047916bc4e23d1872734427bee90a362b38f2094d5523243100d259dd25 SHA512 ff2a08e48ab4e7d941b6525793ae5211395086683e1a2c9807b1657f17fa2907c0b1ee9f90158a71ed056690af1a1ffe98a2dc8b6d291923494b351172208ad1
+EBUILD rdiff-backup-2.0.5-r1.ebuild 921 BLAKE2B 6fdbb6d086ed97845010d224d51b560ec2c334820901a0a3ec032264d3587a4a49be29de41baf1bc053ec5d70df2cc4ca307ef86fc9cc0c46868bd9166c6770b SHA512 b4327590c16cb5b7272d10d415b0d024cb8a4836dc6617dc2a0b7f969aa9b92acf2228f491cbc8f5093747fbdc79615a735b2bec1e7cd7da59d91d8d9893f51b
 MISC metadata.xml 342 BLAKE2B 903f50786c577854a71efdd79b6897368c6fdfe1bb796286397197de79c6c3a3339517d0efea229508dd11167ee52b8dbd5aae7846e1052642fe06163eb6e31f SHA512 13f95f42486db40682d3733858d152a30c3cedafeee6642b7517dfbb60f7eeedf5c0b65265aaf1a2be9bdd59f3fbabd0c6103cf8c1c4517d697eb887ab3e27be
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
index ff190b906638..63dde15c5ccd 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 8b122b0fc0c3..d75d60f13384 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,11 +1,11 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
-AUX snapper-0.5.6-swap.patch 852 BLAKE2B 89b05a268d3fed009665c9db6e43d5552023940b14c5afb58521582ba10c9ce332cf2aa07dcb336dd8cb825e5063a553aa6fcb84f597e380831bf0d507b7a96b SHA512 7ec3a471ece6e24c6e225f45401635317197a8d4daebb32817df64b035df3a7df02f0af85677a37d7a2b69af1afc785d70bcfe42252cc7453bc7eb2f7aa2740b
 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.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
-DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
 DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c
-DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d
-EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
-EBUILD snapper-0.8.15-r1.ebuild 2047 BLAKE2B 60f9e5d2b31d3d4fb8b64c07d2e5b819e83653cef5b51bd2a5fdc79c0758b02bdf64eebde7d98ebcebc22ca2cb100a04ab09bf29c03c7616504ea2cb1c868187 SHA512 5b14fd94d7685fb733d522d786f47bbed6778af456e3df6a3f2257e8c7456743a2e6b658c3af2e3d6d81a560a4c6049af9549aa89cb56b1d38928abf3bdb287e
-EBUILD snapper-0.8.9-r1.ebuild 1843 BLAKE2B 8d24ca268222ef6917a6f06c6d83a667c363037ae413b8139844715fb00c38e25e821be080edeeab136267718497f49c675e6b14cd15572c06458baf659a59a1 SHA512 40f4443313427b740f18ad279e8188c48295d8d6b2f38cd0fcb601d9b4f6f1f486e48b3fa1b057d1815ab3f227eb1537ce4c1f1c306256104416a5358d5a3c60
+DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae
+DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
+EBUILD snapper-0.8.15-r1.ebuild 2045 BLAKE2B 05149082654681be0062cee1360b3cf93ea2b8059cc70d3af365f8fb3913f99eed6953c4ebaf9f5cc89a0477c66b51a53414143b60531ec02c42bee092ed3ac2 SHA512 3302ac9266cfd50c7365ef1e573013a0ac1cb5b5d0b22caeb5e0eef6118c4db3004c09c2f89499f363245308f8b1a36fab7c1ba19cab9cd53b4e47f6ee761585
+EBUILD snapper-0.8.16.ebuild 2055 BLAKE2B f72ae42c8108cb28b257f9f3fd34c6f23ce18e9d7e3ff9dd2257440263417d7e2124096fa123f80e211ff2d59a72498e3fb653ca5a972f9ef955b716d0d9aa7d SHA512 201f826a193136f585675dfdacb710e4e724be8dbf7220859cfe56297e4002a09995a905b42ee2ae356c7b997242e87dc4641649b66c4a8071ef88eebdffe772
+EBUILD snapper-0.9.0.ebuild 2047 BLAKE2B 60f9e5d2b31d3d4fb8b64c07d2e5b819e83653cef5b51bd2a5fdc79c0758b02bdf64eebde7d98ebcebc22ca2cb100a04ab09bf29c03c7616504ea2cb1c868187 SHA512 5b14fd94d7685fb733d522d786f47bbed6778af456e3df6a3f2257e8c7456743a2e6b658c3af2e3d6d81a560a4c6049af9549aa89cb56b1d38928abf3bdb287e
 MISC metadata.xml 1330 BLAKE2B cf72d6a7fc0ae542f465e6e916ae284710f057cee8492bbb2c3f3ce833bbc633e4ed53dd996b231bf26343898b344c37322582c18dbf01e23d068b80fccf5875 SHA512 3086569ba74f6b163619718fe08974856634dde997fcc2a8152f7cc1ba1a5c5638869869806d723f65249725fb61d84d3fe64f2b3b58c8b5e05a1524cb464915
diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch
deleted file mode 100644
index aa24330d7304..000000000000
--- a/app-backup/snapper/files/snapper-0.5.6-swap.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30
-Author: Spencer Janssen <spencerjanssen@gmail.com>
-Date:   Mon Dec 3 17:33:49 2018 -0600
-
-    Work around btrfs v4.19
-    
-    Addresses #459
-
-diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
-index cb9f7b3..c05557b 100644
---- a/snapper/Btrfs.cc
-+++ b/snapper/Btrfs.cc
-@@ -41,6 +41,9 @@
- #include <btrfs/send.h>
- #include <btrfs/send-stream.h>
- #include <btrfs/send-utils.h>
-+#ifdef swap
-+#undef swap
-+#endif
- #include <boost/version.hpp>
- #include <boost/thread.hpp>
- #endif
-diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc
-index bada3f8..9edc325 100644
---- a/snapper/BtrfsUtils.cc
-+++ b/snapper/BtrfsUtils.cc
-@@ -34,6 +34,9 @@
- #ifdef HAVE_LIBBTRFS
- #include <btrfs/ioctl.h>
- #include <btrfs/send-utils.h>
-+#ifdef swap
-+#undef swap
-+#endif
- #endif
- #include <algorithm>
- #include <functional>
diff --git a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
new file mode 100644
index 000000000000..7aa089569b4a
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
@@ -0,0 +1,83 @@
+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-r1.ebuild b/app-backup/snapper/snapper-0.8.15-r1.ebuild
index 3a46790c0d3c..43989af176b2 100644
--- a/app-backup/snapper/snapper-0.8.15-r1.ebuild
+++ b/app-backup/snapper/snapper-0.8.15-r1.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.8.16.ebuild
similarity index 71%
rename from app-backup/snapper/snapper-0.5.6-r1.ebuild
rename to app-backup/snapper/snapper-0.8.16.ebuild
index c6f5ffca2a55..2cfe0b2ba1f1 100644
--- a/app-backup/snapper/snapper-0.5.6-r1.ebuild
+++ b/app-backup/snapper/snapper-0.8.16.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit systemd
+inherit autotools systemd bash-completion-r1
 
 DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
 HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lvm pam xattr"
+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
@@ -28,12 +30,14 @@ RDEPEND="dev-libs/boost:=[threads]
 	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}-swap.patch
+	"${FILESDIR}"/${PN}-0.8.15-testsuite.patch
 )
 
 src_prepare() {
@@ -42,19 +46,25 @@ src_prepare() {
 	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"
-		--disable-zypp
+		--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)
 	)
 
@@ -64,8 +74,10 @@ src_configure() {
 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() {
diff --git a/app-backup/snapper/snapper-0.8.9-r1.ebuild b/app-backup/snapper/snapper-0.9.0.ebuild
similarity index 86%
rename from app-backup/snapper/snapper-0.8.9-r1.ebuild
rename to app-backup/snapper/snapper-0.9.0.ebuild
index 5a5593c28464..3a46790c0d3c 100644
--- a/app-backup/snapper/snapper-0.8.9-r1.ebuild
+++ b/app-backup/snapper/snapper-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,9 +12,11 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="lvm pam xattr"
+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
@@ -35,6 +37,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${P}-testsuite.patch
 )
 
 src_prepare() {
@@ -50,13 +53,18 @@ src_configure() {
 	# ext4 code does not work anymore
 	# snapper does not build without btrfs
 	local myeconfargs=(
+		--disable-silent-rules
 		--with-conf="/etc/conf.d"
-		--disable-zypp
+		--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)
 	)
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e9b8645340fa..8c61b6d4578c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index fb5d517b869d..59fcb32ed6e3 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
 DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
-EBUILD acme-1.13.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
 EBUILD acme-1.14.0.ebuild 1679 BLAKE2B 64e0de8b2918b8646553f73125ee0fb9b50b0214281f650dbbd9c4aa5dd626fa11a3e15733825c492c321ee94a1af2ebb3d9389baf7ec06f66437065472f8913 SHA512 4e76ab6eb91592eb0cc43786df06b78ab3f7ac3e1ca8d4039feb9dc3583c6ecb562302bcbbb8d83a9443180c91c9b987db751cbd6f903f76605f41b82f895f93
-EBUILD acme-1.15.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
+EBUILD acme-1.15.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
 EBUILD acme-1.16.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
 EBUILD acme-9999.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
 MISC metadata.xml 400 BLAKE2B a09af005ab6b00b9eb6e9252814273c932609e4dd6020c2289f5dafc8aa3e6bcb9696dc887767f29271af4a93fae73116f688937613ff9a340d5747a801097e5 SHA512 92c877fdfd16f55997573f2719eed9a9609fe34baff4c8b09bdb500c9eaf3e2bd3536e60127f171a92c4a1b8d9446e00208856754758c21779a8bbd137c3fab7
diff --git a/app-crypt/acme/acme-1.13.0.ebuild b/app-crypt/acme/acme-1.13.0.ebuild
deleted file mode 100644
index 37a6145366aa..000000000000
--- a/app-crypt/acme/acme-1.13.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.15.0.ebuild b/app-crypt/acme/acme-1.15.0.ebuild
index 6e86a07321fd..37a6145366aa 100644
--- a/app-crypt/acme/acme-1.15.0.ebuild
+++ b/app-crypt/acme/acme-1.15.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 05823fee4791..855adc67cf80 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
 DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
-EBUILD certbot-apache-1.13.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
 EBUILD certbot-apache-1.14.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
-EBUILD certbot-apache-1.15.0.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
+EBUILD certbot-apache-1.15.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
 EBUILD certbot-apache-1.16.0.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
 EBUILD certbot-apache-9999.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
deleted file mode 100644
index d2e3aeb128a4..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
index bcdc453cba6d..d2e3aeb128a4 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index c9f5409e638f..159982220fd6 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
 DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
-EBUILD certbot-nginx-1.13.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
 EBUILD certbot-nginx-1.14.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
-EBUILD certbot-nginx-1.15.0.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
+EBUILD certbot-nginx-1.15.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
 EBUILD certbot-nginx-1.16.0.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
 EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
deleted file mode 100644
index 2ae43ed4bf96..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
index 52c50cecd71f..2ae43ed4bf96 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 6dfa20f45ce8..e94c21df329e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
 DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
 DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
-EBUILD certbot-1.13.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
 EBUILD certbot-1.14.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
-EBUILD certbot-1.15.0.ebuild 1152 BLAKE2B 427c31271d42843567d0d985b66079a85854a596e8da91142634bfc160e0b2e3fcf78af602a53bb3e9643d5c80068d37269f79e25e1b1fbdb8752f9dfb7c507b SHA512 3e32d7ad4e129d87d05d84365aab483bf7715eb10a730b1e195495461ac03d1cada5705f0c68477b56621761431dbdd3989e81929f99f453d91734de74075aea
+EBUILD certbot-1.15.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
 EBUILD certbot-1.16.0.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
 EBUILD certbot-9999.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot/certbot-1.13.0.ebuild b/app-crypt/certbot/certbot-1.13.0.ebuild
deleted file mode 100644
index e131af1788ec..000000000000
--- a/app-crypt/certbot/certbot-1.13.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
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/certbot-1.15.0.ebuild b/app-crypt/certbot/certbot-1.15.0.ebuild
index e2450c428f8d..e131af1788ec 100644
--- a/app-crypt/certbot/certbot-1.15.0.ebuild
+++ b/app-crypt/certbot/certbot-1.15.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 73c9c931dbfe..c04accb5a12a 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,4 @@
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
-EBUILD libmd-1.0.3.ebuild 564 BLAKE2B 8256e1ec9d23eabd5ab9d3318e5f0d387f0e9eb9d034bb8cff29fd8b77d4f11e69028e4ae90c0b434d1446c1a2ba38e5d5dc24e16ee4c976f2a7f5b35a4126f3 SHA512 c8f83133b1b958afdc8849b8817b514d399194cfc9699dec296d14d549873de74ca3113eaeadbb47869578f19daadc9ced934ed719625dc4bbf703c74e3dcf75
+EBUILD libmd-1.0.3.ebuild 563 BLAKE2B 0a43166defe23d160046741dd6811ccb897b4a27453c141dd854ce93b7134dc111bb0db9d4ab85592c0fc78e398fdf74dde2598e11092998a87f5557c033dcac SHA512 0b7b49b623b67ad57ef8f4eba25982f70eef5b378b03612a8cd4d9fdd566e1f618e81eb78ca06d010e7101bfdccbdf543bccaf460fc13149cd72f6aeb3e54ef7
 EBUILD libmd-9999.ebuild 523 BLAKE2B e512f27bd0203585b0e2f3eb11c6b38ea853949bdd5dfca7b2f744650b11a18994089bd847fd6a73c5a909ad7f7a9043c2421abaa811a7cf83ea9e4b5ba3ebad SHA512 0ff23822acfdf09f4ce1fa90184c64b58154fc0ab9d713424d32b120bc2670d63865b3be9c831c34c45a5afa308db9c5f5dc12753e9a4a7ff47b14d28eb0fe14
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild
index 26bacff07bb1..cc6cfe8082cd 100644
--- a/app-crypt/libmd/libmd-1.0.3.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3.ebuild
@@ -9,7 +9,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 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 72c00dac15f1..814955efb0c1 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
index eb2ddd529228..5e98928fb890 100644
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@@ -2,6 +2,6 @@ DIST dict_pack_ru-aot-0-4-0.oxt 1509261 BLAKE2B bdda8be3d0a9266285215ffaa4ad8916
 DIST dict_pack_ru-aot-0-4-3.oxt 1393032 BLAKE2B 8fa0587ae31a155631f799dc7c0214cab0f6c58a059d6948c540061afd7111eee26c18cc638a560928201ff718a638178cebcbd1b7eb17e65b45709217b47332 SHA512 17c0f4d75c397014e3fcb653c8e20d907d9acb2594ba9e43986312d1081f46638a0e3737cb1bf3932d602342f53add26f02efc4edb7e24dd29522aba901f240a
 DIST dict_pack_ru-aot-0.4.5.oxt 1584360 BLAKE2B 14282262644c8a2c1b1f7951f4c5e330213302d20b25f6fdcd431a72dbd0d42e47302402862b8bf5774d202b9c7975669cf395822d5926f6d6bf02f5a81cb342 SHA512 85391cbadbb152aecb30aee148ef936d950d1dc39d0722cc28650f50241cc0fae32c60ccc57d2a9fe8746dbb4df4579f5c002a6beefebd936322ed480aa13bd0
 EBUILD myspell-ru-20150711-r2.ebuild 826 BLAKE2B ec9c115a9cf016238bd0d2a53ed3a28af36d66d8439c7f79a769f267a40b65cfffad0a51f108e6ca5dba6fbec72002e7849cf5be32028a92ab3fb249e4066e74 SHA512 7f84b305b044091628c6f6a6ed11152c8c68b184b4ece332ca66987ee74ba4882dec292807ce644ab4e5506d0c034b7d1d0f1a176550a7d613533892c6b834dc
-EBUILD myspell-ru-20180627.ebuild 837 BLAKE2B bf6fe81e1a58ae086597c69563d06325eaa1c99f8fecd08ecebe5046e12ba57d788784336ccc3487c449d3c155d5d3a407e45abd0046276814e18aa879836367 SHA512 2de79dc1389967cfa5e900745cdbbeb73b677684d21bd620ed77bb3d259fd31fde80db73e192252f06b659972aa42bf81a77300ed7c76fa399a91ace95d8a356
+EBUILD myspell-ru-20180627.ebuild 834 BLAKE2B 06a794f6a7bab75906c050c09afb5204eaa29fc71b4258f3818adf4b937a88cd8032e45eda9ce815c461e7e2c517697229d1e8568ab21423bb63559dd83f45c3 SHA512 f6065905df55d2dec7b115d8afca1307767e980be75b42dd841825cb76ed6226c8c98daf436af74d47526372197119a9c6c4306eeea26a9c775304a816d84328
 EBUILD myspell-ru-20200606.ebuild 732 BLAKE2B 808d4316ce21679f1192203b62c3f4d3d95b3f8315366a24989bc4458a72ab48a8deb17d79beca38ae9659f602336ba70e49a161c247aad941f858d49ab19621 SHA512 fae4110277569caa119099af9fdc1819369111e7d85fdbde122609edd2e3bcc339f87befd8ab4c37224e2c927533c8b1f56504708f97231d33d06bf6259204de
 MISC metadata.xml 433 BLAKE2B 050e393f89b53c4dfd87f189e1dc53613aeab46280d70b11acf4ec6435ae6a64c83671ad02d68000f581eaaa17c2059418d71ffd437952848d9b8d2417d39da2 SHA512 725b9c110335ed4018853adfd6902d52eebd2e7774b0dc17e91748dc0c08e31a4beb15047ebfbd01153ff7a1b6b0f04e6717ff82d22a9e6150655dc619c03c75
diff --git a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
index c5b3a4ca275b..a41fe7e0ea8f 100644
--- a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/0-4.3/@@download/file
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux"
 
 src_prepare() {
 	default
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 31a52eee4fbb..fad1816ededf 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/cantera-docs/Manifest b/app-doc/cantera-docs/Manifest
index 3fdd1d9aea5d..36c2274ca2a4 100644
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@@ -1,5 +1,3 @@
-DIST cantera-docs-2.4.0.tar.xz 4915944 BLAKE2B c7c40651ec8b4c6f6488c49cc991a115f08d6053b3383e28660028e72a55b2c231bfcfde976bec5e2be85828e642668d71730bdc803198bdcdee0631c09208ec SHA512 182475b180e65bb8bd7d5259a3b2a385b2b7c7db61a258a460c3e5fa91ae101306702ea3f00c6996a65ae8ebd1985dcc84b6d8291434578938efbb584db94c40
 DIST cantera-docs-2.5.1.tar.xz 4916296 BLAKE2B eb3da9f1258f6ee71d8a886c916b7c53c886078a0cf92bb407b6ddde28da659e9bb9195809a65ffdf20a49cee107e1a6503a381b52cc58a36fe750bd7edc6d72 SHA512 3e7cac6bc5ef8c8721f4fa4aa34ba9a3291a8bb9919801df22d080a4a45158e9388d2e4b19f0b133fbf9e9a1810d3ef53d12aae032caed5bfe593bc3054de939
-EBUILD cantera-docs-2.4.0.ebuild 831 BLAKE2B d9a095ee817e46ea3c6d150d602d693971d519edb07936802c4253668393658cf76ba49eeb983442829cbcce3e69e28187814ce031caab581033a8ab74fe238e SHA512 5028e20ed26a2620895ec0ab97aaf3fc26f4998254b7714c0eed259fd1b41d10d3a50114f56d0af8de7973bb8a56e9b6159da8b85e3181736f0f411ec238d74f
 EBUILD cantera-docs-2.5.1.ebuild 799 BLAKE2B fd5848748292bb69b0d239104ee5c09ca6a562acef23de5679b540da4533d8cd4e844d41a103b0d26668322dba0044a6dc814ff24bdf5a0c43f1e91b28d93a4b SHA512 f5e8939cedb4ef879d4ce7c925270d41b6bbe0148cda57a03343381d6f35dc83f245f2ebd611762e172320e3347e65cce7e4d7a631385be5062b3b5e51d1d42a
 MISC metadata.xml 613 BLAKE2B 0f39e26b066271d192f226d50ce5ce19f1937662581dce8e0f9582615e14af5a62b46737a56be375adca579c4d79b069311d61f9d9ff7a2703ba04c94b5f53a5 SHA512 a185ec9416cf25bcd960988157266d9feecaf2bff97fd39765b1d4fef6d362a591cc434072acb03a03b15a0e5722c8185a63cfcb30cdddb617d7fbcf37a8b52c
diff --git a/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild b/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
deleted file mode 100644
index 9a9bf2122f29..000000000000
--- a/app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="Documentation API reference for Cantera package libraries"
-HOMEPAGE="https://cantera.org"
-SRC_URI="https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-${PV}/${P}_modified_menu.tar.xz -> ${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-misc/xdg-utils
-"
-
-S="${WORKDIR}/"
-
-src_install() {
-	insinto /usr/share/cantera/doc/
-	doins -r "${S}/."
-
-	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/doxygen/html/index.html" "Cantera Doxygen Documentation" "text-html" "Development"
-	make_desktop_entry "/usr/bin/xdg-open /usr/share/cantera/doc/sphinx/html/index.html" "Cantera Sphinx Documentation" "text-html" "Development"
-}
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 1fb94957feb4..8b127c79ff3b 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-doc-5.1.9.tar.bz2 74200779 BLAKE2B 9bca24edd9b73a2a532740538dd253a445e8acd1fa56179173be5f231be9781dfd63451e5ad1b4ebe8f676101f0db838f7acc032a5e0b0b21a073332e4978f6b SHA512 5c587fa7fe9611e76537efd8e6a1fc38ce299d1d5a974f27986925c5b6867287b5cd8350d53978e03ea5cff7c2782c1a0c12a5bc64c230973234cf2481a93f71
-EBUILD kicad-doc-5.1.9.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
+DIST kicad-doc-5.1.10.tar.bz2 74201837 BLAKE2B 6e9810c1efc46c52c4d7f4818c8a5cf438bdde82971074cd8d59a1cf81431d77d3d09877666dba8d9c3af8a2b0bcb643352db0b9f95ec60b1c3325f0f2adc667 SHA512 2795bafe835c94ea169484e997cb57a0e8b419e6e7b28324f96602940e5d66762cdf594ec6503cb8718707d6dfddde2070aadc8e97888c0bf455ea56f625dd43
+EBUILD kicad-doc-5.1.10.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
 MISC metadata.xml 851 BLAKE2B ccb27060634024b293cbbd1ee34d774b158d3d21e32f7b36d69c25422181d29d1d5a2de3e9b88f898314290e48bc381fd20d4c042a100d2047ce3d5e7cb36901 SHA512 f48e3e651a0810eddf6c990e4510e86fdca9ff2bc1d58b2df2169449259e8f57f54870d0f3461e8dc66b1ad38dc55c9e7d1493c2b4a73813c21c7b80972d16bb
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.9.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.10.ebuild
similarity index 100%
rename from app-doc/kicad-doc/kicad-doc-5.1.9.ebuild
rename to app-doc/kicad-doc/kicad-doc-5.1.10.ebuild
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 7b430c7f6c5c..8d6043195b3e 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/curses-hexedit/Manifest b/app-editors/curses-hexedit/Manifest
index e7497d1f4991..32b97493ffc4 100644
--- a/app-editors/curses-hexedit/Manifest
+++ b/app-editors/curses-hexedit/Manifest
@@ -1,5 +1,5 @@
 AUX curses-hexedit-0.9.7-fno-common.patch 1077 BLAKE2B b9e43f69e84870e295ecb4bd9bfdcfb7cf5afe8cc6d432b0fc93acf5a837a566e7fd024ee74ff1f0e6abed8926b28e6dc5979a9d02f7690069eba84490cc6741 SHA512 868d8196406d89bb63e64887a0d13eacfe6ed1ad1faae63b460f5d6c996dbcd3d58c12430cef8177a5890be91f2940a21f1b69418d3aed9957a009e13e928c1c
 AUX curses-hexedit-0.9.7-ncurses-pkg-config.patch 964 BLAKE2B aa433c31a1838cd9fd5d179f628aa2f4c9ffa44bc9eecd1c52c03b6b7a1837235259ad9c689bc6b574c56b0181c1a8ee556c46064b49b70a7393ce9ed99cbef1 SHA512 33efc29f64b9556e761f84d425b1e3c6207c06ecdac0499c9ce4fc1fe9023dbb06245987e8d4f23a6149607d033d1b6a22bf2e7cb5904f83a258cf0e91e56cda
 DIST hexedit-0.9.7.tar.gz 165110 BLAKE2B 8adcb2aa8265ef01c475fcefc97c987da26107871ac87e6154b13257cf30283d5be96fb87d67b6b24d79cf0fdcca7c2bfcd1ef642e9bc1655141cada27fd9aab SHA512 b11b28538900f6e66a9efcca14cd8c2a312c29cea98c6ea5018cd3423e12876a9a4d0bf6dc4f94e7cb02e8bc8d3a406e6bccca7fa7dcbab2e4b717ee2fd826da
-EBUILD curses-hexedit-0.9.7-r1.ebuild 761 BLAKE2B f106a5b92d343a63a931beb5f3f4820fcf1aed2069abcdd07b27314b3f87e966333f9dd20cd45d1cb3a783ffd392f6d4ad97192bb1ac94e7a18c3b6295b6a380 SHA512 13150576c07792fe5a68e19decc7f6efdfe70630f50bc737df4e2811d70daac8c77c5a347e8e2f22e233677e8c8cb25aa909ae9c9ddc5ee9016ce96aeb59924b
+EBUILD curses-hexedit-0.9.7-r1.ebuild 748 BLAKE2B 1e1971082e9f610fd0bdf92a35d3064b2e01bbdaeb84c092d957d0ba5a8b95c86eaf70a3074063f8dbc4c636432e4dff9bca1a5b49d974dcadc14950b0dc6a79 SHA512 b5e297145e94fadd488e9b3ae1ee4640fab4fab7c343f7d637a5f6da00d65a8220d541702361dd5ec9ab96a4c536b99220fd22d1d31cc9b430303e29e79685b0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild b/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
index 1572d3c98ed0..af9d0b852813 100644
--- a/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
+++ b/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
@@ -4,12 +4,13 @@
 # There's already a "hexedit" package in the tree, so name this one differently
 
 EAPI=7
-inherit autotools toolchain-funcs
+
+inherit autotools
 
 MY_P=${P/curses-}
 DESCRIPTION="full screen curses hex editor (with insert/delete support)"
-HOMEPAGE="http://www.rogoyski.com/adam/programs/hexedit/"
-SRC_URI="http://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz"
+HOMEPAGE="https://www.rogoyski.com/adam/programs/hexedit/"
+SRC_URI="https://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 588133805b2e..ddd49e8bac3b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -16,6 +16,6 @@ EBUILD emacs-25.3-r9.ebuild 11142 BLAKE2B 2eb2fe9e84133d53d874e66b05fe8f98c5460f
 EBUILD emacs-26.3-r4.ebuild 11785 BLAKE2B 807bbd1eda823268087003da546d68b5837c4984736e85db519e8ab02924b366a34e8df9d08dcfc0da8b7996c2d4a82a0abe305ceab26eb3783c895e6894c8c7 SHA512 2fb3a6622224509586aaea43dfde63d07e1d568baaa4d808e4285b5466f369fd34a21c56519b0a15e131cfd48f6cd046010eb62cdc6c3ac8e238f3ba4c1a22c5
 EBUILD emacs-27.1-r4.ebuild 14334 BLAKE2B c524e15aa87eebb1eacb52368fc11b17c429a10c83509e883cea3fada349d7a63e7947b1f3c050641ed65fabfbad2ebe965ec19f96b062ddc62162d344bc044a SHA512 7238304e452cf3bae3930c25726fb92a8b76c35155c35793a69aae08b23b7066b34cbb1ae18bd385388ec07170da14008cd89397bd9483a9033f4feaf1632baa
 EBUILD emacs-27.2.9999.ebuild 14298 BLAKE2B 5649b3f948225639e73f6b4570f6facf9e81f57476354604c78a178be8f146d0e9325d98f3eb52689d2e02ba522ffe690e33e9c610b6e99584704a2f140b805e SHA512 e22fe0e2da09c9823bcedb148060a56d5b481826fe98f09a6112b3b27d65778e0db12a748e7ec42805345729a0ed0bc0ea46a7878e12588cf4cf999d69f6746b
-EBUILD emacs-27.2.ebuild 14293 BLAKE2B 893221417f1613e5a21dbde09762eb8befebc1adae8fe24e49e103107e1d892a874da2aef5caf196cee895f17d91f2fe95eb05bfc63069b5790dc844f2832c52 SHA512 f5d2221cb409ebf1248f18fa336bb8d38ea165dcf5e323be345f1bc0552423ac8f60d726492b327c85701360ddd2ce705b5950560b24e71aec2279e81cb64d71
+EBUILD emacs-27.2.ebuild 14292 BLAKE2B 7bd11f527bdd8f72ada3cefe1ffd2914b439e64107c5fafee9331882744dedaf9b0e9ec029edeef6a5247f36b991376c14c4e28fc5a6ba19cde362f2caabe842 SHA512 084a830713fbd08016bda90d76729f8bd8eae4a97aff27a76a3a889d6c7f26b9a71260febbf912676305729974b6454bf690a35d9934d90ffc2ecc16124e5d43
 EBUILD emacs-28.0.9999.ebuild 14185 BLAKE2B 76d5f0f59a0cc1fd4399e7aad1544d26d5abc0473ee01e7541a633fa743b2be880c8a81212fc37845bad64292851fdda8ec67833760316d8d2c7980d0c7fd37e SHA512 8e3b7413a3d8224a3b8642546f2d47afd5bf3c0404caa60deb97c20d6c4178fec990785b51df5a1f6ba0d5d156161195cd818ba3df7fc8e92fa8802d32ca129d
 MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild
index b5355a44356d..271469e3625c 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ else
 	fi
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
new file mode 100644
index 000000000000..df8efae13c09
--- /dev/null
+++ b/app-editors/vscodium/Manifest
@@ -0,0 +1,7 @@
+AUX vscodium-url-handler.desktop 294 BLAKE2B 340dc0ae856092ec5d4d044ea1ac2ccbd4d4ac8eaa3bab6eb7a48eb21090b1bed24eda15f3eb4c22d0326a802b7ada77a5b6d7277b80d7885c529edb062e85f4 SHA512 6916dbcb0ff1eb131b1bc17aa8c601cf34bf1264702ca574bd6427d3b3daa6d7d69cf0591c48734205b0f12cec396917b89317107b2158b58a0a4ba8ca04cd86
+AUX vscodium.desktop 460 BLAKE2B f07817a1c718b3b981bf353a8b73c9457828b9f48524f01c2a7673111a729b2f81674beae006d566946b81e52a0df162e7ec8a97e050607ecf413f22f6f5b9b3 SHA512 fc05408dcb33ccab0a91e71da36e461bb40f5b8a2b8477f283080d050cb612f55385022228d73bc3b48ae2b7ebcedd63bfc5924c0d87928d91929da8577051c7
+DIST vscodium-1.56.2-amd64.tar.gz 108032091 BLAKE2B e6d66885f79a8f29e9316cf759d6b562029a3da9c3fc6d14742adda0ae20e4be05b6c08f8c1698f3340cd0ca97836c49d3ef82bca9a27318d5f6d5e36555455d SHA512 831444221a3055fde829920ad6c0b8c007aa539b614918b20af0e676ecd31f341497f9c7fb8d8fe95f757bc360446cac93e00ee1a828183e0feb1eefad1e0c11
+DIST vscodium-1.56.2-arm.tar.gz 96683293 BLAKE2B bdc6b89ebfa9e1be765aef63f8a2bcdbf2074b64d70833447b3a3caf148c7887c672077827b7467a681219eef0101bdf82581f589586a263397d2cc9951a8c0c SHA512 023c59d4ae6590437c9425fa02f70cd957c125ea69cfa1c4fe8812f2b7521b747421efe89fd3e4bd95b54f0bdea177941f72467af5d8036d51426b8139a48fc2
+DIST vscodium-1.56.2-arm64.tar.gz 113358341 BLAKE2B f7f8c8589985edd11ba80b4fff9ab1174d436a2516eabc02cd6b3f5d03559295f3fe6772a16e6825d6a23953107b5b7537ab28cedc040a8b35a4b25182ee8d29 SHA512 f0aec2074e93bc26cfc615029bbc9ab360993f00a70272002982c058c7746824f6d97fffb34a5d6c16597b4ad8453730f28b04c11e4d0fd8ccea873490b260d5
+EBUILD vscodium-1.56.2.ebuild 2353 BLAKE2B b0d5df95befc92bc17316a3948c93ae5cb0f7cc12d3cde72b92b805fbcbfde61913bac6a438d2cc1b809ae55b4cea7ee7775d5cbe87961addc7572b161b55f82 SHA512 7003ddd421cc3416d7aa26181e1da148ab152fcecda780c0fecba4b8f1d8df9bf7af89fac0fc4fb5a5e88d1c945348adafcd59d280f016c89bfe32147bbc98e7
+MISC metadata.xml 1190 BLAKE2B d2a237155cf015fd18d0bf562747788584142e136c3ffd98ebe1a07c796562a65c27818c0ba0db9e5b64a3a8d1f5c9465e48de285f38042890160eedcdcf017f SHA512 f8e6986a85092e68c016aa34bd4948f0eea6f83b26935e07697ff1c536616c6829495467b2e09d4cda01699bae5c7825fcc711adc2f90e81e60592c168220d4e
diff --git a/app-editors/vscodium/files/vscodium-url-handler.desktop b/app-editors/vscodium/files/vscodium-url-handler.desktop
new file mode 100644
index 000000000000..780fb6d55584
--- /dev/null
+++ b/app-editors/vscodium/files/vscodium-url-handler.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=VSCodium - URL Handler
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscodium --open-url %U
+Icon=vscodium
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/vscodium;
+Keywords=vscode;
diff --git a/app-editors/vscodium/files/vscodium.desktop b/app-editors/vscodium/files/vscodium.desktop
new file mode 100644
index 000000000000..bea1b284d393
--- /dev/null
+++ b/app-editors/vscodium/files/vscodium.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=VSCodium
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscodium --unity-launch %F
+Icon=vscodium
+Type=Application
+StartupNotify=false
+StartupWMClass=VSCodium
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Exec=/usr/bin/vscodium --new-window %F
+Icon=vscodium
diff --git a/app-editors/vscodium/metadata.xml b/app-editors/vscodium/metadata.xml
new file mode 100644
index 000000000000..facecf84a9fe
--- /dev/null
+++ b/app-editors/vscodium/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>adel.ks@zegrapher.com</email>
+		<name>Adel KARA SLIMANE</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Microsoft’s vscode source code is open source (MIT-licensed), but the product available for download (Visual Studio Code) is licensed under the Microsoft-vscode license (a copy can be found in the licenses folder of your gentoo repository) and contains telemetry/tracking. The VSCodium project exists so that you don’t have to download+build from source. This project includes special build scripts that clone Microsoft’s vscode repo, run the build commands, and upload the resulting binaries for you to GitHub releases. These binaries are licensed under the MIT license. Telemetry is disabled.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">VSCodium/vscodium</remote-id>
+		<bugs-to>https://github.com/VSCodium/vscodium/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-editors/vscodium/vscodium-1.56.2.ebuild b/app-editors/vscodium/vscodium-1.56.2.ebuild
new file mode 100644
index 000000000000..e25a3967ed49
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.56.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret[crypt]
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libpng:0/16
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscodium/codium
+	/opt/vscodium/libEGL.so
+	/opt/vscodium/libffmpeg.so
+	/opt/vscodium/libGLESv2.so
+	/opt/vscodium/libvulkan.so*
+	/opt/vscodium/chrome-sandbox
+	/opt/vscodium/libvk_swiftshader.so
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
+	/opt/vscodium/resources/app/extensions/*
+	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# Cleanup
+	rm "${S}/resources/app/LICENSE.txt" || die
+
+	# Install
+	pax-mark m codium
+	insinto "/opt/${PN}"
+	doins -r *
+	fperms +x /opt/${PN}/{,bin/}codium
+	fperms +x /opt/${PN}/chrome-sandbox
+	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+	dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+	domenu "${FILESDIR}/vscodium.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9076809774e5..3326d2a84b2f 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/libegit2/Manifest b/app-emacs/libegit2/Manifest
new file mode 100644
index 000000000000..11ecb52c303b
--- /dev/null
+++ b/app-emacs/libegit2/Manifest
@@ -0,0 +1,4 @@
+AUX 50libegit2-gentoo.el 199 BLAKE2B f9f7b6d2c6d8a70d37e698dd71a40b0ccb4224c1276393adfe2eb546313cc3bea29136820f98d3579f6cdeafd0559e1739150be503233de44dddefd3f97b66b6 SHA512 067030b050715f80251b28a179c0b4779efd311c4d5c1e0bb2bdd10f95442cd8f243c45c81f004ad8362740aa0139667324ef9c829abec7291ddfe801ea4c67a
+DIST libegit2-0.0.20200515.tar.gz 132122 BLAKE2B 2e8e06fb833e5ea2ee0f4e1fa760d30e91235a9b9c4a465de6d8a12d6c8431bdc85204546ba36c36f206e2788d9f1cda00d578c1c40057ccfb3f2117e8302013 SHA512 f604591ba272ea1cef8c428f644c0cfcc4ba2438a55c2b7a0dd1cdcb15836c755c0c6bdc6c42bd6da05935bba7fdac30efe65f26307599b07e591f4efdd1e897
+EBUILD libegit2-0.0.20200515.ebuild 1054 BLAKE2B d8e402885e7462fefb237d6740f822b4ad229611a01939c2fd3611aa40ff57652a8dff254d504b45bdc0ceafbc8032e154cf39b31e8b999a41657aa89ed9c666 SHA512 7bb6ecc9c06e3517259efd08500764902a3f874dfccead423207dd9f27ef47f6e86fad5f874f29e55f6d4230d84e307c6268c37c50be60f4a67694e074fc0520
+MISC metadata.xml 481 BLAKE2B d06b7cfec5217134e02da97f1ddce3c04b515ac9739ba5ae2044a00bad58350b1da130d07db461fca4c0fed83273ddcbe310cec4b5247b95ee980122926ee62f SHA512 777c402b7b95a7b37e920553080bfb848529f0fa74cf15cc3d3e0664405dd9c7c711f248f3e3421d2019e89b4b50aa5cd42994796462a3faec09c3adbeb6f4fb
diff --git a/app-emacs/libegit2/files/50libegit2-gentoo.el b/app-emacs/libegit2/files/50libegit2-gentoo.el
new file mode 100644
index 000000000000..4117c7926cd8
--- /dev/null
+++ b/app-emacs/libegit2/files/50libegit2-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@EMACSMODULES@")
+(defvar libgit--build-dir "@EMACSMODULES@")
+(autoload 'libgit-load "libegit2" "Load the `libegit2` dynamic module." t)
diff --git a/app-emacs/libegit2/libegit2-0.0.20200515.ebuild b/app-emacs/libegit2/libegit2-0.0.20200515.ebuild
new file mode 100644
index 000000000000..866475b7aba7
--- /dev/null
+++ b/app-emacs/libegit2/libegit2-0.0.20200515.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+COMMIT="0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a"
+
+BUILD_DIR=.
+
+inherit cmake elisp
+
+DESCRIPTION="Emacs bindings for libgit2"
+HOMEPAGE="https://github.com/magit/libegit2"
+SRC_URI="https://github.com/magit/libegit2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-libs/libgit2-1.0.0"
+RDEPEND="${DEPEND}
+	>=app-editors/emacs-26:*[dynamic-loading]"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+# The tests seem to be written specifically for the libegit2 git
+# repository.
+RESTRICT="test"
+
+src_prepare() {
+	# Don't build against the bundled submodule
+	sed -i -e '/subdirectory.*libgit2/ s/^/#/' CMakeLists.txt || die
+
+	rm -f test.el || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	elisp-modules-install ${PN} libegit2.so
+}
diff --git a/app-emacs/libegit2/metadata.xml b/app-emacs/libegit2/metadata.xml
new file mode 100644
index 000000000000..717abc0dea75
--- /dev/null
+++ b/app-emacs/libegit2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+  This is an experimental module for libgit2 bindings to Emacs, intended to boost the performance of magit.
+</longdescription>
+<upstream>
+  <remote-id type="github">magit/libegit2</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 60d409614f87..77ad7188dd99 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,6 +1,8 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
 DIST magit-2.13.1.tar.gz 520271 BLAKE2B fdffa561dccaafc2be56bf285e286859145e00f5037c99b5ab1ee50c9895eee56dbe8a5470e3a148e0150367bf92ed1c7cee4a35662f5c0bed0e4e7a2d49638c SHA512 f9f796fd6840788cebff62b316a0a1d708736e7a6962cd34d8ea86e94fb5a55c9e25f9aace17bceec199b2b931a0d5e586c4ab7d189c64ec6e5a9e42d041b269
 DIST magit-2.90.1.tar.gz 544968 BLAKE2B d3a38cf8c4d8c15529463028c4f6718d65bff044f91f58f2027c62d584202835d17229ec1db93d2990b5bb59403eabf7f12e7e91e2de519149ad40c274da5f25 SHA512 57a81fc72276907009fd3d05abbaed930d089d3e4621d539abb6ce2b24fd594950533f47d60682e25f0bd1c9f1ab3a16ba6b2698d79c6980f250ffd335be7789
+DIST magit-3.0.0.tar.gz 610528 BLAKE2B b667a6f12020f37303fa5d5c8bc71cb8f66bd25acbed704f3b3ba666b95b656da8c1b979d592e58171dd7bbaa4896b8fa144f52ec65e28976a88f42917df9323 SHA512 f1bb0d96906d327bb929cc45e2496a214513b1da4fd68e78a3db188f19dd69bd253c83e6b7881713989ee2a70d2f2cfdc9414263e0ee09be34cd72eb7fcb198d
 EBUILD magit-2.13.1.ebuild 835 BLAKE2B 786b7e8ac034d16b1baef4620c1eca7b436dc3c13b75d97e246970d80a96575c5111d12edd3c34e792126706b1cc87ac295e8292361a917948f9988949730869 SHA512 78e0c514ebe0eeaaeb69c66980794886e8584e52dc1a695ff8a333eb91be08ca8ee6b8cfae902633aa7572d123b609a82d4e3ed96ff59e27c4f4f410a3004df8
 EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
+EBUILD magit-3.0.0.ebuild 823 BLAKE2B eead5e1ea1d1ba7e2969cf81358cc9089c1e7b7d5df257d93133033430e7ea5342cef6cd4aa3b74b1cf8615205f6e438ed1dc52704330bb8d0e5cf7a41fab80c SHA512 fcc54d58483dc52229468ea2e90150be80d3efce32e4cab7fdf8d12956c9a8a51143da6b99151f402934d777eaf6d0134bbf8f5381a696cd10fd489ebab8666e
 MISC metadata.xml 811 BLAKE2B aa2a5aaf1024e2a75c24cad4d01622884ffde259c3a2d9869df9629741d4a19da87c5933efd2aa58a9fc0256150e8bf5e68bef99595993154cf06027f2de4b83 SHA512 ec3ade59fbba30a15b3b728f293884c9f5cf532a8ca92c984c7978b73061cbd5a7b4b1fc68af15d28990d13f50cad688d7cc8229e9e38988bdbdbcf2fbe2a900
diff --git a/app-emacs/magit/magit-3.0.0.ebuild b/app-emacs/magit/magit-3.0.0.ebuild
new file mode 100644
index 000000000000..1315dee8fe75
--- /dev/null
+++ b/app-emacs/magit/magit-3.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*"
+
+DEPEND="
+	>=app-emacs/dash-2.18.1
+	app-emacs/libegit2
+	>=app-emacs/transient-0.3.3
+	>=app-emacs/with-editor-3.0.4
+"
+RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+	default
+	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d520fe39ee52..1932b0e1444b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 142ed1466798..1b196b8a8e97 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -23,5 +23,5 @@ EBUILD libvirt-7.0.0-r2.ebuild 8728 BLAKE2B 69047ed88abf8ec34d90c77ab7ebb9251398
 EBUILD libvirt-7.1.0-r1.ebuild 8479 BLAKE2B 2b16121f4b0930eae86e7866ca7ad5859cc5009cca4d3b2d3e08566a40dbe94f54e324435fdaa8ac8c6b8eff269fc02421c503b52ffd7e5ab31577bc40b03873 SHA512 75a840582349c8c9373e6f15645818a0f5ba6c8aa4510ab62a16499c9dc7d06f23d1caf488ada35d6d51b24fb62cb96d9c362c0cef592b75adaee8516739c4c9
 EBUILD libvirt-7.2.0-r1.ebuild 8285 BLAKE2B 7d5c0c746e44714177a6192250992e190d57deb8ee342e7fe5f457b2bb6a905bff860544f7fd6267624d46b95b0e75caf905dc6c29ea273f8c72cb5edbaadd45 SHA512 a578a69498e3bbe5b5d9df0509c9cfc6294d49f351bdf4ab20df8392152d655777897c8d15e58c2ff344251c444b981f3f7e58c49b09d952816733dd73f0ab9d
 EBUILD libvirt-7.3.0.ebuild 8183 BLAKE2B f5883eb9d0f5e8413fee7c1a413734957e99445fb60cbe56fea042c486430eb66a9daee811cd73befa1424aba25cda75898a6dc94e65ff000b275d89a0de6956 SHA512 c606015a23412fbb5878e939987ae98851690bbae777eec59e80945097751b60f960a4d1488943c55d0f9c3bc9b926e78574009fce707b53ffa4e26377fa67c4
-EBUILD libvirt-9999.ebuild 8183 BLAKE2B f5883eb9d0f5e8413fee7c1a413734957e99445fb60cbe56fea042c486430eb66a9daee811cd73befa1424aba25cda75898a6dc94e65ff000b275d89a0de6956 SHA512 c606015a23412fbb5878e939987ae98851690bbae777eec59e80945097751b60f960a4d1488943c55d0f9c3bc9b926e78574009fce707b53ffa4e26377fa67c4
+EBUILD libvirt-9999.ebuild 8209 BLAKE2B 75eae972c65414567b4642006d3f8808a3891869b2f20b35b83e4915e3fe8fc260faed427ebec4a576b02f27db548b34b000a409fc41f565abc69def47611fdb SHA512 36087e78dcaa57efe1d479cc76323d6bc3634a72b2e2cf16a4f981f3cc5caca9f1854fad0d20f3745e836a4f86968659434237492f83779151405337a45dcf9b
 MISC metadata.xml 3326 BLAKE2B 70997d3eee5387a0735faad11a891927ad7c96b5fed632c3774611a7c35159eacfd6b0e9561c09dd08d64112c6bd66ff011fd58ed23520bc4f4f531c0d5f4693 SHA512 651bf4d8eec1af7b08c8b1050f2a4d57fa8e205205c59f231d3f84be643a71633b1426e9df1c83c838636245503bfefeef66696ddb9dc9e8da6b1aadee741856
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 2de18dcd6e20..ccc4f6f1ce73 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -10,6 +10,7 @@ inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfi
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
 	SRC_URI=""
 	SLOT="0"
 else
@@ -225,7 +226,7 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		$(meson_feature apparmor)
-		$(meson_use apparmor apparmor_profiles)
+		$(meson_feature apparmor apparmor_profiles)
 		$(meson_feature audit)
 		$(meson_feature caps capng)
 		$(meson_feature dtrace)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7440efc85a6c..c163bd54e83a 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -15,6 +15,6 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd
 EBUILD qemu-5.2.0-r2.ebuild 25479 BLAKE2B c53c242253d3571ba7d5484ff30773e16aa51c4c14be99c7c50326657220c3ddfe5e84074b0e99268582d8c735b6ce71a179ab5ce5d88cdda33dcd0f0cc3aef4 SHA512 88f55bba87bec4393f3e4e1706ad5352a7b2f1f531b2f4c74370beeab7e4318428113040861b0dd37ed6ce3524caadfb957ab15a329fc52cf13ea1cbbd70c86e
 EBUILD qemu-5.2.0-r3.ebuild 25639 BLAKE2B d23bdb53da967696bd56afd27ef58b4653b7954d170c6957a9956aca3f6b0d23c72a3e3f786826110652838bcebd4b765fcdd679b50754fe35d04e160bf44dd4 SHA512 4860b1b80237fa6c15fd798bd94327b3b573738365a768bb1c18ecb055bd30c8a762bbfa6df3b83c8293407e2029af05de4766c9310a64eb5382076865dfd70a
 EBUILD qemu-5.2.0-r50.ebuild 25747 BLAKE2B d3e246fe9e046bcdd7b8e6d0210f0189dc399a1fe01146467f0106e92b7a91b963fcecc990266aece5aa3fcfdc79f27d84d41bf9a9dd54d7d73d2fde7ce7876f SHA512 b7c010506d72909a01dfe01cd0118a67f274322aeb12adac700631dba7198c26d3c465bd38af9fcc0bd3d46890f7dc43b45897188b41ae1bfca27e1bf68eaa22
-EBUILD qemu-6.0.0.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
+EBUILD qemu-6.0.0.ebuild 25567 BLAKE2B 8fa84bfb7ed4c04b8c5fc5565b7886f3631d573c9cbd366d1675b445455b3d3d890a8bbf3313fa2560919d0977a0b52892237508f73ee84cdc38e19d75baca8c SHA512 0ded00d0e2217c628af92fea7b12a517b002e77742ffd3d45b92c32f02a6ce212fd6d7a4fb1664a7f615d2e75d98fd7c1650df6968680945f90cba929e6da477
 EBUILD qemu-9999.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
 MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild
index b3bbda4c9b82..1a60df4d49b6 100644
--- a/app-emulation/qemu/qemu-6.0.0.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index b93bd10470d9..250ce86ec17d 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -12,5 +12,5 @@ AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821ced
 AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8fa0f33e8c68fc5de873b92398dd4a048307f3d4db47eb2d04a8323ce3748e893e190d42ca5168de442c892edff92834544edad52 SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
-EBUILD ski-1.3.2-r4.ebuild 1558 BLAKE2B cc28e4ba990db883074b505a50ad823d9104e7fb6f8746fa14e4de1f707556a6bd1bf7ab5c0b33f99b3e2b949c5c4220ed72258c2aca1ad282332842cc357a02 SHA512 cc7eccadc7ddd10c247afc8b5ff840fcf93d9452396c553cc3401040a58b2c6e03ab8692a0cf99fd33d92c0f0b2b937e5ddd11bc42008531f37ec301e72a6ed9
+EBUILD ski-1.3.2-r4.ebuild 1506 BLAKE2B 90836a677e69fb8ebf30da8e387f48b440999de416f2924e4e11d0db2a3b36f55b1050a67bf04b3ab86319664cfe8b0493328907debf72c45254ed990d959b53 SHA512 e9c9f64fb7230421a12a910ee4d46e9defe4ee6a9ef85fa8fe47bc9f7a6afa91bc2eb387736639682848b1e01be433f079a08c822c687a30ccd5a5fa66468892
 MISC metadata.xml 445 BLAKE2B 9ed57ae50b2327c0fc3bf69bf2ced1dfa2b069abda5da550bd82d04cdf834fe9e5f2a5089a9e5788c45bdc4312127654d482a9b6edc7a39adb05844705e36099 SHA512 6e91887d446a1d2fec5ab934df8d3cbd629bd905541db8300751f624d19061f8d78ccc632d4d36a8505f2f4e29137a20fb2feb0aad061379ea6e39783bdbef58
diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
index ed996625c01d..c5bac307e7ce 100644
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="ia64 instruction set simulator"
-HOMEPAGE="http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator"
+HOMEPAGE="http://ski.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest
index 6e4355bbc19b..f7ea8d393dc0 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,6 +1,6 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
-DIST snapd-2.47.1.tar.xz 3664756 BLAKE2B 90cb117ea385890c38c6efdecd3652c115158ad769858ebe1a5035d37c9543da5b2a8768ce4f56cfcee053701d308f826bf7993d9b5f9d5313f2840ca829ab23 SHA512 e08dd7057b85b970a1177996c483d3f663b1424cdbf6643a69923a7012d38fc13109b449ce3a2c5c8d65e5836f93a36567f2f641a62caea6e9989a458f7f2892
 DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
-EBUILD snapd-2.47.1-r1.ebuild 5572 BLAKE2B ae6c639cdda970dd44a23025b735ca370d976279f7a311892eeb8c802e52c2ae6c4c611c3160ca933d9409aab5b31a4e046d4614a79d5aeb2e80f29e80a73157 SHA512 d09ab7989bff32bf1f257573c12a7c50c490e154580c87f852ff935a6990901d5f0f7b90bf2a8c49c51ffbeb5ba2e342808fd543f0d9141ed066b8d125091cbd
+DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15
 EBUILD snapd-2.48.ebuild 5366 BLAKE2B 1dd5ce2d317e9be68f85edae48806f53fd8e79f7479c08af66b0dd329273f80fc9d8fded1550af67210e751ae276a4848fb3e51f13c172376cd865d47bff9ea0 SHA512 2f237c6514e5319eb4d99578f7b1ad2c4a9f506bf29e7f3d5212a41eb56c0a9158f19b11f4a0385653e146691890427f2b07eaf5dbd4c743a95aba1339c13ad1
+EBUILD snapd-2.51.ebuild 5372 BLAKE2B af735d3f690eb176b37611bc16770bfd92c311bbe8578254b9859b57df1ccb9e650358f40b24770934198a7edd74df758848f70b79503869da11dcc388a04381 SHA512 41d520a0c0a03d47e00b01dd67db1336599c42af377e6b8213c257ff751ec6fb1593c250b37b0c6668b515f30bb16a4fd7d459fe3d1376dcaa39d16e19555ce8
 MISC metadata.xml 635 BLAKE2B b3ed2d2b0fa24d4f06a0ff8a01391856432c6cb97eca89d49bafccbd1f5421073f4d5366484b784e8683d288e26908306a5abbe3e1766e784c1effd2f29ee3fd SHA512 e9319595c1e6b96c2907010873d5793b981c88b34bc1df2f3f6e34ef48ba7bb9b98d32419372688a48ec4d8310083055a6be735e9bcc6e59df2ed162e311ea1e
diff --git a/app-emulation/snapd/snapd-2.47.1-r1.ebuild b/app-emulation/snapd/snapd-2.51.ebuild
similarity index 94%
rename from app-emulation/snapd/snapd-2.47.1-r1.ebuild
rename to app-emulation/snapd/snapd-2.51.ebuild
index 863784f7b24c..abc28376ab87 100644
--- a/app-emulation/snapd/snapd-2.47.1-r1.ebuild
+++ b/app-emulation/snapd/snapd-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,14 +42,15 @@ RDEPEND="
 	virtual/libudev
 	systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
 	sys-libs/libcap:=
-	sys-fs/squashfs-tools"
+	sys-fs/squashfs-tools[lzma]"
 
 DEPEND="${RDEPEND}"
 
 BDEPEND="
 	>=dev-lang/go-1.9
 	dev-python/docutils
-	sys-devel/gettext"
+	sys-devel/gettext
+	sys-fs/xfsprogs"
 
 PDEPEND="sys-auth/polkit[gtk?,kde?]"
 
@@ -68,12 +69,6 @@ src_prepare() {
 	sed -i 's/libtinfo/libtinfo{,w}/' \
 		"${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
 
-	# Add "gentoo" to altDirDistros: https://github.com/snapcore/snapd/pull/9588
-	echo -e '@@ -289,2 +289,3 @@ func SetRootDir(rootdir string) {
-\x20		"fedora",
-+		"gentoo",
-\x20		"manjaro",' | patch "${MY_S}/dirs/dirs.go" || die
-
 	if ! use forced-devmode; then
 		sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
 			-i "${MY_S}/sandbox/forcedevmode.go" || die
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 82fcc38de0eb..557ba087ddb5 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -4,5 +4,5 @@ DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee
 EBUILD virt-manager-2.2.1-r3.ebuild 2369 BLAKE2B d429198a0d3b4e629b28bc43de33950e6a2e236cc732d641e9d05d9c48da1c3f3da629f06e3c451d357c9cd933bebc5950ca55aa3f6889e05775d2020e86a220 SHA512 49831cfc41641f24cc19306d829246bef0d80138ead3a29f4a311f775f88da4ee50ea40f14c05ba1751b5e7042d4ea4f8831d222ebdd5a9b100a38e5cd55cb30
 EBUILD virt-manager-3.1.0.ebuild 2426 BLAKE2B 0cddadea64ff30d4e262095c5fc0c3623c6f25a9a16a280aa594a62b437d20cbfb9cc4e12f498d55ef8f2e29eefa4a242daddcb04a267f169f38cc9770d007ca SHA512 09787a65b161d8b81e36e2210cdd0a3932013891d2dc86d97411d02734f8b0ed7c3936b69f88eaf80aef4d4035d5730c2fc73b87ddde0681c243d7cc548fc654
 EBUILD virt-manager-3.2.0.ebuild 2410 BLAKE2B 2fd0693f3f03309ddd7f037852471a37e6cc8acae79e32323530985f06823fede5685da70a9cabc8db345ed3d9f05f8f1334a931353e665fbe0d9687aa82ba3f SHA512 34d89c7de927bda0a3c92f4977ffade32d85f261696264a180f9602a665ae6581bc0033406ff45a39f1329a1734e496e3e6da003e6f332090cc66ad5038b03d4
-EBUILD virt-manager-9999.ebuild 2405 BLAKE2B f9428dabdc6c1193af28d6c6829bafbef6ec70fdc9b9ad47600b2b73c25708856caef642b4c72ad327fec3c425547f57eca644fcba78d9ec497fb0462279dd7c SHA512 fb0017b665759dda9e58ffa010db2fb0a6fe6cbca1e5465646d3280129e9167acfab79ffb1c80289055a298549e871468c230d669e76731f285bb2f87c6d05da
+EBUILD virt-manager-9999.ebuild 2469 BLAKE2B b85b2152a80e57e72e80e3b8a198cf210acc78a108b46456bd2871d6d176aac0705b8ba47a6f22a5cfa4559d4a1fb5a7ee599af3b1b2882efa9ea9b37ae2182a SHA512 9499fee65f618ed2916388b3c826235eb822f192e37c258a49aaa7eb910b1479bfa8ef2edb1fed1bcc2144ee2559bf0578986e10667405fc507223d5c98aa817
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 4c93200f4a26..5bb21473d4dc 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -16,6 +16,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="master"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
@@ -34,6 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/libvirt-python-6.10.0[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/tqdm[${PYTHON_MULTI_USEDEP}]
 	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index ba4d56cd9b4c..6db321d04406 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,7 +1,9 @@
 DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613
 DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820
 DIST virt-what-1.20.tar.gz 459243 BLAKE2B c51bfc4366ba90e32548a5d1e0779fcc1835dae7a6bb2b6f67b4371c2d2e949339aa0ff67d64485cdb03592713a3ae04a6779e4dac0babf08bb268ce6403066f SHA512 edf74903122bfb422c7a5ecba711bb64d6ef668828f208dfc0571ef14f2643456c14bc9a77dfea209df3d93869ac0a2c9fd039779922eddc6ebd9d988585dea4
+DIST virt-what-1.21.tar.gz 478767 BLAKE2B 7c48b84d9f1fe5f734921f68848b84beee2e5687a6ebfbc422a1349063e6a83c932a89cb2936239da6be033b72e6010694314cf106486cd6c54cd02652bc61a6 SHA512 14ace184c4aee5a09b855c1f5acaa619057aed1b9bf03c91ed1003e6a39ea69162c9fe452ea8162c7fe29825e0e2202cfc7d76e82f0cecea3e32405e5eb9f717
 EBUILD virt-what-1.18.ebuild 610 BLAKE2B 8e8cacd1b74212ef1aada2102323f86b74ae8c15da54be191757f57182042f2a98c380ed4dd956ecfb61e97c7798570ecf0aa5b83ac4831e3f8a8cdffe18c545 SHA512 b47766c54839bce195ab5e19ff653e2d50d0c920710939fb6fac807a28ad3469ea9da6b9e89ec686106b40ab13317eb53923ed2e1c2c6088a7d03f390f87fd70
 EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9
 EBUILD virt-what-1.20.ebuild 613 BLAKE2B dc561d0ac5a889d5884afc8d2e31793f7571cdd2f26395327e0390bbd3db277c880ae96fe5cc9cf99ea0d86292a9ba77cfb0cc7b7126eee316314156caca63d0 SHA512 8c64ded91856ef2c1246ea3e160f84f822e871c08a09c8e8242c654058bc644bc33225774abe536b264be0c386a615379c16cf91d6f2f89bb7ba072f04ac2619
+EBUILD virt-what-1.21.ebuild 613 BLAKE2B 180027f5e8022811a4ab4a882d81b22d65c9291b135f9e1af44334c14878b0e2858dccf933ac0d757145a1373ca8d5b61d8c254c3093d5b4ad6d90e4879cea0e SHA512 f1d33d80059a61b5aae53639186d94f8f26e8b1be15393905003d5ab9a98597006c2fe9b9a5020151f698febcc4dc2dea9a5b221f91ffbe0cc6a348252934265
 MISC metadata.xml 463 BLAKE2B d2aeb047a6f3595cf1f064685fedb75876854c2361c084a909813d07fe7495882f9f6d400a896b3c67f578bae02fe89ec3cf8971478b15200a5486392e13b9d2 SHA512 85f83ce93888eb68982ce585aac6c29cfec62df4a5d76ac483d8946b0efe9dcabba271c7391aaa3c37247b228d06d21cb023efbcbd84cd48cf9733b918991b28
diff --git a/app-emulation/virt-what/virt-what-1.21.ebuild b/app-emulation/virt-what/virt-what-1.21.ebuild
new file mode 100644
index 000000000000..04e200d15f87
--- /dev/null
+++ b/app-emulation/virt-what/virt-what-1.21.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Detects if the current machine is running in a virtual machine"
+HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
+SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dmi"
+
+DEPEND="dev-lang/perl"
+RDEPEND="app-shells/bash
+	dmi? ( sys-apps/dmidecode )"
+
+src_prepare() {
+	default
+
+	# Pretends to be POSIX sh while it is not
+	sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
+}
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index 61d3f36c8766..972034de515c 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -1,35 +1,7 @@
-DIST wine-mono-4.6.4.msi 45592064 BLAKE2B 30099b7f02276e47e350a96af07bf64b43c857b3b3323d0cab85864b753e9810c0d7b5d496e2f53f5b2c3a434eb440a19f9928707c4127303aa0335928e39097 SHA512 1d50df5d4d000998c74fbee79b8ffc691d88ee3b34db9fd7124e0df68d6f84768ece489ac8c3f5f3141c2073c8666b93ae23ca6cd652a6542a821df3d1b66b6d
-DIST wine-mono-4.7.0.msi 64625152 BLAKE2B 9c533d9f9a5cec6aefa66ed916e88f0a03ab76e8292f112a669208c5b26855a314657c9950993a205941cd314f0c93a55f621ed71ebb4846a66d30fa9af3c855 SHA512 07cd2b26f3bfe6fc796a126b83e9c0aa655d3e8152af536ae2e8ae419013742706ddae6f93cc2341c94a2f3b8ae7d1b27d12f891d371928189291428f9ed877c
-DIST wine-mono-4.7.1.msi 56470528 BLAKE2B b1b9dd832f725cb70b80889c08db524540c389c4eb8c990415f0c1b4a17274fc96390808c943bd0ff42c79f4bbb376b3d599d31ed42b5ebcb4be79dbc273eeec SHA512 d47f21fa3ddb31522366056a2062cf7b77eec0a12f96dc05326561c9d2604405128441ff40d1b9567a6e6cd1c19ee03444d2ba02dd3b8dd2d150030dfb52f765
-DIST wine-mono-4.7.3.msi 56470528 BLAKE2B 59397f851bd0883f060fd359228fcdedea5a32ce06349fd563411dfa603a6c8700496111821fd9e571cfd4586e829acb12321528a4a8330d1fb6f92855482225 SHA512 d51c0e21c8448a4d11c3e4fd530bda340cc93cd420080e08aadd7b704183dcadf8553b0937e02c7a54a8a2fb46a395718a3e807b85f19936b0e4ee7b92052dfe
-DIST wine-mono-4.7.5.msi 56470528 BLAKE2B a662249fe85dbcc6de273cc8f8384fee9fe789a272c7dfec28e406ac2b512cd0e9ef07716004c694f66a69d2dd0a62e14691123db7b9845d7ad86762619da100 SHA512 25e4188e42362aa9050e4d78a5748697d63181fa91a0c0d2e43ad4c26996f9fb82053a5e6942621aaff01c832be88ea13ac7b472be8841a828eed4e5e87c9ee7
-DIST wine-mono-4.8.0.msi 86536704 BLAKE2B 24120b57a6b51b47d66b4dcf9765492ad2dce8ece7d186b7bd78172598308be43336944ae804be5181e2c3d7ae7cace08c75e2b66fbfad097c9c16fd6fcfc3a9 SHA512 ab0a9795ccbd3acf42d0e904585a16c62b28a2753771b5dccfd4013b77a118eff6fd92c4a8711be43df2b09c993884cc9bb48e025b60059b2a7d3a832ecbbf43
-DIST wine-mono-4.8.1.msi 115878912 BLAKE2B 88bd9b35efd89aece2dd0cd9529bc081fcd2a97f3af81806e9901158cbe48e920e5e6ac276da16c9c2d369dd307a7be05d7b8b67acf2733279a5df17696dd154 SHA512 06cbfc66ad82c40975f9d41698c49ba19c7eadf56b5ea87037b7cf0dbe2053de0d5587573798af294eb5ef8c7f2f5ffb7b3c45da83493c71d1923c1abee1bf9b
-DIST wine-mono-4.8.3.msi 116183552 BLAKE2B 5e82c2e6e456311de817b7870e02d60abc3e359a9b5989257cae4a31e24206e7c8289f417dbb5fa2e315537b4e8352f9f1237f576b3c06cb2dbaaa7a5443a4f0 SHA512 5b5c1c147453cc691ceb17c850be66e3701e784d2ed4bd27abd92a815f7070850b5e0fc1778c3a3aa2b84516b4c5e01abe350d6ccc5578037e75cb1afe1dfb6a
-DIST wine-mono-4.9.0.msi 94960640 BLAKE2B b60debd41ea33eee15ab1a546c526858b97cf4d5d896c856cce21f09210e3e10f1abf98dfb723abbe75657dd44011c1c793a08a329e037144d3266001739467c SHA512 76142fa7233aa3f8111df9112927e699cfc39f8bd0f02f0fc4d065eaeb37964f9e2b49bf53c406fa6ec72c247ab85ddba244ac97b4d6a377adeb63d9ae339e24
-DIST wine-mono-4.9.2.msi 94981632 BLAKE2B b70a5177fad3c6ee2b04ef40105c7700a08339786a23d7378ba72005da5b3cb6b3a797f0173ba32224bcfd25a4bb0fa01c92a83b88e005973b33320717f5b31a SHA512 73e46ec57c7a78d8c32ead4698c299fa557bb97739ce22c9405f95f48f55d604743aa01cc64183c9f89f99aec6f04b664bac0ef96e6a436d38ebcd9d7cf3b329
-DIST wine-mono-4.9.3.msi 95017472 BLAKE2B bf054bcff51e986ddb95788fdd1925ee13efe6e881089a23192d4ccb2527ccb2a2969917b9c3bb16a2161a2bd1d60c24605fd07e6c432f8f77c7c506222045f9 SHA512 4631d4e3b5118eb726f614e2f58f9e95f44bb97a1285fa726d3542d44e2a77ce818997ecb4de42e0d318d364d7c929f10d7c5176b59732e8b468e7695633706c
-DIST wine-mono-4.9.4.msi 95266304 BLAKE2B fb9c81f8ac8fca104f766d62b02c8751b5b7b91740cb43942477c7bdcac382eafeb5fc9c3fe78191b19d81bc5f06dd5c33db7ecfbdaba5e6be69ed39a6827706 SHA512 d52a2cc1137eac87acdaecbb7a81b3d618cad9ad3d7bca5b29940b7432923bfc1497ec21501a05797ef52c6588bb9c5e312df5c02ede8448d1fe1f2880557fc9
-DIST wine-mono-5.0.0-x86.msi 79537664 BLAKE2B f5a4185a7a63a1c1966d871d4c8d5bae07d3bbbc3153f20847c3919ac87be5644e15b45764286483641d9ce19176f79c7c7544e543fad62032ef5302a66ea8ea SHA512 8f83122d4b552b3a3d8b000abbd19b7a72edf45e52fa63a9220228240d8e4c014531bb265d062a38f6924fae07dd45420a5c7566f99e0c471e116fb80906c08c
-DIST wine-mono-5.1.0-x86.msi 84094976 BLAKE2B 25b044696f46810a843c17117f61532de3d4922f202e5acc2106b67f99eda6d359a799dd53ac4801380e81fdb5929c29e09a4923df99bf104b462ac77c682f29 SHA512 c4013307ba43121346f11881a30ff83d4921e0563a1ad3ff1adc34373f7bda5d5f6ad8c46bafe11c13ca372075333562864e073fe944428225b01fb885f9532f
 DIST wine-mono-5.1.1-x86.msi 84130304 BLAKE2B 05a5344b59249a758443cf91670eaef71d9ad3a3024b11442a8d3512ba54356439d503629fa799e2454975f47c0eaf6ff9e25ed61b020f29efceacc78347d578 SHA512 c518b93a470cc897abaf1dba18cc773dca0df62a28d35f32f2ddbe39b4de616c0307545bea5dc3ca87a01fd96b47feb3e1d8c3778106304b9cc08ebb3d1d665f
-DIST wine-mono-6.0.0-x86.msi 87507456 BLAKE2B b3cd3c767ecab3f679f82ad5efe393c10bd87261b48d25804ac4fa200eeadae74f73ca59b6b31f2d64695f1ea28e43ea333fadc78bb4f0c3d97d22087667548d SHA512 04a499429572a88308c3b906d4f729648b0a5bdf53f24e3630b14f644aaaf6d9be603f08cc76e25a35010f9e347b4b93c308bab417e5e64a801050f932ea176b
 DIST wine-mono-6.1.1-x86.msi 87879168 BLAKE2B 3bd7ce6da017edd7d462e91afff17f17bf22179d7ff21f479de92d768c8414e329e497ad3a5860499db7c2075629020aa190cdba80285e28fac8996d3e4337ad SHA512 3d2c7b14e605023f45eedf487e14a106f751b1c8da1063efddf5875a7ab9d9d064489940e499b509a573b0daf8274f2375f80fc8e9c10419cff249048fba8a87
-EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
-EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
-EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3
-EBUILD wine-mono-4.7.3.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c
-EBUILD wine-mono-4.7.5.ebuild 501 BLAKE2B eee7aacb2a2b5f74792f309f0d72a3b34ae408f0bcbb063da597a983c4b830a79ce7debe95af3f6a1920e0c96c636b4f7852c157d0901e8fe8d99d36796a3426 SHA512 e858ecd234c0ee658f34926bd0151a9db15931ebd6e6aa4087fc767b34b9c944c7128057b0a08e968c29c3dccefec2fe935f6008eaa8a75b9550a9623fad22bc
-EBUILD wine-mono-4.8.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.8.1.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.8.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.9.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.9.2.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f
-EBUILD wine-mono-4.9.4.ebuild 501 BLAKE2B 291fc02c8a792407a6e727ae5ac2a211201fa00761a5dc613cda2bd231524f187897e39725c08114316bceee53676998c2a5b4669da56919da665af5f5643c9a SHA512 710d387c1d7dce22f8a832bf7f090aa4cd9992e6622133a7cb187f2b13a7de0a88b0afc45d53882094a475de56ba5e0e4b631d778d61186686e76f9a4380cdf5
-EBUILD wine-mono-5.0.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
-EBUILD wine-mono-5.1.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8
+DIST wine-mono-6.2.0-x86.msi 87498240 BLAKE2B f7e20876732cbdfc472d5f850b167feceb4e09dd1d14db2d5e81580fb28cb1ec2fc7d1a48a187a0b0d0ad3884c3880a9f3512efdc5ace02795c3158b404a6770 SHA512 99007d7bf3bbdb97babdcc9411a3c9583c261918889e72f785e41cc0638fe4774d81040eebb7d3547ac2609a4684263feefa9e70b662f277ea1717dbd604d3d2
 EBUILD wine-mono-5.1.1.ebuild 509 BLAKE2B 71b054382d6629d5828bb3e82b2ba8b5ee7b6582e3cb4e787ceb99b6386f26aef0f205cdcb86154ee1b1000abbd17ea1e0d85c5200962c782e25080c12340001 SHA512 377135ac3b6b82ebefd2411351e8a97a245f21f2bdf713b89ca3774e0950cff39095728ec577a59426010ed3d1fef01b9af58b81c5684a46036c0f7557027293
-EBUILD wine-mono-6.0.0.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8
 EBUILD wine-mono-6.1.1.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8
+EBUILD wine-mono-6.2.0.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8
 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c
diff --git a/app-emulation/wine-mono/wine-mono-4.6.4.ebuild b/app-emulation/wine-mono/wine-mono-4.6.4.ebuild
deleted file mode 100644
index 4a5144adb837..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.6.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.7.0.ebuild b/app-emulation/wine-mono/wine-mono-4.7.0.ebuild
deleted file mode 100644
index 54ef87ce73c8..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.7.1.ebuild b/app-emulation/wine-mono/wine-mono-4.7.1.ebuild
deleted file mode 100644
index 4a5144adb837..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.7.3.ebuild b/app-emulation/wine-mono/wine-mono-4.7.3.ebuild
deleted file mode 100644
index 54ef87ce73c8..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.7.5.ebuild b/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
deleted file mode 100644
index d45f506606cc..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.8.0.ebuild b/app-emulation/wine-mono/wine-mono-4.8.0.ebuild
deleted file mode 100644
index 15aab248909e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.8.1.ebuild b/app-emulation/wine-mono/wine-mono-4.8.1.ebuild
deleted file mode 100644
index 15aab248909e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.8.3.ebuild b/app-emulation/wine-mono/wine-mono-4.8.3.ebuild
deleted file mode 100644
index 15aab248909e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.8.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.9.0.ebuild b/app-emulation/wine-mono/wine-mono-4.9.0.ebuild
deleted file mode 100644
index 15aab248909e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.9.2.ebuild b/app-emulation/wine-mono/wine-mono-4.9.2.ebuild
deleted file mode 100644
index 15aab248909e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.9.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.9.3.ebuild b/app-emulation/wine-mono/wine-mono-4.9.3.ebuild
deleted file mode 100644
index 15aab248909e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-4.9.4.ebuild b/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
deleted file mode 100644
index 063347ed1e0e..000000000000
--- a/app-emulation/wine-mono/wine-mono-4.9.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-5.0.0.ebuild b/app-emulation/wine-mono/wine-mono-5.0.0.ebuild
deleted file mode 100644
index 30b33158592b..000000000000
--- a/app-emulation/wine-mono/wine-mono-5.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}-x86.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-5.1.0.ebuild b/app-emulation/wine-mono/wine-mono-5.1.0.ebuild
deleted file mode 100644
index 30b33158592b..000000000000
--- a/app-emulation/wine-mono/wine-mono-5.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/wine/mono
-	doins "${DISTDIR}/${P}-x86.msi"
-}
diff --git a/app-emulation/wine-mono/wine-mono-6.0.0.ebuild b/app-emulation/wine-mono/wine-mono-6.2.0.ebuild
similarity index 100%
rename from app-emulation/wine-mono/wine-mono-6.0.0.ebuild
rename to app-emulation/wine-mono/wine-mono-6.2.0.ebuild
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 2bfbe4a22b76..f1e932dbb524 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
+DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-6.8.tar.xz 24481304 BLAKE2B 37643eb75b29a646f23620df4084809aa15ac9d390e34e2e1ffb9e0c5211df9e7595dd0d877ede61f914f4a4373a450c50f4f2da5f7a0fa880881404cd918c88 SHA512 784863e3aa11f692cee2ab3b3d99cc896c1eb41cfab8cc6b52b5a31671d82fc7f6783bae72c65d8806a8c4096000401cbd0a1a7f1a88fd980685fae67fa9bd91
 DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
-DIST wine-staging-6.6.tar.gz 9756871 BLAKE2B 45e49f7cd2820e027cf9788e7257a3fdaeb97d711d8ae4b466026316f331c2ad84aa0f8446cbeacb98c280e21bd1666d23054bcbc7702533e4974148e684be91 SHA512 65e90c4a0965f2db499edcff5171552b8e95716ff9b2a4ed272d022bc0b1f99547ca1d7b09ced2a267cdf3dfbaf552f9cbb2cc8bbd34636eb3882406ab5985d2
+DIST wine-staging-6.10.tar.gz 9673740 BLAKE2B 3ec1dcc96dcf583f061408b7bdf4adf14fddf6bf0dcefbb9a060a63de7ea87c3df0a5a76c14e01b248c9b21c1ed25379867f9e4d392b251f56deb93a78b2752a SHA512 9ba4fb7451f675fd9ad3e872adada708e9e7e8875f69567d9f2bef2cc8024667112538a385769eac2fd4b3c157266488458e76a1abc92d0a76109ca032103bcf
 DIST wine-staging-6.7.tar.gz 9722531 BLAKE2B 1df164ea23808f40baddbbe30ed92125563c3c952e13817ddea124cf780a397237e70aa48532d5b49c8b80919122a09e579f1928a13b6d17329d51f0ba03da74 SHA512 74805846e2e6e5d751c25f4b98ac671f8507d3a9b13d572e166b1885e397a6bb74bd3ea4b456d46298306d632499a4b88f97eb6d53ff049c2495cf055347611d
 DIST wine-staging-6.8.tar.gz 9709006 BLAKE2B 48a100f43cedc4217c083421d4391e5f052faf354483990552d271a5820b654b4dd4db0b3d2d1478cbdf8414da56c86e7bce05ebdb70c347d81ce0b6df811498 SHA512 a2dfe74b07b687af147b61f235ea2843ff38a563f37ed2ed68dce1cc0ff3d50dbd7c9596836c6e236e368e7a55cbe1ba881dac11bb0966e61a76a7376f92bdcc
 DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937
-EBUILD wine-staging-6.6.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4
+EBUILD wine-staging-6.10.ebuild 21988 BLAKE2B 1cbbc12829c027d3426036a994401ff48cf817e28b9d1fdb7d27d97c9c41db6ff5c01d72b8fe461da82639d3f252162bc241ea2eb549b56094c4bafb9a45b016 SHA512 ebd4a0622329afbedc34220c772aa76d5bc75eb267afb7c4e2f5ed3021497b4d6bfcb6eeb3ef0aa3abcaac0c18bf1e4b8d05fccbf6048168b3f1379372806fc0
 EBUILD wine-staging-6.7.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4
 EBUILD wine-staging-6.8.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
 EBUILD wine-staging-6.9.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b
-EBUILD wine-staging-9999.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4
+EBUILD wine-staging-9999.ebuild 21988 BLAKE2B 1cbbc12829c027d3426036a994401ff48cf817e28b9d1fdb7d27d97c9c41db6ff5c01d72b8fe461da82639d3f252162bc241ea2eb549b56094c4bafb9a45b016 SHA512 ebd4a0622329afbedc34220c772aa76d5bc75eb267afb7c4e2f5ed3021497b4d6bfcb6eeb3ef0aa3abcaac0c18bf1e4b8d05fccbf6048168b3f1379372806fc0
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.6.ebuild b/app-emulation/wine-staging/wine-staging-6.10.ebuild
similarity index 99%
rename from app-emulation/wine-staging/wine-staging-6.6.ebuild
rename to app-emulation/wine-staging/wine-staging-6.10.ebuild
index f1e4e79a20aa..ca97ca2b3783 100644
--- a/app-emulation/wine-staging/wine-staging-6.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.10.ebuild
@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.1.1 )
+	mono? ( app-emulation/wine-mono:6.2.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -373,7 +373,7 @@ src_unpack() {
 
 src_prepare() {
 
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@@ -436,7 +436,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
 
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index f1e4e79a20aa..ca97ca2b3783 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.1.1 )
+	mono? ( app-emulation/wine-mono:6.2.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -373,7 +373,7 @@ src_unpack() {
 
 src_prepare() {
 
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@@ -436,7 +436,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
 
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 6a1d27a9171d..4bd76ef04026 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,13 +1,13 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
-DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
+DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60
 DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-6.8.tar.xz 24481304 BLAKE2B 37643eb75b29a646f23620df4084809aa15ac9d390e34e2e1ffb9e0c5211df9e7595dd0d877ede61f914f4a4373a450c50f4f2da5f7a0fa880881404cd918c88 SHA512 784863e3aa11f692cee2ab3b3d99cc896c1eb41cfab8cc6b52b5a31671d82fc7f6783bae72c65d8806a8c4096000401cbd0a1a7f1a88fd980685fae67fa9bd91
 DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
 EBUILD wine-vanilla-6.0.ebuild 18915 BLAKE2B 62da21f599f1b17670630aebf24e9d05c0372567cca2708d40ec3d3da2f5db7c96c5888fd7f8c61e0cca151e31a46d9f538da5468bad06672f57e63d81c7b49d SHA512 4bb50445f5d5e6c21171fa87fc5c098e5993e3e65519726ad5bf84b50cd0b4d0096ace5ac31073f231bc65bfb8d78924f6892f801c2a977e1b82488b2293a282
-EBUILD wine-vanilla-6.6.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751
+EBUILD wine-vanilla-6.10.ebuild 18884 BLAKE2B 722bade3a2039293c35afdd82cc88f4d7cc43beedf73b1b033a69a5fba536a08df4d4416e476495bd62dbd40a9a2565b3a4c713b3e1fba84242f1739b669807c SHA512 ea77e49c183ef89928500364eaca6307002aa79b2e8bc2957b725540dbc012acd07c80686d6f9beeed3ecff373bf40f12ba11c8426ebfe40b6e23d85945cc4d5
 EBUILD wine-vanilla-6.7.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751
 EBUILD wine-vanilla-6.8.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1
 EBUILD wine-vanilla-6.9.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1
-EBUILD wine-vanilla-9999.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751
+EBUILD wine-vanilla-9999.ebuild 18884 BLAKE2B 722bade3a2039293c35afdd82cc88f4d7cc43beedf73b1b033a69a5fba536a08df4d4416e476495bd62dbd40a9a2565b3a4c713b3e1fba84242f1739b669807c SHA512 ea77e49c183ef89928500364eaca6307002aa79b2e8bc2957b725540dbc012acd07c80686d6f9beeed3ecff373bf40f12ba11c8426ebfe40b6e23d85945cc4d5
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
similarity index 99%
rename from app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
index d1662b9c437b..497755a1ba25 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.1.1 )
+	mono? ( app-emulation/wine-mono:6.2.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -318,7 +318,7 @@ src_unpack() {
 
 src_prepare() {
 
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@@ -364,7 +364,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
 
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index d1662b9c437b..497755a1ba25 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.1.1 )
+	mono? ( app-emulation/wine-mono:6.2.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -318,7 +318,7 @@ src_unpack() {
 
 src_prepare() {
 
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@@ -364,7 +364,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
 
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 2d361f4cfc76..bb4a5da5b84f 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 39c1f259d1eb..203ffba00b56 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
+DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68
 EBUILD eselect-repository-10.ebuild 975 BLAKE2B 2c20086412e71e0fccaea146bc9aaf79b0d81e81fa51a3ef2d048baed86175a4ea0d92e849c80e2a71befdf116e759518fcf095944b784a430c21693c7fcec5a SHA512 58c67bd341b3edfdc09b0eb4234b07700d6b18c921dd8c30e4055ee7bd63ffef19ad0addea87d21ccf52285d3e1d9fc8eb3e214fc6d6711d831baeedffd0a8ed
+EBUILD eselect-repository-11.ebuild 1133 BLAKE2B e5b8008ced2b478c424cdcca871c8f1746a20c5d519495811b1fe551149ba50c16f0e435b3ce7e4ed49c47830c5f9360b8ac87a273855a1f60bea6e279a37835 SHA512 65c1360324945f1cba4c4b2c5d6abb32bf08b0dc547ce424fc12884cf64043c080183b5ab59da3486c14ace6f589d2a0e10334369b8134d4ebd072f17bf85ae9
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-11.ebuild b/app-eselect/eselect-repository/eselect-repository-11.ebuild
new file mode 100644
index 000000000000..8a6bf3e77577
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	app-admin/eselect
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	net-misc/wget"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+
+src_compile() {
+	MAKEARGS=(
+		PREFIX="${EPREFIX}/usr"
+		SYSCONFDIR="${EPREFIX}/etc"
+		SHAREDSTATEDIR="${EPREFIX}/var"
+		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+	)
+
+	emake "${MAKEARGS[@]}"
+	python_fix_shebang eselect-repo-helper
+}
+
+src_test() {
+	epytest
+}
+
+src_install() {
+	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 63816dc3511a..11b786b9312d 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 3ea683f88ff0..a73fcc8d9387 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -9,5 +9,5 @@ DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfb
 EBUILD librime-1.5.3-r1.ebuild 1598 BLAKE2B e2bea3ac09fb0f5f132382caa6a37b8fc3e674688fbbba71e68a5a48e1375248633ec5de170030a5d734f18e294aeb8c3b2b2cba9d033c56bdd88e9709c14c1d SHA512 9c389f0f4ad573bada9c18bdfb3af3cac4f17e42f3bc1fe5d308fed123a3458a28e243f0ac4134753d24b1cbffb644707adbf693fc0f01d5fbc5eb25177bf416
 EBUILD librime-1.6.0.ebuild 1635 BLAKE2B 13cf817648886c13fc1c6c3913c9bdce4a3c1947928a70a5d904b6dd8160905e1e9651c6bd758a6c6711c7d37781776af75c90b4f7e22bdc6bf4b218e44bac6f SHA512 ff4577d82f8c7e00a565ebae6d8a6b9ad3ad49f33319de9c65c9b50c8599b00ad71ae69f9d304aee217458df858ce78a4557fa52d3f8943281ef9d1633f327d1
 EBUILD librime-1.6.1.ebuild 1635 BLAKE2B d69511b155960827c1d9a058132c5b9e36d03021688aadf7f42634526f10f4f0fe860b93b81dadf35da6486f8322cdf10d1d26912eba0cd172d4da764f77272c SHA512 c8766ba24f6b5f52cd200655796bc3621d4fe51fc115ad97ba59638c2c1d8ab9e5856832159c6c48854826a6ac8f6f338f9fa49f3325e5e2faad51a5b7838ab5
-EBUILD librime-1.7.3.ebuild 1675 BLAKE2B 68da6df319bed7cf08c3fe4c31b3e29f025f9043de71ce11f963f6f4f2d868d28bbad4508652634d22d65d37f45d3205e59272e5727ae875096e7add592efa83 SHA512 f3ffb0b4e50a003edbd57b14a558b04c19072db75b6301c1ee0cad7b7e8f727116eb609059c2ce47fe9fa63a48950b8346e7af4a4a0d2730ea85858e802a78c0
+EBUILD librime-1.7.3.ebuild 1585 BLAKE2B 6ce009eeb9308f28720b6d395d5b7c3a688c6c90dafb5cd689703ccfc71277019193f574404e1169f644487f737824c46bd7c1ac9b81fc5ae4db17df2ae90b62 SHA512 7b47c9ed42c26998bf361b617636dc3b768752db2865dfd3b1654da20bf476bfa292abe4681502ac54f627ee263023354b4bb5ddac0f53dd96cc8327025c05f9
 MISC metadata.xml 776 BLAKE2B b362c5696516b756bb9c9c3102d7d5f52f843807d523f26bb12adb6b2c077f98c0aaa2d5d7d87c0a413b8ed69994f35a7fb02db423592ffc5529150df4253f83 SHA512 1bf10d3e1394b0f9512cfe564dfa4eac007e5b343831a482764f1c7c99500ad55cd99e10f07a4428c67fb262b80a2e2be41f9c36f3a937f5521c72d969403817
diff --git a/app-i18n/librime/librime-1.7.3.ebuild b/app-i18n/librime/librime-1.7.3.ebuild
index 0cfa7aec1dfd..44959fdbee64 100644
--- a/app-i18n/librime/librime-1.7.3.ebuild
+++ b/app-i18n/librime/librime-1.7.3.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="dev-libs/capnproto:0"
 RDEPEND="app-i18n/opencc:0=
-	!sparc? ( >=dev-cpp/glog-0.3.5:0= )
+	>=dev-cpp/glog-0.3.5:0=
 	dev-cpp/yaml-cpp:0=
 	dev-libs/boost:0=[threads]
 	dev-libs/capnproto:0=
@@ -66,8 +66,6 @@ src_configure() {
 		-DBUILD_TEST=$(usex test ON OFF)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
 		-DENABLE_EXTERNAL_PLUGINS=ON
-		# dev-cpp/glog is currently marked -sparc
-		-DENABLE_LOGGING=$(usex !sparc)
 		-DINSTALL_PRIVATE_HEADERS=ON
 	)
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ff149ceaf585..fcf2bb044740 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index 0439fb1a56bf..405d4cb7ec15 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,3 +1,3 @@
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-2.0-r2.ebuild 1029 BLAKE2B b647b4f710a437fdb6905875e3a3d8df95dbf8a762f54a5706740a82cc449bd79f38917835a3823ad24f8d6cf071e57c3eb34ed50b5fd149246ef63b92c47a60 SHA512 4cb93f824a360b6231dae0262f882ba6bf9aae161e3e17391e830370d2ab21e50b5bfc21d357b7cb3bf74925f8d04538fae53543f2a6cf35b8e1c854e254cbae
+EBUILD cmatrix-2.0-r3.ebuild 834 BLAKE2B e21d62ae01d97cca5681c4f7c646b724cb2bf1a937bb123446e0d69564dc08b5e5b473ef8912604d4c9c31caa030442afdebae0db724f27a01682b6146e68fc8 SHA512 b5b5af76c4035fc821a22e72eb8ec65c9df38b4f5e4d5a80d6055855625be6b172619d2d5c7494910253600d1d24db82403192084450ccbba73fd5050a0bccfd
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild b/app-misc/cmatrix/cmatrix-2.0-r3.ebuild
similarity index 65%
rename from app-misc/cmatrix/cmatrix-2.0-r2.ebuild
rename to app-misc/cmatrix/cmatrix-2.0-r3.ebuild
index 20bbda5977bb..18a688600f04 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r3.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+FONT_SUFFIX="pcf"
+
 inherit cmake font
 
 DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
@@ -14,17 +17,11 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="X +unicode"
+IUSE="+unicode"
 
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-"
-BDEPEND="
-	X? ( >=x11-apps/mkfontscale-1.2.0 )
-"
-RDEPEND="
-	${DEPEND}
-"
+DEPEND="sys-libs/ncurses:0=[unicode?]"
+BDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
@@ -35,18 +32,12 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	font_src_install
+	use X && font_src_install
 	doman ${PN}.1
 }
 
 pkg_postinst() {
-	if use X; then
-		if [[ -d "${ROOT}"/usr/share/fonts/misc ]] ; then
-			einfo ">>> Running mkfontdir on ${ROOT}/usr/share/fonts/misc"
-			mkfontdir "${ROOT}"/usr/share/fonts/misc
-		fi
-		font_pkg_postinst
-	fi
+	use X && font_pkg_postinst
 }
 
 pkg_postrm() {
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 1233e79fcc4f..0f26c5fe7811 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,3 +1,3 @@
 DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
-EBUILD ddccontrol-0.4.4_p20200630.ebuild 1947 BLAKE2B 18fdaf726bf8c96a5348d19a9db8c04254448e7d390e466886a037208ce139a43fae45ecad16427d4ae5cdb9e8b1e3ca3f3e886b587826ad599b6783c9162874 SHA512 ba41e167774ea1048efb12e519b97634479e323ad866a7289f4f797ed6d1dbe8edc44a76cf7df7c33820bbc709e3daa71ae42350813c4513f73509536ae803cf
+EBUILD ddccontrol-0.4.4_p20200630.ebuild 1967 BLAKE2B 81f65ef049bc913f50764801f7ce5bed9cee26e20662d221fb9e061abf5c2e92ccd551b79544e6f23a807b22a6e9eac0951e6346a74471369bc868b5d188b894 SHA512 844751b33f72dabf73ad999cadd9ee40c727c0e17fa0b35a0dddc2a93a9a5ed97c50e3ca3f0f98b889276481cc5cd73c4f257544b9c1c9e7a2d159131127af58
 MISC metadata.xml 417 BLAKE2B 8bd8767a184790aea7b6a63383a56d25de54c68a044a6549683a979910bc6d6d8d518bcd71acd14b393f12a8c43cd8c7ba6bac1775f7ed28314bf56d4a97f9fd SHA512 8e2d095bfa5e56a10f9187894c34d1b8a4e6b3562c10c29ce374f5efde918f1d097e2678f044a838b31778bd7f9333c7fa7c41d2f9fc2011d263d4ea0831bf04
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
index 2f7c7e8748e4..ca00b21efde5 100644
--- a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+DESCRIPTION="control monitor parameters, like brightness, contrast, RGB color levels via DDC"
 HOMEPAGE="http://ddccontrol.sourceforge.net/"
 COMMIT_ID="f3d003f63aaa0407d3147b04848e0722f78695d5"
 MY_PV=${COMMIT_ID:-${PV}}
 SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc gtk nls +pci static-libs"
-S=${WORKDIR}/${PN}-${COMMIT_ID}
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 RDEPEND="app-misc/ddccontrol-db
 	dev-libs/libxml2:2
diff --git a/app-misc/filebus/Manifest b/app-misc/filebus/Manifest
index de9da1ca7999..f095e8ffc729 100644
--- a/app-misc/filebus/Manifest
+++ b/app-misc/filebus/Manifest
@@ -1,3 +1,5 @@
 DIST filebus-0.2.0.tar.gz 7895 BLAKE2B d113ab7e57ee24371dc9adbeb4767f533007d36cee2a3f55ee7bbcf13c31980355cfee2db748ef6c485bad3cb8c68ba1c31f9829b0c6365fa3b63c4899fb8b02 SHA512 fc7083444a67e36778d15a8af38487024ab661d32b891cfc735fd31cce2ddecfff3ef63c591106d97250373dac9aeef8dd0e8cf0ec260b2d67031018fe66249f
+DIST filebus-0.3.0.tar.gz 16921 BLAKE2B 60ec7eb3fb584c053f00301898b914ba9034e3aaa79a79eecdc31f8e1abd1db5c473486e02761adee537faca6725916cf327e38376bdbbeac2c8548be427089b SHA512 a7dd4cbe96e6e691794ea21b23f79caee518855235c1ee35f857fe2938f437095a9199eb9bf309087cef523b6dfa963f3635d94e9b7ece15bbe1b4284fca793c
 EBUILD filebus-0.2.0.ebuild 694 BLAKE2B 1a0495db0123f618f6948cb4cfb673d777b43e8857276e3ef5f877f7ccf2ec9ada0b24c3a96168f2fb3002c36b38151dfccf57bdbd79f585c16eedf78bf32ed1 SHA512 6cd2049b7a226461431ce1696a0e5ce50ee949793bca05eac851bdb260d7ff6c0e75a7a92091061bd52633579c4cd1f2b92c3dc7cda8abf639a6a166a43f8f9b
+EBUILD filebus-0.3.0.ebuild 1376 BLAKE2B 81370e9d490267966b24c316d7def4cec115a4d336a4af68562035ca16d474a60f86d8b703fba447c7368a3fa8de3ead24fa46a5eed195ca8028bb3fe5dd80e6 SHA512 5b29b78b44dd2fc6df031ccb503a6ceca88a0b218c9cb821875f20aa877f55954fa5969ea9b03de51220f57cf174128ad57e8426b150539493fdef1883e9dd00
 MISC metadata.xml 343 BLAKE2B 80599aa7feb132f250137dc6a8c8543a23481bda7868ba518c5f14b74c0075e57a44703e85fd8184061a2bccf4375fb40399a68b6dcc75a5fce86330edfffb55 SHA512 bef20545056bea490dba6ba5bc13a76fe8d333c14db23703d428af16a70c236d62381488981e647d9221b170bb5e144f94cb50c3904a5d630a6d94543d144155
diff --git a/app-misc/filebus/filebus-0.3.0.ebuild b/app-misc/filebus/filebus-0.3.0.ebuild
new file mode 100644
index 000000000000..7df930651d17
--- /dev/null
+++ b/app-misc/filebus/filebus-0.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A user space multicast named pipe implementation backed by a regular file"
+HOMEPAGE="https://github.com/zmedico/filebus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="+inotify python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
+	)"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if use python; then
+		distutils-r1_src_prepare
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	"${BASH}" ./lib/bash/filebus-test.bash test || die
+
+	if use python; then
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	python test/test_filebus.py || die "tests failed for ${EPYTHON}"
+}
+
+src_install() {
+	if use python; then
+		distutils-r1_src_install
+	else
+		insinto /usr/libexec/filebus
+		doins lib/bash/*.bash
+		cat <<-EOF > "${T}/filebus"
+		#!/bin/sh
+		exec bash "${EPREFIX}/usr/libexec/filebus/filebus.bash" "\$@"
+		EOF
+		dobin "${T}/filebus"
+	fi
+}
diff --git a/app-misc/geekcode/Manifest b/app-misc/geekcode/Manifest
index 9612d643964a..23d5f77404a6 100644
--- a/app-misc/geekcode/Manifest
+++ b/app-misc/geekcode/Manifest
@@ -1,5 +1,5 @@
 AUX geekcode-1.7.3-exit.patch 203 BLAKE2B 119ed822686a89039a0b41376a312c969eb714a7f61a22371779418e7f7699cf43728655f641d9f7226ce99b95db7ac3aea4c54df5c2de85117d7954605d8328 SHA512 34718833c4294f53db35e9d948aecac25fa389a06146a0ab2db2606f50d7de26779415a16689bbe1ef5db09260d3c33fe124aad781c05b1c252e956b1381204c
 AUX geekcode-1.7.3-fno-common.patch 5896 BLAKE2B 88ab358dd1866752e4f994e72e42561dd78318727f12dfefbf55f4102a3209782c9acee81d959c17132d6bcc43aa06d64141405243cc051104a4453a4b22acaf SHA512 bcaf71f3135a1ce1642628badaee5144e625515af09f5ccf119c31458ae14369c794c602cf40a500f7c5cd46f965c7ff92cb5278f093fd87eda9ef3cd0d50123
 DIST geekcode-1.7.3.tar.gz 60617 BLAKE2B 9e848d45054805e21489e59c6e31ba4aa41a557bf9f89754a3423724bbc449415b3033de0383b9e035af6409abfb24c36b5fcb5a25ad90a14602f7d2164b59af SHA512 eca8489dafee507246538bbb8d35cc17c5712571603bad1f470803883cdbaf9658769df77e214704b6a5adec382f76e599a2f6c48ec3759861159ac626131bfa
-EBUILD geekcode-1.7.3-r1.ebuild 724 BLAKE2B 1bfcc76c1fc03eef841af314af5899c3d7c534f0b3300f2a3fe5dc3d826c6f30883e5cc309ff19640773fc8b378a31fdefc8b79578b66688b6d5f352a3418a2f SHA512 91e1e4fef6f00535d1b4c9f7cbe3442306f516555bad8177fe3fc8e9b982d5e466505eb3e90cb62917df4d005bb416472400d8def0c4396b744b0bd7e2f2c67b
+EBUILD geekcode-1.7.3-r1.ebuild 712 BLAKE2B 5e54a1f7e99fde24edcfed296b855e6a9ddc53edb13d79813ee18e2fcd886c39f9767513c7a4143c5fd7c259c441f715d5b191184ca5b7794ff74219834802ce SHA512 76fb927950f9f254cf45b6dc6944d08c4684513f0609e7136ee52319e168a8d797bce7e53f414b771361b69fd76279410551ef21620b6f5b9fb7f8a08a9b8e68
 MISC metadata.xml 245 BLAKE2B 3c0714cdd9bae31bdd4066cdacae1b7f6da612dfb694a03268c1229922ea4b9786750624e77844eb39dd5a239a4cd025b7a520551434481dd133e5f12358f051 SHA512 893b63b0ea6d148dc82926eb61cc86db6ec79b5121f65ec56160f7ccea3610a134851cc82e9161a32ff7bd8094ee5c6b8e16060b4642b046a769bcd85dc19b32
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index 443adb611452..1dfbdd8cccd4 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="https://sourceforge.net/projects/geekcode"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 3f3ca2c15e47..058a75ac9a41 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
-EBUILD hivex-1.3.18.ebuild 1998 BLAKE2B c929cf2ca36dcf63f8200ecd681dcd1e59f4e3ddedc37e23595aa64bd8bb762112eaa4171929d3c093a385dffe0dca011f9350be2bcc02f77b9142626294ad08 SHA512 7470376de69e43baeefd14f7e8b53edbdf41016d81275b1b68bf8df49d09abb08289d64b313f3c7507fb9308cd89a1010f45043c49834e30a73004f263ce3928
+EBUILD hivex-1.3.18.ebuild 1996 BLAKE2B 4337c1440a1e9bc881dc8c9a7bdd8b9e009abfa19050ea287df50a7bb6da805877c917f69279fea9446dae62563bf7039ddbc817168c454c729d68eaadee7f49 SHA512 ef2f9d1079c4ab579987ea12211eaf6d6718c657b7e560ed03fc5990fdeff5f7dab279534aa8525a591f1266ad2e840cb1518e9d461e8901b64d6b0723ce16d6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
index 9e486753dc95..cace53ff05ef 100644
--- a/app-misc/hivex/hivex-1.3.18.ebuild
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -8,7 +8,7 @@ RUBY_OPTIONAL=yes
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils perl-module ruby-ng python-single-r1
+inherit l10n perl-module ruby-ng python-single-r1
 
 DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
 HOMEPAGE="https://libguestfs.org"
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index b1c122c08c4e..b510292c1a98 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -9,5 +9,5 @@ AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r4.ebuild 2228 BLAKE2B 0dc5385363d4b9b52cebd572fd8094613447545f199f665f080bd2dd9cea90f362ec8b369b1f9e782c4ddd20cd657892fd1cf311752bca515374df19748a5ad3 SHA512 38c2769338d5442589f01fde20d19657ad09ace8cc4ac2b821bad9e41a0e40c41000a8b3e3e645b18bfd645a1fa0e58641bc015c2149cdc6d6d2c0d732e319fb
+EBUILD jail-2.0-r4.ebuild 2215 BLAKE2B e60f9e1725860dafcae4d1a6f0a2477b69291c53b58bf1657d5077bac5a23edf85d3a17693db1fe71d1ae176ab7f9c0469d0525807d9b1fcdead1cdbbf57e7af SHA512 e8d95af95bb194c7612222cf5c4e51a737a2304811633eae0083ac0c4a37e92ad19b2abe606df6a3da8b81df4c99465af28cab98339b719cecea9fe3086afe47
 MISC metadata.xml 745 BLAKE2B b3182c8a1f9f31ecfe0526b88d2e8fd4f898af2a6ddc4371a841d2a7aa2e4d89cb462b03bca0f334b952afe910d7c6bd555083c292326f57e2f91755259fc40b SHA512 6b4396d20fb883385246425e04dda03453f7a49b210a30b0863b1b163b664ae5bd55ddc8c6bf862cdffe1087e34167299379c28e06a8ac6aacde2f2993363880
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index b3921ab2daec..884a5fc7c489 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
 HOMEPAGE="https://github.com/spiculator/jail"
diff --git a/app-misc/jitac/Manifest b/app-misc/jitac/Manifest
deleted file mode 100644
index 7f369c2432b8..000000000000
--- a/app-misc/jitac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jitac-0.3.0.src.jar 141514 BLAKE2B 7f8028f2971c55d84710a232f32f187f3239e08461e9c534ad5d014f19741c088cd3a294ed1705ef7a940d94163788fd9749b037385c91c2d1b4c639e18d9dbd SHA512 8a21e80246e450c9afb7e92cad14b8901fab7e039a7312df0b87cdab307c68a3db8a1090cb044b74c50eee47dd480f8c8d1465111e2f508584d38c9ef31511f8
-EBUILD jitac-0.3.0.ebuild 970 BLAKE2B 38bbe49ed817eb37e21ecdc66016f790f9570d86d6e50548a06d6aa077a26f4a63a2be4280ce5435eaf33dcbe46f4c7d61397caf1d1d119baef2ce1c2e31a9e9 SHA512 8fa777453cc7791b9d1fd3e962b0a940738c9d5ed6c9f2523b5096841b412dd4cc768b9756e520a703ddd8597fdcc1dbc8de9855b71bdbc76c4abfa523e68883
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-misc/jitac/jitac-0.3.0.ebuild b/app-misc/jitac/jitac-0.3.0.ebuild
deleted file mode 100644
index 7028a28a9b34..000000000000
--- a/app-misc/jitac/jitac-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-DESCRIPTION="An image to ASCII converter written in Java"
-HOMEPAGE="http://www.roqe.org/jitac/"
-SRC_URI="http://www.roqe.org/jitac/${P}.src.jar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/sun-jimi:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	jar -xvf "${DISTDIR}"/${A} || die "failed to unpack"
-}
-
-src_compile() {
-	ejavac -classpath $(java-pkg_getjars sun-jimi):. $(find -name *.java)
-	find . -name "*.class" -or -name "*.bdf" \
-		-or -name "*.properties" -or -name "README" \
-			| xargs jar -cf ${PN}.jar || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dolauncher ${PN} --main org.roqe.jitac.Jitac
-
-	dodoc org/roqe/jitac/README
-	use doc && java-pkg_dohtml -r org/roqe/jitac/docs/*
-}
diff --git a/app-misc/jitac/metadata.xml b/app-misc/jitac/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/app-misc/jitac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-misc/mkcert/Manifest b/app-misc/mkcert/Manifest
index cf18fd5ec174..350827bffc10 100644
--- a/app-misc/mkcert/Manifest
+++ b/app-misc/mkcert/Manifest
@@ -33,5 +33,5 @@ DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip 69738 BLAK
 DIST mkcert-1.4.1.tar.gz 18104 BLAKE2B f1e191994e036676ccf87a3285f07da56aaa044ef4b99f6f0f39cf76a1e281672cebcee9a46b8223b7a25632abccc1d0cd10ba9a4c0a864d89ad5bc19644382d SHA512 23b008a06ba594f7f5a82b12d00dc129d237421f776bcbf4be04e61a99fa92d49977a616846de45ef98292e31d28bbd543bec70566d14ecfceccee8bbe49038f
 DIST software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20180114231543-2291e8f0f237.mod 42 BLAKE2B abe664186109087cfb218c4f35147ce524b2dbb26e58a51c2bd57f333bff13172669b394987c58ccbf83a5f3f738077e3c4ac93485dd64d235d6887cdaaeec83 SHA512 a8c989ab7fd82fc4215ace85e81d33156ae354ec09e859b2c42fab1b53d0c3608458628c3371a48c4f0e6f338985f6f7f31cd16f1ba9498c275d5a6c9b812375
 DIST software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20180114231543-2291e8f0f237.zip 30079 BLAKE2B 88b9fb9ce055273cd9f6d8881381b83ef472b1c3173df17955d850d64f745a7a963fdd6c5774b14dc5070ec93b41ddcd2152685f5cb562ef9851d0da0b580056 SHA512 2cacf3d5153d36ab2c4840657e2167faa060c1d0b15c349a4a3aeb65261145f4fdf98f30b1ac8560728971e723774de97fcea90ad00397209684f2b0f622cf2b
-EBUILD mkcert-1.4.1.ebuild 2426 BLAKE2B 9e98466b39c990bf8ee0b1dc05bba0e08755537ce857a3b81f80b27f41c6d1b8947b4117f6f76f27b2e5dd9007d582e37aaeebd759b8d147ab2b098b8e7ad52a SHA512 f5570cb5cbb7c3099e0a02c7c3c6de9539f4117b5bd1c0a5ec367956abae7e423192dbcbdc85abf704655897e85d80149c4f32b9cd67476032fdeff9b2036476
+EBUILD mkcert-1.4.1.ebuild 2433 BLAKE2B 38de0460438731e35c9ff334af7a259c1ab99f48ad5082085350122bf2b369fdfd436fb2dd0ea84fac828cedcc010b9ae60b6618d84641802fab0a150a22a608 SHA512 7249bd437bbbc528ba1ec665964733bebe73a30757ab242eda532fe9a6176aad7f9369f5600b191b6b1ba132afc80cb628a3587c1383298df22d273c511991bc
 MISC metadata.xml 250 BLAKE2B b66a738607cc4fc7299cb2075c67ac40558a890c57e9c28539c4eeeebf1edf12288414babb7340a5464fe87ba325d7665a37ec2aadb81934a41f16b467db96aa SHA512 c2fa249b463e4116ba228c35128bdb3d4b8490678cc9e240074bcf4d3569b54edbb67cdb27da45535f2e23bfe4d35607fbc16887e97af285cfd2b1f994fe95ac
diff --git a/app-misc/mkcert/mkcert-1.4.1.ebuild b/app-misc/mkcert/mkcert-1.4.1.ebuild
index 9702e600a1ea..d2e82ea9167c 100644
--- a/app-misc/mkcert/mkcert-1.4.1.ebuild
+++ b/app-misc/mkcert/mkcert-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ SRC_URI="https://github.com/FiloSottile/mkcert/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE=""
 
 src_compile() {
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index ee65875c1ff3..f6c44fcb8345 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,3 @@
-DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
 DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
-EBUILD pax-utils-1.2.9.ebuild 1887 BLAKE2B ba4f47fff5eb0e56bcb845a04a7cfa61c655503878d66c6684b32a3fd15a19a2e30757c560a1ddecc1e49ace6540b420b2adc6d542c60e2285d63cfba0179d4b SHA512 dad5e4f7c102a6f4a490c5cdcb80759d0e71784081d8e363183d37970ddaa5bdf87a0bae66d010f88ce092cf74a328e719a5b0bacfa579654e8f7c06f99ed48c
 EBUILD pax-utils-1.3.1.ebuild 1872 BLAKE2B 72742c0c848c2a5a9c9697ac7316ed723635d8322af47d5cc6bdfbc02dce9f4247cd933a319dc1294e60f428e213e275637f29840fddc44d0e321c212b755d30 SHA512 3b635f5a72f16c02d6b1f6756c1efeef36bc2bbebe83f7be0e8e71a50c2776b5db385ede07d3bcf810692622a4b4b1d8087813c125b642668318f4d1a4bf3321
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.9.ebuild b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
deleted file mode 100644
index 277c9f68fa7e..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.9.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug kernel_linux python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	seccomp? ( sys-libs/libseccomp )
-"
-# >=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624
-DEPEND="
-	${RDEPEND}
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) )
-"
-BDEPEND="
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux ||
-		has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/socnetv/Manifest b/app-misc/socnetv/Manifest
index 985bbd952d5a..4d50930b65bc 100644
--- a/app-misc/socnetv/Manifest
+++ b/app-misc/socnetv/Manifest
@@ -1,4 +1,4 @@
 AUX socnetv-2.2-deps.patch 218 BLAKE2B 8f9900b1f9a6d6e9e4a116d3da75aa743d7a193dce8136582eabfa9c183209d4ead2fa782d7cefa5366eb98f1a5e29ac20c8f0b2350982856c05826130b63fc4 SHA512 30fa3fda847aee54452ebbbaea8ae2439dc99fd5b79bdd41517d12effaf2a8e1355257b00e80dabb40e1502a169a8b46bbb98af8ead5239731d35a75b847db03
 DIST SocNetV-2.2.tar.gz 745086 BLAKE2B 3b520df2bb29f1989f744ec7e424caecd722cf3f903cf494e0fba9c0e5c1def413411768f593a3f8c0eb3cc20d1071d54babbd76eb24aac9f6670b4f2623ceb7 SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b
-EBUILD socnetv-2.2.ebuild 774 BLAKE2B d85bb25ead5d9c6e31750b8c6dff9883ec1e3eff6a4413831e8a4319e719ca86691d9e38f377b17347dd00ec5989d3a2e6d4abfee0f28c0e1bce83d0272a1bfa SHA512 f2a3193ab0203b25bfe9f9f6c8f3afcbd79df1683aa5faf6bef58a49ea0612928ed204fde97d804c99aa5d2229467cbe00bab605b27f7a5d7b9c5d6c84e8e5cd
+EBUILD socnetv-2.2.ebuild 758 BLAKE2B 6e2ddd4164d44e33afc0605d0e712fb4161d973f50cd67d74d2d5ebd64a27b871741b8596bdee8cd1d460b2cb01f975181114d2d25ca11cdab3f8c0ad9d13f52 SHA512 bbab328b52850df83062f1ddb7c2b73ee8694a4f5793d79e335be6d4bfcb3588751bdef9c0d97278d6b8cf3092c7b5491773a836cc8071a4b43e8d4d01f8f5ed
 MISC metadata.xml 788 BLAKE2B 6b43e5250ed70aeb8f600e3a8ff344ff547a803619b29294b7290b49cd38e8a96c9e7f4605d667536261028cac19f75f21a9691eabfcd883245c6a8bc5e9b3de SHA512 1054727f278eb6cbd492deac0fee36b79f9b34804956df0c6df0a16a25af3a626aacc0f3476b0cf0d3d8197973cddd4e589be4b70a17f534fbc80fd91bb1b2de
diff --git a/app-misc/socnetv/socnetv-2.2.ebuild b/app-misc/socnetv/socnetv-2.2.ebuild
index 347dc4a70b7f..21357723af64 100644
--- a/app-misc/socnetv/socnetv-2.2.ebuild
+++ b/app-misc/socnetv/socnetv-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils toolchain-funcs
+inherit desktop qmake-utils
 
 DESCRIPTION="Qt Social Network Visualizer"
 HOMEPAGE="https://socnetv.org/"
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index 9ebbfe3d826b..c2cabc4b97f4 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
-DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B f3650a037f00e6ce8cd7bd1ff5f3e11c794ceb09563193e2930eb9b81cd40120dd48f117e8c96d900a8221db9a68360ff633e591367bd544ad07045b1a505304 SHA512 d370687da706677de61c0d234d4cb4db4ff4d9da8cde60c361d11eaccf319e2e418969a7d49ec6edd456524b1275b63d1fcd49bc9a9012afabda1c7a8ad7de78
 DIST trash-cli-0.20.12.26.tar.gz 74542 BLAKE2B 558e3cc043cdaef44bf68317e666c6f757daf9feeb6b731a57aba91ec983e1adb1e404f7e8428a7bd1225d83df6e94e8b9b793942bbb233f09a44127af0a42fa SHA512 d0b0a97014c888ddda95759dc82837385a2809cae04bdf6a84dcf0233dc2cf9370253110bc5fdbc5c4452ebb65c5e7836fe1cfaa9aaabe38d34269724456cd1c
-EBUILD trash-cli-0.20.11.23-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
+DIST trash-cli-0.21.5.25.tar.gz 77067 BLAKE2B 5db46b21ba33b9076ea7f024b93e62f30b3671f44a024b30013369607bd580f0ef9831debd9fdc6c64575ab6edde14aa921229bbd16a6a77657b7ed20b58c318 SHA512 75ef338b356048768febc4afd42933d8aa44cde5156e386968dad7b33033b84becaef3d39ccf15c02216394735f37d1c7c8cd499000068d51247710e87590507
 EBUILD trash-cli-0.20.12.26-r1.ebuild 598 BLAKE2B 1fe9975c5b1f7a8646cea9f25c487ab4b84095c4a010d80ec8bc21dc77cf283ad726d09ee0c13227cbd145aeeae25d2444f6ec0e7510c3c8356992809eb6604c SHA512 8449369b777c9460106660ce57929a67eefb1a3f3e247f020070c5b863340c48c2b79f825eff77a783fb5a44a3a3f0a883c963af22de0319427d9c22ead88c3a
+EBUILD trash-cli-0.21.5.25.ebuild 574 BLAKE2B 31409aa4cdf69f1daa528f34c997bfff42ee0b049cbad6c7fa46b15f23aadf8fbfc564ff35f44e9237c861841b3c802bdfe05e2b38c5b6edd62589cc3af2ed01 SHA512 867ab0e00dcac1d6d8d1471772b74e4527a958f0b38d9e272cb080ca2875ee1830adba534f6bd860d1e0e298c0ba6d7b160f54e540ac46d7992e60d9bb7104cf
 MISC metadata.xml 1094 BLAKE2B 25187a31e5ffc666c680bc9970599affa08b76be31618489fb698e9a4581c75e75385c32c1ff65a10c6749222f813e4a783e657f9b142cfa2283ab863be3deec SHA512 81dda2f222de76ddf74f37e19afb498b0cfd37ed6583dcf92adb2a8ce64566c2b8360cca535bdbe9343c04563894257a74fdae3df2d9bac20e486f3aa7c86417
diff --git a/app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild b/app-misc/trash-cli/trash-cli-0.21.5.25.ebuild
similarity index 87%
rename from app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild
rename to app-misc/trash-cli/trash-cli-0.21.5.25.ebuild
index c27b8153f31a..de8339c9926f 100644
--- a/app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.21.5.25.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
@@ -14,7 +13,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	test? (
@@ -25,4 +24,4 @@ RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 2e30fdd00eca..39d95889e64b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/hourglass/Manifest b/app-office/hourglass/Manifest
deleted file mode 100644
index aa5a9cbece87..000000000000
--- a/app-office/hourglass/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hourglass-0.7.2-src.tar.gz 119371 BLAKE2B 8581ecc0e5c53b7e19dc0ac4514c49241246b0aa11a757d37bc1bd7183db5441e57a8c85a4e9887b53b3514ccbeebdd625e3bca3928240b32b3bffabcc55faeb SHA512 c15c9c6268f2f99ff2138764197b70480566926d524ce22039c85b7ddd11e1429e9f40c07691e4cfaccc9899e27f3d808e2cdf31d207c379dd67e5bd3c0f325e
-EBUILD hourglass-0.7.2-r1.ebuild 1373 BLAKE2B 3837a0154411bc4efa8af8bb18e58ba0c863f238c22fd39164d775d555cf5a85688d711ec2b1e40264ec429e599af91ed0eaac98dc8e7815adc57e9b068b11c6 SHA512 a2c994e689fd72f9cf5885cec2c0fea50c1a9b2a0ee57ef1aec8a71f969cad8be2688464f552d9ee9b83694c80b1d570af42f55fa7c0379204092a5c274225ee
-MISC metadata.xml 315 BLAKE2B 112d092b193e2b98ac67fdcd2c3d0d31baaea8980059be82e24e40cf231df5b3fc72370581c07fb12fa8cc5c92ada23cd39b22c8154b8df171fa63b72884ce4a SHA512 8ac90ea393b90bddeab543f2b00f5a92b74bd18c342ecc97d384c6e98178e418698afead4acff15a35d98f948f6d29a69bfeb419d8bb31426fb3790232df98f8
diff --git a/app-office/hourglass/hourglass-0.7.2-r1.ebuild b/app-office/hourglass/hourglass-0.7.2-r1.ebuild
deleted file mode 100644
index b096765f5c80..000000000000
--- a/app-office/hourglass/hourglass-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A PSP (personal software process) time tracking utility written in Java"
-HOMEPAGE="http://hourglass.wiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/jdom:0
-	dev-java/log4j:0
-	dev-java/ant-core:0
-	dev-java/jcommon:1.0"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	${CDEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	echo "jar.log4j=$(java-pkg_getjar log4j log4j.jar)" > conf/local.properties || die
-	echo "jar.jcommon=$(java-pkg_getjar jcommon:1.0 jcommon.jar)" >> conf/local.properties || die
-	echo "jar.jdom=$(java-pkg_getjar jdom jdom.jar)" >> conf/local.properties || die
-	echo "jar.ant=$(java-pkg_getjar --build-only ant-core ant.jar)" >> conf/local.properties || die
-}
-
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="javadoc"
-
-src_install() {
-	java-pkg_dojar "dist/${P}/lib/${PN}.jar"
-
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/*
-
-	java-pkg_dolauncher "${PN}" \
-		--main "net.sourceforge.hourglass.swingui.Main"
-
-	make_desktop_entry "${PN}" "Hourglass" "appointment-new" "Office"
-
-	dodoc README ChangeLog AUTHORS
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b21239c33ea3..3d95ef96ff04 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
deleted file mode 100644
index 5b0db6982e60..000000000000
--- a/app-portage/demerge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r3.ebuild 1313 BLAKE2B 00518ffb80e18c6e1e8ed3870c93f1a38219ca899d4d228fbd45c881e8bf2f0481513c5e485cbf689bb3e0334c848b432a272f208838149835b1afe36638a3fa SHA512 db2746ee1cdff08f192a2466a3c5c9cf0d37b89d63ce792a4740bafeb4907f81a30dad2d61ef9a291448df8ef72c6bddae3416f9fcb227a90c9a5b07527537d6
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
deleted file mode 100644
index fcd36913797d..000000000000
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DESCRIPTION="demerge - revert to previous installation states"
-HOMEPAGE="http://download.mpsna.de/opensource/demerge/"
-SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/PortageXS-0.02.10-r3
-		virtual/perl-Term-ANSIColor
-		dev-perl/TermReadKey
-		dev-perl/Shell-EnvImporter"
-RDEPEND="${DEPEND}
-		sys-apps/portage"
-
-src_prepare() {
-	# Fix path for new make.conf location
-	sed -i -e 's:/etc/make.conf:/etc/portage/make.conf:g' demerge
-	default
-}
-
-src_install() {
-	dobin demerge
-	dodoc Changelog
-	doman demerge.3
-}
-
-pkg_postinst() {
-	if [ ! -e /etc/portage/postsync.d/demerge-record ]; then
-		mkdir -p /etc/portage/postsync.d/
-		echo '[ -x /usr/bin/demerge ] && /usr/bin/demerge --postsync' > /etc/portage/postsync.d/demerge-record
-		elog "/etc/portage/postsync.d/demerge-record has been installed for convenience"
-		elog "If you wish for it to be automatically run at the end of every --sync simply chmod +x /etc/portage/postsync.d/demerge-record"
-		elog "If ever you find this to be an inconvenience simply chmod -x /etc/portage/postsync.d/demerge-record"
-	fi
-
-}
diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
deleted file mode 100644
index 51930499ab60..000000000000
--- a/app-portage/demerge/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index e286b7b6468a..b7a28195d895 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,5 @@
 DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
+DIST eix-0.35.0.tar.xz 636432 BLAKE2B 8a880cde56c0010f193445d9813c533effd59b8ee570132a0c40d62de827968839d99ee16981d152e737b881519e9f73d4ddac5375b6339dd480064deefa6149 SHA512 b9a6e59e666ec6015a612e083839a11a77e1d649262a802a9c8684fe25abbeda7a2c51ea629f1bb85ddc77fccce42b577178284763668bb2d1bcc85df5d68f2e
 EBUILD eix-0.34.12.ebuild 2539 BLAKE2B 9df22e7365f6a7352edf3326d405135fb2e2ef0f2efbed1b90f0ce2e5c834a4868e30f5db1b2ff3219bdbda16ef9b557c616fce63b24d7d9379a128391982f25 SHA512 af74697e0c3da63302d117405b77b3d85cd4c27feceb1af72e3ee7d0bd7fa51e64ede71c9327de7abcdb3e32baeb54cd7c58b265d59554360d08bf378f38bddf
+EBUILD eix-0.35.0.ebuild 2547 BLAKE2B 5e181c69cde90dca9c29816e3cbe630ca70434d09544b48269f7fe5dd743afb093b8259b00f284b7964b80275a1610d129e0d84f7d9f8f152955e0591e3398da SHA512 541beaba3647be36da2847e05e79631b671130fa281462f88e65e41eddf430b5b287de0f62580ee5ea962930ac695ea1c6e2fd7015128b705433bd9d223065d3
 MISC metadata.xml 1065 BLAKE2B aba22801b07a7346aab81b420cc8eadc9aabd68f27b5943b9f5be4f98bc435bd4db09fca13356e09ca16b753e7378459001501112e8358ff552e9efc46569626 SHA512 3524a0ca51ca92fcbdb2c7b4c862d8f71da8041fc8c968cf63840266d79c52b7d5632cfc479c4e9171ea4b680e986b10861afb3e49598e1e10327587937690a9
diff --git a/app-portage/eix/eix-0.35.0.ebuild b/app-portage/eix/eix-0.35.0.ebuild
new file mode 100644
index 000000000000..a13024c139e6
--- /dev/null
+++ b/app-portage/eix/eix-0.35.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 55bf393f8aa9..e05f38b2572e 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,4 +1,4 @@
 DIST gentoopm-0.3.3.tar.gz 38624 BLAKE2B 018be741c6970b17525e56d5acdb23e15c8f78016fddda50ef329ea65b84e085a928e1e5e95c69757530c067c28aa578e9c56b8bd7546d7249a75e9c3cc3b57f SHA512 91ea07035b25bdccd8072c5691690ae0b40b6220a2ea29e4b051aeb8455f200e94569036af42ff2f5d7714344d332e5d71e3ff8dfde811f2aa6b6c1b3a895b21
-EBUILD gentoopm-0.3.3.ebuild 669 BLAKE2B 3cd6ece409f2f7ba307187cee03c69531b5cadc88100d4205839664f1c34a6baa40ead8cb354b97cf15f5215b313f54df029e5fcdce23f0da921f9680b9231a3 SHA512 81f8db9658172a17513c1edd89553a4bdbdce515fc30fd7830422e41bd5ab51e0ea55dc7c192a0434c4bfeebd25153073f0a5deb808d4ed2a05442281934f621
-EBUILD gentoopm-9999.ebuild 617 BLAKE2B f51639ceb38c9a47c654ddf939a661610add943e51f0ed5f60185f4a24654bd424dcc382cabafad72dcc640d52159678fbb8dfcdf868f023084020a3010ea535 SHA512 bb56a8288bc78a5be1371e03eb7bf685aae5783715f32662a81de1662a7168ffbf4723dfb02fb154fde3f4f08ec33880e700748856e6a3a5784e64ee6cf43ccd
+EBUILD gentoopm-0.3.3.ebuild 670 BLAKE2B f9165305085974f4d359db7d45276cb8174c327f1d5e8b13260974f74e098d63babcf9e0e3c2e67520793905ad1618dfcc349536450cf8dc13dcd43381a80083 SHA512 91b500dbd24e4631290f95d6060a708abadf9e6cb65cd4d9c2581a07b72dd120177c8d08253ea91a4293c9bd1ae6c587ed6bf10ffa31c4109ec68bfd11b2d97c
+EBUILD gentoopm-9999.ebuild 618 BLAKE2B a3bdad7c8ad96eeb9fcd123859c6868dd104e0130f76d9b5c21cf63a8d91e405b9b7527378de5e8715040525058be03dd92e812b781b96b7f379cf6a095c681c SHA512 1f4031557dd08aa9ab0da28e38e183843a58071bec302d3f85838747af69b65733b8a94c1fb8d03be2c7b09cd6695d199fdcb320000a083762e0100fba3f153e
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.3.ebuild b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
index bf6318cf270d..a97e106c1412 100644
--- a/app-portage/gentoopm/gentoopm-0.3.3.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 787c12954d99..840415f2aa12 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 EGIT_REPO_URI="https://github.com/mgorny/gentoopm.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/kuroneko/Manifest b/app-portage/kuroneko/Manifest
new file mode 100644
index 000000000000..2a476be9a08e
--- /dev/null
+++ b/app-portage/kuroneko/Manifest
@@ -0,0 +1,3 @@
+DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1
+EBUILD kuroneko-0.1.0.ebuild 790 BLAKE2B 4d5b1b9aa95ac1a1ed215e08690fa3b5b4d5f6a183c9d52960d2cb6bccd825e2d9a30c688f4b9d203571bf3ee63ffbbcfd7888182d9a02518ab0c33833005ea6 SHA512 52e2fa14d8baf97817e400170bc452a105a3b677ac91b9ea16654272f0076fbc25eb1fb2b1e6c77adbd08e632e6084059984e6215a91ae1ee3033101c8a9ff73
+MISC metadata.xml 357 BLAKE2B 901f6d525dc570d6137f33509e6fb3d973f256abc53a394b12d63c88749af811bccd6b4a9c0f862d37c23cf2d7605f90452cbae2c92dc508e035165a386db0cd SHA512 6ded3806aef8698d4c83afb22f7bcdf9899a68b697442a00067da7552750ccffc34ce055568cea416a4ce3eb11d845dd471448392ed1347c93cf672dfd788ead
diff --git a/app-portage/kuroneko/kuroneko-0.1.0.ebuild b/app-portage/kuroneko/kuroneko-0.1.0.ebuild
new file mode 100644
index 000000000000..0bd9b554e20a
--- /dev/null
+++ b/app-portage/kuroneko/kuroneko-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Vulnerability checker using data scraped from Gentoo Bugzilla"
+HOMEPAGE="https://github.com/mgorny/kuroneko/"
+SRC_URI="
+	https://github.com/mgorny/kuroneko/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scraper"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	sys-apps/pkgcore[${PYTHON_USEDEP}]
+	scraper? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? (
+		dev-python/bracex[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/app-portage/kuroneko/metadata.xml b/app-portage/kuroneko/metadata.xml
new file mode 100644
index 000000000000..b09f3f81a528
--- /dev/null
+++ b/app-portage/kuroneko/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="scraper">
+			Include the dependencies necessary for Bugzilla scraping.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-portage/perl-info/Manifest b/app-portage/perl-info/Manifest
deleted file mode 100644
index 39e1806c6d76..000000000000
--- a/app-portage/perl-info/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST perl-info-0.16.tar.gz 2058 BLAKE2B 07691f2b2bbc36c171706e55257d8ed57a45f629e71e12d438d236a0d026d50fdf8a0ddc05644befb4d916cf8cb2ad6819753f27baf5e14ac00c86e331dfaeeb SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483
-EBUILD perl-info-0.16.ebuild 556 BLAKE2B 7da91dc3415ea85cea7b5d7ec3db1c909a0f3fa4a0b60857c8191be0fe9e6ad7929d2ef974724fd97f06db76f2c68d330e2c0effa1a25931ad5212ea2ae3567b SHA512 138a2efb6ff916249b5670a4a73bfa8304a3730bc85e73aeb727fc5d43e2a37e24310dd8cdb9fc31e77dc66feb474968e40183d92273492225d415315c379931
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/perl-info/metadata.xml b/app-portage/perl-info/metadata.xml
deleted file mode 100644
index 51930499ab60..000000000000
--- a/app-portage/perl-info/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
deleted file mode 100644
index 546636434b50..000000000000
--- a/app-portage/perl-info/perl-info-0.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	https://dev.gentoo.org/~tove/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Term-ANSIColor
-	>=dev-perl/PortageXS-0.02.04"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index cd8f5beb9d05..6887ccf7f1e7 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -6,6 +6,6 @@ DIST repoman-3.0.3-version-bug-779508.patch 1887 BLAKE2B bc3a49266fe64d55ec95537
 DIST repoman-3.0.3.tar.bz2 90373 BLAKE2B a4ea542c452d44b1f4aef235d67390b0a0f139f32da33ab9ad8992797965724f4ef8123a49b681e9205b6e3fe279dd248b65b0119659b7a0038fe9884bec0797 SHA512 09855a8a0098482c1ce0a7f50d2481528e713fb6796a4004475c841de59f9df8d264f2e9342fdaee87c71d275137234b7e3adc3454f7f33dcf75e32a0ae3f0e9
 EBUILD repoman-2.3.23.ebuild 1938 BLAKE2B 54c79d7a62e3ef16ef068c6e09cfde0193dcaf3521e662386726457ec95be61fc51d2e5aa3e227f2054b2d646e75ea6cee484be0b9a8c61a55297dc96c1e363c SHA512 2cc9e9f701c97e4caae34950249920a380d86be7268241faea551d6b198049fbfe9fc623a8905861533977000c9b4f45fcaf12edd03007b6fa1508b1d3ac2c94
 EBUILD repoman-3.0.2.ebuild 1944 BLAKE2B c277bf0e07c9c24fd74689ace176c50c1eaf68b86d813fedacef3fdc681e961260175494affaa8c9d923466ebf598bf79ceac2680652645296909467aa7a39b4 SHA512 cdd803942694a76f348a6214599dad241462f6a85446d8cf841e5c2b7772ff417c824db7121d3b2160f1fa26b0e16f3bcdeb6590e43288b324753f7547e3ec59
-EBUILD repoman-3.0.3-r1.ebuild 2644 BLAKE2B 10bb0421a97be44db4f319ee722b86a5bbe72bd6b4adcfe95210bbd38a29659fc3fcfa37404f4d1f20801814ab407a630a944123539df0ec175214faf1c35d6f SHA512 a9c4d3207c280ede534845fc4b64868fa49e4c18d1bec4e1f96fe84541882111d5d57985e021ad09db8e56ae4f4ab2e39bc15052bd1e21340865345883458771
-EBUILD repoman-9999.ebuild 1951 BLAKE2B 734234a6e5793ca63b8e84f80fd6c2c3b556c4618abe766a82863855596c446a5e18d27c41c9e56af9649b0c5c4c20f375ccdbf94ecba1f1bbfb55dd431c6b2a SHA512 72c97210d7536bcfe01448b157881a62e4508ed6dbc2fa5dc2942022f9cdddac93cbd5436b701e7769986cf23bf4c09a8c5e8225426335bb05f6d32a65be77a6
+EBUILD repoman-3.0.3-r1.ebuild 2645 BLAKE2B 5f49cf6ca7b35fb6ad06cc7dad22a114ec6dce8c7f5b66b8ba60d6d59c156deab4399f3cfd65e3ba3d8404f0da023f02ba781a15ef8c64bba6ac0fcc0386e8b4 SHA512 1b2ffa126b294c227baf2c4c30cfb58182b2c5596e63740d06baa6aa3a841f94ea208750e266913125b45238d781eb68ab3b79d3b2e042b22d072c7fb90883e5
+EBUILD repoman-9999.ebuild 1986 BLAKE2B f392c8de0be23a3161eb0141afb91d6669b050f83835b948283f6dce6d367a0cd5f1a7d5f27484f07915fa6caf1313d30a60424330703cdfb46715af32c4538c SHA512 7c3cacbca70f4660f5621d8227d96920c1b8663adcd45cd18f04781e799d910a6fd6e16cc50d606b9a68a84c6d0e9b2e2a39ca2194bffce346982b5a120fb8c9
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-3.0.3-r1.ebuild b/app-portage/repoman/repoman-3.0.3-r1.ebuild
index a7bb7dee6d44..3d9ec6752cfe 100644
--- a/app-portage/repoman/repoman-3.0.3-r1.ebuild
+++ b/app-portage/repoman/repoman-3.0.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index 5db2b94f6761..0ba9ff39dfda 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -26,13 +26,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
+	>=sys-apps/portage-3.0.18[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
 python_test() {
+	unset REPOMAN_DEFAULT_OPTS
 	esetup.py test
 }
 
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 3ba58c3b369d..6d07b31af0e4 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.3.7.tar.gz 17283 BLAKE2B 9de30e07b7c950c7e0e3d7f20a364ef65028fe425a017cf46de73a4aaa2c82f13359bc8e2d3269ed50b201b95c41af16c6f233576c1176f8c9b6394227bc8e14 SHA512 47111fa0e4ef9630a60b262566166822ac3245338c9cabc9e5959922e6f60cac70087025321fc9946ef7527b02ce7eb25d74e22d045f9e875c82d6f7877feb4b
-EBUILD smart-live-rebuild-1.3.7.ebuild 858 BLAKE2B 4dd1985c9a9bc1bbc326898807ccdd761067fb362fd988d537445f902785e0649b7ec43ef504004c5e80d1e11929a7b4a6355fdae7016b6ba116da930d38bc43 SHA512 ee57a67b50c7e15010d2f952f984be8d9c0889ccc38427e9c1f06f4d4445c2690d703d1ef4a88a62c973bc25e01dd31b9d181859f2147663231fb7e2a75da18c
-EBUILD smart-live-rebuild-9999.ebuild 753 BLAKE2B 6213e113179dc428d5f5fb5e72a3a3560c8d52c5361655828e709c97c3cec4d9ad3f5590a839bbfc7ca46ddca9548d3f00949e6c6b4d1e8e480c6c883a1f89a0 SHA512 9f3cd7437a551bdf8faa57990143ca422d30f3a5cd5de58e8cfcac701d553df1d2b3cee5c5aba41501d79b3b49f4ccb6abc67be845675376a9285a7e33866b78
+EBUILD smart-live-rebuild-1.3.7.ebuild 859 BLAKE2B 0ff1fcf38ca8e6f17da63a34e8c4540c930678859ea1abea10e46d5cfc08322190b7f3f86cd4d4da4a86ceebe643b4a98dcd554a55ad4d3816667a452b279cb9 SHA512 6ea06a8f46cac40967e3b20d956c9780e78208a4cee52cbadc0d00db86b1f9c78428f39a242ff3e21378c17ec44892ed33864bbf4e5728f6d6586a0843e558d5
+EBUILD smart-live-rebuild-9999.ebuild 754 BLAKE2B 3059fb3c3325ba070f24084b5d62e008582b69bc55e2bce58a3a3c013f80424abc93452846dc2247e3c9bbe2bb8de05ce97114ad2419f59150b8c9d9c1c03193 SHA512 9733aa8e3bfacaac9aea937fe0ededfa6f6cf605a1376eacfcbf722c8a89695ebed0e57ed227e53b8743632842e2b29c6ee69a83cb32a459966fb699ed5d1aa9
 MISC metadata.xml 793 BLAKE2B 2a6117b00b5818a17925bf108428153f0171cb60cedb167d8608d67aa7c18c81f1b603f131d6e4fadb52ceec7116daf0c9977c4f6d5ce7eca8c5dcd814eb29dc SHA512 256a28aa2319add0633a5f5fa5c65550e071cb3206e94db358cf932c00c3aa4ab908b97e50f66d645b92671b75d9aa0a504b1d9dcdedeb649d2bbb52042ca1f8
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
index 7180a55364f3..8dfa9ae35508 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index adf1f7f98aec..22d242d6b73c 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit distutils-r1 git-r3
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 90579d8245e0..f2db32164bd8 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,4 @@
-DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
 DIST tatt-0.8.tar.gz 22215 BLAKE2B 6c21acb9378045679c4a03badcb7c60638c4007ba19857d7519f68d4d658cd1418e952cf15a64679c6a9b28090856a588e60e9db1abb360d0625a633491deb3d SHA512 31be6573e3d7c9a690e57d64adcbf87983d5dd226afd162c7bfa425847a84705beda530cd5b648ac85cf8cd3907d46ae638bb0ca0d903d8d1968d0ac30703703
-EBUILD tatt-0.7-r1.ebuild 842 BLAKE2B 6fd0771afdfeaf9e486c48d432aa1d5ae55a790d27f574fa965df898e7fe7a7c44f7ac04a3f476b7148047475a5be4d0a23a28d38efcf6f32a3094bf5af513e8 SHA512 3a0c4970b0ead9c0c2b8ff524a2f71e30c63cc8c41db1c0d77acb4ada8a47b2620bb5ed8f57ba6510f722b7d85959ccc0c21f2b6ff2db5d570de057079e9a30a
 EBUILD tatt-0.8.ebuild 825 BLAKE2B 77c5f43f27e9559a38b378a162fd52d9b5bd9c71ecc68965282f36fc8167b13e664edd907a5e8a8c4277f226351be882e153538f8d76b6ee23a6eb60561ccc45 SHA512 c05b802f73e050e8cec6e32373b791d684f9c77318fc26e0c69728952e1156fe6adb24b0e022e3994de5a95cbf91ecb744618b5ca0ddba97943678c166cd1974
 EBUILD tatt-9999.ebuild 763 BLAKE2B 04c33f57cd3af03a13e6e96453f6a18d017bafeabef27449714ff185a9ce7df61f3f488b6345f622b14c94238450f4b46692718a682750a97e7e45377c7029c0 SHA512 4b97ef44e12c8c2d3d70dd15dd57a3cd317beb3024f8b4e3042a599f8aa032c399471e02395f04c5e5cbc16b38aa2ecedef339afd747353e2b35bb8eec726b90
 MISC metadata.xml 661 BLAKE2B 1b520ce91684b655f849ab8dd0b53c6224b54a8152e7a3f65707384ca9133682c25244a86ab272b8c0b350db99a40e89d66a206bac9de21afded39b1a2be0b4f SHA512 872ebc25ebd0c9ed90544990f3ae5301b7e81fae733085d19e74f6f46743046b785fa1ece3aaec57db72f343ed222d6e555369c326a9781cbabe3a399278cdba
diff --git a/app-portage/tatt/tatt-0.7-r1.ebuild b/app-portage/tatt/tatt-0.7-r1.ebuild
deleted file mode 100644
index 96b1744dab86..000000000000
--- a/app-portage/tatt/tatt-0.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="arch testing tool"
-HOMEPAGE="https://github.com/gentoo/tatt"
-SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+templates"
-
-RDEPEND="
-	app-portage/eix
-	app-portage/gentoolkit[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-client/pybugz
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use templates; then
-		insinto "/usr/share/${PN}"
-		doins -r templates
-	fi
-	doman tatt.1
-	doman tatt.5
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 08573138c1eb..9be90ce0d165 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 42f303068015..2517982bb010 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,4 +1,6 @@
 AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f65126cbac7499c34928827057656f35ac53132b697e886f4995b55361bad82fa76c9364a376f1c0056075da2eac8f82d2c77d544e5d103c2 SHA512 1b826edc306c109b3595ec38b07657df81bf6dc380e2390c482d668f97acbaeef670d22cbf04b88e005b49ebf1969169afbc6c1a51ae7d148ad2abc118158bc4
 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20
+DIST dash-0.5.11.4.tar.gz 240652 BLAKE2B 67c8c148448b8d95d09e5229953a88d52338d71c8e647977b92c12c56f19ffc62f24c775409231409bde9f7e5cf05f97f131a4967dd93fbdc16f539846467e61 SHA512 2344782b80f69b74d00eb153a918c2293eec2316825bf83c1eb4ff787eddf78f67ca3026cfce39b1db8d5ede69c7268951eec1e5711903f2306714b665f84160
 EBUILD dash-0.5.11.3-r1.ebuild 1802 BLAKE2B b4ed4b396ad07bc350e2eb78db47167051ac38a305b8c80fdfa3ba12677498c83840dd7d5b453e5c14a59f9666e463f3a2a89c716704ca684b3371e3fc09cbc1 SHA512 6062ceecdef0bd6b9042d36b2e77958477a499bf563eeb5e0cfdfc1dc0944d9f5e946bb2ff6d54c1a0d63a3f3081cdcfd4958dcbd8d129b858478d19af5f2847
+EBUILD dash-0.5.11.4.ebuild 1809 BLAKE2B 0d871ef3b3f8b2dcb92d046c88ae1fa7701b57be1ac572bb6d9a73ca47b35d1bd6dc761809cc4085b8fe714ae6b6bb44acdf09dc9f1c60e6dbaa28e3c78a47d5 SHA512 cb09c1f7a30caa3ac947c849e8edb33de5f05b190a72e3f9b776f5d82e4025562bcf1d5920be1f95771e8338577d905cf36c50bb863176e927fb7dc6151d05fc
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.4.ebuild b/app-shells/dash/dash-0.5.11.4.ebuild
new file mode 100644
index 000000000000..1c194ba16619
--- /dev/null
+++ b/app-shells/dash/dash-0.5.11.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Debian Almquist Shell"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+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 ~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"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267
+)
+
+src_prepare() {
+	default
+
+	# Fix the invalid sort
+	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
+
+	# Use pkg-config for libedit linkage
+	sed -i \
+		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+		configure || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# don't redefine stat, open, dirent, etc. on Solaris
+		export ac_cv_func_stat64=yes
+		export ac_cv_func_open64=yes
+
+		# if your headers strictly adhere to POSIX, you'll need this too
+		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
+	fi
+	if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
+		sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
+			src/jobs.c || die
+	fi
+	append-cppflags -DJOBS=$(usex libedit 1 0)
+	use static && append-ldflags -static
+	# Do not pass --enable-glob due to #443552.
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}"/bin
+		--enable-fnmatch
+		$(use_with libedit)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bd16e63dcb70..5085e01921d3 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 1903a4ed72ac..e9a7cc00edba 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1,6 +1,7 @@
 AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3af122826d7250d9cec4df9ef48a3564cb522911d56710394eaa183b6180e08eae939b9f00a73fe061f21be4142520689687ad4c SHA512 72ebdc63cbb2c56bd8274f92501cbbae8c66e7d81b11b8fdeda38149da4bf44ab88699d248093eedc9813f6cd60e2a1f360fb39d778b4b7827777b1d003ab1dc
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
+DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r1.ebuild 962 BLAKE2B 6a889b5c824b1ba1fb3f236538a7e1c223784191ee745dadabcb753e6d0dee6552dd7955c5a75eae0075fd84a92203185b1c2d6a65166018a8ff94b7406532d7 SHA512 c914886adc6268dd82db8740a611f8737cbcab5c752db551d9282d782b1ed8767094efa95e7dc85304ce0837143d93bf06689132fec3ed7f79ebce99b2481639
+EBUILD aiksaurus-1.2.1-r2.ebuild 1040 BLAKE2B c9e0aafd7def0606780ea4c6871680fd86559a9e374734de4164981e9d00eb61e6d63039ef16ffa0c1a08bebfd952610e9f9df6062427dcb8435178323b6b3a1 SHA512 807a439e6b87ce940ed325b524bce9ed3eac0ecfbaff259a86d364d3f18d7bd75bde68af963051df585e89e383914115a711e1d57fcd1e5a7fb21ac709fc5baa
 EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
similarity index 67%
rename from app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
rename to app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
index 3bc1986d9baf..0062ee0b9a9e 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
@@ -2,11 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic libtool
 
 DESCRIPTION="A thesaurus lib, tool and database"
 HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,13 +17,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-"
+DEPEND="${RDEPEND}"
+BDEPEND="gtk? ( virtual/pkgconfig )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-format-security.patch"
+	"${WORKDIR}"/patches/${P}-gcc43.patch
+	"${WORKDIR}"/patches/${P}-format-security.patch
+	"${WORKDIR}"/patches/${P}-c++17.patch
 )
 
 src_prepare() {
@@ -32,12 +35,10 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -fno-exceptions
-	# bug 787899
-	append-cxxflags -std=gnu++14
 	econf $(use_with gtk)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 8e94e3c9eaf3..f12651f58728 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -5,5 +5,5 @@ DIST tl-dvips-2021.tar.xz 58076 BLAKE2B 23105928a22ecb0fb9d9b3b9bc8e5edb2eb42c7c
 DIST tl-dvips.doc-2020.tar.xz 521496 BLAKE2B 1a19670ea2a6339f983564580bfc15374737014fe5dbccc4fb3f3f81455bab2c0ee9cec9ea0b9858ccd3d75cff6465d825a4a2fb095e7d4e70edb459e76634b5 SHA512 6f97f38327335ea711ec467133d1fa4e3124f3362d177e19af2cca06a50be1cf1de4d9e5b1aacbd1ba9779e0062a49a7572d47c5de918030fd5f78476e2bfac1
 DIST tl-dvips.doc-2021.tar.xz 521496 BLAKE2B 7c366af47a1ea967e871e5740d8debb1751b67b9e41a35aada0327c1aa26c04a90baf1898c1c50965ab766006028f5fb13264f5d7cda87fc630dd99300995b5a SHA512 07b00a4bfe557a04a93b22667f4854e2d55f76f33d2fa767d445b3301835aafafd4b8046b7126d5f516b65a743b1d0fe32a8fa3d0dc9b7b29e47bcfdfc790138
 EBUILD dvipsk-2020.1_p20200406.ebuild 1563 BLAKE2B 8c0e32dd0e55888d1b47411efd967fb6c22e127fcb5682ba18c2a16ea92abd26fdc8a9205d3024890c71f7cdbc61e570c8bf6237e04c7717e82bc6754e7120ba SHA512 b10e98aec4a2511a07f8f84949a4d694319244258310a512570b72f6e14bb34290fbecd8703d22642452713891bac48442f935f40f07b818ea05b61d86a133ed
-EBUILD dvipsk-2021.1_p20210325.ebuild 1571 BLAKE2B d9909c8d8cf206761f4d9cd6206969bb0420e8effe7ea8cb8c7651a16883a130ed6402247bbb60416eb7079370bdb2a88f112ce4631e7d17b8b3078630d641fd SHA512 cbacaca5bacc63aacb8f48aeb931790c1a5734abf840d1ef1e02d8a7bca003b6d511608e567dab4a0b0427d98eeccd0ce87fb6ea5ff916434ac8c41395d8e378
+EBUILD dvipsk-2021.1_p20210325.ebuild 1563 BLAKE2B 41bda98de894203badebbb49d2954a1e5c95614abb5cb3f3a9a5dfe4ddceea7c1f4850ee352949371d61388beb0ae8db5f4901de6862288a66f1ae2e57455d50 SHA512 e3fb9f7a2589c360acfa965b425a2d67dbc02d80392dec76c964aa312b205e9958e058b1edda0b5c489eeded910f66339e52c5439044128cdff5270f1445d856
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
index 627e1168083b..31343a58c7fd 100644
--- a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index ac1366f3047c..bc35ef796eb1 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 EBUILD ps2pkm-1.8_p20200406.ebuild 786 BLAKE2B b96b70a4cb0cc2371c5889cbb82b510812f29c13a8150f2b68a081be2da7330d45780bc1d0182631060ee0d3028528db23a142b1cb52e1d3baf735df43761d1d SHA512 20c73be65f099ad8f5df79e96b3b87f3f450a9a7a0911a9a736ca0d0d0460539139d0463e02ae6d7e41363ea20ba31dcdc146424463e8ac733b37211e62763a9
-EBUILD ps2pkm-1.8_p20210325.ebuild 786 BLAKE2B f0ddca8b71acbd704b493ca821984dd5d2fe74db72c738a58cb5a8994bddf314c78e403620136bd1e325f0c4b58ae1e377455fd7606c4d4d8ba8d37bdee66865 SHA512 0cffbcd2687c66c8d2b7f29659c6cd5a448d9807d6708368420dd9bae3dd9b672db78240b0e2d0918b767d67674bb934e5d788d54b273dcc99a96de67ec0ec60
+EBUILD ps2pkm-1.8_p20210325.ebuild 778 BLAKE2B 9d04d755585356dd9855c8ec08be981845e927047a47cdcab95e6f85f25bb79e0af5640353a88aadd30951d2f7e51b1e950f7735d4da9dbc428672b89ee0cd6e SHA512 a2dfd913c4de734384a68baa567e4165abb50d22d8648d46fdfbf26202035aa3e406a9e9e207fd1add7bd6b7c5981ed1862bcea4ca6da30495b2cfd94f502f7c
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
index 56c4150a4946..ba369b0c001e 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
 RDEPEND="${DEPEND}"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index a05425fae35c..dc51cc98026d 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -378,5 +378,5 @@ DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b7293
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
 DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
 EBUILD texlive-core-2020-r12.ebuild 11941 BLAKE2B 06ee8afe2cd8345b6a6f7f50767b36661db7bef5d0cbdb7679490bdd72a48e7d013682cd7a8d2ec0ca1896d10de2127b665f23acab62460a055e1b0895496a11 SHA512 47938416987dccdf293554654287e306f2e3e122711818f7439f61beac493ec9eb9c80d6967038f4c12fc01a9bb18a9a4f49f2ea853170beac7bce6fc099b557
-EBUILD texlive-core-2021.ebuild 11774 BLAKE2B 1d793d51154a63ff3e35ee15d4a75ab133962786e23d7764a9f68e93247088be361a88059260bf1d4f294e26ef2d1c8f083762dff064e2ef1e2ccbe245e83a23 SHA512 baf0e4ff92c0cb39ba7e4b94bf0af3ab3fc0302d030cc2aaa3b45c7514f46599d801e7a5d7e58979a2e0ea995a183d01776646bbe4b04d658d742bef95d68880
+EBUILD texlive-core-2021.ebuild 11766 BLAKE2B 2ec395f4caddd1ba57584e023fe39648f9eb88695c7ae6b2942df4beffee9e1b8c1c4104f4631e8f470c68e1a2fbd1a51c3035cddfe58635f89d39bd95e5f911 SHA512 1711c3bcade1f086ad1550ac89ee87c1318f296f19aefdcfbd7e4fb46c42c5184bb654a74b6e8b2e7b61b1e4c0b951e3a2559719782c6a30201e3f4b41806287
 MISC metadata.xml 674 BLAKE2B 4bab73d192039ab8cb3952877ced5e1b7b329f47d2a5b96e72ec82428dbc2236629abb7e2de1af1997bf577fc81cc91ada9f173eadcd2a2e726acbd79b9607bc SHA512 6faf1b433b9236aaca1fc07aa5679752b2d0214b5bb5f7aea03aa6c21e8a1880a103dea2b9a4c87ea84e85d91d259a2c01f5906190c96c7467f8b0a4863d85c1
diff --git a/app-text/texlive-core/texlive-core-2021.ebuild b/app-text/texlive-core/texlive-core-2021.ebuild
index 6e386ac22154..512afedff308 100644
--- a/app-text/texlive-core/texlive-core-2021.ebuild
+++ b/app-text/texlive-core/texlive-core-2021.ebuild
@@ -75,7 +75,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index ae06161488e7..aff21e8a7f32 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2020-r9.ebuild 6758 BLAKE2B 026890baf4d477e7140005a243eb890a7ffbc8163860a6d15dd95398c95bedabada111f86e10823e8c35b3b4a9415e118552634229c6d8558b4b1da55cb0df44 SHA512 f3e496d5438643e000b06025205c0c99b1912535fd69e98f5e213d24328320db560ad845edfbd599a76756b22b3bc0f4b2b008270d2df92c7da2c5d57e846bd7
-EBUILD texlive-2021.ebuild 6694 BLAKE2B 82ac251256335dbadc451e45c0861dbe865f17083ff53e9b5e7fcfee1a442d10e8482a2c932f846fbf54730503b2dbc9012979769b54437a3cdf497a00da6829 SHA512 1fb0d61df75eb4f304c84af7c03a5b66d5aa4f54dc36b3de7ed2ba7553d3adae0408ae5f980f3bc474437ea61b487307e41195bf48b84f21d158918dccc2c81b
+EBUILD texlive-2021.ebuild 6688 BLAKE2B 906342092da463d8872d87fbeb5d7594bd07c229c5fd5878a1b4e79d59669d1ebfc7ea45d77c816bf5749cbef3709ada8346231567bf129d4549f22f8a0233a1 SHA512 51553e74ad8390f2c21d583698e5e50eadef1fc9b08467e6b6ae29dcfc2b63c21b83249295906946afb5aa0df1049e3dddb031ccfb7b182cac66f2fad1b4c231
 MISC metadata.xml 1932 BLAKE2B f69f70507b754ea964ffc2c7a1d5f693d782e87b4b40fb715b2be25d044a628cb9177c3b7695ef4093afd72b54e15f43564978b104f8246d3b307e288b06585d SHA512 3f9f2defe49de21e0eb8c6398f607d0138bd789071766e0c3a737dfd5692b41423ba29107e817a760a410080fe55e42cba33f84c08f70258ffe5b7337d34f2d4
diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021.ebuild
index f88937a1333b..8e45ab20cc60 100644
--- a/app-text/texlive/texlive-2021.ebuild
+++ b/app-text/texlive/texlive-2021.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
 
 LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 16f2356b225c..35875681ec29 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,5 +1,6 @@
 DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
 DIST tidy-html5-5.7.28.tar.gz 670474 BLAKE2B f1f030bda478f09f1786b34f62ac547249cbfe9d7d06aa7a3a07fb993ee64cf9911d04e4c487c9854e86493da08ef8ca5ee65faf0ce6473cd5914c74ad8c9251 SHA512 557cae0c00d581c9272649e0b3c143b70bc1941a59c497dd0b7266d70b3b2ff652dea075a855737d2d02ea58bb57d9403d61287c1ae40ec0281e7801991b57d7
 EBUILD tidy-html5-5.6.0.ebuild 622 BLAKE2B 365c2b9c65a461c6bd460d8a1a74071968c63576256b901fea5ed1a3b309a6ab5f0beb92029418aa938b2f61c1565e2e334f7b8d49a687c3a190297636f11e58 SHA512 819f2d445f0eef9ed960f72d714299b1fd8652e1389cda4d029eb8fe801405f1f27bb2349afeab57af995057b70707bf2f41441156da324b434c1b89c8a83f67
+EBUILD tidy-html5-5.7.28-r1.ebuild 657 BLAKE2B 56d93051d4a52625a04378a25a580a2c5becbe17054cc981e661266e5cb622109cb4409777643523cd4cad1626f3e1a6aaf37dd817e3e17d1f9ae8ae46b73e51 SHA512 742b207ab47895fe8f658a835ed7f8d7bc93c22f813877efae9d3f97314b409422b4644141475e3f4ce25a43255547be05406d0718d215cb38736dfa0a6e5b5c
 EBUILD tidy-html5-5.7.28.ebuild 629 BLAKE2B a439eab0e94c83d7ce3773c6517d13bb100444465c0c18ed22f48d5fe9bc93b8013ac46f629e8b43a1ab80418170973cd50e22925e55f0d493308645a397c486 SHA512 46bcf18c55ec48c715ec8ccbae7f8fa917d30e3f048b1fa878bd2fa93cd8be8590f171b99af4615c4c2e83cd65d862da59a01a554afced75675f84c6ad847025
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild b/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
new file mode 100644
index 000000000000..f3f78ced3cec
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
+HOMEPAGE="https://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="!app-text/htmltidy"
+
+DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIDY_CONSOLE_SHARED=yes
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	cmake_src_configure
+}
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 05388abd5f27..ad5ef2f8614d 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 EBUILD ttf2pk2-2.0_p20200406.ebuild 1120 BLAKE2B 92b477af86c6b1bb15a24e0cca0d28c85182168fe47f91a5d20b2cfcc0870db239975f43bfc55d2142a9494121e91b82414aceb6974d307e265f93f3452dd40e SHA512 00585ea45690ed0052940d42a4410a39d4ef2239a581b9e62c6494aaaf32a0754b7c6617bd42f807f56ad5489125db7dcf424168a3edec309af0e3810b6a7e37
-EBUILD ttf2pk2-2.0_p20210325.ebuild 1127 BLAKE2B 8a66adfb1cfe4e88915d4c06780fe1c8fbfc6636ae3072431bc3b53b62370ea0084db269e877e768670c07324923a8210cc6a9e9a239da1a9510dfcb5e23d0df SHA512 a20f912d525874b85ed46daa43e0482a0373413fee69cb371e1b00d12cfdf5f77da0474053465cf777a41e4c7c51ecf63c1d00f7d73bf3dbc7613a3cc37ddd25
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1120 BLAKE2B 92b477af86c6b1bb15a24e0cca0d28c85182168fe47f91a5d20b2cfcc0870db239975f43bfc55d2142a9494121e91b82414aceb6974d307e265f93f3452dd40e SHA512 00585ea45690ed0052940d42a4410a39d4ef2239a581b9e62c6494aaaf32a0754b7c6617bd42f807f56ad5489125db7dcf424168a3edec309af0e3810b6a7e37
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
index 901cf53cd7c8..e722a14b4810 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 928085e93b50..5b4e4f92f171 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
-EBUILD xmlto-0.0.28-r6.ebuild 1435 BLAKE2B abcc70422eb5d91bed1137158a33a9d4e2c6a0a2833e37d549d8c573377909e347989c40cc51d5beb09425e6f5f47c4159158ab638088e99464568098e841885 SHA512 c59fc49e086cdc37b40fd4bd7849d4fe191e9e4f3b119d28a5a14c2166bf68e444acb8ca31a0949b400891cab4d7d63b7228c6601cd81f03adccbb288c2b5ea3
+EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
 MISC metadata.xml 323 BLAKE2B fc92312d7c96a25a1d35384dd78942a7d6bfdeb0d1c36a7ffddc687d42a83261766e7042dc109b2544da11d72274761a98c62cc8e0ac872e8478e5e027cc69bf SHA512 33789a6e807d048100b32969bfbce0beea9c3b25fe279fe5d318d59b970b4562ec8edd222bf5817a62e46d23961160ccb11384be06e605fb115b3fc7c72299c5
diff --git a/app-text/xmlto/xmlto-0.0.28-r6.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
index 87c5faaa209b..9188b524d598 100644
--- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 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 ~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="latex text"
 
 RDEPEND="
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 97130eef92c3..fd07fcdf04aa 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/Vim-Jinja2-Syntax/Manifest b/app-vim/Vim-Jinja2-Syntax/Manifest
new file mode 100644
index 000000000000..099450327df5
--- /dev/null
+++ b/app-vim/Vim-Jinja2-Syntax/Manifest
@@ -0,0 +1,3 @@
+DIST Vim-Jinja2-Syntax-0.0_pre20210604.tar.gz 4579 BLAKE2B a63888feaeea3eadb6eb733631241d0a3d9248387a21fb8391b9ea9e70d47bb17535c9baadef6577fdb714ae07cb7e35d1aee97320c155de0b67f6121fcc5747 SHA512 c563b28df738ab7b087637247c1ea4f644cde0d15ccad4f6f6edccf9a04712666ff32447e43b35fff389e50bc1f6b4addc2ff5857f4a1c683b8f02adbf3682c6
+EBUILD Vim-Jinja2-Syntax-0.0_pre20210604.ebuild 453 BLAKE2B 9637ffa2db25ab72dfd291f9ef3cce438197a740b96967b4381d3395b3a92e1d9830916277cc57dba55a8b0485680f4de28ae860670c625537cb8361287b6283 SHA512 e242e22642d1925bc286b8582d92951598feea29c5f47d7a189f2a2e08325a6666b02b932bbb509b3e7d955d5b65938201694da141c01ea6f0afc4ba6089827b
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/app-vim/Vim-Jinja2-Syntax/Vim-Jinja2-Syntax-0.0_pre20210604.ebuild b/app-vim/Vim-Jinja2-Syntax/Vim-Jinja2-Syntax-0.0_pre20210604.ebuild
new file mode 100644
index 000000000000..e52a759ac606
--- /dev/null
+++ b/app-vim/Vim-Jinja2-Syntax/Vim-Jinja2-Syntax-0.0_pre20210604.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT_HASH="5d2496eb5fd4415c7ce062ccbcd53a3f0de93aa3"
+DESCRIPTION="vim plugin: Jinja2 syntax highlighting"
+HOMEPAGE="https://github.com/Glench/Vim-Jinja2-Syntax/"
+SRC_URI="https://github.com/Glench/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
diff --git a/perl-core/Devel-PPPort/metadata.xml b/app-vim/Vim-Jinja2-Syntax/metadata.xml
similarity index 61%
rename from perl-core/Devel-PPPort/metadata.xml
rename to app-vim/Vim-Jinja2-Syntax/metadata.xml
index 51930499ab60..cee379b15409 100644
--- a/perl-core/Devel-PPPort/metadata.xml
+++ b/app-vim/Vim-Jinja2-Syntax/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index f2b308ae21db..7408746558d3 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index a2474bf188e5..9e190ee4a2e7 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,7 +1,4 @@
-AUX asis-2016-gentoo.patch 1487 BLAKE2B 859aebba0bfe56ab846f82f2f75cb04c6b5edf25cd25175272f6da5e65356a8f82b205940e43b64832e25789c71a19ac0861d20fc44106bb06f1e05ec8d63f95 SHA512 93142623810c5a31e3d4d792144c2f352b4238a6fa96eec71489453bf6e9cfa084c0e3ec4d4e6bf37df09229f2f8045c82a4797a11555ef378774d0d2748a540
 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9
 DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f
-DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
-EBUILD asis-2016-r1.ebuild 1113 BLAKE2B 38a3e218153d8a9f35d3f0bc795de883a6d069e5dd459a6e9fda06590e5a4c8ead23ba0c3704ad1b8c7b6f7b7a62f2be2820b4fa67ee23351fb973e96c4dd2ed SHA512 26f1ae553eda889add57c0791ee906c3e5d2ad4d1d01fa856f7b0de8172db0b8f42025ee91b187d2a0cebb7d80339915faae7466371d87e054edbd9e3eeddcd9
 EBUILD asis-2019-r1.ebuild 1213 BLAKE2B 8460b7c7e3185d15d2ee21f784a01a71c91b35af39be467b39b80c8e1649a6f38e84c199d8db255a073c0f7ef3952c0eb401042c63152a8ffc82183f426f6548 SHA512 8f6212f5612a12a463d894351fb1848ad2fef415e671b9da066bb7ddd0b6c39cdf3ceb848f6b4173650aa137b1140b5521a3a9069b46ac0a8d8133d8a70c832f
 MISC metadata.xml 507 BLAKE2B 8b1df4ce46d0dad00a66b5460fe5274c3d31080a6dbfe88c2482bce2097c22899ed9bf8415243c4af658dfb383c5865bf0b363cec7f72ddda54d595bbd772708 SHA512 09fcf4af4c0ff4a27bdd41a2abece2736c6f78c38b1a5a4f05dbe418def78493df4940b2ee6e528f9ffc9184f69c61deb1912fc309b0304da0b4a30f1690dd9d
diff --git a/dev-ada/asis/asis-2016-r1.ebuild b/dev-ada/asis/asis-2016-r1.ebuild
deleted file mode 100644
index 1918e6f75d29..000000000000
--- a/dev-ada/asis/asis-2016-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6,7} )
-inherit ada multiprocessing
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="To develop tools for Ada software"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ada/gnat_util[${ADA_USEDEP}]
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl"
-	emake tools PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD_FLAGS="-vl \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	emake prefix="${D}"/usr install-tools \
-		GPRINSTALL="gprinstall \
-		-XGPR_BUILD=relocatable \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable"
-}
diff --git a/dev-ada/asis/files/asis-2016-gentoo.patch b/dev-ada/asis/files/asis-2016-gentoo.patch
deleted file mode 100644
index 11a83e0fda9f..000000000000
--- a/dev-ada/asis/files/asis-2016-gentoo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile	2017-01-03 13:59:38.106788092 +0000
-+++ b/Makefile	2017-01-03 14:01:43.735605615 +0000
-@@ -10,15 +10,19 @@
- # ==================================================== build
- 
- all:
--	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
--		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
-+		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr \
-+		-cargs $(ADAFLAGS)
- 
- tools: setup
--	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
--		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=tools build_asis.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
-+		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=tools build_asis.gpr \
-+		-cargs $(ADAFLAGS)
- 
- setup:
--	$(GPRBUILD) -p  -XBLD=$(BLD) tools/tool_utils/generate_factory.gpr
-+	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) \
-+	  $(GPRBUILD_FLAGS) tools/tool_utils/generate_factory.gpr \
-+	  -cargs $(ADAFLAGS)
- 	rm -rf tools/tool_utils/ada_trees-factory.ads tools/tool_utils/ada_trees-factory.adb
- 	rm -rf tools/gnat2xml/ada_trees-factory.ads tools/gnat2xml/ada_trees-factory.adb
- 	cd tools/tool_utils ; ./ada_trees-generate_factory$(exe_ext)
---- a/Makefile.stub	2017-04-06 21:16:41.802376709 +0200
-+++ b/Makefile.stub	2017-04-06 21:17:01.627023825 +0200
-@@ -3,7 +3,6 @@
- 
- # Where Asis library should be installed
- # Default is into current GNAT directory
--INSTALL_DIR = $(dir $(shell which gnatls))..
- prefix=$(INSTALL_DIR)
- 
- # System commands
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 7ccf7821ed69..285ba599faac 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,7 +1,6 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 DIST aunit-2020-20200429-19B6C-src.tar.gz 615443 BLAKE2B b7d31dc8e198b3ceb94d043d701dceadbc1e20596a71a4f25a140bdd3f9ad54f7d7e4d4bfb587fbc31b9a6a046407c2d0dbd77dd2d045878e9aa2da3954d2964 SHA512 2d61db882cd7eaf66be101ffabafafdab1834578df162f0ef1947b517265033285cef3d84a76a3b0f1cb05d0adf12a1910b652bfbaeb56fc022157f44b34de86
 DIST aunit-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
-EBUILD aunit-2020-r1.ebuild 1174 BLAKE2B 7c2bd419c5fdbf372b69f81fb7f1b4d8839b9338c078e03f08aa6024cc30dd8740ff0fbb18f14a6d90896529f97d86d6344a7c1dc1370a963f60ff33c7ab5e24 SHA512 c352579acc49b5a8fa65140898127dc41a5daf500790fca8da25147c2b111bb95c47895309d1ce478cadff32c334ab30d5a679c93250b8243d34b5b3d24a978c
-EBUILD aunit-2020.ebuild 1160 BLAKE2B 2b80eb06dc8ee854292090da2271ceeecf02e01b6ca3b51377ab2e260659d15687caca26a6be158d73773c0bc33af55b51f2c940cffc0c7262e527a03594e6eb SHA512 f18a0e578ed0d6af531b401e8974202aa655954001a9aca01a43abf3101810940aedbbc8973a8541279f9d42ddd7a5f590f02ce713951943650e1dbb04e4df45
-EBUILD aunit-2021.ebuild 1206 BLAKE2B 0c5b8a8ce237322419b03445cbfd18d0370f50de22e874fbd92fe70f36ef649b832ac576279d725876643481cbd7d99034a8eb01386b717595e8d22bb89be85e SHA512 c362a73c029544c7dd333970c9ecfcb0a4525e372aa911c0c1e1c815481eddae427a65c2913f67976d9fb69040d3b16af251b4ea8e360ff9e3e7a1a75c074a5f
+EBUILD aunit-2020.ebuild 1157 BLAKE2B dfff70a9ec5b111355f65f820529781aa5c2041109095310b31f5780738e330d5a0dd2228e889847f2d39f9db5a7d4a2fa13166a6f1fbd63b470dfdc944999a7 SHA512 165e1398966e92da28f0f8c23870b2827783471e735f545f0f62ae54b56a4c9179a769161f68eab407be35f676a19b9390e1986a4ac21cead3120d2e0a8a7815
+EBUILD aunit-2021.ebuild 1206 BLAKE2B c09b536abbebcf81cabdff54df9dfaf3130e49a4f0ce658c6205fded72a28eae269495ca3fda9fc0514ae397f811eae5aaca938eea0d9ba68ffeca16a6f5b692 SHA512 4533b71bafc14282ef0ef18205a87ee74e74421ed60197fe1b49e3f9ad78be9d45d4436e270240d1940abaf8575e7797522ed0abf8c20a5e1510635837af2d7e
 MISC metadata.xml 764 BLAKE2B fa5a767e7539d5fa8d2ce44240495fe471f8221897273a6c73748b0065a5239afaf99d4c28172a877b47611aa7d568a439cf47d172bee4a3f2878d4bd778ef9d SHA512 211f0200353e3573a700d1cbacb421e53e817617bbc5b74dbfb668194eae397b34193ad743acf70287b66d3fcb4c366214822b2e97a15bcfa80f9252b7f5faa9
diff --git a/dev-ada/aunit/aunit-2020-r1.ebuild b/dev-ada/aunit/aunit-2020-r1.ebuild
deleted file mode 100644
index 2e3ce4c2ae34..000000000000
--- a/dev-ada/aunit/aunit-2020-r1.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
-
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${P}-20200429-19B6C-src
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	einstalldocs
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
-	rmdir "${D}"/usr/share/doc/${PN} || die
-	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
-	rmdir "${D}"/usr/share/examples || die
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aunit/aunit-2020.ebuild b/dev-ada/aunit/aunit-2020.ebuild
index d91d2752f4ef..4bf0db12dc93 100644
--- a/dev-ada/aunit/aunit-2020.ebuild
+++ b/dev-ada/aunit/aunit-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B6C-src
diff --git a/dev-ada/aunit/aunit-2021.ebuild b/dev-ada/aunit/aunit-2021.ebuild
index 5388c385095f..12757b958979 100644
--- a/dev-ada/aunit/aunit-2021.ebuild
+++ b/dev-ada/aunit/aunit-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19DC5-src
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 69f7b8f4ce26..965b7db3d072 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -3,8 +3,11 @@ AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb
 AUX aws-2020-gentoo.patch 450 BLAKE2B db6858688b2a9237efea0bf82f39d62855a0d126f3be7174981700bf4964e053c0715cd2e5f9f0cc98c5a884a89af47b7f83e6a7ce89d491073bf4c2370ee91f SHA512 80862c07fec63999ff531981c843e463888bb2f78310e28fa9ade6814553cb3cadad548d896a643a819bd5904b7056486ff372ad101c6919919fcc6895f14d02
 DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b
 DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33eedbb39b4d4fa542f57f3a7d596875a25c1eb59c3e4cc0085cfc60f385566842f2b047086a66a966dc3b9dcd8f48ae7da0c07c01e SHA512 284331bcd07955737ebc6b95a0a72984ace55a1911f1ed809b0ba8e525b03df57a668ccd92d0edfde42be2e06c09a3225e84f5d0501a488a004eb3eeaa746a61
+DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
-EBUILD aws-2018-r2.ebuild 935 BLAKE2B 008b7dfdac6b1ab61b64c9d9d63aef6349ba5d74c8872fb387a9544f6caf78b33e14e82b3872f83088d4dc4b741fe5746fcc6b79c3cc0ed31dd72090339b13fe SHA512 3e1d24cae29ad40fd31368cedfa8a63e86366aae45e4e2aa79bacbb883277ea74e71130dc6e801fd623657a50f8150fb4ae2a9469ad7c4a33899165c26743357
+EBUILD aws-2018-r2.ebuild 932 BLAKE2B 3fc7a96afbc603efc81339cea628ee55739a93859cad07a3255103daf04635280d6d2329a1532dfef2156ee9f53e4d020bb03d5901720c9570a0a851d727d24f SHA512 27b1a91ffd6b9c30099f3d556d4443deb19ea6970fd943e3c1cecb1ea83611ddbfef382b2d45b4ba0762bbeff36e9e0f5677255ef6fc511032cf128bd4270d2c
 EBUILD aws-2019-r1.ebuild 892 BLAKE2B a364986dd0a40544fb4915ce6484d517f62437468a55c01189751b3d9c0818acea43df3db2ff29de97736fc045da9c3346bbeff77ccf73e146cf80e68c433c7a SHA512 c394e76af5ba613cb8d817b563947f8d12a988f1e2d024ea31c95bd0f361a342ddf30a769bf77a8dc9c001d404e65afb609997130f3a08cdf63940497e0f3603
-EBUILD aws-2020.ebuild 929 BLAKE2B a93e4cdf292eb49684af50ee21bde6e98fe41c3b31ff69aaf7b75e1da5bd7a75f9503bab35f557e08803505cac16f63814bd91752c73f2dccf416e23b2510cd6 SHA512 e63eb249375c7648477d0337d1a47111b5f21e746884380d4d13a91121811d4b6c19e2b31a0602ed3aafaf15f951d51a05ead51a1e718ce0666c89260d3c34d8
+EBUILD aws-2020-r1.ebuild 949 BLAKE2B 4e1c7cb3283d45871e84b3eb13d92e2dcf1a20ae3bf49c69fe1e028fa9f570e18e62238f62070c685695b5ef2ce1113caf3b66e8dec1a3a3cea0e03a04c07b64 SHA512 c72b085268de15d8373f1bb270f9171e483056532f90e79d1ae259943baa0354f37a6f31ee4fa11c8dc950cae830c689205451cc7990a4ead4a7176e78b2253c
+EBUILD aws-2020.ebuild 900 BLAKE2B 4e8e25a6008bab2738c23883c55680c99e068604f00f6f1900bb03e410295c6a591fc8ddc728d19f376c2539f0d6f31bce4bcb438c3b349b9b50bccdf55f18d9 SHA512 125aa34b8f5046cdd56e7111dbd2a53bd39b46ee2e6ead82fdbf04d0e62d1d62d570494fc6fb803e8f8864b443f8c1ea8b14b356be2b8e518b1aa1951ec8db60
+EBUILD aws-2021.ebuild 945 BLAKE2B d61772a4427b8700f99cc99faacafab22a27d420992d4b686c4c2470ac7593f84de7e0beafcb2e755fbabe4fd87e6175ebc111683ba6f6c7b5676916e9af2804 SHA512 d0d1aea4172582dc19166fb9db1cb31b5ddd72d311e710dd2bd6523ce7b470df5b8629d95396c4aba3075ca1a70d7089e9a2666d1c7f248bfe830134b2b43671
 MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227
diff --git a/dev-ada/aws/aws-2018-r2.ebuild b/dev-ada/aws/aws-2018-r2.ebuild
index db8d0fb6fa7a..9e567177b601 100644
--- a/dev-ada/aws/aws-2018-r2.ebuild
+++ b/dev-ada/aws/aws-2018-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing
 
 MY_P=${PN}-gpl-${PV}-src
diff --git a/dev-ada/aws/aws-2020-r1.ebuild b/dev-ada/aws/aws-2020-r1.ebuild
new file mode 100644
index 000000000000..a831ab9427ea
--- /dev/null
+++ b/dev-ada/aws/aws-2020-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+inherit ada multiprocessing
+
+MYP=${P}-${PV}0429-19A9F-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=c1b0f6863d1a30acaee1df022a65ad11d5737a84
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+	emake \
+		PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
diff --git a/dev-ada/aws/aws-2020.ebuild b/dev-ada/aws/aws-2020.ebuild
index d33c830bc500..c566cbadf06d 100644
--- a/dev-ada/aws/aws-2020.ebuild
+++ b/dev-ada/aws/aws-2020.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ IUSE=""
 
 RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
 DEPEND="${RDEPEND}
-	dev-ada/asis[${ADA_USEDEP}]
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
diff --git a/dev-ada/aws/aws-2021.ebuild b/dev-ada/aws/aws-2021.ebuild
new file mode 100644
index 000000000000..247f5e933d6b
--- /dev/null
+++ b/dev-ada/aws/aws-2021.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing
+
+MYP=${P}-${PV}0518-19F65-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=5b0fa09df8ac0c717abdf4ede9e08efe5fd98984
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020-gentoo.patch
+)
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+	emake \
+		PROCESSORS=$(makeopts_jobs) \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
diff --git a/dev-ada/gnat-suite-bin/Manifest b/dev-ada/gnat-suite-bin/Manifest
index dd26e6137b91..4a00f376fefd 100644
--- a/dev-ada/gnat-suite-bin/Manifest
+++ b/dev-ada/gnat-suite-bin/Manifest
@@ -1,9 +1,7 @@
 DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gnat-suite-bin-2018.txz 337235688 BLAKE2B cf1b8f0253907b8fc97b9c7218b23dcda8f1557be5e12293eab59e09427418a8814c1bafbcb3f89c1e5dd755a161c5dfa8a852631d137f17acb3167bf51dadbb SHA512 9b57709c05a121b0a0adabe3232128e3f27659d1928857fbd6883b73a7487c3d457317e8f236df3d16ced635514af8afbafc584cc74d865e11288820ac9c4f77
-DIST gnat-suite-bin-2019.txz 518461388 BLAKE2B 31ca194d15cafd66abe1d0896f1444e746c1484149db26545855561512c251b84eea5b4d0932860dfed23cac7f0b3c94a9884c586f509ceb6da8b9becd29e913 SHA512 a640e451a1badc2a9c64abb80f1ae1b49b5389e265d14dfe9b22891d23b3d13a9770841a43cc50ceba81c2728777ed9da854654afe6198c79dd4e0fed536907c
 EBUILD gnat-suite-bin-2016-r1.ebuild 3047 BLAKE2B 572bd1bd6a58bc92ef4b4d7d837ffc843b58e9fe855620b817dd73353a7a708395fc9746609051f51193e3dba7d0f6846f363277bbcd397a6110dd2d930b0229 SHA512 55fc6bd9e891486347d0439c02f933c5bab2a79758ef4c95819295aa51099c0ae376ba87e5d9afe2db966fa74f5e49ca7cd2e982f90657fd2913f62cd39b4c0c
 EBUILD gnat-suite-bin-2017-r1.ebuild 3056 BLAKE2B 084b833babecae00b2abde0201d5d922f505512f1a7ebef21fc804f965e7e33f6b458bc378b9bdc29352b646e2d0cbfd779c8b42ac93da2034678368039bbc8a SHA512 13cf9b0bf38f0571931e122eccf4163e593465478487946ab400e756013a81d7c1d3561028aee7a68b09b268dc475197c1cd6489b2fca37a2593d0506036bcbf
 EBUILD gnat-suite-bin-2018-r1.ebuild 2635 BLAKE2B e27bb365615e90a06bfdf0a6cb63a1c1983c63bdcc5b2733f2fd071ce01702078dd98e4be4b123dd3ea1bbd0293afeabff7493b14058fcf9b4addc74e7603d86 SHA512 2b5664186064527292120704bb4c4e9ec39a82b15afae22c8c3454b149c3806da8a2a483608812a5cc2cfc4a9bd08901d7d4df0dd27d2151032031d05074e434
-EBUILD gnat-suite-bin-2019-r1.ebuild 2622 BLAKE2B edbfd8396b780fc4130f67a8ce55f69afa1e7e63808f09015120b9f4afad5975b491b2579861650398e33a26332a55ac97c58f359b9322cd9a0cfe5de08be5b6 SHA512 5d4bdce159582f9a62c2c09e8312984837b7909bd247e3caf5486aace446094b73e8564939fdbbd5f0f607c2bb54aba304625c42e97fe356739480cbe27132bd
 MISC metadata.xml 215 BLAKE2B 98b1646db0c7bae55bde9ba8a125710b47045fa5937d90218279c551cfff2a12bc45f46b99f0586adc9d3be222abf0dd7b5b5d8ca8e005a6fc55a0b13dd5cea7 SHA512 ec803d562bbbb43b0b41dd837b0f3691a652aebecb8419cdb9c50f96e4c17f90ef10a99df773cb88fbe4670692171b5afd0be68c7f630091de18090301302f8d
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2019-r1.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019-r1.ebuild
deleted file mode 100644
index 64c8331619ff..000000000000
--- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2019-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"
-
-MYP=gnat-gpl-${PV}
-DESCRIPTION="GNAT Ada suite"
-HOMEPAGE="http://libre.adacore.com/"
-# Extracted and repacked from gnat-community-2019-20190517-x86_64-linux-bin
-SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${P}.txz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-devel/binutils
-	sys-devel/gdb
-	sys-libs/gdbm
-	sys-libs/ncurses-compat
-"
-
-PREFIX=/opt/${P}
-
-src_prepare() {
-	default
-	rm Makefile
-	cd share/examples/gnat
-	cat header.xml \
-		full_project/full.xml \
-		options/options.xml \
-		other_languages/cpp_main/cpp_main.xml \
-		other_languages/cpp_pragmas/cpp_pragmas.xml \
-		other_languages/import_from_c/import_from_c.xml \
-		plugins/plugins.xml \
-		stream_io/stream_io.xml \
-		simple_project/simple_project.xml \
-		starter/starter.xml \
-		xml_stream/xml_stream.xml \
-		containers/anagram/anagram.xml \
-		containers/genealogy/genealogy.xml \
-		containers/hash/hash.xml \
-		containers/library/library.xml \
-		containers/shapes/shapes.xml \
-		containers/spellcheck/spellcheck.xml \
-		containers/wordcount/wordcount.xml \
-		containers/wordfreq/wordfreq.xml \
-		oo_interfaces/oo_interfaces.xml \
-		oo_airline/oo_airline.xml \
-		altivec/altivec.xml \
-		footer.xml \
-		> gnat-examples.xml \
-		|| die
-	sed -i \
-		-e "s:PREFIX:${PREFIX}:" \
-		gnat-examples.xml || die
-}
-
-src_install() {
-	into ${PREFIX}
-	dobin bin/*
-	insinto ${PREFIX}
-	doins -r etc include lib* share
-	insinto ${PREFIX}/share/gps/plug-ins
-	doins share/examples/gnat/gnat-examples.xml
-	basever=8.3.1
-	machine=x86_64-pc-linux-gnu
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
-	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
-	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
-}
-
-pkg_postinst() {
-	einfo "GNAT GPL is now installed. To launch it, you must put"
-	einfo "      ${PREFIX}/bin"
-	einfo "in front of your PATH environment variable. The following"
-	einfo "commands enable you to do this:"
-	einfo "      PATH=${PREFIX}/bin:\$PATH; export PATH  (Bourne shell)"
-	einfo "      setenv PATH ${PREFIX}/bin:\$PATH        (C shell)"
-	einfo "   Thank you for installing GNAT GPL Edition"
-}
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 08e35d621b38..35ecd692268f 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,7 +2,7 @@ AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0
 DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
-EBUILD gnat_util-2017-r2.ebuild 1248 BLAKE2B f0785a2673c48dda445563cd458e1a21f20967fcf41f10b3869574872a393dddd504b1156b90f887225c85cf46f8f62778ef118f5b2239d45096eb0e940b8cf4 SHA512 105f0f6f8883d968cbc22fac64c20d5b8eb8573df538033983ae716170464b6e266740c4a1b2e40a98b2b04c93332e21a38668ab735ae70ecf8213d36297317c
+EBUILD gnat_util-2017-r2.ebuild 1244 BLAKE2B 4fb03cb585d6d31a0275105010ce68ecca67ff54fac3ab51d25a8ac0adfbde864c228e8e0d6456c79d7b0400aaae8fed8ce938c9e80c5b4d121c0df3e724055d SHA512 105082690539addf15cfe4f1b33cc799f9bf916b98d4db95cbee97d95b111e39e7c5c6666ee55b157230fec1a156ec299617e1ceda12d8c6cfe0e9c91b1ce68d
 EBUILD gnat_util-2018-r2.ebuild 1253 BLAKE2B 72b6eccc9972817dbcec0509aa3af9ac29022b7b5df46684ca965770c040219d22bdca884d114ed6dd73c15275e7188394820ee0e138d821174901dac4870f7a SHA512 0fbb2651dbabe8112b0362e0f777191d939dd557d80b3699ac18bf65e1a2449e975a91cdb48eeae03a30d135f5231e019d1753d6b9ab53d3912516df604d3892
 EBUILD gnat_util-2019-r1.ebuild 1259 BLAKE2B 400c5a88a9e79726b80fb3460f022b218be554f16369ab49ddcdb48ff875df9e480dee8edbcd4ca0bd444b4f1d6a9f532260dd76fd660d34a4b69f8e5d86d55d SHA512 32631f35eb4c21a29d18a62437d1a39deb8b0ab9c30f7c7e67c8dcfc3dc86ebc4ee45ac60fc6ca1b26d46b084fadfcc13fab0e80796036ccc8064b5904e2ff9f
 MISC metadata.xml 921 BLAKE2B 7e70b07f291098feab880aaedb4ebf5eb1dd6a83d4e5bff1f50b9e8657b9d2fc947cc33d91c02b1a1df5cfd15ce565fee9c267fdbe4063affc4a02e8944348c2 SHA512 d313f2d9d6dfd9a5616e75ce7ab5fb3670deb54f0fbc66f584ce398d5b5c8b9196f92833f54188ab8ea5dc50e5b7b8c74104b4af7050b268e9c2dfd5defe0374
diff --git a/dev-ada/gnat_util/gnat_util-2017-r2.ebuild b/dev-ada/gnat_util/gnat_util-2017-r2.ebuild
index fa96acade333..5180e31004cf 100644
--- a/dev-ada/gnat_util/gnat_util-2017-r2.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7} )
+ADA_COMPAT=( gnat_2017 )
 inherit ada toolchain-funcs multiprocessing
 
 MYP=${PN}-gpl-${PV}
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 45cf62a51bc3..dc7bb90602cf 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,4 +1,6 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
-EBUILD gnatcoll-bindings-2020-r1.ebuild 2506 BLAKE2B c0aa82783dbd0b785b95b36fbea6539cb19f5e45111db21210946234a8e3e917185dfde3c656635aab0ce4c954ebae18b50c260c5cf81246328a1129995b7a35 SHA512 e512511eee059ff26586120e063cdd5e20c8fe4022cf7e19ab2f324144a4e899fdf0ed66e3a9a3d379108cbdd6ef81c2b8b9b21b2f62192bca0caebaa16ea48e
-EBUILD gnatcoll-bindings-2020-r2.ebuild 2518 BLAKE2B 24be5efd551ffd6411238e638d334e8ba9b05ea196df49daa0c21d7cf19be2060478ab0484a436da780a6f86e41b584ca9fa828755d000210232f74e23027b11 SHA512 724c79f89928f16a9629c85532e2a3ab23c44a770136caf14b64e2ea9218b343d8121d2222edcf971e466110231ee3f3f99dcdd6386faaa0e204dd76a0fbfce3
+DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
+EBUILD gnatcoll-bindings-2020-r1.ebuild 1941 BLAKE2B 7a536cbeb74cc777d1313a6028c2459f73434eddc0419855ebab884b044cf17e724a5e97f590747e4ab5b10b306a8cbb95330adb0c15b839a063bb561089c0ff SHA512 48f4943ac35909e1b556054e1f4c69dca023f1e9123ed3fc0b20add8c7226b77a0498c63476bb5dd4a53e5190d6bb44353142adcbe03e98ede95c1db0d7c68f4
+EBUILD gnatcoll-bindings-2020-r2.ebuild 1958 BLAKE2B 151ab89cf5c6e0aacbf92c36be997727f6be69dd21a8079ae3023ca5911276b7545469872d952df2a0c88e4b838341e0dcc92533e7840f9ed3fa523e9c47c23b SHA512 c77a376be1e52ff62ca6a13e90d3054dfc61b02c651907e8e0daae7399a843e237df97f6438f50f74f365227404afb0d44d7a47702d63b3844594a9660c7aa5a
+EBUILD gnatcoll-bindings-2021.ebuild 2393 BLAKE2B 0b03e3a3c03399d44a5bda6ecf567eb37dcc1269cbfdc5b8220f19afd6e76f639e840a44d5b57f69d004baad33b2f5b88de9cc55cb5859c62c4e8ca6cee3c216 SHA512 eeca43fb2eeef35799db40c7ede79b8a7e526f3029195feafbc590a276ec7859f0f1317deced23f63028f20f2d5dba9e0f312d51ff95ec086b46bf49cd62e4bf
 MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
index 742e2f983a43..8f47cc46b77a 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} )
-#inherit ada multilib multiprocessing python-single-r1
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multilib multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
@@ -18,10 +16,8 @@ SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 IUSE="gmp iconv readline +shared static-libs static-pic syslog"
 
-#RDEPEND="python? ( ${PYTHON_DEPS} )
 RDEPEND="
 	${ADA_DEPS}
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -29,17 +25,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 REQUIRED_USE="
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
-pkg_setup() {
-#	use python && python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
 src_compile() {
 	build () {
 		gprbuild -j$(makeopts_jobs) -m -p -v \
@@ -47,14 +37,11 @@ src_compile() {
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
 			-XGNATCOLL_ICONV_OPT= \
 			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-#			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-#			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-#			for dir in gmp iconv python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
@@ -74,7 +61,6 @@ src_install() {
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-#			for dir in gmp iconv python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
index 52cb19c29ba6..e1b4a17dd43c 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-#PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{6,7,8,9} gnat_2020 )
-#inherit ada multilib multiprocessing python-single-r1
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multilib multiprocessing
 
 MYP=${PN}-20.0-20191009-1B2EA
@@ -18,10 +16,8 @@ SRC_URI="https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fc
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
 IUSE="gmp iconv readline +shared static-libs static-pic syslog"
 
-#RDEPEND="python? ( ${PYTHON_DEPS} )
 RDEPEND="
 	${ADA_DEPS}
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
@@ -29,17 +25,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-#REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 REQUIRED_USE="
 	${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
-pkg_setup() {
-#	use python && python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
 src_compile() {
 	build () {
 		gprbuild -j$(makeopts_jobs) -m -p -v \
@@ -47,14 +37,11 @@ src_compile() {
 			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
 			-XGNATCOLL_ICONV_OPT= \
 			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-#			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-#			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
 	}
 	for kind in shared static-libs static-pic ; do
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-#			for dir in gmp iconv python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
@@ -74,7 +61,6 @@ src_install() {
 		if use $kind; then
 			lib=${kind%-libs}
 			lib=${lib/shared/relocatable}
-#			for dir in gmp iconv python readline syslog ; do
 			for dir in gmp iconv readline syslog ; do
 				if use $dir; then
 					build $dir $lib
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
new file mode 100644
index 000000000000..d8d413bfabdd
--- /dev/null
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+inherit ada multilib multiprocessing python-single-r1
+
+MYP=${P}-${PV}0518-19B15-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=d93655ced17f15c5f376b6861825df3f9c183980
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gmp iconv python readline +shared static-libs static-pic syslog"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	${ADA_DEPS}
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	gmp? ( dev-libs/gmp:* )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	rm -rf python || die
+	mv python3 python || die
+	default
+}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
+			-XGNATCOLL_ICONV_OPT= \
+			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
+			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+}
+
+src_install() {
+	build () {
+		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
+			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
+			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
+	}
+	for kind in shared static-libs static-pic ; do
+		if use $kind; then
+			lib=${kind%-libs}
+			lib=${lib/shared/relocatable}
+			for dir in gmp iconv python readline syslog ; do
+				if use $dir; then
+					build $dir $lib
+				fi
+			done
+		fi
+	done
+	if use iconv; then
+		sed -i \
+			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
+			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
+			|| die
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index aaf95b97ae32..3b06ee72952c 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,7 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
-EBUILD gnatcoll-core-2020-r1.ebuild 1590 BLAKE2B 660d0ec3b66d1509f5c567f5d542d55ab3e83180bc81e571390b22ebf28f736a85cb13c7d83dd6f9d4d82822068c25cf21d315cf5f5b0e807bb61c11061b2e9c SHA512 ed31ea1d7526acb5f9edf520542f3b25143076e6b010f1e1b73d3028a427d9430c83533b0983af10f65497236ae27720e6d391905759d6218e68390ef458b6c2
-EBUILD gnatcoll-core-2020.ebuild 1581 BLAKE2B aad248cbaa6d35738712d5e1e6d41570ead7f105bce57a7e0f46e7c3cf46b3c0211e473f6e8c7c54e0a43c7150133fd67786cb42f2c615bb8df5ab47cac8104d SHA512 af18eea52f77537b4e59e62b11752b47400675cb422024c61d9e528640e99e73e5246b044566a3b35d014d55f70d48613f1172d38862598bb91b8a4b4e9223e2
+EBUILD gnatcoll-core-2020-r1.ebuild 1590 BLAKE2B d91ea0e079e7c1d2d8c200a8c96bef3b3d157e6e8408b3f51e8c7a546389a186762939e3d5a9cb90c501441929fd50a2554774b30dfc3639aaa2ab19f1a70873 SHA512 b2b4c5df7f7eb3ca474963e1fb2ae793cf0a26b111e53c6fbf5a20df74f6d5c407e1742d6aecb66c8884f9f16a3b5c9c33b191df10b47de491d159243139b031
+EBUILD gnatcoll-core-2020.ebuild 1578 BLAKE2B 5481ee650d75cc3f963c0c8992c46133e5b9db29d95a850f915ae7183ee0c877e48e2247ab9e7a27cf80ad181557b64eadc3c71d3e4f1fd66005b90b61312f95 SHA512 310d4563b3f16f60a893ecfd4cf28cb2425b7d0c33c1b9402308c76876cd6f2dc0016cb4e1a3b74ec062ac7ad723ce4ff119dc9c16011dc2bd0469c4a294a7ee
 EBUILD gnatcoll-core-2021.ebuild 1612 BLAKE2B 430cd6214796df035571b64d1d8bab34b793f5bec0c4644cfcbb57c21f5d1d47b8ce6f8ef4c38f81b38b174a77cbe348c2e331bd82c5e6e9ce6f677887ba3265 SHA512 9676bb49b5734d1f4cfb8f03fd36dda97d27a3c8643d55e4ff2dbd706aded38ac5e8a645591c04c08bb99607d9a60308a88fa6577f91e8392e8385a18b67bc0f
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
index b7350caaeb9f..1d815b25b355 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
+ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
index 142bfee53528..da03ee877522 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19B7C
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 55174a1c8e3a..4096a725ea7b 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -3,7 +3,7 @@ AUX gnatmem-2019-bfd.patch 690 BLAKE2B 81fecbd5eb8743a91699b98f73cc63f7e3112544a
 DIST gnatmem-2019-20190429-19745-src.tar.gz 80136 BLAKE2B 8ae3b41827416f951abb0d0a1fe533946fad2ac8d67ae6aad2b14495a3c068718befbbbf11800c1864f3becaa0ca6dfb838aeec3b3d715b250d4436ccee93c69 SHA512 4354a30efcf95a013f481b3519a79a22f85348840f074c734013d6c73e00fd771118b84eec416260983c383484f7a404217a32c012ca0bd7c37253ba17f2eb85
 DIST gnatmem-2020-20200429-19911-src.tar.gz 80400 BLAKE2B 0367e4b40a3d0cde1002b49a330db3b5c27a08074bf9687699d0fe6b3f046562c4758865fd30a3f99703d209e24b0b5b72902cc4bcd4fd1c54576a0aa082b0fa SHA512 9d5e2bfab73ff2f9b6864bd8b1f2844587a21352a782f1dd52a17eb911d4791d93806a423c702979636dd402e372ed7954ffd33d3882c8703d0f6e8fc056babc
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
-EBUILD gnatmem-2019-r1.ebuild 971 BLAKE2B 2f0a96ad6064e51fa60257a64aba3aa078a919fc8f6d34e58b10ce1e69b79fcd54b0ddd9e3e693013f28a56a9b04acb27796eb4d6d4b2062518a1a3508f870d2 SHA512 5d079648cc2b1288f0948f09f05efcc696590e5fdd049ce89c61319b514b4e9e87290b6de84f68c1eb198d92024651e2eeea3a5e65d0e12da68c0bd6ea441886
-EBUILD gnatmem-2020.ebuild 1001 BLAKE2B 5adc28a848b46a942ca2f52547adcfe615903568e2e6329cdf0921204fef3952d5afbf06429b72498f1f4a197e23a8d680738b194e81c83a9bc553824ddd2491 SHA512 a629ea451585b1a0f990d918109b578bb4fa8f104f5bda62ff35b9f625e8621d67ab5b195c04a5b3e157f5a09b3d170003e71979d06805ea036f1e056f34a6aa
-EBUILD gnatmem-2021.ebuild 1036 BLAKE2B 6740597a951adf96d6a5baf45bc28fe4abfbb7da3d52a633bc8b0cb59a4dffe877fc2b48ed6d1ef7ad595cc5617fee2f312890208864359eaf4cb6508b74e3a6 SHA512 e8e1076fa28ed4533713a677188a4b1b384d52b2354b2c08633481f1dba8dce37e72136d41bc9314a606ee6f6c44685a30861f3a7ef67f3e3c27ff99173fbf88
+EBUILD gnatmem-2019-r1.ebuild 968 BLAKE2B b6e338b6c5d0d456594fe1d18f77ead2011783483b0144fcb102882e29bbc29efef08f85b26fae5a7610aac4772d56ef3bf51698c71db0c7db856898291aa28d SHA512 51a720b4badc759b66aee6923e506670a516da634ff7a20d16a04aa3e2d2daf9ac20226d46a528f02620039392e9c99d0019ba676827d875355fce1b1da0b880
+EBUILD gnatmem-2020.ebuild 1001 BLAKE2B 7366b48b6a930b755b4b414d826467912eb2d347d40fdf0c1f0aa8b9ee305162883febfddd41194327fee664a437b559630c3ad2ac5ca7c135a1652dd0474de8 SHA512 668b3d17b8cd32f990dbde400533b59bd7e2662d8442deaeabf9e954ff726d8ae5373495e4ae6002dd0be91de4ac3dcbaf539b1f66dc281d056fce440a560e4a
+EBUILD gnatmem-2021.ebuild 1036 BLAKE2B e0d86c6d2113946584a24732833d60fd8d2d83c788595e0fdc14d5caffb0b61367ccc8fcabb08e28c5220abb42a987ca38cbd84c83b0a5d3dab2b04a8145fe11 SHA512 2bd94e5353c56912aaa1439041df602422124dff1185849a85db3ffef9bf0aec2b3b2441a1ec112925af862f08a52948638dae2469449e758bdc68acd7d76465
 MISC metadata.xml 955 BLAKE2B fe2d45bebeeb3f23c6eae6b4b2fbc14156884636af28c5bf31bb946d9a8bd74280a426be7d5e003aa88d1c6bc390f8ddd96c864d4715ce1c034b44995eeba3d1 SHA512 f2fee13e2c491e0a0393b67aa558bac39c7f3ea5a186da421ceb3ebf092bc5acb74cd2076ae59abb81d28a83c07bf4561017164ab27558a1805653023877fa72
diff --git a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
index 67e5964f46a9..8d03df8f5400 100644
--- a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing autotools
 
 MYP=${P}-20190429-19745-src
diff --git a/dev-ada/gnatmem/gnatmem-2020.ebuild b/dev-ada/gnatmem/gnatmem-2020.ebuild
index 76ed48bdc69c..62a7881960d1 100644
--- a/dev-ada/gnatmem/gnatmem-2020.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multiprocessing autotools
 
 MYP=${P}-20200429-19911-src
diff --git a/dev-ada/gnatmem/gnatmem-2021.ebuild b/dev-ada/gnatmem/gnatmem-2021.ebuild
index 2423484393a8..bfa7f8890f2d 100644
--- a/dev-ada/gnatmem/gnatmem-2021.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multiprocessing autotools
 
 MYP=${P}-${PV}0518-19F7B-src
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index ef0ba2b0978c..cdd423577356 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,14 +1,9 @@
-AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886
-AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2020-gentoo.patch 11688 BLAKE2B 698f203f1a4b6086b1cc20300506db4d10e62bbade354891404fb8ac1e828370992e6e85cdb6777c6d1ae5831a2a65a1f7483ccb8a3b065c83233162055c1c8d SHA512 ec9c99db6fcd26b6971754dbab9187e6589a1bbc2e513cb205b37519c21296a91678aac09833839256cd6558d9e228878e63e264658b32b1b9403e40a61f02ab
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
-DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
-DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD gprbuild-2017-r2.ebuild 1973 BLAKE2B 2cdba6aff85b0a25010e66c442a26e8f36e0c4007e6053205a21912cc99cf079c1035a291c8744a89cbe67b57953ee925f4463edf27c2c63a9438ae083d66d6d SHA512 af9505dc527d335e4dab40d8c532a886c008ee80ebfd00a190af91f828aa43dbb1fe8e9bec61070ac950d4fb9d232db4eb2a290ee626aeab42dd2040d7e206d8
 EBUILD gprbuild-2020-r1.ebuild 1944 BLAKE2B 89f815aa6ae31ecb34a58cadb246bd29f20c871b074b30b32999f57991e47346dead6133aeb2e61fcd3927cf775f752caec99f76070fe66806a8a3221673b8fd SHA512 624ad556d9c9349c983358032ba3b5a221104e462401e8c23776cb26318201ed2e9508d7e4cddbebfe8cbd8870d5e010f14205f6b02d130d79fee860ac8af626
 EBUILD gprbuild-2020.ebuild 1933 BLAKE2B ef95a4e2a94b502bbde2ea536ed846534fafc8ed0bc5138501118b668db31968019f61a523a250bfbc5207f1de79a99b9db2852a87b118a984d4685cf6dcc366 SHA512 5d2fcc275366e0408e2dbb14ef31ae00e6222610a98056376cf57f53f47b84725142352442fcf2c37c09bae05f78ba4bee347fed9b1b67349c2520ced36f35bf
 EBUILD gprbuild-2021-r1.ebuild 1956 BLAKE2B 19aec91243c1ee1de85ccf48e8d8da76bd54124de5c7cfe9bd3cd4d19ccdeb4f2327a54ca0b53c70ac499d6b18446ce95bce0ff4b3ea71a11e746c886577e8fc SHA512 713afaeeda52d4917cf252dd93018d80608729ac5b86544816cfd19dbfbf29430694dc9acb766da50bb704860550acfe265d66245474ad737b58f87fe8b4700d
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
deleted file mode 100644
index 5dcd58ffb21d..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- a/share/gprconfig/compilers.xml	2018-10-27 09:04:53.830077299 +0200
-+++ b/share/gprconfig/compilers.xml	2018-10-27 09:05:14.883724079 +0200
-@@ -20,15 +20,15 @@
-   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
-   <compiler_description>
-     <name>GCC</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
-     <version>
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <nogrep regexp="for GNAT Pro"></nogrep>
-       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
-     </version>
-     <languages>C</languages>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
-@@ -325,14 +325,14 @@
-    -->
-   <compiler_description>
-     <name>GNAT</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls-@VER@</executable>
-     <version>
--      <external>${PREFIX}gnatls -v --version</external>
-+      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-     </version>
-     <languages>Ada</languages>
-     <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-     </variable>
-     <runtimes default="default,kernel,native">
-@@ -342,7 +342,7 @@
-        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-     </runtimes>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
-@@ -509,21 +509,6 @@
-     </target>
-   </compiler_description>
- 
--  <!-- LLVM Compiler -->
--  <compiler_description>
--    <name>LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang -v</external>
--      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
--    </version>
--    <languages>C</languages>
--    <target>
--      <external>clang -dumpmachine</external>
--      <grep regexp="[^\r\n]+"></grep>
--    </target>
--  </compiler_description>
--
-   <!--  Windres compiler -->
-   <compiler_description>
-     <name>WINDRES</name>
---- a/share/gprconfig/gnat.xml	2018-10-27 09:38:31.615357671 +0200
-+++ b/share/gprconfig/gnat.xml	2018-10-27 09:40:54.603044560 +0200
-@@ -60,7 +60,7 @@
-    &filter_gnat;
-    <config>
-    package Compiler is
--      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
-+      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-       for Language_Kind            ("Ada") use "unit_based";
-       for Dependency_Kind          ("Ada") use "ALI_File";
-       for Leading_Required_Switches        ("Ada") use
-@@ -77,6 +77,9 @@
-       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-       for Driver         ("Ada") use
-           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-+      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-+      for Required_Switches ("Ada") use
-+          Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-    end Binder;
- 
-    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
---- a/share/gprconfig/c.xml	2018-10-27 09:42:01.327035277 +0200
-+++ b/share/gprconfig/c.xml	2018-10-27 09:42:16.529803718 +0200
-@@ -14,7 +14,7 @@
-      </compilers>
-      <config>
-    package Compiler is
--      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
-    end Compiler;
-      </config>
-    </configuration>
---- a/share/gprconfig/linker.xml	2018-10-27 09:43:17.934862859 +0200
-+++ b/share/gprconfig/linker.xml	2018-10-27 09:43:54.127304471 +0200
-@@ -814,7 +814,7 @@
-       when "arm-android" | "arm-linux-androideabi" =>
-          null;
-       when others =>
--         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+         for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
-    end case;
-     </config>
-   </configuration>
-@@ -830,7 +830,7 @@
-        <target name="^.*linux.*$" />
-     </targets>
-     <config>
--   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+   for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
-     </config>
-   </configuration>
- 
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
deleted file mode 100644
index 3f74f808e0ac..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- gprbuild-2017/gpr/gpr.gpr.old	2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
-@@ -67,6 +67,7 @@
-             for Switches ("gpr*.ad?") use
-               Compiler'Default_Switches ("Ada") & ("-g1");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end GPR;
---- gprbuild-17.0/src/gprbuild-post_compile.adb.old	2017-05-18 14:17:06.114797015 +0200
-+++ gprbuild-17.0/src/gprbuild-post_compile.adb	2017-05-18 14:18:55.466956852 +0200
-@@ -4744,7 +4744,9 @@
-                                  No_Create => Proj.Is_Aggregated);
-                            end if;
- 
--                           Shared_Libs := not Is_Static (Proj.Proj);
-+                           if not Is_Static (Proj.Proj) then
-+                              Shared_Libs := True;
-+                           end if;
- 
-                         end if;
-                      end if;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
-@@ -27,6 +27,8 @@
-    Name_Buffer : String (1 .. 1_000_000);
-    Name_Len    : Natural := 0;
- 
-+   Last_Id     : Name_Id := Name_Id'First;
-+
-    procedure Get_Name_String (Id : Name_Id);
-    procedure Get_Name_String (Id : Unit_Name_Type);
-    procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
-@@ -354,6 +354,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Enter;
- 
-@@ -427,6 +429,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Find;
- 
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
-@@ -53,6 +53,10 @@
-          return;
-       end if;
- 
-+      if Last_Id = Name_Id'First then
-+         Add_Name ("");
-+      end if;
-+
-       Add_Name ("a");
-       Add_Name ("b");
-       Add_Name ("c");
---- gprbuild-gpl-2017/src/gprlib.adb.old	2017-12-18 12:20:02.937317216 +0100
-+++ gprbuild-gpl-2017/src/gprlib.adb	2017-12-18 12:21:36.519604590 +0100
-@@ -400,7 +400,7 @@
- 
-    Driver_Name : Name_Id := No_Name;
- 
--   Gnatbind_Name : String_Access := new String'("gnatbind");
-+   Gnatbind_Name : String_Access := new String'("@GNATBIND@");
- 
-    Gnatbind_Path : String_Access;
- 
-@@ -2237,13 +2237,13 @@
-                           and then Line (Last - 2 .. Last) = "gcc"
-                         then
-                            Gnatbind_Name :=
--                             new String'(Line (1 .. Last - 3) & "gnatbind");
-+                             new String'(Line (1 .. Last - 3) & "@GNATBIND@");
- 
-                         elsif Last > 7
-                           and then Line (Last - 6 .. Last) = "gcc.exe"
-                         then
-                            Gnatbind_Name :=
--                             new String'(Line (1 .. Last - 7) & "gnatbind");
-+                             new String'(Line (1 .. Last - 7) & "@GNATBIND@");
-                         end if;
-                      end if;
- 
diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
deleted file mode 100644
index 4b54ddf99782..000000000000
--- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6,7} )
-
-inherit ada toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
-		-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
-		-> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${ADA_DEPS}"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-config.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@VER@:${GCC_PV}:g" \
-		share/gprconfig/compilers.xml \
-		share/gprconfig/gnat.xml \
-		share/gprconfig/c.xml \
-		share/gprconfig/linker.xml \
-		|| die
-	sed -i \
-		-e "s:@GNATBIND@:${GNATBIND}:g" \
-		src/gprlib.adb \
-		|| die
-	if use ada_target_gnat_2016; then
-		sed -i \
-			-e 's:"-no-pie", ::g' \
-			share/gprconfig/linker.xml \
-			|| die
-	fi
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	local xmlada_src="../xmlada-gpl-${PV}-src"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs ${LDFLAGS} gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index a404a2fab586..1725b05dc8e1 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -2,7 +2,9 @@ AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b0451
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
 DIST gtkada-2020-20200429-19B96-src.tar.gz 12232938 BLAKE2B fcd5fdfebced2fc2b4dd1251f81a61b1564a72a3cc1854a78c4d9e32824d55188dd440bceddd4e86f3dc03c455b1db109bc68d5cb29e2a61d62bf59895b68895 SHA512 d9405d03cc3bf375ddddca54f2fb935ecd64cdf6eedb32efbd994a6f8a7693c6ee7aa10d558cbf89e9ad3174a3ac9a0c8f0ea7e444ff5d2a8b9af76a6ff64d4b
-EBUILD gtkada-2019-r1.ebuild 1132 BLAKE2B 527d869f7db0ebd302597434f415d098fc136908bf425c732380d76d50aef3fb1e3d9ac874c478580199f30676427ff8463c5f1f93312f27eb769d949a140bd4 SHA512 5128d19e17e567cc07d0a2e98f66a223f5bc874ca4bb25ccc92fd7397bcd6921c03164e0ad1b28d5b5ebe80ecd5886cb101bc25b3e4d64ee8581fa2f197c6a82
-EBUILD gtkada-2019-r2.ebuild 1141 BLAKE2B cf4ad6b9bd19465ff7487cc2fea129af2bce20d63f78a42033724cada78d38c785923c0a6e93c912e3b99ec1eeadcfbdcc64c4921a745d3547dcd0fe7cad5b18 SHA512 181e64541b7632845f7402ad12b57245eafdc5b2a7e3337bb2051a4ba101e5e8ce9b73624e2e62d94734151444b7d30d7ab89dc9cbbfc29b4f169a114cd0a4dc
-EBUILD gtkada-2020.ebuild 1199 BLAKE2B d39e6592301c55d1faaebe615fa249aabf42f2a2452fffeaeb4db234304dbe41714017797592a777405e4975333e62abe1570528829eb9573c7b4937290278a1 SHA512 7cd661a9509b2a86ac45044780a312c1f78bf7773a1ced5f70988c2127553bfb46c6d93af6df54ffc91df6e1362784840a59e3bf8e93fd9ac4659098a881d3e2
+DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
+EBUILD gtkada-2019-r1.ebuild 1129 BLAKE2B b9804325b08da5a66a4423b5f8f2c987b374a8ec8e1153d0f5ad4b0ecdd619c076a3219ffa8a3d1ac55df34380ef8877064e7b74942e39ccc185d3f45feb796a SHA512 482b5b22512b81b6e2e7f26b488780a9c7eaa54fc3252ceef2b34174bd3f2eb71f108ac41a9408d37f735bc89750b2a946c9516ece39162e12bdf723e40feb32
+EBUILD gtkada-2019-r2.ebuild 1141 BLAKE2B 0e31527469b36e1194f2cd3eddb2e44f28bf93e5ebabd5b39ff24bbb778154f8190d63bb70f78028bbcb0e1260f8da64eb1f9ffa33afd9114774ebfbb32ac475 SHA512 ab530fcce187433da2db5e27530e8dd5b6919f4bdf6273fb808e62fef51115e30e7bc03a276bcce4c5406cf1b0279007d561df317277776d41627cbf5b676c70
+EBUILD gtkada-2020.ebuild 1236 BLAKE2B 57fdd5cbdfdde03705661dae4bb405c4aed6119d0057286a1774a820bbb9459b57f37da4eea54fb4b98e37aa5043d91d897363f07628936213fad47f7275929b SHA512 654d4ed98b2b528cbdd7d5df7cb45d0e5dcc0c1cded18946b1f950061347194af090f1c9f2f181e4d1d14be2f72eb817acb12b12399b399bdba49705cd79daee
+EBUILD gtkada-2021.ebuild 1236 BLAKE2B 49904e162bde97c7ea928fa7e3994c004703cb6fedcf877911e9ec3b234c4e8eadc5ec6289d971df1972b8e00737d3646283a893cc25ae0f05b625541acaa12d SHA512 09d13adb2f84567f11a9d53a8a6134abee22cd4954e15df0f385123b7ee542ee52dccdc4b9e0cf686e77cc5941f3540f3cd5cee4ecb4bbb3e9024327ae7ffbaf
 MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
index fe02b028c8b6..b85d3df230b2 100644
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada autotools multiprocessing
 
 MYP=${P}-20190424-19D98
diff --git a/dev-ada/gtkada/gtkada-2019-r2.ebuild b/dev-ada/gtkada/gtkada-2019-r2.ebuild
index d6f595288791..a523439d409c 100644
--- a/dev-ada/gtkada/gtkada-2019-r2.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
+ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
 inherit ada autotools multiprocessing
 
 MYP=${P}-20190424-19D98
diff --git a/dev-ada/gtkada/gtkada-2020.ebuild b/dev-ada/gtkada/gtkada-2020.ebuild
index b8aa324b5e98..537344fe613e 100644
--- a/dev-ada/gtkada/gtkada-2020.ebuild
+++ b/dev-ada/gtkada/gtkada-2020.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada autotools multiprocessing
 
-MYP=${P}-20200429-19B96-src
+MYP=${P}-${PV}0429-19B96-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=96f85c875c161c36e7d0edb19aa4dbddf41ea671
 
 DESCRIPTION="A complete Ada graphical toolkit"
 HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="https://community.download.adacore.com/v1/96f85c875c161c36e7d0edb19aa4dbddf41ea671?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
new file mode 100644
index 000000000000..5c7bbffbef1e
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
+inherit ada autotools multiprocessing
+
+MYP=${P}-${PV}0518-1A011-src
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=8f1daefcb56e3ee7feaad67bac66deb0f7c37a82
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs"
+
+RDEPEND="${ADA_DEPS}
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
+	"${FILESDIR}"/${PN}-2019-gentoo.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable shared) \
+		--without-GL
+}
+
+src_compile() {
+	emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}"
+	einstalldocs
+}
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 89845f199e35..fe5e02d7b5cb 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,7 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
-EBUILD libgpr-2020-r1.ebuild 1484 BLAKE2B c56c62b9b1bf80318f39dceece21f7c404b10520b4ada53523b29f2d6debcc1b74cace1b6b631604ea30427d0e2df0938c8b53ceaf5e4671ebb2d066ca8bbcfc SHA512 5cf1f289af218b134fc65814ec52deab0620576f429e44939095fac3cca0e6fd9d636753266e3c7e96a28c921f4ae6dccf7875630bffb3721604c342767d7bb3
-EBUILD libgpr-2020.ebuild 1475 BLAKE2B 345e78dcabe1557b5b0a6b1307549dfcd6075e0796f422e671c69bac139c331f4d6a491331bb1c2497e6a5dd117c250499c5f3f32980193e920e9ae49a0dbaff SHA512 143b8264b3f0bfe837471c44cc50c6c63fe649b1963a7ecf6d82cb246f4bf461b6104167e6f59532b83e64cf0c464bd94b47dbfbd510cbf7893893ba4a22a804
+EBUILD libgpr-2020-r1.ebuild 1484 BLAKE2B 0ac331f5ce34fe6106fa0bba65fb086373e61d34ab8a4cd9480103ad8cfc14286dbbf545cc3a6b800905ec79e5841d95fa19646ba10b0edd29d01dd56d379d60 SHA512 339fad2a5679494a1f574799ee2aa0d87df4982fdf8f53f9e1c2d23c4c3272e1fab9f77b6aa2ac7d964162fd6d3826f6c2cd50f95d97c349812d0b49bd1b794a
+EBUILD libgpr-2020.ebuild 1472 BLAKE2B ce843e14df9e0c0d41c592547a2b21628d1eba1a10e6ee9b6ddbbd43196407a91ff2992898e691fd928528d81ef8334d03480dbbd674ae9dc8641581fef4e9f7 SHA512 55a1c88f5880b4607b8a3b6e1bcb9bd11291ca3ff45f4c51a83c9929ea339087cfb5305f2dc9b7bbe4e2bb8bb247b4fb58af1321827341f344bd0b700d614da8
 EBUILD libgpr-2021.ebuild 1511 BLAKE2B 803c1151393f4c78a06c87c9e607b4316c4e12a77540cc081e50b0425e3291f7da64ea796af76c9285d8c61aee5023ad1e1ccd1711bace057c4481ddd66ccb88 SHA512 e3f8bab6f891e4b274b6ed6435ff744d7d7d2b9e03db96a19464426ca91daf094e03977e101d16970e706c8f0780d3a2e92d445137e865bc429119ab4978ed7c
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/libgpr-2020-r1.ebuild b/dev-ada/libgpr/libgpr-2020-r1.ebuild
index 9a3b8981ee3f..9c7e8a6ad421 100644
--- a/dev-ada/libgpr/libgpr-2020-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2020-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
+ADA_COMPAT=( gnat_201{7..9} gnat_2020 )
 inherit ada toolchain-funcs multiprocessing
 
 MYP=gprbuild-${PV}-20200429-19BD2-src
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
index ab41d067b564..fead7b2fb0a9 100644
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada toolchain-funcs multiprocessing
 
 MYP=gprbuild-${PV}-20200429-19BD2-src
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index aaa923f4e74d..9bfeb17faa87 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,7 +1,6 @@
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
-EBUILD xmlada-2020-r1.ebuild 1826 BLAKE2B 87c968eb610b6de9d4bd195c6d0162a77fbfec5c8c75ad7dd60bf558d45ad5c19cb845a17fda948cd81ffd0e6511fddb3d3993578af8c45173da1bb12218044d SHA512 7e89f731395ffb53c0ec1c2de36bc965138523b35cfc2bdf403491201c19a9cd92e87623eb75f85415d338bceb8be7cfa62bb0c174be34f15bcbcaa80a76dcd6
-EBUILD xmlada-2020.ebuild 1986 BLAKE2B cdf92efc79b033ec8071a3464303c538e950e03cd24543b8ab054f698231a40af742607d7dd2ec9601543d0001a5192d762d72cfe31df109b8dd343644f030c8 SHA512 603a5f3ef31f01f138b0d5f59dce45fc7ae0f606cc094dbbac228569f9fec602b01ab38353c0652b72c2a97f858b9416106cf7f8bc96b4a50010430cc44f4546
-EBUILD xmlada-2021.ebuild 1858 BLAKE2B b26b94c316ae552b6f6cec305e1e06b0e6767c67c882872cba2c8490aa3d9f84f9d995959a60e25e9db5ace374557fded0be8ef6787d5b5e5cb2e6292c810123 SHA512 577e651ea1c767026e4f0e686005c19480dec03d3ce239ceaba8124ea37b1e88aca6d64de3095d61099c2663bbb8e2373186e649d33b6d613098b74689b2f7b7
+EBUILD xmlada-2020.ebuild 1983 BLAKE2B c0a5071421bea52e92e98b9aaed78674ef99b27e2d025e9a6e802268329ddd10e2d98155f51d96591d2c2efc55fa1b58d4f0684b04580061a4db6331e0c432c8 SHA512 8398141057cfbb291b4dd11b54d11186068e141d3e8a06ef9fe4eedf256d1a868baef2ceb5d595d54a2396c2ceec70dfb0c4a0a446c2a8a964a821b5b66be6b8
+EBUILD xmlada-2021.ebuild 1858 BLAKE2B d49f9f81eafcfc01c725ff7edbb50e1ce526e2b00aaba0ed8a2c90c142da9d30e1c6e637c4a655b516a2022da66b453c9076ade2aa5cbf4570b0571e031f5059 SHA512 eeee8789ee053d02cd0dbb2ac1efc4eed798b730ecef1ac4612a4962549e989b52ea8f1cece0fa83f06469e99ef646778502063ff076be53f0228324456ba6be
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2020-r1.ebuild b/dev-ada/xmlada/xmlada-2020-r1.ebuild
deleted file mode 100644
index 4ed5844ed1f6..000000000000
--- a/dev-ada/xmlada/xmlada-2020-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${P}-20200429-19A99-src
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	emake test
-	emake run_test | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
-	rm -rf "${D}"/usr/share/examples
-	rm -rf "${D}"/usr/share/gpr/manifests
-}
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
index 6092f980feaf..9d23c04dd7f6 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19A99-src
diff --git a/dev-ada/xmlada/xmlada-2021.ebuild b/dev-ada/xmlada/xmlada-2021.ebuild
index e861e3f175d7..e6db9a16536f 100644
--- a/dev-ada/xmlada/xmlada-2021.ebuild
+++ b/dev-ada/xmlada/xmlada-2021.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19D50-src
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3a6a7a6d7735..e75ae207d211 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 57bf15c80171..09a7dc083dde 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -2,8 +2,10 @@ AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
+DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 EBUILD abseil-cpp-20200225.2-r1.ebuild 1335 BLAKE2B 36a2211e821fbb9257aae09d0a5b2d49d3ee7e27ffd6eacd21387746983b9f600ddc0137c9581ca88fb2ca3431594590f5b43539f15e8b7bee5ce4ab8b9eb9bb SHA512 7311121c0b25b27b95d19115a194e16dda45f02ed6e2c8fbc83ff6eb44d20500f583e0ae0d2ab5e384b02758c57828521b8845efee5d9f11d50a41c1ff5d0307
 EBUILD abseil-cpp-20200923.3.ebuild 1977 BLAKE2B ef17c3577458836d9f6503691ce4b67102a32dbb661fb33532180a120538dcba59af29b1146401928eab55a59a7333c176fae55e19509249456b0cb73a49f194 SHA512 50a0a8631a37f186364b413dc7ed9b728483361325c0453dae7c9eca5ae3e1a694289feca051d48994161fa93a732651270dd81edbe41cf166052a5f8aa9f84b
 EBUILD abseil-cpp-20210324.1.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005
+EBUILD abseil-cpp-20210324.2.ebuild 1887 BLAKE2B cb5445c3be46ab7eed9451e40a9e04a6514955b9517727f060686c5e022a96d648df8794605d38ad3e3b8d46b531de523d2b75a3facea7137848f3d4753046da SHA512 ec9dab5feabf0c6354227361ee78a8ec7befa239aecd2d6d76e815fc3dd765a90cc021541a099fc84564edf73f0f4e462abdca2186a81aa3751917cf78130005
 MISC metadata.xml 356 BLAKE2B 192cd53686f89cf886b3dccd4d3c64dd44912c3572c3ec16c786c81c62b5ad1090be7c6e43bf2900d731ca72804f57f17d2eef619b88932d14423e72363e61b2 SHA512 39f66dcee864111412707467b6757811eeb9ddb24cb23bd3ff01b9426dff922fbd69312fda9142e03df146c22cd2b5fc1b06249cd1b6c334b076b798721fdca2
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
new file mode 100644
index 000000000000..f251363fd3dd
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake flag-o-matic python-any-r1 toolchain-funcs
+
+# yes, it needs SOURCE, not just installed one
+GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
+GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+
+	if use test; then
+		sed -i 's/-Werror//g' \
+			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
+	fi
+}
+
+src_configure() {
+	if use arm || use arm64; then
+		# bug #778926
+		if [[ $($(tc-getCXX) ${CXXFLAGS} -E -P - <<<$'#if defined(__ARM_FEATURE_CRYPTO)\nHAVE_ARM_FEATURE_CRYPTO\n#endif') != *HAVE_ARM_FEATURE_CRYPTO* ]]; then
+			append-cxxflags -DABSL_ARCH_ARM_NO_CRYPTO
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DCMAKE_CXX_STANDARD=17
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 80f3a878f2d9..ec0a311f7c2b 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,11 +1,10 @@
-AUX glog-0.3.2-avoid-inline-asm.patch 1837 BLAKE2B 2cd93d0be42a9cf18e610dbccc3859cf7347d25b9205c6bb69c795e3df63c2fdd31972312afaa835cbf1d5eae8b1b6b274d41093bf35d32db7cba2df8833f8c3 SHA512 d45e6e1ef311a8eaccbbcf802c609c19509b74d0647a6ff4e2f0886ecd52d7f107c76d06cba88036870a4c34c62c19df661c59ea5011dff931ad14a3f5d8ab58
-AUX glog-0.3.4-fix-build-system.patch 4861 BLAKE2B d1c10a8c4b264003e0718da28e1df5a24045a61987dae2412a1c72abcc3ec8d8f01d3f5a4e14a97ebb3b482effe8bafa0fe44710a94d16c5db97d44891ca3a68 SHA512 ba162ebb8395044b2bb7b1982a463be01155772acf898614cc13f73c523f63094621f887b8a67e6f810d98914177a1a4a82a45ba7ff7415101f70a8915ae42f0
-AUX glog-0.3.4-fix-gcc5-demangling.patch 1992 BLAKE2B 086661e687a98e34777fd0baf97dec3730acad2ff8fd2184bb0a25d3c516125ca97d92bd799f33fabce4aabfeb1fba6dd865c89aef1659095988c34166285f69 SHA512 6f0b6f74dd039672f80dce55526ae784ff56add01ffc0dc0f5adf4c0ebbf9af15cfd054b370a0631fb7044abb20edf6dc79cb0dd2ac49fda7131ec152f54f054
 AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432
 AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
 AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
-DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
+AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3029 BLAKE2B 3b46cca54d2fdfdb51a64d9322246c26848c876c19c6aa13cd344d56fb938879339f41aa89348a1ed5fd7d52182f2803be00033052e7460d9776211df2f6448f SHA512 e83c818d4307ded63c6ee750c76f48594f8dc484b45c56b344a761ab4ed4d9e3c3fa66c78456c40d60ed19a9b0b5e07946de6971285d3779704e85eeb95dea98
+AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec021d44496c72beaca0239445eadb4bd11f022d6abdfdb5b97bc9e8bebc5f79255999bf655fde5572009e6fa71e7d8a0af785581a574cc5ec SHA512 db883cd941cab39954f06a75929520c94d824344de81c712d495d03bdd438a2cd79a1d975330848c84f0b482bcbf8c4fb120c45171e51c37dce960bf9cf4c2d5
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
-EBUILD glog-0.3.4-r1.ebuild 1197 BLAKE2B cea35c7b86d979e70a48d7ad73eea6089da777a81f96c91e4667c20a53faaa2801f4008e4687f584bccfc141139b059249cb4757bc8033c38e7e2409a764b190 SHA512 9fc0cf68094b667b5aaec75c77f313afb9017c1e82c37fd2cd9bdff959e7522a19baf4414287af878a5724694948b6be5f7b3ef03f74ecca31b0802580518f83
+DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
+EBUILD glog-0.5.0.ebuild 1450 BLAKE2B 7156f879e58f723184efc9fc960c926322bf297549d0d5326712d1ebfd6f9d438b9c1bca915ad19bc1fecdaa122b2ff72811b9cfd8328957568b5b1ab3f65971 SHA512 cf566c17f165ab0ab7e20aabca37f1a16fb3842112b7b60a4ad1894add98e4058ed9559979440340ccb34bb3ed3a5aa298132757999e2a0d6a69227ac9e94ae9
 MISC metadata.xml 765 BLAKE2B cb580cd0aa55d17f3b085e5603693b4c7c4e9ddb932e94fe08fb6fc00891d9d8366d9208c2d4cd7c0f56fa451866cb70575987822beb094525adf44b9410a15f SHA512 afecb5d946250c4a3d5098bf407bbe86ed4e48412e3e08282165c04eb4e7dfd4f48c734b57e2105c423bf9181e6cc74680b98d889f67904effe98cc203cac216
diff --git a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch b/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch
deleted file mode 100644
index b6fa9cdb7374..000000000000
--- a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-http://code.google.com/p/google-glog/issues/detail?id=130
-
-make the code work with all gcc targets
-
---- a/src/symbolize_unittest.cc
-+++ b/src/symbolize_unittest.cc
-@@ -60,9 +60,7 @@ using namespace GOOGLE_NAMESPACE;
- #    endif  // __i386__
- #  else
- #  endif  // __GNUC__ >= 4
--#  if defined(__i386__) || defined(__x86_64__)
--#    define TEST_X86_32_AND_64 1
--#  endif  // defined(__i386__) || defined(__x86_64__)
-+#  define TEST_WITH_LABEL_ADDRESSES
- #endif
- 
- // A wrapper function for Symbolize() to make the unit test simple.
-@@ -289,22 +287,24 @@ TEST(Symbolize, SymbolizeWithDemanglingStackConsumption) {
- extern "C" {
- inline void* always_inline inline_func() {
-   register void *pc = NULL;
--#ifdef TEST_X86_32_AND_64
--  __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
-+#ifdef TEST_WITH_LABEL_ADDRESSES
-+  pc = &&curr_pc;
-+  curr_pc:
- #endif
-   return pc;
- }
- 
- void* ATTRIBUTE_NOINLINE non_inline_func() {
-   register void *pc = NULL;
--#ifdef TEST_X86_32_AND_64
--  __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc));
-+#ifdef TEST_WITH_LABEL_ADDRESSES
-+  pc = &&curr_pc;
-+  curr_pc:
- #endif
-   return pc;
- }
- 
- void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
--#if defined(TEST_X86_32_AND_64) && defined(HAVE_ATTRIBUTE_NOINLINE)
-+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ATTRIBUTE_NOINLINE)
-   void *pc = non_inline_func();
-   const char *symbol = TrySymbolize(pc);
-   CHECK(symbol != NULL);
-@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() {
- }
- 
- void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() {
--#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE)
-+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE)
-   void *pc = inline_func();  // Must be inlined.
-   const char *symbol = TrySymbolize(pc);
-   CHECK(symbol != NULL);
diff --git a/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch b/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch
deleted file mode 100644
index cd38111bc81f..000000000000
--- a/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@
- AC_CONFIG_SRCDIR(README)
- AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE
--AM_CONFIG_HEADER(src/config.h)
-+AC_CONFIG_HEADERS([src/config.h])
- 
- AC_LANG(C++)
- 
-@@ -21,7 +21,7 @@
- AC_PROG_CXX
- AM_CONDITIONAL(GCC, test "$GCC" = yes)   # let the Makefile know if we're gcc
- 
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_SUBST(LIBTOOL_DEPS)
- 
- # Check whether some low-level functions/files are available
-@@ -128,32 +128,48 @@
- fi
- 
- # Check if there is google-gflags library installed.
--SAVE_CFLAGS="$CFLAGS"
--SAVE_LIBS="$LIBS"
--AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR],
--  GFLAGS_CFLAGS="-I${with_gflags}/include"
--  GFLAGS_LIBS="-L${with_gflags}/lib -lgflags"
--  CFLAGS="$CFLAGS $GFLAGS_CFLAGS"
--  LIBS="$LIBS $GFLAGS_LIBS"
--)
--AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0)
--if test x"$ac_cv_have_libgflags" = x"1"; then
--  AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library])
--  if test x"$GFLAGS_LIBS" = x""; then
--    GFLAGS_LIBS="-lgflags"
--  fi
--else
--  GFLAGS_CFLAGS=
--  GFLAGS_LIBS=
--fi
--CFLAGS="$SAVE_CFLAGS"
--LIBS="$SAVE_LIBS"
-+AC_ARG_ENABLE([gflags],
-+	AS_HELP_STRING([--enable-gflags], [Enable google-gflags]))
-+
-+ac_cv_have_libgflags=0
-+AS_IF([test "x$enable_gflags" != "xno"], [
-+	SAVE_CFLAGS="$CFLAGS"
-+	SAVE_LIBS="$LIBS"
-+	AC_ARG_WITH([gflags], AS_HELP_STRING([--with-gflags=GFLAGS_DIR]),[
-+		GFLAGS_CFLAGS="-I${with_gflags}/include"
-+		GFLAGS_LIBS="-L${with_gflags}/lib -lgflags"
-+		CFLAGS="$CFLAGS $GFLAGS_CFLAGS"
-+		LIBS="$LIBS $GFLAGS_LIBS"
-+	])
-+
-+	AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0)
-+	CFLAGS="$SAVE_CFLAGS"
-+	LIBS="$SAVE_LIBS"
-+])
-+
-+AS_IF([test "x$ac_cv_have_libgflags" = "x1"], [
-+	AC_DEFINE([HAVE_LIB_GFLAGS], [1], [define if you have google gflags library])
-+	AS_IF([test "x$GFLAGS_LIBS" = "x"], [
-+		GFLAGS_LIBS="-lgflags"
-+	])
-+], [
-+	GFLAGS_CFLAGS=
-+	GFLAGS_LIBS=
-+])
- 
- # TODO(hamaji): Use official m4 macros provided by testing libraries
- #               once the m4 macro of Google Mocking becomes ready.
- # Check if there is Google Test library installed.
--AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes")
--AC_CHECK_LIB(gtest, main, have_gtest_lib="yes")
-+AC_ARG_ENABLE([gtest-config],
-+	AS_HELP_STRING([--enable-gtest-config], [Enable looking for gtest-config]))
-+
-+AS_IF([test "x$enable_gtest_config" != "xno"], [
-+	AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes")
-+	AC_CHECK_LIB(gtest, main, have_gtest_lib="yes")
-+], [
-+	have_gtest_lib="no"
-+])
-+
- if test x"$GTEST_CONFIG" = "xyes" -a x"$have_gtest_lib" = "xyes"; then
-   GTEST_CFLAGS=`gtest-config --cppflags --cxxflags`
-   GTEST_LIBS=`gtest-config --ldflags --libs`
-@@ -178,17 +194,13 @@
- AM_CONDITIONAL(HAVE_GMOCK, test x"$GMOCK_CONFIG" = "xyes")
- 
- # We want to link in libunwind if it exists
--UNWIND_LIBS=
--# Unfortunately, we need to check the header file in addition to the
--# lib file to check if libunwind is available since libunwind-0.98
--# doesn't install all necessary header files.
--if test x"$ac_cv_have_libunwind_h" = x"1"; then
-- AC_CHECK_LIB(unwind, backtrace, UNWIND_LIBS=-lunwind)
--fi
--AC_SUBST(UNWIND_LIBS)
--if test x"$UNWIND_LIBS" != x""; then
--  AC_DEFINE(HAVE_LIB_UNWIND, 1, [define if you have libunwind])
--fi
-+AC_ARG_ENABLE([unwind],
-+	AS_HELP_STRING([--enable-unwind], [Enable libunwind]))
-+
-+AS_IF([test "x$enable_unwind" != "xno"], [
-+	PKG_CHECK_MODULES([UNWIND], [libunwind > 0.98])
-+	AC_DEFINE([HAVE_LIB_UNWIND], [1], [define if you have libunwind])
-+])
- 
- # We'd like to use read/write locks in several places in the code.
- # See if our pthreads support extends to that.  Note: for linux, it
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,12 +40,11 @@
- nodist_gloginclude_HEADERS = src/glog/logging.h src/glog/raw_logging.h src/glog/vlog_is_on.h src/glog/stl_logging.h
- noinst_HEADERS = src/glog/logging.h.in src/glog/raw_logging.h.in src/glog/vlog_is_on.h.in src/glog/stl_logging.h.in
- 
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- ## This is for HTML and other documentation you want to install.
- ## Add your documentation files (in doc/) in addition to these
- ## top-level boilerplate files.  Also add a TODO file if you have one.
--dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README.windows \
--                doc/designstyle.css doc/glog.html
-+dist_doc_DATA = AUTHORS ChangeLog INSTALL NEWS README
-+dist_html_DATA = doc/designstyle.css doc/glog.html
- 
- ## The libraries (.so's) you want to install
- lib_LTLIBRARIES =
-@@ -215,7 +214,7 @@
- 
- ## This should always include $(TESTS), but may also include other
- ## binaries that you compile but don't want automatically installed.
--noinst_PROGRAMS = $(TESTS) $(TEST_BINARIES)
-+check_PROGRAMS = $(TESTS) $(TEST_BINARIES)
- 
- rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
- 	@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}
diff --git a/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch b/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch
deleted file mode 100644
index fd1518c68583..000000000000
--- a/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b1639e3014996fbc7635870e013559c54e7e3b2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Mart=C3=ADnez=20Moreno?= <ender@debian.org>
-Date: Thu, 13 Aug 2015 09:31:26 -0700
-Subject: [PATCH] Fix ABI demangling for the GCC 5.x case.
-
-When glog is compiled with gcc-5.2 in cxx11 ABI mode, it barfs about unmangled symbols.  This patches it getting inspiration from binutils and demangle.cc itself, although it may be totally wrong or maybe have to use ParseAbiTag in more places.  I haven't read the spec for the symbols, though.
-
-This patch makes the demangle unit test pass correctly.
----
- src/demangle.cc | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/demangle.cc b/src/demangle.cc
-index e858181..0f0c831 100644
---- a/src/demangle.cc
-+++ b/src/demangle.cc
-@@ -439,6 +439,7 @@ static bool ParseExprPrimary(State *state);
- static bool ParseLocalName(State *state);
- static bool ParseDiscriminator(State *state);
- static bool ParseSubstitution(State *state);
-+static bool ParseAbiTag(State *state);
- 
- // Implementation note: the following code is a straightforward
- // translation of the Itanium C++ ABI defined in BNF with a couple of
-@@ -567,6 +568,8 @@ static bool ParseNestedName(State *state) {
- static bool ParsePrefix(State *state) {
-   bool has_something = false;
-   while (true) {
-+    if (ParseAbiTag(state))
-+      continue;
-     MaybeAppendSeparator(state);
-     if (ParseTemplateParam(state) ||
-         ParseSubstitution(state) ||
-@@ -585,6 +588,22 @@ static bool ParsePrefix(State *state) {
-   return true;
- }
- 
-+// <abi-tag>          ::= B <source-name>
-+static bool ParseAbiTag(State *state) {
-+  State copy = *state;
-+
-+  Append(state, "[", 1);
-+  if (ParseOneCharToken(state, 'B') &&
-+      ParseSourceName(state))
-+  {
-+    Append(state, "]", 1);
-+    return true;
-+  }
-+
-+  *state = copy;
-+  return false;
-+}
-+
- // <unqualified-name> ::= <operator-name>
- //                    ::= <ctor-dtor-name>
- //                    ::= <source-name>
diff --git a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
new file mode 100644
index 000000000000..a19ebdcf0fac
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
@@ -0,0 +1,106 @@
+https://github.com/google/glog/issues/125
+https://github.com/google/glog/pull/651
+https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
+
+--- /src/glog/logging.h.in
++++ /src/glog/logging.h.in
+@@ -594,6 +594,9 @@
+                                             void* prefix_callback_data = NULL);
+ #endif
+ 
++// Check if google's logging library has been initialized.
++GOOGLE_GLOG_DLL_DECL bool IsGoogleLoggingInitialized();
++
+ // Shutdown google's logging library.
+ GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
+ 
+--- /src/logging_custom_prefix_unittest.cc
++++ /src/logging_custom_prefix_unittest.cc
+@@ -221,11 +221,15 @@
+   LogWithLevels(0, 0, 0, 0);  // simulate "before global c-tors"
+   const string early_stderr = GetCapturedTestStderr();
+ 
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
++
+   // Setting a custom prefix generator (it will use the default format so that
+   // the golden outputs can be reused):
+   string prefix_attacher_data = "good data";
+   InitGoogleLogging(argv[0], &PrefixAttacher, static_cast<void*>(&prefix_attacher_data));
+ 
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
++
+   RunSpecifiedBenchmarks();
+ 
+   FLAGS_logtostderr = true;
+@@ -992,8 +996,10 @@
+   base::SetLogger(GLOG_INFO,
+                   new RecordDeletionLogger(&custom_logger_deleted,
+                                            base::GetLogger(GLOG_INFO)));
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
+   ShutdownGoogleLogging();
+   EXPECT_TRUE(custom_logger_deleted);
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
+ }
+ 
+ _START_GOOGLE_NAMESPACE_
+--- /src/logging_unittest.cc
++++ /src/logging_unittest.cc
+@@ -197,8 +197,12 @@
+   LogWithLevels(0, 0, 0, 0);  // simulate "before global c-tors"
+   const string early_stderr = GetCapturedTestStderr();
+ 
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
++
+   InitGoogleLogging(argv[0]);
+ 
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
++
+   RunSpecifiedBenchmarks();
+ 
+   FLAGS_logtostderr = true;
+@@ -965,8 +969,10 @@
+   base::SetLogger(GLOG_INFO,
+                   new RecordDeletionLogger(&custom_logger_deleted,
+                                            base::GetLogger(GLOG_INFO)));
++  EXPECT_TRUE(IsGoogleLoggingInitialized());
+   ShutdownGoogleLogging();
+   EXPECT_TRUE(custom_logger_deleted);
++  EXPECT_FALSE(IsGoogleLoggingInitialized());
+ }
+ 
+ _START_GOOGLE_NAMESPACE_
+--- /src/utilities.cc
++++ /src/utilities.cc
+@@ -62,6 +62,10 @@
+ 
+ static const char* g_program_invocation_short_name = NULL;
+ 
++bool IsGoogleLoggingInitialized() {
++  return g_program_invocation_short_name != NULL;
++}
++
+ _END_GOOGLE_NAMESPACE_
+ 
+ // The following APIs are all internal.
+@@ -176,10 +180,6 @@
+   }
+ }
+ 
+-bool IsGoogleLoggingInitialized() {
+-  return g_program_invocation_short_name != NULL;
+-}
+-
+ #ifdef OS_WINDOWS
+ struct timeval {
+   long tv_sec, tv_usec;
+--- /src/utilities.h
++++ /src/utilities.h
+@@ -163,8 +163,6 @@
+ 
+ const char* ProgramInvocationShortName();
+ 
+-bool IsGoogleLoggingInitialized();
+-
+ int64 CycleClock_Now();
+ 
+ int64 UsecToCycles(int64 usec);
diff --git a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
new file mode 100644
index 000000000000..f9b90c1521aa
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
@@ -0,0 +1,171 @@
+https://github.com/google/glog/issues/649
+https://github.com/google/glog/pull/650
+https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
+
+--- /src/glog/vlog_is_on.h.in
++++ /src/glog/vlog_is_on.h.in
+@@ -81,10 +81,10 @@
+ // parsing of --vmodule flag and/or SetVLOGLevel calls.
+ #define VLOG_IS_ON(verboselevel)                                \
+   __extension__  \
+-  ({ static @ac_google_namespace@::int32* vlocal__ = NULL;           \
++  ({ static @ac_google_namespace@::SiteFlag vlocal__{NULL, NULL, 0, NULL};       \
+      @ac_google_namespace@::int32 verbose_level__ = (verboselevel);                    \
+-     (vlocal__ == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
+-                        __FILE__, verbose_level__) : *vlocal__ >= verbose_level__); \
++     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
++                        __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \
+   })
+ #else
+ // GNU extensions not available, so we do not support --vmodule.
+@@ -105,6 +105,13 @@
+ 
+ // Various declarations needed for VLOG_IS_ON above: =========================
+ 
++struct SiteFlag {
++  @ac_google_namespace@::int32* level;
++  const char* base_name;
++  size_t base_len;
++  SiteFlag* next;
++};
++
+ // Helper routine which determines the logging info for a particalur VLOG site.
+ //   site_flag     is the address of the site-local pointer to the controlling
+ //                 verbosity level
+@@ -114,7 +121,7 @@
+ // We will return the return value for VLOG_IS_ON
+ // and if possible set *site_flag appropriately.
+ extern GOOGLE_GLOG_DLL_DECL bool InitVLOG3__(
+-    @ac_google_namespace@::int32** site_flag,
++    @ac_google_namespace@::SiteFlag* site_flag,
+     @ac_google_namespace@::int32* site_default,
+     const char* fname,
+     @ac_google_namespace@::int32 verbose_level);
+--- /src/logging_unittest.cc
++++ /src/logging_unittest.cc
+@@ -98,6 +98,7 @@
+ static void TestRawLogging();
+ static void LogWithLevels(int v, int severity, bool err, bool alsoerr);
+ static void TestLoggingLevels();
++static void TestVLogModule();
+ static void TestLogString();
+ static void TestLogSink();
+ static void TestLogToString();
+@@ -223,6 +224,7 @@
+   TestLogging(true);
+   TestRawLogging();
+   TestLoggingLevels();
++  TestVLogModule();
+   TestLogString();
+   TestLogSink();
+   TestLogToString();
+@@ -453,6 +455,24 @@
+   LogWithLevels(1, GLOG_FATAL, false, true);
+ }
+ 
++int TestVlogHelper() {
++  if (VLOG_IS_ON(1)) {
++    return 1;
++  }
++  return 0;
++}
++
++void TestVLogModule() {
++  int c = TestVlogHelper();
++  EXPECT_EQ(0, c);
++
++#if defined(__GNUC__)
++  EXPECT_EQ(0, SetVLOGLevel("logging_unittest", 1));
++  c = TestVlogHelper();
++  EXPECT_EQ(1, c);
++#endif
++}
++
+ TEST(DeathRawCHECK, logging) {
+   ASSERT_DEATH(RAW_CHECK(false, "failure 1"),
+                "RAW: Check false failed: failure 1");
+--- /src/vlog_is_on.cc
++++ /src/vlog_is_on.cc
+@@ -125,6 +125,8 @@
+ // Pointer to head of the VModuleInfo list.
+ // It's a map from module pattern to logging level for those module(s).
+ static VModuleInfo* vmodule_list = 0;
++static SiteFlag* cached_site_list = 0;
++
+ // Boolean initialization flag.
+ static bool inited_vmodule = false;
+ 
+@@ -190,6 +192,23 @@
+       info->vlog_level = log_level;
+       info->next = vmodule_list;
+       vmodule_list = info;
++
++      SiteFlag** item_ptr = &cached_site_list;
++      SiteFlag* item = cached_site_list;
++
++      // We traverse the list fully because the pattern can match several items
++      // from the list.
++      while (item) {
++        if (SafeFNMatch_(module_pattern, pattern_len, item->base_name,
++                         item->base_len)) {
++          // Redirect the cached value to its module override.
++          item->level = &info->vlog_level;
++          *item_ptr = item->next;  // Remove the item from the list.
++        } else {
++          item_ptr = &item->next;
++        }
++        item = *item_ptr;
++      }
+     }
+   }
+   RAW_VLOG(1, "Set VLOG level for \"%s\" to %d", module_pattern, log_level);
+@@ -198,7 +217,7 @@
+ 
+ // NOTE: Individual VLOG statements cache the integer log level pointers.
+ // NOTE: This function must not allocate memory or require any locks.
+-bool InitVLOG3__(int32** site_flag, int32* site_default,
++bool InitVLOG3__(SiteFlag* site_flag, int32* level_default,
+                  const char* fname, int32 verbose_level) {
+   MutexLock l(&vmodule_lock);
+   bool read_vmodule_flag = inited_vmodule;
+@@ -211,10 +230,17 @@
+   int old_errno = errno;
+ 
+   // site_default normally points to FLAGS_v
+-  int32* site_flag_value = site_default;
++  int32* site_flag_value = level_default;
+ 
+   // Get basename for file
+   const char* base = strrchr(fname, '/');
++
++#ifdef _WIN32
++  if (!base) {
++    base = strrchr(fname, '\\');
++  }
++#endif
++
+   base = base ? (base+1) : fname;
+   const char* base_end = strchr(base, '.');
+   size_t base_length = base_end ? size_t(base_end - base) : strlen(base);
+@@ -244,7 +270,20 @@
+   ANNOTATE_BENIGN_RACE(site_flag,
+                        "*site_flag may be written by several threads,"
+                        " but the value will be the same");
+-  if (read_vmodule_flag) *site_flag = site_flag_value;
++  if (read_vmodule_flag) {
++    site_flag->level = site_flag_value;
++    // If VLOG flag has been cached to the default site pointer,
++    // we want to add to the cached list in order to invalidate in case
++    // SetVModule is called afterwards with new modules.
++    // The performance penalty here is neglible, because InitVLOG3__ is called
++    // once per site.
++    if (site_flag_value == level_default && !site_flag->base_name) {
++      site_flag->base_name = base;
++      site_flag->base_len = base_length;
++      site_flag->next = cached_site_list;
++      cached_site_list = site_flag;
++    }
++  }
+ 
+   // restore the errno in case something recoverable went wrong during
+   // the initialization of the VLOG mechanism (see above note "protect the..")
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
deleted file mode 100644
index d6fd3e0dc0d4..000000000000
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="gflags +libunwind static-libs test"
-RESTRICT="test"
-
-RDEPEND="
-	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
-	libunwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-build-system.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-gcc5-demangling.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gflags) \
-		$(use_enable static-libs static) \
-		$(use_enable test gtest-config) \
-		$(use_enable libunwind unwind)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
new file mode 100644
index 000000000000..4df075626adc
--- /dev/null
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_ECLASS="cmake"
+
+inherit cmake-multilib
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/google/glog"
+fi
+
+DESCRIPTION="Google Logging library"
+HOMEPAGE="https://github.com/google/glog"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gflags +libunwind llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="gflags? ( dev-cpp/gflags:0=[${MULTILIB_USEDEP}] )
+	libunwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:0=[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-IsGoogleLoggingInitialized_public.patch"
+	"${FILESDIR}/${P}-vmodule_levels_changeability.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DWITH_CUSTOM_PREFIX=ON
+		-DWITH_GFLAGS=$(usex gflags ON OFF)
+		-DWITH_GTEST=$(usex test ON OFF)
+		-DWITH_UNWIND=$(usex libunwind ON OFF)
+	)
+	if use libunwind; then
+		mycmakeargs+=(
+			-DUnwind_PLATFORM_LIBRARY="${ESYSROOT}/usr/$(get_libdir)/libunwind.so"
+		)
+	fi
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index 3af25b6a84f3..c1d47f0a5ec3 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,3 +1,3 @@
 DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
-EBUILD robin-hood-hashing-3.11.2.ebuild 481 BLAKE2B 4b9ec0837cfd3bb3584b61577489fffb4bc66052def4b6f79759a5301d5aa310da2b4f288179257a6bd394622e41e5c8076f5bc9286bd30d99f62dc448baee9a SHA512 b6db825452c417502eb3d093a910beb2b9a3eff6e079a6ad6b04aefbe66244134db549dd45284a7a4217573ccfe44ba27389e270c7a53af7804fe6c893c5f388
+EBUILD robin-hood-hashing-3.11.2.ebuild 486 BLAKE2B 8f617add1fa90ac158574417e78f614b7a47b37c45c1b5b1e8e653a3bed9f5bdb4e6eb03acfedeef938937d4c8a12f1397ad7421528024fd8f5573163c0494bd SHA512 44ea5a95747bb4fdb93251258c820a1b0cedf9312916be6664324b7035f60d932a80b5697a8160360e93fea0a5e1a0a7f1b61de9b44975ca8ba931b364771a78
 MISC metadata.xml 431 BLAKE2B 301a6f1026a18fd6d6322f95833f515247111fb9bb88d915724c263e167ea93bbc7f72a734c1aa4fffb5e2068a43f42a104446e7dddaf56334c73eb29541481a SHA512 80aac4cd60e6768675f5cf8619b99d7e4d95b3c691dd4cd7400040610abfdc5f9182e166f5b1c301a14380a3216fca87613dd7e4098fe2e1e2330e49f0660654
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
index 13577d90c006..7b03f771bc40 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7a661de23401..b94a0b5c492e 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index e36e6609b282..533313efdb8a 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -31,7 +31,7 @@ DIST redis-6.2.4.tar.gz 2457940 BLAKE2B 3e89e404a624db6f739fdab72b8b7f7f92b6e96b
 EBUILD redis-5.0.12.ebuild 4727 BLAKE2B 296ae8313437d189b96ee93f5b63cefe11abb576d4925e150de6db510183a948bae6a4ae76db1a393e8c1f3c0c17dfad8c52e07b8d1cf36cd88d11df4d2ac17d SHA512 af8a96dcccbc12d8dfb0c77d1c857b245c47d77b3084f11021e9cf02ce1a8258c3c09a855c209356c49ba9aa8a5ad37e732751d908e01e2314d7c2d5ceddf320
 EBUILD redis-6.0.12.ebuild 5014 BLAKE2B ebf162717236cf1a528ae0c11dbbacf1227451246d13460ca4d4172073c7b768d9e68e97051fdba45c595df092c1006a9d8681f26dc2b8a6b6f0a7b5846fbd10 SHA512 13ec7932d3b0502092b15f8a98f67305549ccdad86dee8fc5aa62335d40a9deb0bca0f11b8ed3dbddc0a31982afcba1ea346a1be740d7e50711764304312f344
 EBUILD redis-6.0.13-r1.ebuild 5092 BLAKE2B 82f39c67cfef273c174c0c7cd144e23a93833c2b00f6143e22ea7e3f3e7fe4f044a4f25f00cc72c7a6f72d934e5c4aaa66742ac7172737afa94cf15bc7188690 SHA512 dcb6983cf72b12b28d6dbef8041afd56789f7bd8d3373edd76bc0f09bb277ff78450ff8081e3a007eef0913944950bbe618856cf18c5e84915dc7245a0d80ceb
-EBUILD redis-6.0.14.ebuild 5094 BLAKE2B 6969c621195d98aa949ae7531525e53d48a35336cf1be0963c2b33ef9304bea9d6dad2d2576cbb91c70c384b135ece00cc76d1e1e1bfc246b3417115c63bf263 SHA512 4a23f1203c1e473086eb4c42f4a2e62865923a7a81344dda6004359facc874916095c967f9394b655f391684d196e2724c5d2dc083e65d9431520cd2a2e36eb8
+EBUILD redis-6.0.14.ebuild 5092 BLAKE2B 82f39c67cfef273c174c0c7cd144e23a93833c2b00f6143e22ea7e3f3e7fe4f044a4f25f00cc72c7a6f72d934e5c4aaa66742ac7172737afa94cf15bc7188690 SHA512 dcb6983cf72b12b28d6dbef8041afd56789f7bd8d3373edd76bc0f09bb277ff78450ff8081e3a007eef0913944950bbe618856cf18c5e84915dc7245a0d80ceb
 EBUILD redis-6.2.1.ebuild 5020 BLAKE2B 9d64fc2efeb3b7a22ecbaf9440639b327f2555a21152f0cedb81cccbed351f1037e6158dbff9afa10e33c7ea59b575fce0f9c59e06576b1284e749f07a1472bd SHA512 c61f65441d30d13a939275bdebc0d27b7906eb6aa9de5dc675ba53662a5404d06f5bee04c4412a85daff711b5d31a739142e7e365e2fd19bd32aaaf66ebbbed5
 EBUILD redis-6.2.3-r1.ebuild 5098 BLAKE2B da4c193e6974a19ea309a8548b4edbe4ca086fca2c1b287c76546a7e8d16fb6b2b541b264f88cb8ab4367dddf1aea4afc67cd551413554a9c56f4bac2de047da SHA512 4d3e16a007013f8ea7c25ffd55db947b06e27f78f4119e3b6d29c4b5c3a289c1f62cb1e2d7c287be5bc33eb039f99e41ac7c5b04fc0c6057537f44d5f0dfa099
 EBUILD redis-6.2.4.ebuild 5098 BLAKE2B da4c193e6974a19ea309a8548b4edbe4ca086fca2c1b287c76546a7e8d16fb6b2b541b264f88cb8ab4367dddf1aea4afc67cd551413554a9c56f4bac2de047da SHA512 4d3e16a007013f8ea7c25ffd55db947b06e27f78f4119e3b6d29c4b5c3a289c1f62cb1e2d7c287be5bc33eb039f99e41ac7c5b04fc0c6057537f44d5f0dfa099
diff --git a/dev-db/redis/redis-6.0.14.ebuild b/dev-db/redis/redis-6.0.14.ebuild
index 918ff99b3f75..d871156cf342 100644
--- a/dev-db/redis/redis-6.0.14.ebuild
+++ b/dev-db/redis/redis-6.0.14.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 5b7bc0a31896..72dbdce52b3b 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,3 +1,3 @@
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
-EBUILD unixODBC-2.3.9.ebuild 1771 BLAKE2B 4ae54ef65c77a2afa9a84c1ed80a614e822c924fe4ec43158ea592f93f6174b1c3c82a714e081d45f40f0fdf050fed0f30dfdc0e7024768f0b6dee4f72e25ea5 SHA512 cdd52f7f3d3cb621116d893f93755e0c92096d932d5b27a9c503d6efdf3864dcf904d2b99835825933508fac39d46222a8e91f6a1af31191120ef44fbc8e1515
+EBUILD unixODBC-2.3.9.ebuild 1761 BLAKE2B 8b35e381a6a8ec9a45bcf08547891aab6798f679d6b0075ed74831b1bb6acdc78fbf9d82e6943a880a4fa5b1326e8d77f8467382bea9a700baec233920ab0c5a SHA512 aed67a43ce285aede1962ac44a93c7d6f22ba6e1d9473b55b6dc56a5935f0495eac014042cfe4af77657224bc497d51cffed5cb4b0c63c4ad6aacc33427f6c2e
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/unixODBC-2.3.9.ebuild b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
index ec457a936c35..7c2f87cf0cd7 100644
--- a/dev-db/unixODBC/unixODBC-2.3.9.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit libtool multilib-minimal
+inherit multilib-minimal
 
-DESCRIPTION="A complete ODBC driver manager"
+DESCRIPTION="complete ODBC driver manager"
 HOMEPAGE="http://www.unixodbc.org/"
 SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index a66358328d58..27d0503d5886 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/openscenegraph-openmw/Manifest b/dev-games/openscenegraph-openmw/Manifest
index cedf64396d50..f7392ad5cae7 100644
--- a/dev-games/openscenegraph-openmw/Manifest
+++ b/dev-games/openscenegraph-openmw/Manifest
@@ -1,6 +1,7 @@
 AUX openscenegraph-3.4-cmake.patch 4485 BLAKE2B 3d63d45b7af01dc4153c03edb828a609a0877e30a8aee9a36fbf69b171df04fac5945e69f91c5e107b55b3c771c5dbcba721f607fcb5a73e1c14dd5351854f22 SHA512 e0dd21ecbf92dec251bc40680106adea4c309badafef408473397b8078e20cd7fbd1d9cb1b1912466ded4156275cd5a1fc1e86caa2471670938e3d39c0c84a97
+AUX openscenegraph-3.4-gcc11.patch 1038 BLAKE2B d460790c49c060f79e0311913314f38d32d3cae0056fa2b65462eeefdc7637750a04d3d13a54756e8d5129b9a8bde262e41ce540f480b55934dc23a933234143 SHA512 5e22bf470d18f166927a744f39b21cf9de72abfd17e7d96095943cb4ea698134d9cf4f68a99d4bf2b918f594951d9b9179e29e13d1016e1c0ffee1eb2e17513b
 AUX openscenegraph-3.5.1-jpeg-9.patch 1211 BLAKE2B 7fedf10332a13270a489c5d2e662947ca84659ad5abc43190d0415212b083b72933b01f84caed161d457490587c8236e38e070e734c649c44b0d67fdc7399a2d SHA512 404439415f8ff6881a90be44281e4a811f018c3e82c2981d076a106e63a3c44fd769867496b8f8a7d53669ba660ab9076a6ccab31e921e9abab65d2ba652b5cc
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST openscenegraph-openmw-3.4_p20200425.tar.gz 5698786 BLAKE2B 43684fa898912434dae9a7b41070a893c407dceba7e468a3f3dede32e24aea55d921098faf8d9d05708d2ef01a3507b2f126939dc13b8693002a0bec189bbaf7 SHA512 9bb4d2a6ca4694ee22a29508b74a095a483584ea801dc8298ec8a9b41c4d4fe18c52a21849ae9ec1065060479dcad5156227f82feed13c177415662ecba1da70
-EBUILD openscenegraph-openmw-3.4_p20200425-r100.ebuild 4316 BLAKE2B c5d475494f271839ad50da59caf9b9f07d5144841d64741fc4266b2f1b5eba1aca98ba8ad954a41e99bd01fefdbeb3d93b21fc7f78e0b45da75b9825314a08e4 SHA512 171d766ff3083009f2abe54a55a580d77e56f117072dd78e76f7a81c90d671387a54716ef45ff0923379bccc8ef540275fd99b7636ce936a284bf2c19a166332
+EBUILD openscenegraph-openmw-3.4_p20200425-r100.ebuild 4362 BLAKE2B a8c82b42c5aa43847cef4cbafa0a171ca172760c147e65d2cf4476bd42d52744f75e86566a99b0e10a65f9ee78af5c5f61bb3d795ec6769d45739b8e7ae3d601 SHA512 514cbdabd064d058b0530d42c1393f351e277aee7706ea9971ba4603fabedbf4ed6de13f0fbae5fb2c52f6d451b90c074f144578a4afddd9b78305576f7258d0
 MISC metadata.xml 1690 BLAKE2B 4c99a953f827084c2a9d848f1bed0f1b7c885343ac2bb8ca57b2ada30ab8901e56ff1f7a37e97394c2fd0f8b0eff452ac0dc2a5fcab270ea8781999fd4bd45f6 SHA512 44a3d3a9af55c002330282ce036c3c455ffd7e9800c854657bd643fb3033645217e365a1a8dc8c7dbbff0d7038a9c6b0265fc824af71404a5b42d9a26a147645
diff --git a/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
new file mode 100644
index 000000000000..0d2dc2d0f73b
--- /dev/null
+++ b/dev-games/openscenegraph-openmw/files/openscenegraph-3.4-gcc11.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/788301
+--- a/include/osgDB/ObjectCache
++++ b/include/osgDB/ObjectCache
+@@ -72,7 +72,7 @@ class OSGDB_EXPORT ObjectCache : public osg::Referenced
+ 
+         class ClassComp {
+         public:
+-            bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs);
++            bool operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const;
+         };
+ 
+         typedef std::pair<osg::ref_ptr<osg::Object>, double >           ObjectTimeStampPair;
+--- a/src/osgDB/ObjectCache.cpp
++++ b/src/osgDB/ObjectCache.cpp
+@@ -16,7 +16,7 @@
+ 
+ using namespace osgDB;
+ 
+-bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs)
++bool ObjectCache::ClassComp::operator() (const ObjectCache::FileNameOptionsPair& lhs, const ObjectCache::FileNameOptionsPair& rhs) const
+ {
+     // check if filename are the same
+     if (lhs.first < rhs.first) return true;
diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
index 202f18429af9..08efaabeceae 100644
--- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
+++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -87,6 +87,7 @@ PATCHES=(
 	"${FILESDIR}"/openscenegraph-3.4-cmake.patch
 	"${FILESDIR}"/openscenegraph-3.5.1-jpeg-9.patch
 	"${FILESDIR}"/openscenegraph-3.6.3-docdir.patch
+	"${FILESDIR}"/openscenegraph-3.4-gcc11.patch
 )
 
 pkg_setup() {
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index a22b782cadd2..f95aca19d48e 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index 5e676eff0e14..df66f3bb56f8 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1,3 +1,5 @@
+DIST integer-logarithms-1.0.3.1.tar.gz 9023 BLAKE2B 29a9e2e73a6fb63f31ad87b53161b9f669a3cf6fed2992d7bf7414d9c9cff9cbe00baa301f7a7889fc0a31ff635d85dafc49ed5ce3f009202ba017b47e75c8a0 SHA512 670aff419de8d6afd1b7e1a40b68290bcf7aefad788c3b08aebfa5ca3e709f5d22543fce82fb75dc18b3ba0ef6d8a8f61735cde647a7a6c9392a60ec365534b3
 DIST integer-logarithms-1.0.3.tar.gz 8840 BLAKE2B d59a01c2b712c499ee5c81da0d8055d96137f5a1c55ccc5a77ca99449743b753223949de2a0289965423ae16bb61eef7452ace736cc5a0d6448d7f1ab8318fed SHA512 b211127620bb52398ae7e64281f991d9dd016d5f74ff5d939275afea15689b01f82577efeaa2dfcdf4230cfea841f6c14f731ba16d38192f48e2e7ae90e704f3
+EBUILD integer-logarithms-1.0.3.1.ebuild 1185 BLAKE2B 55362aa678225fcd858b9e07794b784ca6b866b66a21d50c7535e0d7515b07dae557ebe068f1fdc11f644e5c51549cb81a8283962a88efca88a1b19f331a1341 SHA512 45ed7555a6864eaf414f23d390b03f9adbb076c9a2f9e1ed553a4c8ef584b0f4e3018fbad59c6eac2369add41edea1749960ec293d9c0f6e2147b8edc56dd729
 EBUILD integer-logarithms-1.0.3.ebuild 986 BLAKE2B 3342fac7f8b3ba3b019249e9766e2cc84febe55dd4c7575cec22cbe5750a90903741ee6cc5eea87b1064f2955b53641b1fb50f6fae893fbc1a8b5ad06f7993bd SHA512 9dcbad03dc721de0757e18b39c62548ebdf1f75402b827ba4ee7257964e0b448040aa6e170b5756a88ae76729f00544d267866fd18059719c06f95b0eb1d9ee6
-MISC metadata.xml 549 BLAKE2B f46602eb9c49576aee4b2c56458bab5d6a98aded9a44f2ecbde66303e461f84b0afba62bd9575aa9ae35567b046f06a4397ce7d3d9a37292552030a72c8dfd5a SHA512 7c3a9a7d2e09ad62fe7e4c149dd6de970e875fa322afccea5ae22bfd6c0f7a08e92ac077ce08f2484a068d0acc7628c28fd2cae189f1cb22526838ae3ddda904
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
new file mode 100644
index 000000000000..862daf5a24e4
--- /dev/null
+++ b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -check-bounds,+integer-gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integer logarithms"
+HOMEPAGE="https://github.com/haskellari/integer-logarithms"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+# 	test? ( >=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
+# 		>=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
+# 		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.4
+# 		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+# 		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
+# 		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
+# "
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-check-bounds \
+		--flag=integer-gmp
+}
diff --git a/dev-haskell/integer-logarithms/metadata.xml b/dev-haskell/integer-logarithms/metadata.xml
index 24fd8c97c877..b7878815d80d 100644
--- a/dev-haskell/integer-logarithms/metadata.xml
+++ b/dev-haskell/integer-logarithms/metadata.xml
@@ -5,12 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		"Math.NumberTheory.Logarithms" and "Math.NumberTheory.Powers.Integer"
-		from the arithmoi package.
-		
-		Also provides "GHC.Integer.Logarithms.Compat" and
-		"Math.NumberTheory.Power.Natural" modules, as well as some
-		additional functions in migrated modules.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index 0335cb3559af..62fe8cdf37dd 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -5,5 +5,4 @@ DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2f
 EBUILD language-c-0.4.7.ebuild 775 BLAKE2B f7e191f462ff6c1757f10669310c439a0b03a56fe9ed5927551d65b93e64bfb5ee5526c9ce004a0716ef9c392a9b3c40858b784ad5a999fbad3d66bcb1f71860 SHA512 ef7bf4a3d66ab6f0a136f7a9b5366763b0c7841d25991d731e69ce2e46e936faa946f4292f013463b087fa25e35f3cb0d34158ba91d61bdd21bb27363ed4cb2b
 EBUILD language-c-0.7.1.ebuild 755 BLAKE2B 7f003b4d9cd81e358f13441b0cd5b7b30e0ab1183dfef8e3236bb8316e6b48b86b1543dfc5ce61a0c2bf2319243185f0c44eb8b39b03deb940c9a42d656be8c8 SHA512 e54d69d98c3db00a002c9e07768231ad76b334344c2e8f5e73be2b55229b45b91be3a785426812ef37171574055902c25e5f8e6c1f12e3b131a5309a97bb7397
 EBUILD language-c-0.8.3-r1.ebuild 921 BLAKE2B 10dc3c8b25c32a5728e988758e7a6273bd174dbf9561faca9278379cbc1f09dbaadcc032c38e455212db8cd986382577ff8024b0eb64d4c556f65a5cc7a295a8 SHA512 bc34c71bf52eb795082742d232ea642ae43f2588fd0294afa28731d21383c5fbd1ceb96aea36ef8fd4650f21b823cdefd0c0731e4041717abeab19ae1d59951d
-EBUILD language-c-0.8.3.ebuild 868 BLAKE2B fb1d114064d06c436cd149ad60bc9f14c0a680ed87a70dd73e31e3c67901c979ec866330a0fa1172e87ea6a860807ef05a4f47781723d05606a20b3cd9a4cfbd SHA512 db22e8e5eaff028367301d0686ed70258a714c4891d5377924487d8e5c35a8736e95b30c2cc3b6203a2e645be9efb5a9eeb0a3e446fc7798d0d5583922e98175
 MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/language-c/language-c-0.8.3.ebuild b/dev-haskell/language-c/language-c-0.8.3.ebuild
deleted file mode 100644
index e60b7445c7d2..000000000000
--- a/dev-haskell/language-c/language-c-0.8.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="http://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.22.2.0
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allwarnings \
-		--flag=iecfpextension \
-		--flag=separatesyb \
-		--flag=splitbase \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
index 85f0ca889958..38d7c4b328c4 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1,5 +1,3 @@
 DIST unicode-transforms-0.3.7.1.tar.gz 717790 BLAKE2B aabdd2496ad686d203aa0d8f9c4d043e35c448b1cb83546858e487a6f0e6f05f2cd6467be8c0bedf1bac7fc0d45a711b7faa438c433b5a144ad2e7c3dc20df97 SHA512 a4e39b943bcea6c86ebb8df7253a39ecf2a7bf5a083d0cf2ee1e5720af4afe47111330a787353a5728793d02739448debae2fd73fe6ba2d0eb94cbbb4bfef30f
-DIST unicode-transforms-0.3.7.tar.gz 715424 BLAKE2B 9901db4a811613fd75afc29e7f6c2fecb3dc2ff7e66320e88686093b74201075f6d6eca2353e48cf103ad721f8b87cd414011627946b9ab2dc1f75ff670c8215 SHA512 7115a933938b4e110ece136dcce5abad06fdd3011538f62a340db1a28295247ed43616d7318f67192da451758e8e06bd121dc1cc936d5b704b6ffd01c3c2fb47
 EBUILD unicode-transforms-0.3.7.1.ebuild 1002 BLAKE2B 50192af814687df1671c0e553640c8406451e055e83a822c4ede9de4e50c054c503689b185c5f63a39d3a33d8ec3108e9ed1dec69430fc7a0a0f686551ebd143 SHA512 fe2ec4763486965f877254a1e3212c4d1447a9a4ccfcc8672a93d7900655b604d03472c45d73f71b12807d4720735edd431264c296850ac29fd0cdb2f3b38df3
-EBUILD unicode-transforms-0.3.7.ebuild 1005 BLAKE2B ebebee3de113aedd6dd571a1b24b55287d525e38f8c772255b115ec9d5e4c1a417cf1ed3aa2516868542c9e38e9de64ef9f3398e4ef3f1aff28fdea520ef5ab8 SHA512 bb9d3d8dbd2e23ac3a019ac0341b0aa9bbf0bb307b9d5061b358b0e6fb4ab45533f05e1d9607ac14aa4b6e3c391f3156a0c7337d3e7dd45d14f3f68c037da9de
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.ebuild
deleted file mode 100644
index 045ebdcbdfa1..000000000000
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: -dev,-has-icu,-has-llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode normalization"
-HOMEPAGE="https://github.com/harendra-kumar/unicode-transforms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
-		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev \
-		--flag=-has-icu \
-		--flag=-has-llvm
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9216914dcdff..2e9b11ae3ac6 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 0ef8a71df868..478492a5d638 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,9 +1,5 @@
-DIST bcmail-jdk14-138.tar.gz 386478 BLAKE2B 2fee04eee66ab352aa08f72063e0088e61b2e76e389ab0d599ca0496798ef5fbdeba4b1865921045405d886ad928cf1e83782324adcbc8464fb7c3af3f1f566a SHA512 1d79aebee02a8d0017dc0b05f68e49fc031a797043eec173aa68ef0148e06b6ebe4d001a1494d6ed95114b1534ece7c47982e119ad8aec2485323babe34f3a13
 DIST bcmail-jdk15-145.tar.gz 483519 BLAKE2B aed9d4ef1ede10b97979652a012f18e45b7d4d597cb8b3ad168e847563ce14f7effe429b7f213adb77befeb144c4c3a279738b76718bde85ce04265d62ef8e75 SHA512 2d3232d5eb1cd75ad56a7316beb32880f3f935fcd3ed0a6cb2cc3e1861dc9f0bece0cbae53471760246505adb5c28328691eb82e11fedb0b160c1248d21c48bb
 DIST bcmail-jdk15on-150.tar.gz 221760 BLAKE2B 48c5d3b692295dcf2ce1e73ce58097b20c11cc353a8e13da9b8987f19eb69f1dbb37747e778e9323c170c0a3baa2ec7257681beea8da4e95343f71c5c6ed186a SHA512 91727ddc4bf932cfaedd3cb90a807b5fec3120e56fde3e5fc73bb5bf2e97db50a35a63e0b5e342fe29e4b974579c5cdd5d427d01c9dd8e7abd521ccd3d1959f1
-DIST bcmail-jdk15on-152.tar.gz 240800 BLAKE2B eb7077f742a8746a1ce13c37bcb936c16f49f6a5eec7421d8f3f93048091d123f416a732add10ed5596fc150d3f129e6b216190c48f6bb1b9d226a0e2bf19637 SHA512 e7301991071709b5788e5a813ea765a5e59bb089104a031ca91a509036e7823b851f854e5f96de6a2d2ef817aad4435f78742dea3a9b1dbeb95a6cddf250619e
-EBUILD bcmail-1.38-r6.ebuild 904 BLAKE2B da5a8b5f4dbd354fc1ebb0a27470e9237b9798a710f1ba19b43515e50b28c0270466a2db0db3d072d4eccc4016485a1b25e6360efb32ba3c54023d4d40378dd7 SHA512 a10aed0ceeed055a40df8dc7c900580484ced08a60363d4f5f138eda3cba8b7ad4ab52ac64306d6666d1b542160f6cf96d24dc47e90fca7be28bc88ac064f620
 EBUILD bcmail-1.45-r5.ebuild 912 BLAKE2B ef76eb9c860233cc5e90b84123eeca0317ea2690e03d09a90bebbd13adfdb0ec3c84335b3ea886306b64caf20b20460158b84d260417fc7f0496cfb75bc63731 SHA512 7936c6be67385f5d97d639697c4295bfa2c886c40b4271ab54cb58fde64233c22184a18ef1e4c247a016d12db16fab2d4a846e4e1039d545730bf22d41f03bfc
 EBUILD bcmail-1.50-r3.ebuild 1194 BLAKE2B 5e040e7cf8852f8398aa6526a11533a57340abbf324be1658ac57d86f805e6fd5d197f8ae154830d1c09fbc6d7310fa71f8e0d6ac905672646dec4b7b1a25334 SHA512 c22936d51fead1ad4a5350bd11614e3efe7ff7dcc2378d7047f1b5fc8e650c18b57b9649f199fc735a7314b010e7da6fd3040c80ad9e011c5fba581aeb10614c
-EBUILD bcmail-1.52-r3.ebuild 1194 BLAKE2B 87ccbd4cefcbd13e0677d550bb48f9295cb2afc501b91892138a2c96a2f2b82854168f7fec3fac27759d292150347c115ac025a3c596ae667a844637bdea9ec0 SHA512 4d30572e003a9de4553f41e5cdb70a777fdecf7acd420ee785cfdbd1f01c75b1b6188ffb7148ce5c5e52446aca8c54cd858b0627251b61d31ef7c3b0a7064307
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcmail/bcmail-1.38-r6.ebuild b/dev-java/bcmail/bcmail-1.38-r6.ebuild
deleted file mode 100644
index acac0b50528f..000000000000
--- a/dev-java/bcmail/bcmail-1.38-r6.ebuild
+++ /dev/null
@@ -1,52 +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="${PN}-jdk14-${PV/./}"
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="
-	dev-java/junit:0
-	dev-java/oracle-javamail:0
-	dev-java/bcprov:${SLOT}"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov-${SLOT}
-	oracle-javamail"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcmail/bcmail-1.52-r3.ebuild b/dev-java/bcmail/bcmail-1.52-r3.ebuild
deleted file mode 100644
index a0af7f956ed5..000000000000
--- a/dev-java/bcmail/bcmail-1.52-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND="
-	dev-java/junit:0
-	dev-java/bcprov:${SLOT}
-	dev-java/bcpkix:${SLOT}
-	dev-java/oracle-javamail:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	junit
-	bcprov-${SLOT}
-	bcpkix-${SLOT}
-	oracle-javamail
-"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-	rm -rv \
-		org/bouncycastle/mail/smime/test/* \
-		org/bouncycastle/mail/smime/examples/CreateSignedMail.java || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index b21ac5d01952..0f1cd43694ef 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,7 +1,4 @@
 DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
-DIST bcpg-jdk15on-152.tar.gz 748424 BLAKE2B f847fa95ae4eff6c9c95f23ad318d3b967bd224a5dbaea20f8e904a50173076e16723519e8985d4afd2ac02c6a7fe83399e0c6005971bd460b41055c4866a506 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0
 EBUILD bcpg-1.50-r1.ebuild 1515 BLAKE2B 25e57aba985350e8922eb0edf9f6a12dbc8f5a2750e4d45c1cb9eb0df0b9ba909ac1eb8d2aa151bdaaa123e7e6accce4eb6182fdd9105c39a2414de9eda46c07 SHA512 eddecb8d3365fe745bf132119d52a46d12a835973e5c9e3e0121822f53b525e8ee24a2b3a6c98920082c24cdc7daf2da6d9d27784abcc424dc41dfbd6a185558
 EBUILD bcpg-1.50-r2.ebuild 1536 BLAKE2B 00122a19f7a787b43507a1a73ae345bd1783efca518818511ea8d8717b42706a2c30f9af202811be5ca60317e3e18250459aa9dd82564daff4e7cd27e36207af SHA512 ad42a74689b4012041e201121ccd134af357b6296f32a4bcba1faad79b03c4ed17579e0e514bdd8c9bcf7f628ad9602a1d8de0f0ff52841a984c408f3ed858cb
-EBUILD bcpg-1.52-r1.ebuild 1515 BLAKE2B 72b4bf72e59b56261b478537c5a29ac660a1504ba824c69c17355d61bdc9284b90e4aaac577856c145576eceff0ed1d453fad2fd22f6fffa70b2c4ec0f00cd3d SHA512 fe5f38bbb296c0217acf3564e403b184dae5e3e87f7a782b55a19e316869fd41853e9c8d7825e51a6825020965c5a7f30c884ba36ccfbb030555d5ddcc948814
-EBUILD bcpg-1.52-r2.ebuild 1536 BLAKE2B e98881a8414cd34669bbe93ef2e2d70b5cf6c69ed1233b1eb6e7f019cc2e3162d6564087c1c594222eb1a9c7c18e88f8d52331ef00ca42a4803c5bf62529f3b5 SHA512 992062b60f1d753f497739101032404483e86af1a1f01121d541d17b6b122f6c16b2e5ab553e67a6292b3644b69137a8c1ff38d7551d36b22bc490f4d8d2a95c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild
deleted file mode 100644
index 74354a732de7..000000000000
--- a/dev-java/bcpg/bcpg-1.52-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts.
-# Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		local RM_TEST_FILES=(
-			org/bouncycastle/openpgp/test
-			org/bouncycastle/openpgp/examples/test
-		)
-		rm -rf "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpg/bcpg-1.52-r2.ebuild b/dev-java/bcpg/bcpg-1.52-r2.ebuild
deleted file mode 100644
index a819a8dcd7e9..000000000000
--- a/dev-java/bcpg/bcpg-1.52-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# Tests are currently broken. Appears to need older version of bcprov; but
-# since bcprov is not slotted, this can cause conflicts.  Needs further
-# investigation; though, only a small part has tests and there are no tests for
-# bcpg itself.
-RESTRICT="test"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-	if ! use test; then
-		local RM_TEST_FILES=(
-			org/bouncycastle/openpgp/test
-			org/bouncycastle/openpgp/examples/test
-		)
-		rm -rv "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	local cp="${PN}.jar:bcprov.jar:junit.jar"
-	local pkg="org.bouncycastle"
-	java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
-	grep -q FAILURES *.tests && die "Tests failed."
-}
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index 4de13138b32b..01755952592c 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,5 +1,3 @@
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
-DIST bcpkix-jdk15on-1.52-sources.jar 422301 BLAKE2B 10a1b16d0d1f7560ce71f9f99c6efaede73250a1ae298c22396c6ac1eeebe0d51c52f8a6a6b1ff68cfd11ab076d5dc97182fb0accd53e769ef9fa65c6764961c SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988
 EBUILD bcpkix-1.50-r2.ebuild 719 BLAKE2B 96642caf10144d1b4d24a4680e3ff2bad09eb12b6c5646d1e12878dcc5d71316a4807aa955df410aebb41092d4560e7ae4ec8a97a6a054ee081002a7de829e42 SHA512 98a55dac21d68a1d529d3d239a531d4d4856a68dad8b2f2f8ab4ce42ade8938863ab63f1ffc9fc77eff0cd9f4f6aab060742dc7e09bd09b1a40b66e20ad5e97e
-EBUILD bcpkix-1.52-r1.ebuild 719 BLAKE2B 333255aec4325341af338ff0c60b565132f45a7fcb40b013d13ef5090385eafd339ca6afd56c80408ae19a8cd8df8d43f2237629633822525b241497a3a1ba90 SHA512 3ae6f18ff1baf32f203e97aa82f48ed172d2cb3ee0aa5f6e1c050ccade118781aba6c95cece719dded31af0e43d9ef6233888bbbf3422ad84801408577ffbdd7
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild b/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
deleted file mode 100644
index 70751f754308..000000000000
--- a/dev-java/bcpkix/bcpkix-1.52-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-jdk15on"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD"
-SLOT="1.52"
-
-CDEPEND="dev-java/bcprov:${SLOT}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index 1db1b96287e6..4705f9651c21 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,18 +1,10 @@
 DIST bcprov-jdk15on-150.tar.gz 4629743 BLAKE2B 7ab18e83f90db38b9af9530246806b4d413718531ce4b34b7aefa7189e28ade8a2afd5d3b3dc25c8cb2d5ef23a8c7f8157ac947ae7d0a46356b00ea7dd6d5f76 SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e
 DIST bcprov-jdk15on-152.tar.gz 6334971 BLAKE2B 5ef7db891c29147ac48689a1f15e907f4a91d15ac63e8f6a031847d92ddad22cef3dff791d4036b74cd39550e9b48b1926033449beca240db2d7ac78510c22c7 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c
-DIST bcprov-jdk15on-154.tar.gz 6903567 BLAKE2B 12039cc6c7dbe06b74a0be8f9482209590ef134b37ef0bc64e97ee34f10ecd7c185bf1129f471e06347ea647d9b2d2dc5b845e0c1cefb5b99ebbe44442de3877 SHA512 3d3bf2a1d174a40941a99d1ac6ac6696e9866964bde0cb23e987e3fbd51e3dca220e16f609c29ef9e761faac670164fa9cccf90e1e0f795c33a3ce80e2783151
-DIST bcprov-jdk15on-166.tar.gz 9684238 BLAKE2B 68d75f8a8e418310179cac2e3d367f759567da280624ac9868ac265779126fa8b722f4291fe254623d92fc304ea057955180ac29a343ee628d9bd36c344fa2b7 SHA512 522cce6d381a51ff7212aa7fd7a99f85cee972a71e2c37c0dcea7e3c2dd4e44f5fa013cd759a11868dec3b6b4bd4f02bedd31ef2dd9379ce89a0d92ec8df2d8e
 DIST bcprov-jdk15on-168.tar.gz 9716574 BLAKE2B 54c4fec3d614bfe6449a10789bf7fd8d01d8d03f0a133dfd01bb7a30d3545d4dda3bbd2b2543a3827ac8988d9c9000cf7c0ebe7d5d462c6f9145c467d3f53ddb SHA512 3cdb6e486f6d1afb8c98c08809d142430191feeb757608f4abf27640fc706decf3975e3bf3f36c2a00bbc77ad2564ff9652bdc5e13662638c66a87bd250302db
-DIST bcprov-jdk16-1.38-sources.jar 1197644 BLAKE2B 758b3c894d648dce357d27f20522f8df9c70e87d83702a4eebf5a96529ba3df7fb65dfd62555544fe5f2757ed3194bccc5bc6d97a074036f8b188d84f1f85a42 SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f
 DIST bcprov-jdk16-1.45-sources.jar 1286663 BLAKE2B da19e2343761f10248f315f6966d071a87660f22fe3e51a35308a3b51f907990ef339f05f0c2367babcb06322ffb4600247ecb22b5a19bba3f5c820ed6fe2d2a SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d
-EBUILD bcprov-1.38-r4.ebuild 1336 BLAKE2B 805b34cea2e31c685e8e241cc39bd81545f5de7421006b12f86b3274a09822c42b16a391c7a9506917cb728126dc80c34c2dfacc4a0f21f4ba26b76e5c685fc0 SHA512 dd26a429c403e8e5af917ee25c3ba56891176fd62455e839a9ca3b5046f88d30b8261cb1126a29f37571f290c3232a1789e145e2384f98ffc41805363f750a4f
-EBUILD bcprov-1.45-r2.ebuild 1343 BLAKE2B 1f4e510474a375d532313eb6c6da68fa8b039ee361103d3c44bbc85061ccfce58979118a3be71e190e7ce68bb6c8a291561952a89016bc8a1f3654ceb901ae6b SHA512 d2c2dd791cdcbe27d98b804bfbe5caf5ee04f0a58568ad9917bc0eee43d9547e01cfcd059eba55b39e0e1cde821e75fcb71c15c3bce0afce9213326490341c96
-EBUILD bcprov-1.50-r2.ebuild 1347 BLAKE2B c242438b0f9a8b1802971c1b44424e76bf6c2c11cf359cef7bcb317024c39c7828d6aa901f309055f8c51a180495cf4c3e9e41a788cab4e0a1ae15c3daa83d03 SHA512 3ad3610ab9b2459797bb1fb864582e9e38f85897982f8b1db0ceccb01a80393968a778f11efe04cd59e9b93c5cad2d684e31ac62cc2de6f12192804c847ef1fb
-EBUILD bcprov-1.50-r4.ebuild 1325 BLAKE2B fb30ce92623bec2ebf9b94b7e912224ca2889beb20ab18b72e48a5b9e26a1f204481bc58fbf617af97c0d09297769c0ee303a8c2e3cb5f98edc57f880fe0f7b9 SHA512 19f3a18ec7f7394d75a3943783bf5c84c12b539e560b05492b9affbc946551bd4efa51a38968067a703fac93e7e07c0b29c8b317dc104423543c1c68f5a37191
-EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158d2a396ee002b91f55a917e5eefc2e1cd9c9c4e5b3dc4b0c1eb0899d693281e0098146de2a448353191092cb50a SHA512 005e608991619786a105699c981c0ac63ae3cd22bd1355aed66693a482b7da25e6474f60dbc11d38c6ab9f8b1202ff3d1b8b6b38f2e404512439b646998957c7
-EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
-EBUILD bcprov-1.52-r3.ebuild 1325 BLAKE2B 5617350d06e52736b19b1ccc87aafc4bbfa5b02a3c06fe7dc4ed33f46dd8fa7a6d85e8f3546be83e14790d8068439c3e0f923e6f95cac1839e077dd004a45777 SHA512 cff73472e90c3bdb219a926fb65bc49685c42def85dbb5fa5d936f82a7dc3916f82c2f27e401cf94bbd32773b9d451c14c0392e49b433251bd631e81b4718c98
-EBUILD bcprov-1.54.ebuild 1332 BLAKE2B b7575fc50709ff5c4250b07b8e72ed008d426236746e8a037ae75693a4496d4a519152878090b922c18aae8ac68056edb47788f49f9e8f7f2bc7cddd1f43f8d6 SHA512 f38d0fa76c72147986c206a1363c8e90f65a7a7efa85a07b91e569dbea4cd55a4702fb9e2323ef95b2423d9c8809073a4233fb5999ed0688994c686d5415a376
-EBUILD bcprov-1.66.ebuild 1340 BLAKE2B b42730a69ac44de04f9e7f006055936f40935a11409f7f6610717637aca7fa265995a604beaf4ae968bfdc3d24a8ac63ca9082f14d7107b20fd13ca4e47701a2 SHA512 7ff6b9d93cab3464478e720cc636bec5da40444bc03867cb4e3642f1c63039f0e1869c3ab1972c1717865c39fc2021c6ec25277f2c6d90aa7aa828c6074014d8
-EBUILD bcprov-1.68.ebuild 1213 BLAKE2B 427ce6742af15cd32a92fafe74e119a134f0203a170736e7afbe4f7ef6c65bac1b027f4d0f149ac61664faaafcb77fa4da3236e9c883a8b4ba8c4ab253e4f97f SHA512 f39ea32e386c2d46a84cafab19f72ebf9b9b517f04ee70dcd2fda75b5695376bc196a23ad39c8258ac657daca4ee3ccbb7a6e75f761d62722ac63ef61739d0a7
+EBUILD bcprov-1.45-r2.ebuild 1341 BLAKE2B 7012f9298f272a44572585ea8c66a8cc61b79e77d026e70a90438f54ce7bca1c88afb5d45c1558797e15bdc687a6c59b3fcba2ffb74e16c822a4728a9ea409ad SHA512 2ad36124570b18e0d294eafeedb0a8d198a72520d58eaf3e93a5e311928f2b0ba7b86c684ade27ab1b9654be359024de13279de3095568bdaec458babb8b2fcc
+EBUILD bcprov-1.50-r2.ebuild 1345 BLAKE2B 6e0103ebcfa6a52bdba02bb40f7085d0361b988e0087ae2d07be9980c2d28825b0014595151cfa23bb24e8f6af2af55b518c64c349b0c6539b97ee3b8a9117b5 SHA512 ad7a4d8cb6ee19336768ffb8eed5ed9f44110fccc0dcd3768ea06419cbbad05de344f2a832333f686f2f00ffaed1f33e1cca9b948be87883208434d77bc5e286
+EBUILD bcprov-1.50-r4.ebuild 1326 BLAKE2B dbd3892976d4eaff7e3af566e13c5f38d5b74bf27cbb3290f3846d560dd0393156c41e6fd92f435ca6bf6609692c195c75743f6c87698bf99cb843369ad7ee92 SHA512 7dfed9b2cae7ea3914278b7be298e517796d8623a33109dbb62ddc87b6d284bcaadf4f4b88d890a1bb8d9447c3b6dfdc80239bdf0b3d5b74e3b96bf99a9485f2
+EBUILD bcprov-1.52-r2.ebuild 1350 BLAKE2B 145f54219d8596d18127ceb1b626bae03bd4cceec442a1e04c5f8f64ce53017ddeb78e2dc33e9d781123e8392dbd249914cd9614f6da6c010665950b8fb1f6a1 SHA512 cd874722a978e52fda5ee92424cd8a0b430c9b9e4c6ab797fa1b0bd63cea199e0f40d4cb4ae1a62d2eb22921665e6580cebe7ec7f5c681ffc349f73b4d9cd334
+EBUILD bcprov-1.68-r2.ebuild 1168 BLAKE2B 33c9797b85d28424bf6f20ac3a34740f14e60a8978fefd0c0fbd8c259637b059587a429d74f67a22f0380f367965ba6ea21c85cd945305de8f025f23211b6f24 SHA512 c1e47f1a31d667564d8fc62c671fb949af30122a1d216fe0b4c44cce038c4d92d4c56ad931b07a9c338fdc4e484571572ce699503166ae8d60a1f338a15e7389
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild
deleted file mode 100644
index e44ab2704b0a..000000000000
--- a/dev-java/bcprov/bcprov-1.38-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN}-jdk16"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
-LICENSE="BSD"
-SLOT="1.38"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="org"
-
-# Package can't be built with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild
index 2722165d64d1..3fe4eb54c7a3 100644
--- a/dev-java/bcprov/bcprov-1.45-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MY_PN="${PN}-jdk16"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar"
 LICENSE="BSD"
 SLOT="1.45"
diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild
index 1eba489d573b..a2a400806d60 100644
--- a/dev-java/bcprov/bcprov-1.50-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_P="${PN}-jdk15on-${PV/./}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/bcprov/bcprov-1.50-r4.ebuild b/dev-java/bcprov/bcprov-1.50-r4.ebuild
index 03655298b7de..dce87d213ba8 100644
--- a/dev-java/bcprov/bcprov-1.50-r4.ebuild
+++ b/dev-java/bcprov/bcprov-1.50-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_P="${PN}-jdk15on-${PV/./}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild
deleted file mode 100644
index 2ac1295addb8..000000000000
--- a/dev-java/bcprov/bcprov-1.52-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CDEPEND=""
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}"
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.52-r2.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild
index 6c5634bd30cc..7f00aae4ba51 100644
--- a/dev-java/bcprov/bcprov-1.52-r2.ebuild
+++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_P="${PN}-jdk15on-${PV/./}"
 
 DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
+HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/bcprov/bcprov-1.52-r3.ebuild b/dev-java/bcprov/bcprov-1.52-r3.ebuild
deleted file mode 100644
index 4f24d02ae549..000000000000
--- a/dev-java/bcprov/bcprov-1.52-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.52"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}"
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
deleted file mode 100644
index 45c74236f28e..000000000000
--- a/dev-java/bcprov/bcprov-1.54.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="http://www.bouncycastle.org/java.html"
-SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.54"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-java_prepare() {
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.66.ebuild b/dev-java/bcprov/bcprov-1.66.ebuild
deleted file mode 100644
index 73e8d4e2db3f..000000000000
--- a/dev-java/bcprov/bcprov-1.66.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-jdk15on-${PV/./}"
-
-DESCRIPTION="Java cryptography APIs"
-HOMEPAGE="https://www.bouncycastle.org/java.html"
-SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.66"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND=">=virtual/jdk-1.8
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ENCODING="ISO-8859-1"
-
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
-src_unpack() {
-	default
-	cd "${S}" || die
-	unpack ./src.zip
-}
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# There are too many files to delete so we won't be using JAVA_RM_FILES
-		# (it produces a lot of output).
-		local RM_TEST_FILES=()
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Test*.java" -type f -print0)
-		while read -d $'\0' -r file; do
-			RM_TEST_FILES+=("${file}")
-		done < <(find . -name "*Mock*.java" -type f -print0)
-
-		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/bcprov/bcprov-1.68.ebuild b/dev-java/bcprov/bcprov-1.68-r2.ebuild
similarity index 80%
rename from dev-java/bcprov/bcprov-1.68.ebuild
rename to dev-java/bcprov/bcprov-1.68-r2.ebuild
index 97794d5fabf4..9a985d3a815a 100644
--- a/dev-java/bcprov/bcprov-1.68.ebuild
+++ b/dev-java/bcprov/bcprov-1.68-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.bouncycastle:bcprov-jdk15on:1.68"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -14,21 +15,17 @@ HOMEPAGE="https://www.bouncycastle.org/java.html"
 SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="1.68"
+SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-DEPEND=">=virtual/jdk-1.8
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
 JAVA_ENCODING="ISO-8859-1"
 
-# Package can't be build with test as bcprov and bcpkix can't be built with test.
-RESTRICT="test"
-
 src_unpack() {
 	default
 	cd "${S}" || die
@@ -38,7 +35,7 @@ src_unpack() {
 src_prepare() {
 	default
 
-	if ! use test; then
+#	if ! use test; then
 		# There are too many files to delete so we won't be using JAVA_RM_FILES
 		# (it produces a lot of output).
 		local RM_TEST_FILES=()
@@ -50,5 +47,5 @@ src_prepare() {
 		done < <(find . -name "*Mock*.java" -type f -print0)
 
 		rm -v "${RM_TEST_FILES[@]}" || die
-	fi
+#	fi
 }
diff --git a/dev-java/cldc-api/Manifest b/dev-java/cldc-api/Manifest
deleted file mode 100644
index 849525836a34..000000000000
--- a/dev-java/cldc-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cldc-api-1.1.tar.bz2 142368 BLAKE2B 3f17d5edba61d8caed820a230156485b995985b4bd04e01982bc84de9c28d890e4ba8d30c24c2b1c211d43c666b7e92163c0442a2cfcf1540ac404816145990f SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e
-EBUILD cldc-api-1.1-r1.ebuild 883 BLAKE2B 83818d42b3a4dc2685c987273ac6bea38e99123aaf582fabbcd1ff1c620cd087640e22ee70cfb69f3ccfa6eb8ddb9ca85886363695c33cde04760b38e8618937 SHA512 530df8267ba39c9c6a6fdeac2333dbf5239fe6a55caee592e732c257e5c3988160c2637219dd35c1ceecf375217ed7fde5567cdc38f6cebb9f0529a552baa5a2
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
deleted file mode 100644
index d502d5ee9bc9..000000000000
--- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java ME Connected Limited Device Configuration API"
-HOMEPAGE="http://java.sun.com/javame/reference/apis.jsp"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-# mkdir cldc-api-1.1 && cd cldc-api-1.1
-# you need a login on dev.java.net - use --username username if different from your local login
-# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/cldc1.1
-# svn export https://phoneme.dev.java.net/svn/phoneme/components/cldc/trunk/src/javaapi/share
-# cd ..
-# tar -cjf cldc-api-1.1.tar.bz2 cldc-api-1.1
-# move tarball to distdir, scp to d.g.o...
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-SLOT="1.1"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/cldc-api/metadata.xml b/dev-java/cldc-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/cldc-api/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index ad6cdb8d958f..f8a80efeaaed 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,26 +1,12 @@
-DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
-DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
-DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
-DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
-DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
-DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
-DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
-DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
-EBUILD protobuf-java-3.13.0.ebuild 1477 BLAKE2B 669066ea60706166627b293179241302d89a4b7241e438a7f98c49992b5283eb201df25b0ee93273276324c3974e64062c80b108168e64606258e2d59f6e30f4 SHA512 a4883fd56780e65ea4cdb48a8e830a996c1bab4b92ab7a5faec99bc0e6711ddd03b094e5607a23bdd8d946161282ea12f19920f14943542c085256e6d2f8131c
-EBUILD protobuf-java-3.14.0.ebuild 1477 BLAKE2B d5d8bedf978eeb76193bb80eeb09bab5c88f61e1c84d7f4e01e28000dcc3915b3d8c88d123adf0eb2184dfe6a9260d4102492ba78ee99e2a819f38f85fb2dd41 SHA512 fe8bcf262d3b3a6667bd7d81dc37b09a38626e9f97567485a682fbbd148cd822fb76eacafb4044a3b561aca29631ffbefe83ba6e7e4b20ba3397d872b5bf0535
-EBUILD protobuf-java-3.15.0.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.1.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.2.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.3.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.4.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.5.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.6.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.7.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.8.ebuild 1530 BLAKE2B 1a33d7ecab3aed288e3ce9e08ce096a43fb156ee50228d77ec00f7f035bdc46da13ddce3e87f475bf2b48430dc9714af7af553975bdce0a6868ac53546b2a374 SHA512 b3e8ba1623123f878d6b0f1b0cfa1ca60a475498950ccb65790108c8e3e1e3ee1af039b1b5983f0caebca527246f46a271a829b43518a230a78d6ed745cfda09
-EBUILD protobuf-java-3.16.0.ebuild 1486 BLAKE2B 69877c74e61fc0ca7e651fd295100f3d6d3184a1848ed9028294e10437d52c833c7ab62ab31932578e4be02cfa413a3b20b3d6bbbb96502d2242466f2f293ef7 SHA512 f21c4393f0e3ef52637bc14accf6f44034d39b7977df950f4bce9723a33f443d64f0f80e8fdfa2116b38dfc7fb9d1c281d6968ee42b00a7ec5a0435267d22147
-EBUILD protobuf-java-9999.ebuild 1421 BLAKE2B 0a6c46886ce93f7046f9ca8253cd9eef9891489404ee1db453c55858bdb9da0a2e086180931fdd25522b1e24fe93c7cbd250693b16cebcb1812505bee90021df SHA512 663f868284b168692437dff7adf0ef1f9b18365d7c554b728e80e8501d798cf2816292b5b82b263e095e46760b8ceafc8731739005d1114677b2c5943ae0a773
+DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
+DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
+DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
+EBUILD protobuf-java-3.15.8.ebuild 1498 BLAKE2B e3e42bc2d5a80adfd042dfc39b3e864517aef340432098c12859a9af83c2da2d66fc7439837efde9623343dfdb05c8870e2dd05c86db6682f963b7aed69e00c5 SHA512 a1552b542ba396f983ecda47dcc4ab368a9e523c8759edaf4da5c481e1639718a2646e4332d99fe4a7b545c8d5feb23a6bb6f535d0be8eeec152adf6f8ce4065
+EBUILD protobuf-java-3.16.0.ebuild 1454 BLAKE2B 72947e022e40f1584a085c0b04a4d14f7cbc5481efb650ef6554287aef504d0de7ebc39fd4c6696f75f8d621e2f960c4cd823cc385320e6d31bac51705249612 SHA512 634b18db5449411fed2546618bcd702cd5a8283f0ae00906655784c16de0fc56b39da567daf471833073635be31b152d0ff3149dbe4a18edb86c8c2660bd763e
+EBUILD protobuf-java-3.17.0.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-3.17.1.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-3.17.2.ebuild 1454 BLAKE2B 8677e5ec0fdc53308a9a219ba1ffd719112e46075f6c376a1d88c542039559173bd9a7b7e386021a78e3ea0c41a66af2effb263d8cb6ff11a4da851a2d7d5dd1 SHA512 125deb6bfb83d79ae3f6169c92ab9d17ea0c4c5f47123024e418811a1460c2c8e96e872c340c19b43991d9b566c5fac5a422278e15944b14cf5a7a6e73610575
+EBUILD protobuf-java-9999.ebuild 1389 BLAKE2B 3ed9ebe10fa9926d513e6f9367c6054cea58b33f007cc4250d251376c2a69b0e9aa305dfa88c7db109ce3262d0563d345ba4bdda98e004cf2ffdb699bf81eca9 SHA512 b8df11ef1583f01bb9633e67e5c6aa9b89782a0e42a15c94d5d826926887b45a068b8ef563ba08ded7c14ae1ddafc6f36dab761d607fcbb7122195b41d2edf67
 MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
deleted file mode 100644
index 73f37de7f484..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/24"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
deleted file mode 100644
index 6b33107b79ac..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
deleted file mode 100644
index dfd68dd9ecf0..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply_user
-	popd > /dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
index dd91ba9be92a..6c648819d2d6 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
@@ -31,8 +31,7 @@ IUSE=""
 BDEPEND="~dev-libs/protobuf-${PV}
 	>=virtual/jdk-1.7"
 DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.7"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
index 0c639fe2105a..96752936a170 100644
--- a/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
@@ -29,8 +29,7 @@ IUSE=""
 BDEPEND="~dev-libs/protobuf-${PV}
 	>=virtual/jdk-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
similarity index 91%
rename from dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
rename to dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
similarity index 91%
rename from dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
rename to dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
similarity index 91%
rename from dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
rename to dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
index dfd68dd9ecf0..d24b960991a9 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
@@ -22,15 +22,14 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
+	>=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 19bed69c6fd9..11d9796bf900 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -29,8 +29,7 @@ IUSE=""
 BDEPEND="~dev-libs/protobuf-${PV}
 	>=virtual/jdk-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*
-	!<dev-libs/protobuf-3[java(-)]"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/protobuf-${PV}/java"
 
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 0e8b76d8be0e..6c246c83b682 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,6 +1,6 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
 EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
-EBUILD sun-jai-bin-1.1.3-r2.ebuild 1091 BLAKE2B dc4eaaa13002d5c337ebf76af5804a17505c2d5d6bf57d5b51a574bb37b46531b709d650f84d0d5d1b04f95fb9409c53a055a4b2f6ca4ef97fea054ebe121f32 SHA512 4b3bb1f789012d207d9d8ad0b407a9491195f079f7c2df72024bedae8003bc8f0767898f77fe8e8bf854b8f8eac040d1eb7a5de464d8c76d5e7cfdb1ef025740
+EBUILD sun-jai-bin-1.1.3-r2.ebuild 1098 BLAKE2B df294ee2f8d42e2f14d05a85263d16e995ccff915ccf68f9d17f2b378afcb0c9341f68c8fc9b2c09c57736a06799032e9354484e1d84554e9fea9b6218efb8cd SHA512 3e664d5a3bf1585e7e8014a93bba9468ed7fd0bd21f4c11f85d7ea09eabde526a8b0bb8761d28b896170a63419722d5e97514a6fc660702fdca736e93caa4a71
 EBUILD sun-jai-bin-1.1.3.ebuild 973 BLAKE2B 07e9e2c6e99b48b56f5ea8dc8d1bc8efc9d5a353b79b398ba078d92e1d92e286d61bad00a81a580e108a64317b3c87644889cb87dd1a69f51683f59380ab4a83 SHA512 2a2e4756e1b32c14d25642d912cba5b08371d4722b69fd0bf0db0f8c8d0348a7f4bbd136b9d28fe9355f3baeed54492c3b22bffce8f616c3d3c992feb518bc0e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
index 1f5ba79b8b0c..dda39756714c 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="sun-bcla-jai"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 DEPEND=""
 RDEPEND="virtual/jre:1.8"
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
deleted file mode 100644
index ef4908cbef6e..000000000000
--- a/dev-java/tagsoup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
-EBUILD tagsoup-1.2.1.ebuild 1071 BLAKE2B 3205b951406d934b0f00686454e44474bc71df8d027150a24f1a042aa5d698f4de9dd23aba37a47727904449e0a6b785ba4e8f3d278c26c8ea66dc2ff71e2339 SHA512 a01329a96bae4547379027d079fadbc1b9276c543bc98aabbbd0ad0d18e6a6145906b9df77c053da1f3e61fbd42f609bf8ca9950edc89f51b95c7a572fd20966
-MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/metadata.xml b/dev-java/tagsoup/metadata.xml
deleted file mode 100644
index 6ba5054b0614..000000000000
--- a/dev-java/tagsoup/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		This is the home page of TagSoup, a SAX-compliant parser written
-		in Java that, instead of parsing well-formed or valid XML, parses
-		HTML as it is found in the wild: nasty and brutish, though quite
-		often far from short.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
deleted file mode 100644
index 501db89baf9e..000000000000
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A SAX-compliant parser written in Java"
-HOMEPAGE="http://mercury.ccil.org/~cowan/XML/tagsoup/"
-SRC_URI="http://mercury.ccil.org/~cowan/XML/tagsoup/${P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="
-	>=virtual/jre-1.4"
-DEPEND="
-	dev-java/saxon:9
-	>=virtual/jdk-1.4"
-
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="docs-api"
-# Fails to detect a TransformerFactory. #421733
-# See also https://issues.apache.org/jira/browse/XALANJ-1549 for why the default is no good either.
-EANT_ANT_TASKS="saxon-9"
-EANT_EXTRA_ARGS="-Dtransformer.factory=net.sf.saxon.TransformerFactoryImpl"
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.jar ${PN}.jar
-	java-pkg_dolauncher
-
-	doman ${PN}.1
-	dodoc CHANGES README TODO
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/{java,templates}/*
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f13a3cf3f7fc..5e672ec80649 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 01b900e5e0ea..2ee1450b6a22 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -6,5 +6,5 @@ DIST R-4.0.4.tar.gz 33687611 BLAKE2B 40cdfd98fe6c9193deb729d151631c2b0f935accf5e
 DIST R-4.0.5.tar.gz 32466444 BLAKE2B 5dbbd289f4fd6347b4109eecaf65b50b5793a83edddd2cb391c20473607f136d91a8e9f4ab9e453f6927d2ca9145762920424e3a1dcea89309afde56efd5d32c SHA512 6ff5b0f9cb6b17f66cde1f5585d1b33659dbae8919d34c2e593f68a0bff4d0425aa9704d99284d103702a9cd42f613311f3a87af6b939b1af65dcec80bf2ca8c
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-4.0.4.ebuild 7311 BLAKE2B 63fc04096321ca5d5e3c947816ad02bf1b1fee47ea9e4500006ebc356dbf4aa70aca631497988ac33fb5a1e8ab2999a23f6b1d4519206a73993cefb79d2f9884 SHA512 6bcae68392035fcb25cf55e5e0dda41ad746ab5dcd1868477da801d8d7af82b0e3d0b52fa2d82009b43ea892bd9cf2c5b57c62aca4a7ee36a431e6f55b4cdf44
-EBUILD R-4.0.5.ebuild 7315 BLAKE2B 77445afa767b02617d92ad61c3c8af84e9a4eb3715579228129c254341382e08b474dae18b819bfe1b559f0e3a48e09a8bde653a16106047a10237c43ed1bb95 SHA512 3c8bbd24aca4985049f7bb6c13dddf22e0eb454658bbc7bd973920a802a35a7f180ba91792a5ca42f72887181d878647a60556d0d64611bd29eef241a3fab225
+EBUILD R-4.0.5-r1.ebuild 7317 BLAKE2B 315e2839c034b781875038a95915c20b2a7119d67f574031567a193387cd2b00064be5040da1c2f4e702652acc2a58d9e810d5a0c8b6ee43b5d6b3727754c4a1 SHA512 822f867dd53fe9a81208d9371c590191abf08c048601ec5bdc77ff9047d624f83918809d3a61ea3281de69c79165f18782915ae7c13b65384bdeeee7e647b37c
 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
diff --git a/dev-lang/R/R-4.0.5.ebuild b/dev-lang/R/R-4.0.5-r1.ebuild
similarity index 99%
rename from dev-lang/R/R-4.0.5.ebuild
rename to dev-lang/R/R-4.0.5-r1.ebuild
index 560e83d01f72..0250344292a2 100644
--- a/dev-lang/R/R-4.0.5.ebuild
+++ b/dev-lang/R/R-4.0.5-r1.ebuild
@@ -59,7 +59,7 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	sys-libs/zlib:0[minizip]
-	java? ( >=virtual/jre-1.5 )"
+	java? ( >=virtual/jre-1.8:* )"
 
 RESTRICT="minimal? ( test )
 	!test? ( test )"
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index df0762240088..62c9c6c3cae4 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -9,6 +9,7 @@ AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f
 DIST erlang-23.3.1.tar.gz 56654422 BLAKE2B b1ccd870d4a47f12d1a65b424d6c6b0f59a4654c0779c595fb28fdc2d3e179bb9b12d2473770b239b65665b2f6a3281d239f9fb3d6b86548df3ee69fce8fe5ed SHA512 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0
 DIST erlang-23.3.4.tar.gz 56664814 BLAKE2B ef8aa8d5a6fd1efc02a35459d1cb15eecf5f948127266bf782544e1da9a59765aca15070ea92df5558a4de017cc810e3542e2393e9470243fc6d9be13e9f37b6 SHA512 c8c5a9676163058276c703a0db0373508fad0ed9dff0aa9806ce59115ca766ff1d343c5a3917a920b249655fe188b974482ff378e9173c9fe00ea3907e618da5
 DIST erlang-24.0.1.tar.gz 58860070 BLAKE2B a52f6f18173f7dcc79cc3f47155fb08854eaef29e52b78e5b78f5239c2f2617c20be3878ba01511d942f0fd0351b44c982fd5ad29ed1da6d8939d05364342238 SHA512 8e6588e69e58395c92a6cd9e63ff4da688e8fe8b1cc6dea3e3bb5b102940854a73a1a6363e8f94c697117a7be0f8b07712cb584af1d9ef9947eb87b09c8559e6
+DIST erlang-24.0.2.tar.gz 58878378 BLAKE2B c2ea65cac39b654d9037ea9fcb47eb6eea96dec2483378f414bc33475e850121c1adaa30ea880070624496be9779539f98c864b0dd6eb92d3c4badaa121353d1 SHA512 d85e3e6a4177ac8c696dd666183f624065a89d35aa7f031cd6a7b105e0d1f9007de8d413880df47daf8f695485d952a81a14a01313b52f66534c1e5bd050093b
 DIST erlang-24.0.tar.gz 58258571 BLAKE2B ee71c1f19a1d990977d3764bf4122593a216e4bbbef7e5a8a5c7e22142171ef869b4a5ac01aa1f4495eaf79808cbb677d4163a52917879e2a615f08e20480c7e SHA512 bd3e4dbe640e80dc2173bc9c92178acbd6aee7a486a1eebb7fe8ec70963b8c94bb456af7ac592f434700cd8b1d98ef8351bfc7a76113bbbd0c9a0e20fd68629b
 DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
 DIST erlang_doc_html_24.0.tar.gz 39731398 BLAKE2B 8a9fe3acb4cc13691e16c477cf89e8298df1a99bbe6a6c9e59e3c34248ecdc21077835951087b5a5bbb23ddb28f3bd7ab8b058fe64ce56c342b825a6c0ef8948 SHA512 453f8a9cf779a4f43966615433afc3be3aae7a571acf45974947bd720a331ca05949bc310de5f3b33b72d274971103ede56875bbfe757ba17f903510f690d97e
@@ -17,5 +18,6 @@ DIST erlang_doc_man_24.0.tar.gz 1666152 BLAKE2B aaef8165322f39f7410840eafe562ec5
 EBUILD erlang-23.3.1.ebuild 4499 BLAKE2B 06891eb432ae12d43e860ce0773eb01768ea75ec4f16c365fbe16c22093039e5b18aaa4d3ca558f7a64cada0fc405ac0ba898065b80c778ad9253197302c5145 SHA512 09397c1f46fcf92ef160dee067b9dbf9e0a9125e112f28748180166ddd0394ad34f03e0ddcf32dccff101485927f41c1b1a4376a66bbfd52c8fb2f74bfac27d5
 EBUILD erlang-23.3.4.ebuild 4504 BLAKE2B 16b09bf6af1c223776b5cb2c55c32dbd5eb540cb9ae12496485f64bc1820c4118575a155440764144e10c6d50609db02ae5eb2c691a0bf82b63c0ec1454a4f41 SHA512 f4bf67b5b4bba5734893e67c50e46c7387c192455befea44eabf1ca5aa1f76dd05eeab1dd9eb7c34c230553ce0864493e81e3185fd5d6554a8cc239ecb49f441
 EBUILD erlang-24.0.1.ebuild 4523 BLAKE2B d17d8fbb7bf14688c4ca9bb041d451cb5cbf37be845ec0e7be165c3a9bc7fe81efd8a0fc7084cd6b5fed930eaad4258be20a56a98e1d19dff6ce9f27ff9d8425 SHA512 d8739eda6d6706da9db5c9bc31048e366c1fc5a4d62d70f732b74b6a26babcd86254678b6ab0572a0b02b1d38fa1bf2205f10d71c670f932d8212b849c567197
+EBUILD erlang-24.0.2.ebuild 4523 BLAKE2B d17d8fbb7bf14688c4ca9bb041d451cb5cbf37be845ec0e7be165c3a9bc7fe81efd8a0fc7084cd6b5fed930eaad4258be20a56a98e1d19dff6ce9f27ff9d8425 SHA512 d8739eda6d6706da9db5c9bc31048e366c1fc5a4d62d70f732b74b6a26babcd86254678b6ab0572a0b02b1d38fa1bf2205f10d71c670f932d8212b849c567197
 EBUILD erlang-24.0.ebuild 4523 BLAKE2B d17d8fbb7bf14688c4ca9bb041d451cb5cbf37be845ec0e7be165c3a9bc7fe81efd8a0fc7084cd6b5fed930eaad4258be20a56a98e1d19dff6ce9f27ff9d8425 SHA512 d8739eda6d6706da9db5c9bc31048e366c1fc5a4d62d70f732b74b6a26babcd86254678b6ab0572a0b02b1d38fa1bf2205f10d71c670f932d8212b849c567197
 MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
diff --git a/dev-lang/erlang/erlang-24.0.2.ebuild b/dev-lang/erlang/erlang-24.0.2.ebuild
new file mode 100644
index 000000000000..01313ebc6b11
--- /dev/null
+++ b/dev-lang/erlang/erlang-24.0.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	tc-export AR CPP CXX LD
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index ec022d9c9260..8e5a0eaa2617 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -3,6 +3,7 @@ AUX ghc-7.8.3-prim-lm.patch 444 BLAKE2B a930bb9657441a48941debf79711e06223c5680d
 AUX ghc-8.0.2-no-relax-everywhere.patch 766 BLAKE2B 76ca925d56a9d2961cd342971ef8fb0165158d707f0089f3726560511e57ee5c08adeaf996595378d1cef3ec7b59ddf1df06d0255bf20da51c5b26e817f4057b SHA512 b729ddc27bbf089324f0b4d7229925226b59c0047cec0c0230e022fb8554389373e309e93a108f0aaa155fd9ff6957a7d41cdd35a90c6ca59b216381ff21483b
 AUX ghc-8.10.1-allow-cross-bootstrap.patch 541 BLAKE2B b77b3c9ebb7a33af6f82ec1b9927664e9bfce04450560a8e436ffa87feca50d606824192b7333e3b98d5552622592b6d39d0b184037ce646d6f7ebd205deb348 SHA512 d87a99ac96846e161d8c939079f8314d380be8e1dc62f956e3afcce1339a76447a14002b30bac1c86c807fd8eba23a0648912a3d074248f3513f9aadacd27489
 AUX ghc-8.10.3-C99-typo-ac270.patch 348 BLAKE2B 8d23baffa0ae781db4610ee78fea812ebc25450c94e942d8008c591cca78c6072c24b042e7a9dab08ae5213ed4ba931ff932ad4685fc029fc004039494a70c7f SHA512 9e224c6863b5f0f0deb032d4554dd41f2396a8cbc373b860294ba76feaf1abe7594711ac02e9a06356c024df8d6fc6a7a064ca428eaa1e4e6209b3a29d4317fb
+AUX ghc-8.10.4-sphinx-quote.patch 872 BLAKE2B 2459d9b2d7d7d30eb0fdda999ca0da86264bbe324786eecfd4a2eab0eee04cd50e378972901a0f84c31d857321218b455aab452e87386c5b3659d4d619efa196 SHA512 05637a55c6e27fe4a128c1978b86c72b6d848cee609c8fb035f32b2d48a8d6536add73717d1dbb232a2a84d7834c80455e6e67000f58813447f7e555b6868d39
 AUX ghc-8.2.1-darwin.patch 910 BLAKE2B 2f1a44dd7ead59301b5dd59c8cab932710655416640f2c8d5273cf07da4a45bf702d840768e2d32822e89f1b07cc9ed3a6110e1847e11468fca5c515e9e26f70 SHA512 0177fda8717d9158a99d96853feb1bf40ff13df8f5c5669c7c48f33accf69d6ddb05876776cda66705e85ee56c5ecff8f81722d8e748b6c2ed6b9bf611e42a2c
 AUX ghc-8.2.1_rc1-hp2ps-cross.patch 3865 BLAKE2B d68b1e15c091047d086be780dc0bb5ce2a1b713244ee240ae045052ccac947baf6a5bdea8cad50d0fac2984700069af7dcd320b96ca09af8c7b81021329da41c SHA512 d2ed48701216f5c03567e61c207e32d6218009380941275c690edd8eb0197728e7e3c0edb00d512792dc2041a958de82ceef393e96d3324b690157162e28d29a
 AUX ghc-8.2.1_rc1-win32-cross-2-hack.patch 6231 BLAKE2B 8ad4428ebe9a373e08e94e5373ad9578cafdf95b866ced2a4000434d9e5d4298b129e832e13e8e175e8977b9dda9351d01a896e2c320a1a40551d5892b0efc33 SHA512 8617c1346ba7aa2b41ee01feaa47f2ca477353f9b825be48c5d3505a134e0a80b613efc6cb92e7fbd3fe062e77450e197c826151a42c0c77177fc6ef8e65287f
@@ -12,17 +13,22 @@ AUX ghc-8.8.1-revert-CPP.patch 2236 BLAKE2B f793a9e9516f9f484234311372715116dfdd
 AUX ghc-bash-completion 6496 BLAKE2B dc94a1979e886026a2fbe04bf7b45718ffa3e025a0e8945262e21a1243bfce6517fa1794f2ba6cd54cc853e93ad5d80472b9019b95762f10b5be83634a479955 SHA512 ede79ccf23555f60f48297d29bd98e3ccfd67d2cf27462153e00beb930398cb497e34ba8316e91df44c577ed11fdbe5606f7c6a2777e35d5e783590e49ccfeb5
 DIST ghc-8.10.4-src.tar.xz 19818108 BLAKE2B 069dd8436c373ccf73c20d8b577243792ffdd3a031e869edd612fe1e273126e60803326542695012dbe62e57654ada18af9342bbe1a741b2bebb41cdb0d86035 SHA512 9bb078cb72535a352243b83b671c871392564efd09e478549f27ae58fc6f46e337a0782f5500d26d5704ad96eace22e77bb36031a1fe9b7e175f265b0b9c028b
 DIST ghc-8.10.4-testsuite.tar.xz 2236932 BLAKE2B 17d0520ad5c6daa0cc60530279ae7e617e4d79328b9f436abbe75e72f0803d9a997fb9e1ae61425326b070f45794a488d8507957fec9a6ed49eea86d30a1e579 SHA512 1bf129c8d872e3ceff7c19929605adc5d68daab9ded9aa2e5109b0de162089631472c66f04993adf8481291f8128bf804fe64a9d344c81e257f1b962ba5e382c
+DIST ghc-8.10.5-src.tar.xz 19920148 BLAKE2B bd3b702fdac4d1c94366bb233a665c2f5677b795d9041c61cc13d813aa43738d5270c3604731f964393035cef90768d4c6e0e401aa35fec6dab61465782f41dc SHA512 b5f39be0accd5c1cecf1cc326ba3142f561d2ac93e9abf366fe46307d7c0712aac244836e659e1a4d9d0fb98299ea96edc8e8a06f3a81b528b14914b94057ffe
+DIST ghc-8.10.5-testsuite.tar.xz 2270504 BLAKE2B 076afc4565c7ba52814547b09313c44bfc3875fc0b05d1af1d3fa702cec9b6b219d86fd56d26a3df07aaa00b37eeb87c58b509162a231bf4e03a07bcc57e9550 SHA512 adae7ff8005c73fc5ded42035c51b1ad6c476beed54de7ba336437a67e81a75d7af8c1be3817516e877b1b2ff0e771fe667d07b93d3a73de8df26a06ed42f334
 DIST ghc-8.8.4-src.tar.xz 19395252 BLAKE2B 6fa898b9552398a724f0452f5cc88ba073264a5645288c73507258959efec40ce5a56a0eaafdabe58f15c5a9210b2c9da5954411dff5c81c52e061569d6a350a SHA512 efd23bd819f7429486696a3a929a040471db7ea8a2d1f1d832e4cf0825b9e1e0c5e6ecad0ab8376f58b74e9c28c1d2f773bd126596d6d853c9e57d57e5ceb090
 DIST ghc-8.8.4-testsuite.tar.xz 1965820 BLAKE2B 3b715700561788b8abdc986961d533b91399461d57a1686ededb4ccc36881503cdc3fc126b9a7b204a728c24b9a9ca97320142348644367aca9b47c87a5b3b51 SHA512 79d8fb0ba8de0fb48c938bd54c8c3278f1895d8ce5c700ce8cf6b3fc550073bb757208e85d4f9818400ebecca96f51d9248b8bbdac9eb2995671756164d08c16
 DIST ghc-9.0.1-src.tar.xz 20782336 BLAKE2B 53eaf903081d705d641459fbc1e6fa7387a6039f9cd466b4708bda86e81252a84d80878d6eb956ec2e1e5b721a313e68eeb796f8345244ca62f536a7a3f0c6df SHA512 bee7950a5118be8d8cefe0db5070139a5a93ca21c5bc6f8bf453429831f0c44f5e0fb5ee569865d6b8b92749044ee4123be06920928ac7a1ec9cffa9404a3e53
 DIST ghc-9.0.1-testsuite.tar.xz 2322432 BLAKE2B 350df763c607dd89ba58ad6e856d815556159a9f088dc0b069de48ae87c1e874a45fad51159e65a3c9a9beed68602eeb2a2728dbce86277bd287455f46f6c53a SHA512 13fbe0f0ab5e2426820d0fb37f0a75e1198ef2a660398508806e8ef094fd23647ca3d386815a2118168d12253d8df3273043678dbb37cf3924c689dd0fd1932e
 DIST ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 123831294 BLAKE2B 1ca4c1b5c34c948011049a73d409c741db89658d10e311cffbe464c631c3733278fc7dede6ad27474832295ded2c26fd4d6419c760505255e29f7cb232a670a4 SHA512 1f87cf63651f7c0e5f7f55d1f4d7d7c48b0a911cc6673a899d4b92190d765b359f9c7d73c329969c1b76f1af102b7e2c18a80382c81d5dade9ac7dd57de4ef65
 DIST ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 122558873 BLAKE2B 9f07c7bdc3beccfa629d28b2524ccd2f4688a5c0036a45408f5ace2d530a2a0e42f95b3cda5037ebb365317999e1ae776c6f9d21692867abfe85e33f2892b1be SHA512 68bd70f94961547746a696aa2839e156c95858fda0c7ec5b2ecf802070724ab7102b0aa86bcbf93432170d521cce4af10f46b851b470e5dc49dfa5b07380f46d
+DIST ghc-bin-8.10.5-i686-pc-linux-gnu.tbz2 124356781 BLAKE2B 53c5d259a19f11db83d69f7a2f39090d623b07caf1859eb8bf0385183586f538d8eb3eadb06f56f4b7160fa82043eb0f7b8df1632d55af562b8b1cb21c08b4c3 SHA512 58676b4eaeef9e05f69b7c821e115f3a678487b0de696e702ff6378f7d8f23fafda997b0c19d52a730c22bf8012a99c01783d16d00e356fe12532156d5965fc6
+DIST ghc-bin-8.10.5-x86_64-pc-linux-gnu.tbz2 123186918 BLAKE2B 5049514a7c2c58e7f5c929cfb9e818cdc20280f4fc002350cf0cc19f410eb4d4be4d0b46db88205633fde73151e322f3cabd050a9c07e05ccae168c7e6be8be9 SHA512 3a8ef5f0c259ad86adc6a7a5718db419fb0e38a5d1e0bdcc8676e44d1a0130a4b25658ab23572e4e860307b024409da021e08b038fac64a773437c23519b1d0a
 DIST ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 120336081 BLAKE2B 55dfbb90d5e55c2af5e93c69249828a85cd9171c164b80dfdaf86512972b2c6854c8e4f07426af4ab52a5fb1a85d96a58c2cf003fb02372c55428001cfaea491 SHA512 ad3b83344349976d3253934195b2dc6299648391572b13735943c5ea2239c031c19b0cafd86c16cfb0c061e73bc72e9248f9c1731494a9a15fbe188f02913c12
 DIST ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 118897883 BLAKE2B a180b2dd1a3bc222044ece809ad700aee29d0c3e75b57ee9af3ca33c9c0f59dbf36f68202f746d99f80915cb717a9c41fc12db507f1cb469981732703a06b9cc SHA512 9d4be02dbd9704c93ef18feb92ea30bd5d590df31f288bf1b364818424c5019ca9ada26eec88418199f90ae8f4459d0a9352104e3f3186bbdc241891eb1b66c4
 DIST ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 122955511 BLAKE2B b870f46cc78fcc1d715aafe7108951582cfd12495b4e9d804d4b66562c66a6a2b2d9513031aedc8f3630a0cdbb3257943304b05732301a084f89487452f2f2d9 SHA512 aafd4233c40f93b71e6ac1acc8a75e30d49b826e4bce6d9832836966fd5f6c4898963bd4c2f34577f4199c1d9a3f537ac1e7d87eab11e9fb5e849573580ed3fb
 DIST ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 121542968 BLAKE2B 837870e68138f8d97dc8b2aae90090cf02416628602ca4ba4417ac92b49155f10028b05ac465665b8872b32372a5cee075616983f2eacdebb0188bd2ce6a93d2 SHA512 0e8c6d2e6f32fac95588f7323a4e02dddfc9ec2476a82b97bf5a106d3810f7e638fda7124c53b5bbc563fce70f4436553c282d8ea2f1f5fdf4fcccfb15a2b079
-EBUILD ghc-8.10.4.ebuild 26084 BLAKE2B a6d1b21fd9563c1b938b1603e52974c5d48c349952b7f1cac400e67a5f0ec14be9970b8f78133cc305cb48e1b742f02dd21075c52f6672956d99823e289070b2 SHA512 04ea85fc82670629675684fd82720e1677b8611ac5c02d94b9031ff28368c4d47c471eb1d71a4c1a7979718cfb749a986742d02f41bcfd3ca85c47c6a7b4d040
+EBUILD ghc-8.10.4.ebuild 26139 BLAKE2B 89fd04e383dce946a9751d47003216f97eaced39a484aae56cdf319fb73624ee0508525f03feda0c8c03b67f8dde2c46f2b8b1dad207eac0c5c8dd7a82427280 SHA512 60c27bd5d2c398bc6964fc33ed75cf69089a72d55a8fae8d94d097d11c4368160cfdfeb52199debb98ba55821089629aadd6951b521c3a033f179a9129b37991
+EBUILD ghc-8.10.5.ebuild 26072 BLAKE2B 07085a0939c55ca628303a43638f07b3f4fe55c34ab2b91ba6339cc65c11551fd376ee08b870bcce5aded2f25ce10243ca0eaa317ed5fa12f33af587e821ecbc SHA512 8fcdedee03bd5a0467d7afc4cdacd78562368bef75906a56f28ae30533d42eb54f069af642f531bb0e48483f85cccb0d41520978595011cc9a251b4878b89fa9
 EBUILD ghc-8.8.4.ebuild 26719 BLAKE2B 548af06ceb26ceff32e7b311108078c7a16077d0ad9e54419177930ef45a31d1d1e9fe1bcd827f626e51187b7676bcbdb84340243605884f56582d3a9535b2ed SHA512 5c61720081a5c8cc7d9810fb5cd7554392ba91a71fa0ba6fa9000ab989fe6894c789e08128ca3cb84bdbafa6fae6b45c8464512560afd12554740438609760c3
 EBUILD ghc-9.0.1.ebuild 26042 BLAKE2B bd86239c2be8bc5bd3ae1c1b376f456c9317d182fe3c020ec2b7adf220c3037554d1f7d20f355465bd483c0bc9d65db12f574e3c90840cf5f75ef9643652b935 SHA512 3fa72c4a8b7b86110a2f5e72d07912e152147d1f3612a8dc726062e554b3591ab2cc888c1fc781f190db7a83e98a5d8bd2843870f06d051d8be11c8762ac29e5
 MISC metadata.xml 877 BLAKE2B 763db2ffce8c241ef55110ca08aa9f7383f14bbe7f96a443b438f027214e04f56f8216b0cd0d871e516a13f07a8a5a52835b0f75ddd3eb9ebd7faccd3a6b03d9 SHA512 516ad3cdb3b26b242668ae2bbf48628c8fb95fdc84ab3dc00afc940c68c2b78a7aa85634c228e9b3427963f0b86263d24ba043d0fd9ae57752e5075392a0322c
diff --git a/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch
new file mode 100644
index 000000000000..e9517dbea06e
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/792558
+
+From 83407ffc7acc00cc025b9f6ed063add9ab9f9bcc Mon Sep 17 00:00:00 2001
+From: Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io>
+Date: Fri, 25 Sep 2020 02:52:19 +0200
+Subject: [PATCH] Various documentation fixes
+
+* Use r'' in conf.py. This fixes a Sphinx warning:
+  WARNING: Support for evaluating Python 2 syntax is deprecated and will be removed in Sphinx 4.0. Convert docs/users_guide/conf.py to Python 3 syntax.
+--- a/docs/users_guide/conf.py
++++ b/docs/users_guide/conf.py
+@@ -100,13 +100,13 @@ htmlhelp_basename = 'GHCUsersGuide'
+ latex_elements = {
+     'inputenc': '',
+     'utf8extra': '',
+-    'preamble': '''
++    'preamble': r'''
+ \usepackage{fontspec}
+ \usepackage{makeidx}
+ \setsansfont{DejaVu Sans}
+ \setromanfont{DejaVu Serif}
+ \setmonofont{DejaVu Sans Mono}
+-\setlength{\\tymin}{45pt}
++\setlength{\tymin}{45pt}
+ ''',
+ }
+ 
diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild
index 3e4cfb0d0db8..af942b11cd06 100644
--- a/dev-lang/ghc/ghc-8.10.4.ebuild
+++ b/dev-lang/ghc/ghc-8.10.4.ebuild
@@ -502,6 +502,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
 		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
 		eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch
+		eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch
 
 		# a bunch of crosscompiler patches
 		# needs newer version:
diff --git a/dev-lang/ghc/ghc-8.10.5.ebuild b/dev-lang/ghc/ghc-8.10.5.ebuild
new file mode 100644
index 000000000000..5c7215a7e76c
--- /dev/null
+++ b/dev-lang/ghc/ghc-8.10.5.ebuild
@@ -0,0 +1,814 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
+inherit multilib multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ARCH}" in
+		#alpha) return 0 ;;
+		#arm64) return 0 ;;
+		#arm) return 0 ;;
+		amd64) return 0 ;;
+		#ia64) return 0 ;;
+		#ppc) return 0 ;;
+		#ppc64)
+		#	use big-endian && return 0
+		#	return 0
+		#	;;
+		#sparc) return 0 ;;
+		x86) return 0 ;;
+		*) return 1 ;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:0=[unicode]
+	elfutils? ( dev-libs/elfutils )
+	!ghcmakebinary? ( dev-libs/libffi:= )
+	numa? ( sys-process/numactl )
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+	test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+	# test driver is written in python
+	use test && return 0
+	return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+
+	# GHC uses ${CBUILD}-gcc, ${CHOST}-gcc and ${CTARGET}-gcc at a single build.
+	# Skip any gentoo-specific tweaks for cross-case to avoid passing unsupported
+	# options to gcc.
+	if is_native; then
+		# prevent from failing to build unregisterised ghc:
+		# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+		use ppc64 && append-ghc-cflags persistent compile -mminimal-toc
+	fi
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+
+	if needs_python; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	ghc_setup_cflags
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-7.0.4-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-8.2.1-darwin.patch
+		eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch
+		eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch
+		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+		eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch
+
+		# a bunch of crosscompiler patches
+		# needs newer version:
+		#eapply "${FILESDIR}"/${PN}-8.2.1_rc1-hp2ps-cross.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "INTEGER_LIBRARY = $(usex gmp integer-gmp integer-simple)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use_enable elfutils dwarf-unwind) \
+			$(use_enable numa)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 2a21618f9699..011cdac94dd2 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,7 +1,11 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.15.12.src.tar.gz 23035406 BLAKE2B b5c79bb243b0052e7a3d58538ae734bbb38839654ffc0e1cf266d360c4f35ac1a8b02c999306a0c1bc598d6ec0c9b3326fea278163b49cd7becc820c7a129bd4 SHA512 9fdb0e74c0b4e8e5d8d45cbdb6f1d4be4d40549ef10629350856c3e045a82567a0418e949dfc229df7eea091ababec6b3e4e12b1bd424e14d7b10ef989e5c232
+DIST go1.15.13.src.tar.gz 23039791 BLAKE2B 45a6cd985a27afa8b063dff1e4e4903abf76f03621bb6e4b64b03ef5ba2a9acd3d8b19e131464e6ef57d69bcb513ae81516e4b2a8b020b50503ca162385ed222 SHA512 3f77716c9721afacb27daa175e236bb25cfc93602f1531df18938fad94bf4f59e81b81f53fa977c2ebc9a912942275a1106043133fec166965e72766b1638ba1
 DIST go1.16.4.src.tar.gz 20917203 BLAKE2B 4602a20ced74dba86938283a736d5235fe5dfb34ae742c44cdcd7ae2453d4654ea5757d0be76b6687d1d34c1b8c32681c41398d1a04ae72d491ee1d8b296d16d SHA512 e1b64610e22e657d9c65094e679cec50f59ff338c0ef102e54debcced1bc032390122456451fffb2d26d45c6db2f55bb9ef7f56ce479f6f1c2c2e6cc49442d86
+DIST go1.16.5.src.tar.gz 20921372 BLAKE2B a6565deb34b6cb167c41fc3af2e3bbdc8e22333adc9109de67c9e1f4bffb3d2c6e7d289e310f777d69092b3ee7a4dd706e13b0fe9ae5b0a16f270569953039df SHA512 ba90ce1f3faa39519eb5437009c4b710b493e42764a14b0821292a8a17b714fe5985ef20e6e3c340f71cb521ff63d45a23570d38fd752526a1262448c641d544
 EBUILD go-1.15.12.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
+EBUILD go-1.15.13.ebuild 4579 BLAKE2B c74b2bdd8db85b106cc7fced8388d1d50a67ccd1cc003ccf984c04a3213191e662a7285cacca758edbaa56149007ca84ae5d869b06a5a3f9cb72239e7ad621e8 SHA512 8cb0132fa8cdbc8a45346013f15c66b0075f3df678c3d623a1d16ed03d6b0a04b6372c14d8fdddde00dfa2eee39661ea17104fd787b6609bb5e8407ee773fcbc
 EBUILD go-1.16.4.ebuild 4574 BLAKE2B 12cc502e407d5ccfc0a4ff3c63c724602e29b3806f8add96e1113f2a76f8444d971e7d1394d4a97b01f9755d743dee2cda4053a89d20d348c454a311277836d5 SHA512 6e4c888f2da630120c644fbc3f330af1c92c0847fb0f5bfb0fd42c888af8b7834c8508263801b34c946ed54e6414e7461411e2713f92f802c293af3624f0ad47
+EBUILD go-1.16.5.ebuild 4647 BLAKE2B 79c9377bc5c5d160ac01597fa2dad4ca3cb8952095942e07f8c8c28796ca0a09b2266bdfaceec14f1d1cf8098d1b94cd7366cecc18b5d8193ff9f174a41a9685 SHA512 6ab9c23dd0854aac6d3601b856ac30d131d42a4656eb5233a0d8bd062772d63db865df5cfa40dd4bff2fb4a035d6c66161c3b39f6fc8996a54fc4f1233d682db
 EBUILD go-9999.ebuild 4579 BLAKE2B c74b2bdd8db85b106cc7fced8388d1d50a67ccd1cc003ccf984c04a3213191e662a7285cacca758edbaa56149007ca84ae5d869b06a5a3f9cb72239e7ad621e8 SHA512 8cb0132fa8cdbc8a45346013f15c66b0075f3df678c3d623a1d16ed03d6b0a04b6372c14d8fdddde00dfa2eee39661ea17104fd787b6609bb5e8407ee773fcbc
 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.15.13.ebuild b/dev-lang/go/go-1.15.13.ebuild
new file mode 100644
index 000000000000..9d3bb807e833
--- /dev/null
+++ b/dev-lang/go/go-1.15.13.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/go/go-1.16.5.ebuild b/dev-lang/go/go-1.16.5.ebuild
new file mode 100644
index 000000000000..135a6fe19a98
--- /dev/null
+++ b/dev-lang/go/go-1.16.5.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="cpu_flags_x86_sse2"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch() {
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm() {
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os() {
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple() {
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile() {
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile() {
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="${PWD}"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	use arm && export GOARM=$(go_arm)
+	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test() {
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install() {
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
+	# [1] https://golang.org/issue/2775
+	dodir /usr/lib/go
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	local f x
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+}
+
+pkg_postinst() {
+	[[ -z ${REPLACING_VERSIONS} ]] && return
+	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
+	einfo "due to the static linking nature of go."
+	einfo "If this is not done, the packages compiled with the older"
+	einfo "version of the compiler will not be updated until they are"
+	einfo "updated individually, which could mean they will have"
+	einfo "vulnerabilities."
+	einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+	einfo "See https://bugs.gentoo.org/752153 for more info"
+}
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index ac03a4444141..8dd02ae74def 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,6 +1,4 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
-DIST nim-1.4.6.tar.xz 4793544 BLAKE2B 5d015193564c63f16bd812eed19ace6cdeb2c944aa3aad3a41f4f811e8d56bdde02c5b405e7939ab09ad8b29d84ef9212c2df7c9f9148e0c26288157d20f4846 SHA512 6b1971a920c3572f9a1997648a297afc1696b09ac20ca031a4b23eba3b66b9ff93606bff2eeacaa651ed8cf6af2df7d38ec6253a4e66955a3e04c6d88991e013
 DIST nim-1.4.8.tar.xz 4786360 BLAKE2B 961b38275c4f9de87ac522c5b47368ce7f5543811a2dfd7b4f3fd79a104bcd0458caaaaab1705f99eb42c64735ca5f71d5018f8a8275a430d883233b28b1d412 SHA512 e6b245271495880f0eea271c46b4f5ce9168a421716a9a22367b6be3c2a9822937aad1f48eb61c151b040ac961728a89c8a6d143c8300057c0d8c1f2d66f3dd3
-EBUILD nim-1.4.6.ebuild 1908 BLAKE2B c7e267e92cda81ae16e1dba7a82baaec77c12b7b7a3a4dccec994d868bef4cf7558562fe3d6f80ec5542f8195dacf0d291fce5d3ac3cabf1172bc887870ccae1 SHA512 70b3b578fc1ca1450fd02d31e865a1d7a2805d9c26c31ceba26076d9eb21100df1357645eee62f68b25f0a434f3bbd07479cbd661ec19b78af6cf253b7dc2438
 EBUILD nim-1.4.8.ebuild 1908 BLAKE2B c7e267e92cda81ae16e1dba7a82baaec77c12b7b7a3a4dccec994d868bef4cf7558562fe3d6f80ec5542f8195dacf0d291fce5d3ac3cabf1172bc887870ccae1 SHA512 70b3b578fc1ca1450fd02d31e865a1d7a2805d9c26c31ceba26076d9eb21100df1357645eee62f68b25f0a434f3bbd07479cbd661ec19b78af6cf253b7dc2438
 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49
diff --git a/dev-lang/nim/nim-1.4.6.ebuild b/dev-lang/nim/nim-1.4.6.ebuild
deleted file mode 100644
index 3c52ea807c23..000000000000
--- a/dev-lang/nim/nim-1.4.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${DEPEND}
-	test? ( net-libs/nodejs )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-)
-
-_run() {
-	echo "$@"
-	"$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_configure() {
-	export XDG_CACHE_HOME=${T}/cache #667182
-	tc-export CC LD
-
-	# Override default CC=gcc.
-	echo "gcc.exe            = \"$(tc-getCC)\"" >> config/nim.cfg || die
-	echo "gcc.linkerexe      = \"$(tc-getCC)\"" >> config/nim.cfg || die
-	echo "gcc.cpp.exe        = \"$(tc-getCXX)\"" >> config/nim.cfg || die
-	echo "gcc.cpp.linkerexe  = \"$(tc-getCXX)\"" >> config/nim.cfg || die
-}
-
-src_compile() {
-
-	_run ./build.sh
-
-	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
-	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
-	PATH="./bin:$PATH" _run ./koch tools --parallelBuild:$(makeopts_jobs)
-}
-
-src_test() {
-	PATH="./bin:$PATH" _run ./koch test --parallelBuild:$(makeopts_jobs)
-}
-
-src_install() {
-	PATH="./bin:$PATH" _run ./koch install "${ED}"
-	rm -r "${ED}/usr/share/nim/doc" || die "failed to remove 'doc'"
-
-	exeinto /usr/bin
-
-	local bin_exe
-	for bin_exe in bin/*; do
-		# './koch install' installs only 'nim' binary
-		# but not the rest
-		[[ ${bin_exe} == bin/nim ]] && continue
-		doexe "${bin_exe}"
-	done
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 304e4aef3cde..38bfc7860f76 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,8 +6,12 @@ AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
 DIST php-7.3.28.tar.xz 12139380 BLAKE2B 696c573878866e97fcae5fe3e33e83e75bf706d0eec2a66b2532ec54ce730e3f4b3fa6f0659ebf14193b6b2a6292d624bf478706790aab60b13b5cea0a1299fb SHA512 91f4f23fea6e2c5ea1fa5774075e1b1f7cfcc46064ab0d2f03e4f1b9b6c3dd7fd5a59854ed3fe3a8e2962283045f6a1c3273438b4bc0c68b11f41b9338f44274
 DIST php-7.4.19.tar.xz 10341424 BLAKE2B b5f549603a2d108d2d4c16dfb15c2088612e040e9e4756cc7c1403c67e152ad3461d84915e4f542b1e558469ae3143721c6d7ec25ef03c3b4a6142fe972bd775 SHA512 2ac51b9920069ebe8ac68a94f8e9aac2b3d44d69668f340aba95f8303632fe1bfc4c3f2ce398cc7e2c2ea48583d8e04dedfc66f7147c1f4470a55417554d0071
+DIST php-7.4.20.tar.xz 10345912 BLAKE2B 4efb53a30caee049aec11269aa64a4f60d3fc9f7abc3c1ee861cfad94b5533833c4d4d1c8aa740db4161d58e58071e9b077488fd970d4e1e53e17367ed751971 SHA512 40261c5a85341fa7c495db86ef3526d1ae2751c6abb05251819c2b7080050715eb44a19c3f8655d101f4308209487ce16dcf94067b71b084c912470796b217f7
 DIST php-8.0.6.tar.xz 10764932 BLAKE2B 9ab23dfcefe2c94a88184fbb3e18267c38fdcabeca0e9ba12a616528895f85790b1238fdb6e0578db2183b6eee26f26d9d7b744b7344495ea20a6e58668136d1 SHA512 4915b9b5024ce1fb7bc3ba7c1a00831841bc970ebb68b6b1e6a00cbec4d8dcbbca3ca043882ffd9c4719a988d08275f77f9cee07ff3d45a71402dfc51bd31e04
+DIST php-8.0.7.tar.xz 10769208 BLAKE2B 6c20cf6c49c56112199bfe4a3154269b1bade7035e07341ec9031ac2a7d0202ecdcaa465baf1f08c76ce09e966f3ca6bf8ce32c111fb710b0e971ca366dfbab8 SHA512 54d0355977a69c3c466054e9e277147874eaab192bc384a199eb98582f9fcccebc685b370dabeb65d2de3bad4d2e4b2490c0164d2ce406af76b0e972ea67bbd0
 EBUILD php-7.3.28.ebuild 22673 BLAKE2B 6c64c471608b337f4ebd5d07a9cec58a38afdf3ca5b64d094e4e1a37040dc4f95331c1fb7bf8f3a8c5d3cf2b0f6b215b4b342fecb162c69bc29214cb250553bb SHA512 49b0d559c6999719ca732d9a40c9154806092083b7da2e5a11ab33718b638cb774de3a6af81949c408e99ba18a3720c4145022221921f3a7bd84572ac28c98c0
 EBUILD php-7.4.19.ebuild 21382 BLAKE2B 27074fae8c5d1b0727acb1ca1672b0300edb30483ec7fcc4b0102982e8ea6a31f4c5f55013243c2de3e3192864ca466cbe1ac589689204ba976eb85cfae7db87 SHA512 afccdc44f0ddd1c5417c8be6655a947508b82c8cabe57a24174fd03eeb951b730136379c2a0f978b10993fa4b0a7ef6eeb95b398298ed4433db86b4e2d2ba872
+EBUILD php-7.4.20.ebuild 21389 BLAKE2B 8f7211b827110a1d3bda530a52eb31611dcf740d5410c50b895dde38b145a79e5e6092ab9534e9aec602d55695217da7dbb24393e374efb9f47cb452d69d971b SHA512 d1503dc8e0eb357f07a645e1a6704507c29b182dd1f2ff615cb8b53cb98f5f70bbaac230047d33dbbb5f85c8f12a4f69b32ff027b0bebe3c2b2c3c96fbbb24d8
 EBUILD php-8.0.6.ebuild 21328 BLAKE2B aa18a9946ac756b200a4b1610ec3cfe8eca05a454458dacb00d8d7138d3933ab73c6c7db9c72bc29b28b470df5eef2d7400354d38b5404281ca33a0f96b36461 SHA512 703e031df5c14982d8278ff824cb1d9f79cb4e33ec9c70de2475232f65dc92c0b4d0400bc60f90902a6a8ad1c769d29a690fa08a3eeac1a99b321ae5bd9e9a0c
+EBUILD php-8.0.7.ebuild 21328 BLAKE2B aa18a9946ac756b200a4b1610ec3cfe8eca05a454458dacb00d8d7138d3933ab73c6c7db9c72bc29b28b470df5eef2d7400354d38b5404281ca33a0f96b36461 SHA512 703e031df5c14982d8278ff824cb1d9f79cb4e33ec9c70de2475232f65dc92c0b4d0400bc60f90902a6a8ad1c769d29a690fa08a3eeac1a99b321ae5bd9e9a0c
 MISC metadata.xml 3268 BLAKE2B 4abc96d858186ab5bc6f0797fb3f1cf7f5aaa0b07a4652dcc16aa65e197bd73803f6bac717084c0c9a194e7da5b6632523105205011a0d39221aabc16ade8e2e SHA512 1413edb5293cb93ad8f94376f11b9952ca6369b667ae23baed56d9cbaa68cb9cfa5a80da7dd7184ba84f08d5a4054068da1c10daca81d1730e7b6edebba8b29f
diff --git a/dev-lang/php/php-7.4.20.ebuild b/dev-lang/php/php-7.4.20.ebuild
new file mode 100644
index 000000000000..7b09eb440f4f
--- /dev/null
+++ b/dev-lang/php/php-7.4.20.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlrpc? ( xml iconv )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	ffi? ( >=dev-libs/libffi-3.0.11 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.7.6 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}"/php-iodbc-header-location.patch
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xmlrpc)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.0.7.ebuild b/dev-lang/php/php-8.0.7.ebuild
new file mode 100644
index 000000000000..bf9240b404a9
--- /dev/null
+++ b/dev-lang/php/php-8.0.7.ebuild
@@ -0,0 +1,748 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 2678fb19f622..4d2bd8dfb4b2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -36,22 +36,22 @@ DIST python-gentoo-patches-3.9.4_p1.tar.xz 14472 BLAKE2B c8bd49c2eb77eb00377e6c6
 DIST python-gentoo-patches-3.9.5.tar.xz 8820 BLAKE2B 177234776f00c3efa6b76fefc1ef0001225ded1dd8ba916e3dc8498a7e845467bf387ba8a4f82da713a51bff627420a084f6627218863f70e1273cce58ca7252 SHA512 37b7e25a1703184556f12202da9cba1a8e2fb1c059d75195ef2997f55948229f164642a580e33c59f5877fe36d4c62f1735f95df318b36d92c528eb98f42e55f
 DIST python-gentoo-patches-3.9.5_p1.tar.xz 9124 BLAKE2B ab2f51c2d10c679022b563efa8b2494499d8d69b7617ec5229c3af546b1a9589e8aa064e9c025e19f658a316fba4134086ac8f357de97042288ee7b8f34ba9c7 SHA512 16da4a4736acd0ceb263766d14781a034a374372c7ab603a966fa364350b28e8c168f2e38c276d8e03cbdc2f3f9dde691fe959ca3db20533b036cc664a3cefe1
 DIST python-gentoo-patches-3.9.5_p2.tar.xz 14728 BLAKE2B b6b0a0c316d99e8282bdbb5e62a90f84880ff89b0b1e236a5bce37fbdd3c3b187f7964873882dbcbc8c9765af107377240e8aac544987452830f0069aff471c0 SHA512 42e4dd48f4b93bd45a70093b447b4862ab286c1b5adc32d22a3e3d08e67db13bfa829bdbcf989fac9b7c8634a4735cfb4a7b16bfc40bdff0c11bc5a768bbeaf8
-EBUILD python-2.7.18_p10.ebuild 10283 BLAKE2B 460a28164ecc075fc168b8b6fdf9a732456c31ee03210b08875c0d396872c8c693413bdadfcb02c90229b1c2f2bbe726ad4fe02f3aa4273f249c2e8c88ed1eb7 SHA512 afd986004babf8282cf1d754a136bcb5ce0330b72425e856cd11f65755276359d7a2f9df6ff70eeee21814ef492d7d79014c3f2fff2c2514a892af4b2fd573f6
+EBUILD python-2.7.18_p10.ebuild 10282 BLAKE2B 2426e2c6aa8f4e53094b597794867aec500931cda86dfce1b2c87e2d88927d8c026e4188734e35c826861621a6ee1011a01855c0e93e6d21814f4f1c446db0ce SHA512 0540b943514ac991d0343810237b6757477a1544e448988bd268eb27a6f5dfc8744123261c0668c48ffd8b10abf3a9bc43d3df6aa9e5b5f66b1c45793896ed36
 EBUILD python-2.7.18_p9.ebuild 10278 BLAKE2B 1831412a47fd78750e3fc1d6bc91c403f70ae1e51500adbc197f671d5057230bee9aac2437ff1fda45923021a3ead7c91cc5fb27967426bc7d45c8dd4162a0d8 SHA512 59eb7b80b2e39da2b2ed47a33b3ddf13975c40ce565f6552c66d7e3bc2bdcd8534065b8f0782d49b5dbb52afd7135af5f0858e963a0bd182723e76445d5495e7
 EBUILD python-3.10.0_beta1.ebuild 10045 BLAKE2B 085fb4c2d64576159313076da40f6c7096d6815151d2a3e082a5bae5164d40442996d579e887dc5a39fa52dfb1220b67fc26f840b2f0b1997346fccfdee56009 SHA512 e66d80207f5897b6bcd72f1506ee5418c13eb1cc51a1b3681e653d49d7473f5755edc8096c7d3becb613275f1e40a13b399b9c61dfc85da9b9e209791ea2d230
 EBUILD python-3.10.0_beta2.ebuild 10045 BLAKE2B 085fb4c2d64576159313076da40f6c7096d6815151d2a3e082a5bae5164d40442996d579e887dc5a39fa52dfb1220b67fc26f840b2f0b1997346fccfdee56009 SHA512 e66d80207f5897b6bcd72f1506ee5418c13eb1cc51a1b3681e653d49d7473f5755edc8096c7d3becb613275f1e40a13b399b9c61dfc85da9b9e209791ea2d230
 EBUILD python-3.6.13_p3.ebuild 9827 BLAKE2B 1b4e38ac6584840625040b89cb888db177a46cd6faec6c236c32f56b890fc6487c826dd9820f05ba9493a792df8f2bab252c7e1c3c86a49fc0e3e1ae00828b43 SHA512 185ca27fa6ba4ed17b89d0e6f21efa5fd44aa40637f3844401e7d6140f82d6d2a815d61210aad50c322de029bae7a46654c90e4ec448bbee6caab25d3a82d711
 EBUILD python-3.6.13_p4.ebuild 9835 BLAKE2B fe07cb4e400f4c7b28c33684d2ccd241c083b9a0f9b1d064dbf78bafa9f08bd01e1c1126b0aa3b2c798e5663e74260ab27a167d4e7743b8d1f13f946094b2892 SHA512 817d0ae1677d08c2068debd873148992c652ff58a4718378c43a6ead9fc09964745de6daace955cec603cab46e9b9520bf92738794e581290306f03ab5344b26
-EBUILD python-3.6.13_p5.ebuild 9832 BLAKE2B 8b999117ba4b77a97c30be37059ea1d0b51297a8122e9762de1d30b997a2cd80629b28a6b52fb3d58feeacbcda522309cd76138cc14732152e42bfb0ae7184f7 SHA512 12d648914cd06c7bf41f0f7f2b9cf73d6fe227e343639d2737e1d0642d0457564eab888330da8a9c9e124213beec7260e53c7f6a62f866a3d9e932cee8e0a8c8
+EBUILD python-3.6.13_p5.ebuild 9831 BLAKE2B c4b11f4bb7ed9538eaee9510128664413bbfb10f7ad46c93e874d7730a8f72eb04f9da58fab3da1eaadb95681b3a87a079b9285bf30902e83105e83a43d4c57b SHA512 32270cd53819c0be866dee1d8c3feb71eab20b4b7d2eac972edfb39dc715e232aab5d32cda5e7c7cc0975335d274ee11a5a83d70e4e92213b3a71dad4cfd8df2
 EBUILD python-3.7.10_p3.ebuild 9632 BLAKE2B 85597824af2426a591a909d7170410ae405bc06381c63ed1603571230efc9b0b2aa8d06443845efb38535d4844a632771ea483845d0034506b69f65ffb509531 SHA512 a0287b8ffc461e9556770cacdba761448a0f2ecbcac6a383c586fe0577bd3fc7603c06b23a186d2f3c15d156b9635a508660cef8812dd18b34834ca0fca9a8f8
 EBUILD python-3.7.10_p4.ebuild 9640 BLAKE2B a38f2c17009ceddd8d5e98da45edaafd8bdf82e1100fb4cff5a45c853f263b592b7e4f51f0b22f62be49b74a1ad4bef001af3a4225a7f39753eeaf1dfca1b6b2 SHA512 077bfe00609cef8943d76306842c2474e12b3dd45c088c67d2ea734cf6bb83e334777a372383c51d5afe9f7ff36f606abba1a9c3eb30e5063891671d67b7d218
-EBUILD python-3.7.10_p6.ebuild 9637 BLAKE2B 41d9e99a667d4e04ca2437e085472b2ea8c3803f589c15a4edabb2d00025e909299f612492bee3b1c45f75bdc7b4f13daa66f33f28aeae3bb2b013b782857362 SHA512 947b67ebc86f0aed99dbe1ee1b3c15e2b0875c588d5af23219a8759597e600e7b3894d3d454561f3b15743f9e998a5b53b00a4e028da2155f13aa1bb0bfd352d
+EBUILD python-3.7.10_p6.ebuild 9636 BLAKE2B 6ee77d8e0ccae8fe8fc04d36730a5b9a18cc7b28db9f0e9ac16312ccfbbb5fd67c3bcb853c501c2b352187c24b786557bee6338db8e4f821dff488f9a16addb2 SHA512 bff1fbb01dd7a980a805f364758fdc194283c9a12fb845754e61c76531d316926ed4f8920931c22fd4cb557fa633ab614b97fc9d18e27e51d779feee4805ebed
 EBUILD python-3.8.10.ebuild 9794 BLAKE2B adea166e768e09b86cfe01fb8629822750261871c1b300e94815967c201ac5b406f1419401e6d0e7872bb7a34e5ca8cfbd0b4dc4ab66855693e74ec540728e4f SHA512 8b2190820a441b4f24ad44cf43c96dc3ac92abc6f02d6bc77dd914d06a95e6ca65c189af73965f9ad9a17c2d37c700fb0cc88b2cc23d6b86806a8661f669406a
 EBUILD python-3.8.10_p1.ebuild 9794 BLAKE2B adea166e768e09b86cfe01fb8629822750261871c1b300e94815967c201ac5b406f1419401e6d0e7872bb7a34e5ca8cfbd0b4dc4ab66855693e74ec540728e4f SHA512 8b2190820a441b4f24ad44cf43c96dc3ac92abc6f02d6bc77dd914d06a95e6ca65c189af73965f9ad9a17c2d37c700fb0cc88b2cc23d6b86806a8661f669406a
-EBUILD python-3.8.10_p2.ebuild 9791 BLAKE2B 84d8aa424ddac48d1f98ae39e01a9ef6b73e98f893497149b1cd412140d544f6c2cbfc3a2fd3fc3c421cf90efab2905bd8e853bee4a68e05e91f948eb3e3f7e4 SHA512 b7511d685d016cf5ebe43d28a6dfe3c54686b609897f2e649c9554cb7b78ea516c7fa4991344ba15b2d4954592711671c1c45b675744a7fed7d3d2d19ad62e5b
+EBUILD python-3.8.10_p2.ebuild 9790 BLAKE2B 594c2a2923aed6cfde85f30e690ac6f8018bcd00a095eeaf477bfb061c093bd12aa57030a679b3e4436593e8b07e3e5036e556520f98bedbca0a47959823e1f6 SHA512 fedb5ccec4ba844d415f4b68878e83b09876c835b8c95597946cc25f5fe68f04cc56d261b00d47dbb8606bcf0d05eaeb9d054bcc35c7f82a2f8e794553330480
 EBUILD python-3.8.9_p2.ebuild 9786 BLAKE2B cdb4cc561d0dceced2e987bd268b4aba5491cbdd2b4a232f59822ff6c913acdc688930c24b25dc771ed0cb63c104ca744dd6c0c3c79ddac175206fbe3dcb9493 SHA512 72757c70b3d179fdc91be409fe8eba79e9868f7672ed8686074027c9a76edbdd0ff9ae54b10ae2b51e116904d36d69a4e9a107f2613bfeecedba32da3c8261d7
 EBUILD python-3.9.4_p1.ebuild 9925 BLAKE2B 8dfccf4bbb7fe7ee7f81cb7902c3f5db8add7694af475f4d9f80b9e4c87d2032bba1758cf62ccdb62eb56c79fa9bc238f850205d5dc159a172f9f4f4757bd351 SHA512 0402ea45911ba01183a65213b0050c9f976c218f1e938f716ac66178e122379c24714758463d1010fbd78828eb36123f16b4540aec0f75216706bc7dfc3e7014
 EBUILD python-3.9.5.ebuild 9933 BLAKE2B 1d492eae570d852efde804615a52f80b650aefa2fe12b64d7cccfe5d950085629d5d8a5251a2452f477233a84b8a9ae0bd5640d59978ee36c1a47048ca6c1b4b SHA512 84c0965e128bc9337373fdf280faf0824b2be0874e2ae1ac75986c0a2eb24bad57c15779487b951708cd56fe0467eec90cda787a3ef788592565fdd1d664f6d8
 EBUILD python-3.9.5_p1.ebuild 9933 BLAKE2B 1d492eae570d852efde804615a52f80b650aefa2fe12b64d7cccfe5d950085629d5d8a5251a2452f477233a84b8a9ae0bd5640d59978ee36c1a47048ca6c1b4b SHA512 84c0965e128bc9337373fdf280faf0824b2be0874e2ae1ac75986c0a2eb24bad57c15779487b951708cd56fe0467eec90cda787a3ef788592565fdd1d664f6d8
-EBUILD python-3.9.5_p2.ebuild 9930 BLAKE2B 6d6b2fd83ce1351c3fca362721ca0d81cacdfcc6086c3349506ee9499f5298001accfd4b1e258bd637db8456a5c54702d59b3c6b3b2b0a3d06390c5c33ef0070 SHA512 3294d4ae959a4a0b9cc153862a4d552905bcbcff572bce27633ae91c4bac1a14ef97322feaf58926e904ae0b35502ded435926ebdf5a5d5b60453c97ded27568
+EBUILD python-3.9.5_p2.ebuild 9929 BLAKE2B 69d9d121084157cd072c1c4a77ee9d2622ea1053ab30af0bd909181a498cf3255b35a14b49e5d5ba0d0e9aa9f1f8e54e4c8b82e6e557f68fd82fb75cd191f0d6 SHA512 2a68481365b13892736aa47f41bfa8f9442eabfba63fa7607bb2a84382914111888c8c8aa21fca6a950c643387c74a9736b16a32d4035aa83c31b480ead66ef6
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18_p10.ebuild b/dev-lang/python/python-2.7.18_p10.ebuild
index 414210415080..80a8b429a069 100644
--- a/dev-lang/python/python-2.7.18_p10.ebuild
+++ b/dev-lang/python/python-2.7.18_p10.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.13_p5.ebuild b/dev-lang/python/python-3.6.13_p5.ebuild
index f5cf812fa89a..69d9ffcf8a86 100644
--- a/dev-lang/python/python-3.6.13_p5.ebuild
+++ b/dev-lang/python/python-3.6.13_p5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.7.10_p6.ebuild b/dev-lang/python/python-3.7.10_p6.ebuild
index aad82e50b93a..882078f824cf 100644
--- a/dev-lang/python/python-3.7.10_p6.ebuild
+++ b/dev-lang/python/python-3.7.10_p6.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.8.10_p2.ebuild b/dev-lang/python/python-3.8.10_p2.ebuild
index 53c5b3df490c..02b8c222b85c 100644
--- a/dev-lang/python/python-3.8.10_p2.ebuild
+++ b/dev-lang/python/python-3.8.10_p2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.9.5_p2.ebuild b/dev-lang/python/python-3.9.5_p2.ebuild
index f1364a217ab2..27d30750ee3e 100644
--- a/dev-lang/python/python-3.9.5_p2.ebuild
+++ b/dev-lang/python/python-3.9.5_p2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
new file mode 100644
index 000000000000..52b0b7e35c0c
--- /dev/null
+++ b/dev-lang/typescript/Manifest
@@ -0,0 +1,3 @@
+DIST typescript-4.3.2.tgz 10624314 BLAKE2B b980fbabc60e143470d437a93247b874823353b7e7e9691b2a35abdfc2c5323fc7184f9ca8adca5211cebc329eac467900a7a54af8435e8955c8d76903a3f14a SHA512 cd9e214a19e69e8567007a551d6a5373176fedd58feb44b616cc9d40b57c5793db4b71627e3585151887496a4325a865cbcf0f472579b5e4d22e8ab8786ee62b
+EBUILD typescript-4.3.2.ebuild 766 BLAKE2B eaa420ad739ed7a4afee41b0d9f4fd7d3283a0a1ca75f5514383470bd4276538147f28ef777954605359a249df6a913e91f04ee75dd3ad55537803f10b1f1259 SHA512 3a65ae24834c4bb449361653daabd973c3bfa2b0d141cdfc90cac3dbcb913f9f161212c3a2b36d155adb9d13bc72051b23f056e6fa55f61e39a57fc0930107c5
+MISC metadata.xml 336 BLAKE2B 0c93fb15aeb261efb010ec4c16400ab2f2c55d881bfa636fca02ac4986f827fa604312f7dbe013592515145b9443cdd3d155493db667c3c0dd9e9ef74e971755 SHA512 d7c39b7326c09964dcd97a2a78970a9613b44e547bfc9c694038a899c8858938e97fc39e31a9c9dbf1aa3225668cfeb6e7ddb3b59927f08e8188282df0215b44
diff --git a/app-office/hourglass/metadata.xml b/dev-lang/typescript/metadata.xml
similarity index 53%
rename from app-office/hourglass/metadata.xml
rename to dev-lang/typescript/metadata.xml
index 71c54c3dada7..4690a60f1fb7 100644
--- a/app-office/hourglass/metadata.xml
+++ b/dev-lang/typescript/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">hourglass</remote-id>
+		<remote-id type="github">microsoft/TypeScript</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/typescript/typescript-4.3.2.ebuild b/dev-lang/typescript/typescript-4.3.2.ebuild
new file mode 100644
index 000000000000..dcbc71b38d89
--- /dev/null
+++ b/dev-lang/typescript/typescript-4.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
+HOMEPAGE="https://www.typescriptlang.org"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=""
+RDEPEND="net-libs/nodejs"
+BDEPEND=">=net-libs/nodejs-16[npm]"
+
+S="${WORKDIR}/package"
+
+src_compile() {
+	# nothing to compile here
+	:
+}
+
+src_install() {
+	npm \
+		--audit false \
+		--color false \
+		--foreground-scripts \
+		--global \
+		--offline \
+		--omit dev \
+		--prefix "${ED}"/usr \
+		--progress false \
+		--verbose \
+		install "${DISTDIR}/${P}".tgz || die "npm install failed"
+
+	einstalldocs
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 65f02308be4e..baf8c0c0b59c 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -4,9 +4,11 @@ DIST vala-0.46.13.tar.xz 3434196 BLAKE2B 49b7e0b776e185653c1b8c00747a150ceb42cf8
 DIST vala-0.48.12.tar.xz 3492200 BLAKE2B 0a401ac4349dc1c628fa608b5a89504583d6d2bb05ca74eb507e766cca418121e14adfe6e8cfeb8f42212c717280b9b91426309df415d869896654be626c46c5 SHA512 da7becf8b92985a07b139651c14bd41ec86aed3e2b610029d2b376f70335c98607f39de4a1fa4efe9d51e6088edd4c13d22431cada389679d55f684ad548f4d1
 DIST vala-0.50.7.tar.xz 3540048 BLAKE2B 4f3abdfe7f0448846f22a4d822b803484afd1a2371604d63cd7092e2854dbfdb15169ac74226404ca572bc8ac29d5262c6e39346271704003138b9881bd99b30 SHA512 50c4c257e0be020f45270b07fef3646712dc1556dd43ae9d54f164b97056b26779b3559deab9fe96afa11e2e97a13aa2cce348a34cf5d72ea6a3be4a8d7efc94
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
+DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
 EBUILD vala-0.44.11.ebuild 1112 BLAKE2B 481c622dead6198dfbc11fb7562b71e6504ab65e3ea354b4a575d138f4a881a8f1f1ae79a0071c7c965bd18c58afde0f79e37d9ba7947858236b408d72e38e18 SHA512 61983430919c70f1524f399cb2d45370f3efb2bd7f6ca347a4bb637062fa71b64cd8507fad5e10b1d6e9a9b2f70808e4cea3c93a2364421a888cbbd719f4110a
 EBUILD vala-0.46.13.ebuild 1305 BLAKE2B 4855220ceb0594546be128b16092270a4d21459d6243c3510e36e556e5e075ab1caffbf579b2a661bbe6470eb24480879928714529a5f82b9d83b0dcbdfd8df7 SHA512 af281ba4479a81ce7e825df237d55e7db552a2f341fe27e0d41de4a0796d0e3e153f9eb01f7ed0ae2b070b5a2ccee6bc7ab32d890ba0ab99d6cadbc3ee14b33e
 EBUILD vala-0.48.12.ebuild 1312 BLAKE2B 5acc6c67a78ff5aff422e44980db6072ea7f1311f46b107eba95ff2963b78518c2a60136c06fcf6da996cdb9bb222c7c9bda56c84c85166d7a69ca885b4683ff SHA512 78e461a215adbdfc7d7ae7ccccc9f97e1b408a133b0e33005841a74169c57adfc624e12ec0fdab9434ea6720649c3356e90cf9af79e698c2998fa93daac1290e
 EBUILD vala-0.50.7.ebuild 1312 BLAKE2B 36746ae0645349498963828caec58e5e82cd9585b8381c268c6affbb884d223dcdeb2f629678de71d288b8b152820fcdf981d622659cafd249ece2d91b0dd656 SHA512 f013ca54bd4f72ba4e632fa5cd7817545bc778cd261c5167e9e566aca0cfa4b34ca7f02a7af2115701f2fae6830b7dab7ddcfbf312907210d064b96fdeeb9964
 EBUILD vala-0.52.3.ebuild 1325 BLAKE2B 3f22f959527acc36013a9c07978b90b087b2075bc8b8208cfc190eac508d8192c6a2d5fa17bcebd259a6e18faf25e8e804b82e8463c05f9dca66484f555b4e45 SHA512 635fd952a9f4ab98718e22e5cf4806da041bda0ab2b09bc3cc18351de85a1350e912590aded7ba827d7d9460d5091c86900fa4216aea57fefd596357fa0212be
+EBUILD vala-0.52.4.ebuild 1332 BLAKE2B 07ebd950465ef0d16801dadd56096d7fa90c218c4e6dd08a6fd9fa487207701c02511c418d210967be351c12c757c342f268cba6f14ca97bd66087cef7ca6ab7 SHA512 e48dd90cd3daa8c2c6eabb13a1f00fcb636efa72c2d7cc581044692a2e78fc39b8cadc47b9ba46fead9f5f258204f25c16358ca81b3f4fa33d210fa6da28e2b4
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.52.4.ebuild b/dev-lang/vala/vala-0.52.4.ebuild
new file mode 100644
index 000000000000..fa44e86dd988
--- /dev/null
+++ b/dev-lang/vala/vala-0.52.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.52"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+	!<net-libs/libsoup-2.66.2[vala]
+" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
+# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection
+	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Ice/Ice-3.6.5-r1.ebuild b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
index 15dcb235df99..56dd843d69fd 100644
--- a/dev-libs/Ice/Ice-3.6.5-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc examples +readline mono php python ruby test"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/Ice/Ice-3.6.5.ebuild b/dev-libs/Ice/Ice-3.6.5.ebuild
deleted file mode 100644
index e9232fc67c06..000000000000
--- a/dev-libs/Ice/Ice-3.6.5.ebuild
+++ /dev/null
@@ -1,335 +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} )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby25"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-4"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
-
-inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.6.4.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug doc examples +readline mono php python ruby test"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	dev-libs/openssl:0=
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby25) )
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	readline? ( sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings
-
-S="${WORKDIR}/${P,}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
-	"${FILESDIR}/${P}-db6.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		csharp/config/Make.rules.cs || die
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
-	# Glacier2/staticFiltering requires network access
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
-		cpp/Makefile || die
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	MAKE_RULES=(
-		"prefix=\"${ED}/usr\""
-		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
-		"install_configdir=\"${ED}/usr/share/${P}/config\""
-		"install_mandir=\"${ED}/usr/share/man/man1\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex readline)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED}/${SITERUBY}\""
-			"install_libdir=\"${ED}/${SITERUBYARCH}\""
-		)
-
-		# make it use ruby25 only
-		sed -i \
-			-e 's|RUBY = ruby|\025|' \
-			ruby/config/Make.rules || die
-		sed -i \
-			-e 's|env ruby|\025|' \
-			ruby/config/s2rb.rb || die
-		sed -i \
-			-e 's|env ruby|\025|' \
-			ruby/scripts/slice2rb || die
-		sed -i \
-			-e 's|output.write("ruby|\025|' \
-			scripts/TestUtil.py || die
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"GAC_ROOT=\"${ED}/usr/$(get_libdir)\""
-		"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
-		"install_libdir=\"${ED}/usr/$(get_libdir)\""
-		"install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
-
-		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-		for i in *; do
-			mkdir -p "${ED}/usr/share/php/${i}" || die
-			"${ED}"/usr/bin/slice2php \
-				-I"${ED}/usr/share/${P}/slice/" --all \
-				--output-dir "${ED}/usr/share/php/${i}" \
-				--ice "${ED}/usr/share/${P}/slice/${i}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			mkdir -p "${D}/$(python_get_sitedir)" || die
-
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D}/$(python_get_sitedir)\"" \
-				install
-			python_optimize
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index acff097f9aa5..e7907221b189 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -3,6 +3,5 @@ AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
-EBUILD Ice-3.6.5-r1.ebuild 8462 BLAKE2B ddb7f24b6ea232655d2536a35f21a0d0ae76daacb6abdb94c2e9fab887530f34ead180bf846ef35ce1e4bf3aeff033e7ba63e6e3a729a338d72d0c079e936f61 SHA512 323207c6422c111e7899f29a1e2bb228efb1ebbf31ac8e64b9af6a865ba8b9fb4d2e67c9fea455a7af6d3321a0dd204c0a3e749b05c78c15507dc3502181dd0a
-EBUILD Ice-3.6.5.ebuild 8460 BLAKE2B 85643420ea423430cbdc2dad7e9c412326bbd10939186ff0a4378446cf8619a8437d32e9c5dbc22eb9052fc82de2c8ff155e53e1bc01b4eac93678bbd70aecce SHA512 a4359fa9123a22359aafc4515e2a360999dd7bf3366449ae3c7ca92dc0f5805156fb5f41f04793de9fe62b705717724f8f4d3b5ff7f8a3b85f235bd0edd50bf8
+EBUILD Ice-3.6.5-r1.ebuild 8460 BLAKE2B 4449caeb6e00dc506f2ba9fb7329035adf38cb6f1320c37e81723465ae4b1157069b7587867dae095a5553f21cf896042b674723e5e58981661cbddbe69b03ab SHA512 23530dcb82ead69074ae03caab0ddadfea367b458230d358999195d2794c30be15427cad63b5d76e91b6872d99ac5354b3d4ef5c72bd3c25770d0f7cb4937c7c
 MISC metadata.xml 470 BLAKE2B 0a0f575d2237b74f0f369c49745408308af92797e19904ecd07a46cb56cf6f45366155318f727045448e3bb9639868672b4c55de224703803216d12b5b920262 SHA512 f0e959732e6800280277c32606ea6ba67947d071f17dbef5ced97970879e10198476ca3ecba2099818e3dbb2ded079dd2a1a9c5517cdd233455869e3d816444f
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b52a98d390ce..d6bfe6c731dc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 78fc187409f6..7025dccf8192 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -5,5 +5,5 @@ AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8a
 DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
 DIST AppStream-0.14.3.tar.xz 2277536 BLAKE2B 99ceae6873c189b289143c8ab59eaacfbadbbe7cf05db96079c00ba09c82aeac63f4436e1b9e54b8d172aa7e9f609583cf2a78d3f44ce880cb1a326034432563 SHA512 b4c41b44375091636cc46e2f7f5e0b86612474faa6d55010caee78cb9c9ac468d093cf261184d900be7aae8513dc72d2821ff9ee17786e123c86a928ce5e9135
 EBUILD appstream-0.12.11-r1.ebuild 1986 BLAKE2B 8ecc11e3c61e1d1e7edaf4904086e38e63a3eaaa079125435aa88188d1d173e455490a2f8aae79e7c0d10d15b621492cbc5bd366cb36b6cced52da79b892b3de SHA512 1e4574d879580cee470d87f7359a0d879675efcf72f7d3026e6a33bbf51b73abeeca26eeb79051a6702a14be1da87598635bdd65e331c903ff47fadb0f19b357
-EBUILD appstream-0.14.3.ebuild 1774 BLAKE2B 0aaee1797ff87ea8680803357e95bc262c837d73a77b2b60dcfac87a364f913e8d618a1c0862f5b43dc615c925879b06fca5130fb6a0be826c60e42016499cc7 SHA512 9058dbe92cc16fc1227b224a278225f51cec5fb969f90183783adc8ecb1e0e1f9bf4bb99dcd5c396305b7c5fd3a0558cd52dbb4d8ee9b1b547ccaf480065bd8f
+EBUILD appstream-0.14.3.ebuild 1771 BLAKE2B e54b4904abf50fc210cd18a1462b0d1a0d97df38f81bf94f86a55dccc3ee32b3a0dadde3e5919ec5edea7fd1c4a03f6d0f4da6ff7f3ebd55fb8c3b9db47a5393 SHA512 28f8bea8d0f6899fef3458202bf80d72c9b9425d6f0965b025d3b4cb7635853eea9a71924ebf314b612363cdbdc160ed85ec51caa25700a7d06fc79d1604a1ef
 MISC metadata.xml 399 BLAKE2B 98e37c9ee3555d98672fc5341ef9db517e386c0ff141671c2d668ecdfcde0fab1e156bdd78fa865bb68ee602b6596b55a20a8513e7c6fb1bc6e0c2843ac0f683 SHA512 fd61c504d44edeebec961ecb6f480562d848a747ee94a8fb88c48e7d885df8475d5fe33422d081576b44a6b7e05d6f94fd9a73dbc3d19f6ead0076654f7a7019
diff --git a/dev-libs/appstream/appstream-0.14.3.ebuild b/dev-libs/appstream/appstream-0.14.3.ebuild
index 7a8b4e4420b5..163beaa684e4 100644
--- a/dev-libs/appstream/appstream-0.14.3.ebuild
+++ b/dev-libs/appstream/appstream-0.14.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ximion/${PN}"
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/AppStream-${PV}"
 fi
 
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 5687250d38d1..4ecfae006d0e 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,4 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
 DIST editline-1.17.1.tar.xz 252196 BLAKE2B ae25ebc8efcc5ddf7d68553b6a5d93738e4fbf67c556b4089ace7386cb70058f36137d99df2385e324b36a285aa319b49e1c2eb82059d99d511c43c70f55ce11 SHA512 9b3f5f4a833e9e38c4f99d2e7f8d2716d4db74b6a2d3362e6c513505ff17a79044496405458835d508efd79cbe9046f3c1db602aaad210926312c22057145d35
-EBUILD editline-1.17.1.ebuild 779 BLAKE2B 720abc5941aece6f32b6380f048aa093ebfddccbbea9f7180ee96946be614eef95248981d53f3c993cf7c83f0eea22e52b7f16653e4e6ba87b2bbf6fc7332774 SHA512 16b833462f06fe21d320a0e74aed88958e5992fd73a6dd6b061a2fca604bd8a8b10a81c17acb1268aac69a3571a9fc66c6e3a899c909b19518c242428904a699
+EBUILD editline-1.17.1.ebuild 780 BLAKE2B a7b816f883c8ba443177b64420a91c9a8a7eb9cc6f55ce6c4c4fd58e64089f2a07d9e0230eeefe6736446216803df9e9c440ce66e47cb3e974e232406d4f7a05 SHA512 08fbcbab0c74ea648886347e93d311040db80d23f1c237dde4c6c5734540e1a429abc2b2d0dda274db875f129a8ef286f72fd3c2a355c1d9f0fdaa51e7d69e1d
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-libs/editline/editline-1.17.1.ebuild b/dev-libs/editline/editline-1.17.1.ebuild
index 2846c63aa397..eed9640bbec9 100644
--- a/dev-libs/editline/editline-1.17.1.ebuild
+++ b/dev-libs/editline/editline-1.17.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
-HOMEPAGE="http://troglobit.com/projects/editline/"
+HOMEPAGE="https://troglobit.com/projects/editline/"
 SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0de53e962d58..bcbd2b3e6f5a 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,10 +2,11 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
+AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb8b4c92c897f7ebb4284445a489b5b28c630ac28e337bff977f67c164abed688aa0ed0dc76a715f6270e1001a7a80d46799f SHA512 8ac89c40aa108b097f18deb82ec3267d987aa16473fb40105aa7f83465cbea4ac1538bf4fc84c957e61250f9b8b6ea1f5694dcd5b404902ce8b73f53eed3308a
 DIST elfutils-0.183.tar.bz2 9109254 BLAKE2B 8dd92e7c2df13d51bb51085f6cf762ea1ec7b803dcebf1202a4441ba152ed0e3332b1267276de4650d5ed5c5bed656f72f4c4e9bbf20700be45312a202351574 SHA512 bdafdd738a33cebe4f87849e5e6f1133881e77ef71b27faa0f0234ff80e9674f506957898326c2a55fd8438cbd189f7930597d0b4b9ca6c77921cc0cbd83b6b7
 DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
 EBUILD elfutils-0.183.ebuild 2409 BLAKE2B 38ad0543c314452ab5342127afe96dbb58dd79c4b47db04edd1528c728f731d1d789adf1d01760588dd89f0d51ffd8b880f6deddffdf41028760cd1f197d3c14 SHA512 b536633804a651e240710c3fe036bbdcf2fe4115aebdce7fc046ecf4d1c6e288cb6ec688ea6a32d1365c9b41ad5feb5da1c979e1c586549c7508e6c23a148009
 EBUILD elfutils-0.184.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
-EBUILD elfutils-0.185.ebuild 2375 BLAKE2B b66ddb74e97c9783a671cdc943aa6c0300936d6b4eac824fffa5259fc6cac9a526a737dfb8a0938da2a337f9549e9eca47e31ac79722572bb876de9730542416 SHA512 8ad71599b66baba3290ad299207d394c202630818fd3e19fe8a5f338ba552958993f0322f7a41e06bd5d542047e65e0ea30041a401a1dff57afcbdcdd12c43a5
+EBUILD elfutils-0.185.ebuild 2422 BLAKE2B 8722db7c34a6e74ba835bc1a839bb32dfe88b9f9fdc55dcb487b136465951e7d1b9ee5f12724ebdab9a57e4d8c14a3b043c8d8cc7369c61ad3a5e929b9ee7de3 SHA512 84d9a249517f2e7a7504774546f6f2e80c83ef45a84de0d5a5e086c87d5c89136049d6f76387750fc5fe867c19fbcdf8d1c436387fae4511b30a5d7cb49ae95b
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index 5860b8abf503..38edee45ed96 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 	"${FILESDIR}"/${PN}-0.177-disable-large.patch
 	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.185-static-inline.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch b/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch
new file mode 100644
index 000000000000..ec1aaf47a331
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.185-static-inline.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/794601
+--- a/src/elflint.c
++++ b/src/elflint.c
+@@ -3434,7 +3434,7 @@ buffer_pos (Elf_Data *data, const unsigned char *p)
+   return p - (const unsigned char *) data->d_buf;
+ }
+ 
+-inline size_t
++static inline size_t
+ buffer_left (Elf_Data *data, const unsigned char *p)
+ {
+   return (const unsigned char *) data->d_buf + data->d_size - p;
diff --git a/dev-libs/gf2x/Manifest b/dev-libs/gf2x/Manifest
index c08cbe7e320f..89405692ba22 100644
--- a/dev-libs/gf2x/Manifest
+++ b/dev-libs/gf2x/Manifest
@@ -1,4 +1,5 @@
 AUX fno-common.patch 1170 BLAKE2B 828fb26be2a3055d0dfb7fb5b0237c0a0b6f22143ed0a55e786b3cae6e39a5eca189856ce0a53d5a672194e2a418e76934ade60549aa7cc6d46ee436bc7583cc SHA512 c01d85b974b58accff169bdb34292d79d84b9035374a92933a503622f66cd2b08f407122c16b8c358d418626449df33083ae554a7e7a334ed6f32d500a7d7084
+AUX gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch 812 BLAKE2B 169a9855a0ccdaed5bdc48175a75f801fec33a189640264b603afe3ae3f0231427106897ef8fa9fa3b57b0d7c83e85f307728c71446980b773e5cae633565210 SHA512 3c4b84757a7f3cfd14040cb30d3e9103f53092c2e02db2c81b912cefe83d45f66446fb331dec99758268d78fbb73f33d8a42a21fbaca05264c28d360754ffff2
 DIST gf2x-1.3.0.tar.gz 727717 BLAKE2B 65f6596a09087708e4ae940b067cb375476c1e7b25a28bf12e9318c752cb326516edeb9363d0f98a9b4173f5bcefd204aa62e1cb87b3f27ad9c30b661edc7451 SHA512 4991568032483e0ecb4552a698e5b7d09f80875e54584a0060a9473be1f87e4e8f714e657f08fec0b9fcf493d969408e5a9000f900623b3694aba1ecf6dc239e
-EBUILD gf2x-1.3.0.ebuild 1537 BLAKE2B 547d75cc83b2013547f860aee5ac9f84dc5f80a47678b0a32ef0a41dba52331501a6faea3a21e5601137a2fb4f74c977bb3d1a81293e69ca91968f53229ef649 SHA512 bb8ef59e2b186bc642041fe2b77db5ac36adb8a84822acf16d8e9b6a0be34a3a65c1d6b8b4643b19a8c787a648b4497e2aaae1f9a6c82d786a9f7503c96617b8
+EBUILD gf2x-1.3.0.ebuild 1621 BLAKE2B aea03ad23616d78db41c6cf21980f6a72a40721ecd504a10a3c3513a79ff3b866920fa2f7da7f5e5986eee26c1b8394819465fbd0627f75bf0006e903c3354c2 SHA512 94bbd2e05dfd529251d00b423b5225684286d344a72a693cb32b7ed219389b5894e4cd03f834ce7fdcfd21700314608e42a216929f657ab2078c87da5a774865
 MISC metadata.xml 754 BLAKE2B 53d2cdd4bf257213b6f431fd7692593d9577f0c146c2b40546846ef868a781f8ef40d82fc3c833edf7e0cb9c9805c67e1740af2ba205a2e50f767d3e7160303b SHA512 48a3afc2bef2fee5bce10f9d0f4580269bc0089855f2329cf74c3726ebf20ab05867e628dad5e05c57982433cee2a17782b30b16080a76ebc979373105e18803
diff --git a/dev-libs/gf2x/files/gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch b/dev-libs/gf2x/files/gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch
new file mode 100644
index 000000000000..cc1bd0f46a9d
--- /dev/null
+++ b/dev-libs/gf2x/files/gf2x-1.3.0-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch
@@ -0,0 +1,29 @@
+From 292b5784d907f420886e50d5683517b8fe1abe3c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 5 Jun 2021 18:29:08 +0200
+Subject: [PATCH] src/tunefft.c: add include statement for MIN and MAX
+
+Add #include <sys/param.h> to have MIN and MAX available
+for next_step function.
+
+Bug: https://bugs.gentoo.org/719982
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/tunefft.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tunefft.c b/src/tunefft.c
+index a08d82a..f5abc82 100644
+--- a/src/tunefft.c
++++ b/src/tunefft.c
+@@ -65,6 +65,7 @@
+ #include <float.h>		/* for DBL_MAX */
+ #include <time.h>
+ #include <sys/utsname.h>	/* for uname */
++#include <sys/param.h>		/* for MIN, MAX */
+ #include "gf2x.h"
+ #include "gf2x/gf2x-impl.h"
+ #include "timing.h"
+-- 
+2.31.1
+
diff --git a/dev-libs/gf2x/gf2x-1.3.0.ebuild b/dev-libs/gf2x/gf2x-1.3.0.ebuild
index 0ff8c7a7a428..d879f80de12f 100644
--- a/dev-libs/gf2x/gf2x-1.3.0.ebuild
+++ b/dev-libs/gf2x/gf2x-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,10 @@ IUSE="fft static-libs custom-tune"
 IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
 
-PATCHES=( "${FILESDIR}/fno-common.patch" )
+PATCHES=(
+	"${FILESDIR}/fno-common.patch"
+	"${FILESDIR}/${P}-0001-src-tunefft.c-add-include-statement-for-MIN-and-MAX.patch"
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 0e94441e2fb8..9b80464b2e71 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -3,5 +3,5 @@ AUX isl-0.24-nobash.patch 1092 BLAKE2B 42dc0587fbb05584ff51ad490cc487159a7bb2ab5
 DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
 DIST isl-0.24.tar.xz 1930956 BLAKE2B 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d SHA512 ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
 EBUILD isl-0.23-r1.ebuild 1946 BLAKE2B 74d448cc3408bdb9bea687ebf578effc2b16676974b156b3dda38c84d27ccb5073bc8de951c615f3e68ff8a0ea0fdd65ecbf6cf41867a50484434e6c8a446e7a SHA512 c8d379c083def1b02c4c9e50d5d520b6cdcbff3fdad85c8c954a28004174ef9e2fe6b985f79d3bd770bcb959365ab067f17a361a9ce929edda4a9dc2eb9ca30c
-EBUILD isl-0.24.ebuild 1992 BLAKE2B 94740683f4723be4a48efd694b1f6ad558b432d27a5863e5abe7d5ea5cbdb90cd4a92b285bf059a5ee5cde841f1dd5aee97d1bd858e83f5a01b6597c2f887726 SHA512 ba3424ef9c934830c6c1649ef029b984fcba67601af66cb93c6db6b77f376bc675f004693e7fd448925409239d99f8487042850da7a728d90348c5bb862d4799
+EBUILD isl-0.24.ebuild 1985 BLAKE2B e0a65b6a516eb5a69ccc4f82af31b51912561c371005f01552f0441d5d1dab906cd64ac0d6796e33548a4684b3f4cca39c471051b9d467b655923d18a5ee811d SHA512 b18e57fcc4ddb1aa00a9e849d2741dc5a91120e7bf0a1d5fb67ba2af2b88a2ac998e592e31865629dc57516723fbf08c17878d30803d621a356f19e0eca769af
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.24.ebuild b/dev-libs/isl/isl-0.24.ebuild
index 5793b07aae36..9b5ae94248d8 100644
--- a/dev-libs/isl/isl-0.24.ebuild
+++ b/dev-libs/isl/isl-0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index fbec6f92dd08..b5859e9c0c25 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -9,5 +9,5 @@ DIST tl-kpathsea-2021.tar.xz 32308 BLAKE2B 83052cefc5699d46ce104e4379d39eee8e86b
 DIST tl-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303
 DIST tl-kpathsea.doc-2021.tar.xz 1066608 BLAKE2B 798ccf9953e4fa2037f81b56dfa30cf99c56c17e2942d5a0f2041b871958284f05150e5d7631b542896190f178327f009130e6bb07f60e8173ec1e9f12c4cda9 SHA512 8ecccee7ad99220f91139dcd9c2ce0bd19eb0e2fe74f0a965f68e59a28bd3de454624d6e014ef2a5c481a537acb95b08a9546a79abd8df429300043ecf973545
 EBUILD kpathsea-6.3.2_p20200406.ebuild 3297 BLAKE2B 77daa60068d648efb1b1c3020d9b78446ee588f478c4f2feb2750b1798d0e18bcb6633c33a75d953879ffc0c0dc1f3f6ef2955bafbd3403b8658a70dcf4bf2d5 SHA512 6ffe280320825ec0228cefcd822347b8f80f70a864b27a777c6615697ed4c11e4dae1e81d6f7dce1c085abd12dfd479c807d7c2358fed6b02b2ab4a81a5db8bc
-EBUILD kpathsea-6.3.3_p20210325.ebuild 3318 BLAKE2B f22884982032df28eb754ad3aecfe3b7fc1b355b72947c658fbc8ca0af2a62bfd4b263c0a6c882724421bc661080539d91d5583064c81161ad82068bf561704f SHA512 1c0fbc057720571211fa3433b269d632f0b6f53ae449f2a8d1d40dcba817a75c569221ad3eaae6a5a5416f533f7f1b8bb1df5b30dad1b5a9efadb9ebea24eb73
+EBUILD kpathsea-6.3.3_p20210325.ebuild 3310 BLAKE2B 1076c000da7bd16e06b2c3ae8f30b35e4db70bea99a33101d8bd691bf89b79936f1fa89788aa77d46f7a3b410e6d1f9764b57a86be0f480f9056f97d868a37ae SHA512 34d099988c6f36c5d2c255cd04c7c9e9abaa2313f259b55e28170280ad1e473d4a2c05c794ff5ad62e816cdbb16ce965d2ea1935fcc1a5f3006c5185245d5504
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
index c5ab6c78239b..fa2ca0b061d3 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 45d3131dc8b3..980a38de7dea 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -3,5 +3,5 @@ AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
 DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c59191fe2b836a0c2a988b6d0404821a9f99be1fa4b258afbbc35b0cb254b348a1e7a0f7a8c4010645afff52f91 SHA512 14ba2779d94209312a8a1bbf598e6a31820df4fa7e222ae1abb8d4234a6c7ba7068e06a73ad4ee93bcb53ccb99a8007d799d9e66a9921704dc75c84b0e7dc307
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
-EBUILD libofx-0.10.2.ebuild 1154 BLAKE2B ae6eb8bc734361c773269476dbb50424575a74ddc28ff487a8d97a9ba816c5faab98cec8ae3ce8613291ce635e39aaee9747b26f419c18df28be83551982b22b SHA512 366671d6f3aed9dca56e113ca9ae0052bf77f683db0c57509cf72a708daf76db8dbafc9bcb10adfe7f69b6e2e4682c21f6ecdac22c6f1001a16e7e9563b45d0f
+EBUILD libofx-0.10.2.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
 MISC metadata.xml 296 BLAKE2B 8c2ee36fd8bf974eaef2eb12ba873f5459d71b0dd9a161740f70bbb9e157ff6aac8e82457a30f8e00d1fc502aa4b186f31fdd97bd83ef4c54970aa751d379d54 SHA512 a95d11edfc43b8a9ea3bac90eb1ee87fa9e73388ac87eb9f8fe8773e7558bb9b761482355a841a784baaa9d0ca69a2ee08274392adc852e03594cb4d1bd7f60b
diff --git a/dev-libs/libofx/libofx-0.10.2.ebuild b/dev-libs/libofx/libofx-0.10.2.ebuild
index 3f8f6d55f1ad..1acb92d8616e 100644
--- a/dev-libs/libofx/libofx-0.10.2.ebuild
+++ b/dev-libs/libofx/libofx-0.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 718c4ff4818f..747ce09120c4 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,10 +1,3 @@
-AUX librelp-1.7.0-missing-files.patch 10718 BLAKE2B 83c4621bbb5e896464d0ec3f8c2ccb1bb5d59371582cf2d360a314cf5bdb8094326aa17b913178206fc8a3dd29f98d7b0c20764fc07e96f5c1204cde51d1243d SHA512 9a8a88a2704b9c16cd5a9bb8c1ab19e6fe541bd5a10f7016e55733baba343a46f1c372f2865f23970d4806395f0f071ab5ec940b7fd207d836179da6818b0a28
 DIST librelp-1.10.0.tar.gz 543414 BLAKE2B 3c7bace3c7892755c943dc4fc9bee7962e6891f5200ac184555da5f552d19d65f5604c745653d06a87210152af9b57f7234636e59257dd29dc83b5dc566c9680 SHA512 a38840231902bec034edb497166deded7577c989e4f735e406c8488384972925de1ca6132b3080472f7919d2439559c8774c02a49c356e90ad791dfbba2a4865
-DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5c0de0bc1ba81fcb6d6ed6529146140a32b05fcdb47330be2b573a9d84779ea519dd9cacf50d3b7710d523b808 SHA512 e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd
-DIST librelp-1.8.0.tar.gz 539467 BLAKE2B 3d1d396059955d2b83a21a42838b56c6a18cde296e6b7c4beb79ba9a8d222d7e5d738419b87b24ed05da553cb16fd827e8820c4c81c50d5a3770ad745efe3ef5 SHA512 aa3e02010cdd4587ff28987f00291708e752b2e2f5f37f5a5239bda6992f55cf428cf1b6e06847062be31844cfdda6b654bcbb9024dff943d140b405ec93c0f4
-DIST librelp-1.9.0.tar.gz 540477 BLAKE2B b42e35e2f3e310cc4a978a6d2f0a127317414d93d87bede5e1bbe69e3031482b4d895bba2256668d383911e2ef55cc3086a44d8bebb15ea56c6ebd28e64e545b SHA512 3cb8cf2707cff662bd0b9100c737458b6b96820db7e362094c77cdb50455fcb944d7760921e0b758a3a6cd15d685f488a976fe909de034c289635c660caae723
 EBUILD librelp-1.10.0.ebuild 1344 BLAKE2B b33053f78d91432ca014378e08f7d8a901538b5c3739a501f97b45e33d63928ba27d91e20604d0a27871aa3177bcf0c7b29346268807272b7b2c82af19df1b7f SHA512 ded75d538100e75c1a2c11823e0ec82c1ddedb928c62ae1af3bf4da98ff7aac3093b3682097e730bf06648480286f280a8547acc44ab0ee03ff62580730d1995
-EBUILD librelp-1.7.0.ebuild 1399 BLAKE2B cca3ee429679bbb3034b7ffaacee4a33e2e44c53ae8ef4952700a41d9e90404d756f56ee5aee581b44d2b61d2187e931c4781ded32ba87db81ffa71be8daf3e2 SHA512 b56657e77d6b8d8a35d79472b629c0eb44291cf5c887200592c267fa7a24ba7d109110f15002f75001c1c4aaf2249ac3bd48fd8f0bb6ed5372f169a642227478
-EBUILD librelp-1.8.0.ebuild 1352 BLAKE2B 095e292659e768b89a6da33ef46deff039b51eb90958cef597841be7e185b3276422f2255ee78af5295c4d73171536c8fcc36c7e877d218fe07f1825f4a7f12f SHA512 e37ffe38da9bcb306832066786f26116629182c4071257fa6ce00e43d6ed86d319bef49806db30c2bc5ea8cdc107246ab47f2d9ddccecbd7a12dd140943d97b6
-EBUILD librelp-1.9.0.ebuild 1352 BLAKE2B 095e292659e768b89a6da33ef46deff039b51eb90958cef597841be7e185b3276422f2255ee78af5295c4d73171536c8fcc36c7e877d218fe07f1825f4a7f12f SHA512 e37ffe38da9bcb306832066786f26116629182c4071257fa6ce00e43d6ed86d319bef49806db30c2bc5ea8cdc107246ab47f2d9ddccecbd7a12dd140943d97b6
 MISC metadata.xml 348 BLAKE2B 2af0e4639968ab3b7e549bd57d42637cf2f6938a1e00d78f90b1697462a76f92adb1396ab3b6966cd1dd433870c5eb23cdf75e8ee9b022b4504d1b639ec39007 SHA512 c294b01d94ab0b79a0552cbb0208dd02dcc022ae8a3b8b8ebcebe4ede39ab9ae01a53af1b5bf28133ba9fde4962f874f351b21979d50e058bd9fede0c5c46f96
diff --git a/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch b/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch
deleted file mode 100644
index 327ca720c72b..000000000000
--- a/dev-libs/librelp/files/librelp-1.7.0-missing-files.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-https://github.com/rsyslog/librelp/issues/206
-
---- /dev/null
-+++ b/tests/tls-certs/certchain.pem
-@@ -0,0 +1,60 @@
-+-----BEGIN CERTIFICATE-----
-+MIIFVzCCA7+gAwIBAgIIWxfNMhQmuncwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
-+BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
-+b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
-+MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
-+MDE1NVoYDzIxMTgwNTEzMTIwMjAxWjCBmDEXMBUGA1UEAxMOcnN5c2xvZy1jbGll
-+bnQxFTATBgNVBAsTDEFkaXNjb24gR21iSDEVMBMGA1UEChMMQWRpc2NvbiBHbWJI
-+MRgwFgYDVQQHEw9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQG
-+EwJERTEbMBkGCgmSJomT8ixkARkWC3JzeXNsb2cuY29tMIIBojANBgkqhkiG9w0B
-+AQEFAAOCAY8AMIIBigKCAYEA8nNWVoZwi7fYKSYxm+lidTbMQEHh9pLXV8P1N2FD
-+wqhNc6Z71VqQw6gIDyzxBjZf3ldyPb6xAcxikvk2XCxVGqDaP7E1rfnCDSqxcgLG
-+r1/TlRH3fFMFPqzMgs0GbDoKi7WuhcNMH1yIRk4uPVSUY3IclcE9sNvMpNVY77c9
-+tYeLyoLgG8A2ljlSjbHXDmR8E1C+WcOvjFKQunpv29zIOvfp3Wuw0g3C6E26RyvY
-+OnNNq6bmDHXdyIkxYNPwxyfBDGq/WhnrFqQTyEqulVLVVIpK+3fIdtmH/4OpOwxz
-+KM0q2k9CzL+AI1JqlFoePeIKYQYAOssUBwB0VBDbhyo8f7txBs6OB1phPcmbkAo2
-+bJfL01UT315omqlGWjvvDRjDEeRAfXnWu/UVLIs1MNn09l2+fKwgZyOZIQEk5gGg
-+b+xO7pZp5W1IuLxB1DMatQjYK1L1MG8KUebovTyumAj8kOaCJaqa+EWcPvsH2wJb
-+zp7JZV7xAMnNQGLHHccY9Iv9AgMBAAGjga0wgaowDAYDVR0TAQH/BAIwADAnBgNV
-+HSUEIDAeBggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMRMCAGA1UdEQQZMBeC
-+FXRlc3RiZW5jaC5yc3lzbG9nLmNvbTAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQW
-+BBTFQ9rF9eWMeqNtrDMOGb1fZ54EYTAfBgNVHSMEGDAWgBQMETadsJwFRGSslyZA
-+wChTI52OmjANBgkqhkiG9w0BAQsFAAOCAYEAG9hahjpm74U85pP7/zngEJ5P5nnM
-+3aC8u4lDM7kodtnxJWoisbv/EBr6SihpDtfWA6+bAJGGu+4UBUaMyUg8w/FjylHc
-+INtljbalRuu7YguL2uLdlDNCxQa1XkWugYMObR6r6OvTPUwK0QakTsZuibRbWBDz
-+lWKOoM7ZSxZi9DaeChe3yNSGxJSC9xHZbYYBOP5RjChXTZTKtYZemF2wx6EtWRtc
-+vXK3TbnJtDy7SPm60EoFnLXUyywmo5mCUSlx85HinS1DzYo7I1yksWQgdW4XgWId
-+9RgwPtP0iZSjrZ1TwKqcvo5jvn96LNCoob+JyhpL+9mFvPc6C3vLOxyG7JZOb7Dn
-+IpJf52KeBnLRUoIpp+x1XYptoy1ti7r8YqPYn5EHmPxCDVoujskRSX7ncP3SV1qY
-+eEgr94Tw/l8GyiaGyixVl2pAMbzYJtgrzQ9UvZurhSPjApGlm87X5KHHXN/CJTY5
-+8t59+qvjESRJk74JNpm1L6X/N7HpAsqcsYjP
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIE9jCCA16gAwIBAgIIWxfM+RyuD1EwDQYJKoZIhvcNAQELBQAwgYsxEzARBgNV
-+BAMTCnJzeXNsb2cgY2ExEDAOBgNVBAsTB0FkaXNjb24xFTATBgNVBAoTDEFkaXNj
-+b24gR21iSDEYMBYGA1UEBxMPR3Jvc3NyaW5kZXJmZWxkMQswCQYDVQQIEwJCVzEL
-+MAkGA1UEBhMCREUxFzAVBgoJkiaJk/IsZAEZFgdyc3lzbG9nMCAXDTE4MDYwNjEy
-+MDA1OFoYDzIxMTgwNTEzMTIwMTA1WjCBizETMBEGA1UEAxMKcnN5c2xvZyBjYTEQ
-+MA4GA1UECxMHQWRpc2NvbjEVMBMGA1UEChMMQWRpc2NvbiBHbWJIMRgwFgYDVQQH
-+Ew9Hcm9zc3JpbmRlcmZlbGQxCzAJBgNVBAgTAkJXMQswCQYDVQQGEwJERTEXMBUG
-+CgmSJomT8ixkARkWB3JzeXNsb2cwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQDHA1CeNI30en7OKGJ/pWyNSH9rnw8z6egDxdTjtOIichA2/LVPaGZYecI0
-+GH/UtkRgM69kFuo6dRaWvr0yp+XPfGlAcFcPg6cYKEoYyb18HsTReyuAcdBcYQYg
-+2ZdmAqtqeHAqcb7wSEB8XuXLdD2Flsco3GaT3zFNv7t7QFDW1b2tT/92w+QGtI1T
-+r5LCMVbISRGSQzhCv29l3UtWt4SKA9W8yhg5zMJkMExaUJVtViRFlAFzKrUVKFqZ
-+8sszy2yXIcTLskJJc5if8o5cpWCrbcXSb5TsHA+4FHOB6ou0z7/s3LwYjof056Zy
-+ixj0LM4sTYIEttDuLERRvYTIhtLhlA2BWfAfuW9bGuog0C9xGpt99vniHJlKmMms
-+qz5hEDLYziUEfj5qzSxKMcA2VCeO1DgajSedh13VN/sWUyk5aKA71i40Cnp4oK/u
-+zeYW7vWl/ttCEFc6x8pzeMdoBjv1Jd9hC0Z2UgttC/KnMTKX3y6NR1PVFjDQ3MIA
-+7Bhxj50CAwEAAaNaMFgwDwYDVR0TAQH/BAUwAwEB/zAVBgNVHREEDjAMggpyc3lz
-+bG9nIGNhMA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYEFAwRNp2wnAVEZKyXJkDA
-+KFMjnY6aMA0GCSqGSIb3DQEBCwUAA4IBgQCOv2kyg8vZ3jncZuZ4i2k0QbXztZoO
-+jMDNqFX2935lK6WrVZ6u1InZzsaqrXXOJions3EvmmAqrdTBW6dyw6V2/lic1gGz
-+MhlafAPe0DyQCaXp9iFCH91Hzo94YhuPbne1qdga9jrVTiQIHdIKqVtbiUv7i7mN
-+43GssOm4a1guf+Qs5rkuHG4YwiJZhjzhmixfXCerHXykJkpSvBUb6EeKA+p5/w+I
-+Wjm9sAkJgqcvrNvOwwBZInU1I56zmM0ZwWucSydf0hgOImpgO5F6KGVQRoZsO9IA
-+Iju2RQ1y9qVTNp8evVjIMuqXh5ZtU9ti/buZrjr5Zb601jFLZCMrpDVUcVyHUfOB
-+rb3nkUFDcFcrKlfovwp/fvlISKM0bp6pFas5X0FXg3sVVI+iIokmHsmqRUHhjdLX
-+t27+/TYpyEkjF1cH3acd7MOcw33KxE/4+qUHT2QU9COPkGu7oPS24qDYnmGPLkev
-+ZSmpz4jLTmbCBSRcoOB0Q4K36WnegzVtvd8=
-+-----END CERTIFICATE-----
---- /dev/null
-+++ b/tests/tls-certs/ossl-client-certchain.pem
-@@ -0,0 +1,54 @@
-+-----BEGIN CERTIFICATE-----
-+MIIEoTCCAwmgAwIBAgIIXBeg0SlsiUswDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEzMTI1MFoYDzIxMTgxMTIzMTMxMjUzWjBY
-+MRcwFQYDVQQDEw5yc3lzbG9nIGNsaWVudDERMA8GA1UECxMIU29tZVVuaXQxEDAO
-+BgNVBAoTB1NvbWVPcmcxCzAJBgNVBAgTAkNBMQswCQYDVQQGEwJVUzCCAaIwDQYJ
-+KoZIhvcNAQEBBQADggGPADCCAYoCggGBAJ2R2tguPZ2uhcPFp/akZvjIkZG4cCDc
-+7egjylP3uFJD86fr+9+KOyywE/pi06FTpFFxH2jZ/bw5SvvJat/ziISwgLzA9RtC
-+EfZMGtgsYgtdUGQwmtPbwdV/OVPkvegeBJ3JEuDkVykpAbnx5bx0pudLYeZnXGxO
-+7u4iDBsUbegMb+7uw7jd3xXtepZbzIXl41DEziu/tjfmIPxuRX4JvYR6rwcn9Jkj
-+Qd822CkxoJaEL/1FLtS0+frcjyPA4AatrQpy2vQ7ocvWpjvsRsSV8nGlrQgf5wYY
-+DtuAUZa6JPZkAmvT8HYBNDpyAunL0KpiUQyPg77AR5nSknLtU6VJBdTJofRN3hKd
-+GsgXhPOifGdHgkuGHnOG4iYmEJSjmZsImXidPTNdhcJGZZSrcLQ7wSaLEbZmJ4gi
-+hAO1CEUyjIEjvmLcb6CqXp8D96f1A3A8eAnQhESMGa9295P8r8b929lMyyB5RHHL
-+5lVhqXqvC6Om7empEa/6o12sl+fvK7aoNwIDAQABo4GAMH4wDAYDVR0TAQH/BAIw
-+ADAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAweg
-+ADAdBgNVHQ4EFgQUlBeunSFXuHvBrhB7CKkhvKEUAIswHwYDVR0jBBgwFoAUsJ9n
-+MyyIiIkfRGJ0nSX/wAYTXdYwDQYJKoZIhvcNAQELBQADggGBAEk9KaiQ6NzNHf7M
-+kvPosgCu9Tm1jgRg4qjdMHxtzDxFQZWOtMuDxqqrNEC9FEF5zpEB8Z4VtubIeVK7
-+6i6BdSMbI5zlnlxffPD1Gz8AKXe9BNb6UlLvlEC+58D4CJmrxDuKZXaBzy3xh2TP
-+Al/s5XkPBuXKc7l0qQdDkt67LfDCrwpGfseOFXNUHDREBOulwX4LJzilVqLMsp03
-+qMHK0f4kOxc0oJrH+2+jCgpu1QPoFOLl/6shbRw3qls/f/coWnnS5kd2NOPUf0pe
-+j5lBt5ThhnLQIGwJucLa6cHVx+R4BWtTz4/v8hCwWr1cUbNEkxTyBErl0l8KkpCQ
-+d0NCuZe2u2AJYEKdNilSiBr33ERZ70peE/ATfk6hv9ysWepeGYJiuybWXMrDtLbw
-+X9wzwtdetIvvMxXiNAT5RpsZtFrdBD9ZwCHhJ+xjEycRDQKdnL/H4WbpAfvB9zcJ
-+WCJ50FBFjNoHSYrwmhQULOYa8AjVxxrX/27g2mN3P3sDLG6bzw==
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIEiDCCAvCgAwIBAgIIXBeb1iWItcgwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEyNTEzNVoYDzIxMTgxMTIzMTI1MTUwWjBE
-+MREwDwYDVQQDEwhzb21lTmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMH
-+U29tZU9yZzELMAkGA1UEBhMCVVMwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQChCwzkraL2v9SFAY3WD1au6cRCSaqrgC/5cecwzGBum0njlO4kmUkI5G4g
-+1cwTtXqcmTh17EKaHlBFougnH5JZdDFmKpOIp4odACl5uuT5J1lRh6lsOyVq9X0h
-+qp9qfjn1rrn7XfLk9i9+or0/iLK2megmU5ZUX6pNpoKaGeLBl4CeiiiqdaUeyGK8
-+YKQksx/0zdeWb04Yp+zHIddcGoGAx88zf94onJQESsVOn1yG3sGM7rhfvOHDLGJ4
-+flE+1ww8D6rZZci6D4bYhfA1bpiRwsU3UILginUVpfbMn+W6f2s+Cq0dbiQza0lf
-++S2rK+7cH+4z9ltqA054B2/JPuNKbwf3lLoabGNWu47TCfyzaDUb7Y70CFRrYfkN
-+4pD5y+Z838IH87RKJioh5q2ceVX5pyNv8XmkMuvWYDrnjVTnX7Q0fN/T6h8fVTIp
-+lojlgV8z2tPcrJE0M4Y67nSAgYX7v2AtmcoBPML5Sairzq5apiljb0Wm5KSNwXZ2
-+eAz9nTsCAwEAAaN8MHowDwYDVR0TAQH/BAUwAwEB/zBIBgNVHREEQTA/ghNzb21l
-+b25lQGV4YW1wbGUubmV0ghNzb21lb25lQGV4YW1wbGUubmV0gRNzb21lb25lQGV4
-+YW1wbGUubmV0MB0GA1UdDgQWBBSwn2czLIiIiR9EYnSdJf/ABhNd1jANBgkqhkiG
-+9w0BAQsFAAOCAYEAl6nIgBHMX8rnAC054xx/aQcXazrv89KyEp0ydzBwJQOTei7I
-+UGWQIRkSLL+CtrGhcLPQpTzAQn5NDo4ayinAtlPtP8MYcMBv13ZBJXLSqRfrTM04
-+wkEbsWuCp+c/fU14E+QYSk4AwpoUdQeqmdM60KAoHNn+BaHGJRhRGOY9A8hfQQ5L
-+S2TpJ+suJuHafNjr9vvhlqTSefCfENV40Ie1nwHCbqNZdDZel1iQBmdI7WJG7uTI
-+OrSOPepYzOAYKQ+PWKMvZuzBc6ei/lcIpPHksWxK7nY35izSHjepMLGqH0/XZ51i
-+wN55slw9agg5eCq/zL/+Ebu7+yub8JhA9D4pgT5nBp8LtQPOIKnkVlFookjfyO8/
-+dWsjGnhT9RNbDUQg7Y7spTWPT7wqOmQchEvQt+x96BHq4SLe88HnTpBk2Cb370jq
-+QQFW6s9vwo9PjOafOkyqYsiBuuCFxT80GegBlaipDNqLYhJ1fJAdQtRtFgogqpeS
-+thWJZzNJeHyZSpah
-+-----END CERTIFICATE-----
---- /dev/null
-+++ b/tests/tls-certs/ossl-server-certchain.pem
-@@ -0,0 +1,54 @@
-+-----BEGIN CERTIFICATE-----
-+MIIEmjCCAwKgAwIBAgIIXBegQDWsgowwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEzMTAyNloYDzIxMTgxMTIzMTMxMDI4WjBR
-+MQ8wDQYDVQQLEwZTb21lT1UxEDAOBgNVBAoTB1NvbWVPcmcxEjAQBgNVBAcTCVNv
-+bWV3aGVyZTELMAkGA1UECBMCQ0ExCzAJBgNVBAYTAlVTMIIBojANBgkqhkiG9w0B
-+AQEFAAOCAY8AMIIBigKCAYEAvYhZDSdPcxBgjF+sgQZ10YPuIXIzoiq4G943OGFX
-+EdMc0kdaVQcCKkR4raPMR0wKs57akpiN5CrU1HvkwYZbTNB/BpyhUuZnx2qjTRyO
-+pB71k62z7HP3KAI/GYfEMX5DNPS0X3B7chkAT4Sk1Xdn3WjW3BVt3GK4XdWmG2M0
-+cmsYaFvijFJDi6Fs8fy/5sG2x+WBwct1Kt8HnjfR+nh00YhgiqOdX1jOrDN29XHk
-+n4GIEm/BRQRQ0/PoOa6VWGVVxu+8sfmM7IJ8kC5/QII3PFZCplqPnxFYd3C0Wa6v
-+au+tYisJ9B5CB/fn9ars7H6nFMc1D38G/sVkspdJrFuFbQLElkH7ydxBZBv3O+fl
-+Iomav/+JL1PiNHFtXxoGsTOPHHFKbqauxLuTbv9B5D1tO/MaxOBTt9MVMx8rDpVB
-+y0spKhfWcxJ/0Hge7G9XrFGpN4joBPHPMghM8QjS9/EL8r98m8PNQk6OIG9TNeQC
-+gzglQIV3K+rhFwTeeyetxDozAgMBAAGjgYAwfjAMBgNVHRMBAf8EAjAAMB0GA1Ud
-+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMDB6AAMB0GA1Ud
-+DgQWBBQ3rDq/2kYOFskMD0lHFG+g2Ej/2zAfBgNVHSMEGDAWgBSwn2czLIiIiR9E
-+YnSdJf/ABhNd1jANBgkqhkiG9w0BAQsFAAOCAYEARbJDuWZiqwA/CU9Eh99POTOk
-+fnWdog8tLaOPLFS5mCiLNDmTXX14syAAjhbRrJ+43j1HWXbgovzDqzFtQzbztCMB
-+qpxQy3d3R9nUKv6NpNT/IO84OcYuiMtRGr/AaVqc2PZlFirBqlQkxFUxiDc2pIhy
-+h2orOJrPu3jSQdWI1PDT6oWKCwHdU+obqh+NmRWwjetpmeJ5r/kgAlZJ1krlNPJU
-+V3U/J9WTdOYMhLcn4RcNOTAyrmxOoTEIOcqkXzJOypbkMcZic+OHCaDohUsfdOkB
-+Xxz+6nP4xqnOcyHBLNTjVVrnr+wyqsWA18HoyLiCluf946S6mVoXcxwvWHzz7VVm
-+qHVppLVD/iOJxtl4bm8YEYjO4C1IPxWOCszG4N71Reyo/+p1UJ8Ww6IAgJj0jX2l
-+L7pqCwZKXhd8+LT05dZr7YJV/EjmGV/pL6IU3RAk6s2BqgtTkvy5nnmSPjBFuxG/
-+gUBfaglsXC6w6R1aMVr9m3E1ht4vOPu9Qx7E21oG
-+-----END CERTIFICATE-----
-+-----BEGIN CERTIFICATE-----
-+MIIEiDCCAvCgAwIBAgIIXBeb1iWItcgwDQYJKoZIhvcNAQELBQAwRDERMA8GA1UE
-+AxMIc29tZU5hbWUxEDAOBgNVBAsTB3JzeXNsb2cxEDAOBgNVBAoTB1NvbWVPcmcx
-+CzAJBgNVBAYTAlVTMCAXDTE4MTIxNzEyNTEzNVoYDzIxMTgxMTIzMTI1MTUwWjBE
-+MREwDwYDVQQDEwhzb21lTmFtZTEQMA4GA1UECxMHcnN5c2xvZzEQMA4GA1UEChMH
-+U29tZU9yZzELMAkGA1UEBhMCVVMwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-+AoIBgQChCwzkraL2v9SFAY3WD1au6cRCSaqrgC/5cecwzGBum0njlO4kmUkI5G4g
-+1cwTtXqcmTh17EKaHlBFougnH5JZdDFmKpOIp4odACl5uuT5J1lRh6lsOyVq9X0h
-+qp9qfjn1rrn7XfLk9i9+or0/iLK2megmU5ZUX6pNpoKaGeLBl4CeiiiqdaUeyGK8
-+YKQksx/0zdeWb04Yp+zHIddcGoGAx88zf94onJQESsVOn1yG3sGM7rhfvOHDLGJ4
-+flE+1ww8D6rZZci6D4bYhfA1bpiRwsU3UILginUVpfbMn+W6f2s+Cq0dbiQza0lf
-++S2rK+7cH+4z9ltqA054B2/JPuNKbwf3lLoabGNWu47TCfyzaDUb7Y70CFRrYfkN
-+4pD5y+Z838IH87RKJioh5q2ceVX5pyNv8XmkMuvWYDrnjVTnX7Q0fN/T6h8fVTIp
-+lojlgV8z2tPcrJE0M4Y67nSAgYX7v2AtmcoBPML5Sairzq5apiljb0Wm5KSNwXZ2
-+eAz9nTsCAwEAAaN8MHowDwYDVR0TAQH/BAUwAwEB/zBIBgNVHREEQTA/ghNzb21l
-+b25lQGV4YW1wbGUubmV0ghNzb21lb25lQGV4YW1wbGUubmV0gRNzb21lb25lQGV4
-+YW1wbGUubmV0MB0GA1UdDgQWBBSwn2czLIiIiR9EYnSdJf/ABhNd1jANBgkqhkiG
-+9w0BAQsFAAOCAYEAl6nIgBHMX8rnAC054xx/aQcXazrv89KyEp0ydzBwJQOTei7I
-+UGWQIRkSLL+CtrGhcLPQpTzAQn5NDo4ayinAtlPtP8MYcMBv13ZBJXLSqRfrTM04
-+wkEbsWuCp+c/fU14E+QYSk4AwpoUdQeqmdM60KAoHNn+BaHGJRhRGOY9A8hfQQ5L
-+S2TpJ+suJuHafNjr9vvhlqTSefCfENV40Ie1nwHCbqNZdDZel1iQBmdI7WJG7uTI
-+OrSOPepYzOAYKQ+PWKMvZuzBc6ei/lcIpPHksWxK7nY35izSHjepMLGqH0/XZ51i
-+wN55slw9agg5eCq/zL/+Ebu7+yub8JhA9D4pgT5nBp8LtQPOIKnkVlFookjfyO8/
-+dWsjGnhT9RNbDUQg7Y7spTWPT7wqOmQchEvQt+x96BHq4SLe88HnTpBk2Cb370jq
-+QQFW6s9vwo9PjOafOkyqYsiBuuCFxT80GegBlaipDNqLYhJ1fJAdQtRtFgogqpeS
-+thWJZzNJeHyZSpah
-+-----END CERTIFICATE-----
- 
diff --git a/dev-libs/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
deleted file mode 100644
index 5b9aa08070f0..000000000000
--- a/dev-libs/librelp/librelp-1.7.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-files.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.8.0.ebuild b/dev-libs/librelp/librelp-1.8.0.ebuild
deleted file mode 100644
index f877c131d5b8..000000000000
--- a/dev-libs/librelp/librelp-1.8.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.9.0.ebuild b/dev-libs/librelp/librelp-1.9.0.ebuild
deleted file mode 100644
index f877c131d5b8..000000000000
--- a/dev-libs/librelp/librelp-1.9.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="https://www.rsyslog.com/librelp/"
-SRC_URI="https://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.5.0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="debug doc +ssl +gnutls openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 8f32cbeda692..eb48d3d96718 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,6 +2,6 @@ AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db26
 DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
 DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65
 EBUILD libuv-1.40.0.ebuild 1702 BLAKE2B 3a8c32240dffaf200cde5cea866934965106d3dfcd56b330d8f346e2b317d87a3dad03511ae954f93e3548c5baf9d707a40fd25347768b9125e55084f108d4ba SHA512 147a8e3ad48b3dbea5da4b635cc472d5f85b4ee3deb2405bef38712a3d9a124f4f9b6576a3a973905e665735229a84d7af06741e4713cdf77564bfeb5a9a8e26
-EBUILD libuv-1.41.0.ebuild 1361 BLAKE2B f9f3022a57a76e9a591193f893f5bc5c008695d361651525645c3d20a59edf336288c624879df96955b4aa1255e67e858ae567a945d33b9b0119f271f31e617d SHA512 432bd850628349d973dfdda62b65f3bcde10c6959809ce8744e2743047e9dc27d253953ca0514a20c4ca815d2cb7adba79e23cd62866f7236fce0ce957b07c4e
+EBUILD libuv-1.41.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1429 BLAKE2B 78cfbe0bb9f028975aaf6721f96efe4e79ac0e14563a32bffcc4ed5509928c76ea28d5b7513290cdaf062c9edfccd8f8f1ffd30922739176a1919303a60e222b SHA512 c429cbb18602a7681a1c2bea6af32e889e33d788c5cdd1f1f5a8b99a9c533c5603bd612bca76ec37bbdc1eeb9bcf5ffa47018f71aaadf66785a3da06667661b0
diff --git a/dev-libs/libuv/libuv-1.41.0.ebuild b/dev-libs/libuv/libuv-1.41.0.ebuild
index 828d1707e652..082ca534234d 100644
--- a/dev-libs/libuv/libuv-1.41.0.ebuild
+++ b/dev-libs/libuv/libuv-1.41.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 9d8f640ce7fd..bfec4e3d1e7e 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,3 +1,5 @@
 DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
+DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
 EBUILD nettle-3.7.2.ebuild 1836 BLAKE2B a8109c4bea51c922c1e23a706c33bba6faf27e58931a058a7051b172e7dcbbc244f2589e57ac68bfc47b6f3ddefc1b092462fb764c45506e7dba5034aaa84de6 SHA512 3d112ed3d24c410c1768974a9702a468c3320772aca3565d7d7e9777969bcc1165f5994518d04966ae92f0adc27580348b369ccfd3e3c1cc721c56d30fb796d8
+EBUILD nettle-3.7.3.ebuild 1844 BLAKE2B c1488108e31969da2e7cfacef25af839eedb8b93a4d4d7f53c9b6e0236415289e2c475d6fa069e6647c769282fb22e49c7a52e597cdb51e6970f4f6bcbb213fa SHA512 29525e4cb2e5f88bcd013157a24dcd796bc662f3f76534838daf89169b2811db35ffc5343b323cafb2a8d09cadb5fab03f6c1bcc5cdf38cdcb5a749a85857096
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.7.3.ebuild b/dev-libs/nettle/nettle-3.7.3.ebuild
new file mode 100644
index 000000000000..38e1726fa6db
--- /dev/null
+++ b/dev-libs/nettle/nettle-3.7.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
+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="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
+RESTRICT="!test? ( test )"
+
+DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( sys-apps/texinfo )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/nettle/version.h
+)
+
+DOCS=()
+HTML_DOCS=()
+
+pkg_setup() {
+	use doc && DOCS+=(
+		nettle.pdf
+	)
+	use doc && HTML_DOCS+=(
+		nettle.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# I do not see in config.sub reference to sunldsolaris.
+	# if someone complains readd
+	# -e 's/solaris\*)/sunldsolaris*)/' \
+	sed -e '/CFLAGS=/s: -ggdb3::' \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$(tc-is-static-only && echo --disable-shared)
+		$(use_enable cpu_flags_x86_aes x86-aesni)
+		$(use_enable cpu_flags_x86_sha x86-sha-ni)
+		$(use_enable asm assembler)
+		$(use_enable doc documentation)
+		$(use_enable gmp public-key)
+		$(use_enable cpu_flags_arm_neon arm-neon)
+		$(use_enable static-libs static)
+		--disable-fat
+		# --disable-openssl bug #427526
+		--disable-openssl
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index ef209f7d5f34..6ebd538ed415 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c
 DIST plasma-wayland-protocols-1.3.0.tar.xz 39052 BLAKE2B 4024ac8c31c1620eb88b027084e9219368f570719cdb53ccff30594de7ebd5e0c01c8baf580d9c19115aa4632bc960fd8e44fd6bf97919e61faf24c1a43fbfdf SHA512 4c0466bbbe07399d4c54d4f04d7bee92826a6009c61fd7e6898c04d12e906c68fce25c520583225aef18737071b71b85814070a769a4f00e2a71b709568c1695
 EBUILD plasma-wayland-protocols-1.1.1.ebuild 455 BLAKE2B 9072fb9f96bef5c5e3733242fb648b295f95bafe31d79a3142aca781765e5b05e73e9b9741e5de50179c0bf8634c5146086a41d1e4826874935ac8529c290d75 SHA512 b5c9738c1215e5bfbc914137b0746b880fecdc54024a88464254ab97e0311d34ac6482453ac74edbdbb6807df4ca0c6033c5d1f9fc477e834af709480cffd3c6
-EBUILD plasma-wayland-protocols-1.3.0.ebuild 452 BLAKE2B 06d8de96518f95bd1561b1b7e35f6c8f0e81c454dcbd2266953a7e91a501f33bdb30b8c5a35b3d566f6ebe3b09b4a957f131acc29eab9c3de08cfc5c9e077968 SHA512 290955b71f01f6de8b6e59f4730c624dbe3b910c98b93d791de9fc5227204f697d7cc6093acdeb5306367ff27cbcaf6af8fcb11b502bd596ea74bdb84aa59d58
+EBUILD plasma-wayland-protocols-1.3.0.ebuild 449 BLAKE2B d97d5458abf29ff6c1c71fea8f5887dd1d9c6aaf905456d5a9eae7a0ca9b2ef111b3641404034dd41acbd5052f87ee5c987d7b92ec8c2ff2af73554235f8e29e SHA512 ab1172e082dc561d362dcceddddd68b4b973c8e50dbadeebeeca2e44cdf91a68f2a1abfd3d1e4141b224824c12f1acdf193a7befd7db5a99f31e4dc28eeccfaa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
index 9f351e59b861..a449591803d4 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index c46af42c154f..178a68356758 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,37 +1,21 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
-AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
-AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
-AUX protobuf-3.14.0-protoc_input_output_files.patch 10684 BLAKE2B 79b86a293fd48e3694327e772dbb7e7ecad2ceaa4d719e2eef5a6221face7bbc26ed00d1efdf9e73dedb9b437603ba6560b5812bbce1c4585bf2d4813afe3aa0 SHA512 35f0ffad2ed3c3d37ba832be4bafa59577e91fba7bef862581369ab92d8c4d3dd801f2e5ec486d989d5e8dfbd04d52d0a869aaecb62c716696a8e3ff6fb9c4db
 AUX protobuf-3.15.0-disable_no-warning-test.patch 965 BLAKE2B fdc24fa141b5d3c4d45dace718d089e26862bb451789c14e652e74cfedde7cca14d1c4c2bc7fbf028516e47b790841bd9c69658b94a47d3ad36ee61bed596b36 SHA512 d1c4ad3ff7a5548437a116243b263d4ccc22b2bc8872c0e043788e902c5190b26de73d61736fb08403bfe4a0b4c2340dbe8d92f35768e52ba3c770350b26cb49
 AUX protobuf-3.15.0-protoc_input_output_files.patch 10060 BLAKE2B 5e20468fe2d31da3651106e57522c2efcdfd70b2430dc1028c95f9752f446b150f8304835349e048d0bcd9aab673814a4540e01671a67e31850f0c44da9cd0a6 SHA512 c43d0a0b5d022ffbac545b596aee139267b5232d4971356d90327a4016e0b2cfed12711efef818aa747caed08964c3b0bfcf501668b9df887b7d3988c17885e3
 AUX protobuf-3.15.0-system_libraries.patch 6352 BLAKE2B 8d54bdfbbeb0420c9d4629ac38b4ba172d59bc832dbff46b6438985bbc76239d3f1a74ada052b046f0e982fe3b2f5109621e6370f2546c37160d31e2d1b4593d SHA512 d98c88b2e96990f943464c429e01a19fe47458d0794ad9ebdae098c48eb25bf46e1fecbca9d09a2e23330a4b9723b9bc18638eb7a043cbd486919b29d57033bf
 AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a901df0b0e11a8e51ff92b8765357e052231a915a2afa996c78096e18cf443708bf32e51b882c3fe2512e2ab9f7bb8ec1c6141f2c9bb7fb98af95 SHA512 03721151866f25564e203eb5af987649bf3c148ba7b9e1a2a837b336062b911d892714c4deaa5b19572a3ec47e3b309114ce67b0ec0adcff50d208b73283a7b5
 AUX protobuf-3.16.0-system_libraries.patch 6299 BLAKE2B 30a2aa46cf9bf6a415e5a12d6d8c931fdd5a18cb100e4389ed777196480598e1400464cf759a49ee3bc4954fc3b9e8d6029a24623aad123186bcb27ca1da6ef7 SHA512 b4b2b60cff6bea9d4dd716c8f7106b0c77ca35f1377201996d6fc323fd4dc59054d7300bb5e949005405ae7371d6c56d1b30195804e723d05fc2199554398302
-DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
-DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
-DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
-DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
-DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
-DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
-DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
-DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
+AUX protobuf-3.17.0-disable_no-warning-test.patch 965 BLAKE2B 584b43b43861280254f92ad48d8a068b6427e1af3822097f2ddd872983fae11f3bd7af1d73b9b58592987ac4aff7399fa31291e21db6656518bce10c5977a785 SHA512 a67fe3231064c1cf3f4ca94be4248fd65f455b1aaa1d1a09afae847a9b9bbae9673d1fec177e822abe0a83b2fe3342bd20dd9aff87adea0dddcc05309aaca682
+AUX protobuf-3.17.0-system_libraries.patch 6299 BLAKE2B a9252af294342e0a12137c618bc1e6fbe9aa021feaa458c2638aaf407dd6a43473587b7ac3e7278217874e5091ff7337234594715daa7567c9d3cf1bd3191973 SHA512 1d712f886e28907d5a5bef414c9fec56d1c056c316428f6e05fdfb87494e93506c17ff6dd5cff4ec716a6f20b56258393773701cdb6b04f87e44264a919a588e
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
-EBUILD protobuf-3.13.0.ebuild 3200 BLAKE2B 1f4ac4437cf047b4f840fec6fbff8e8e909dfc6fab90262e2892856b1884c0fa9762712cf965284c9e059014a47ce4926a12e7d35fd2dc508a4e159e7c15e1f7 SHA512 dbfa8ff4355832fc09465e6cc78a12fe99d92daee74930d86ed4cb5848d51506012cb609ecfeddb21f2ef3ba7f7251a9afede1bfde6fd3b6976121564cfc961f
-EBUILD protobuf-3.14.0.ebuild 3176 BLAKE2B 765c1a7c6063367b4bd85ed5b0f8b64129adbaf799278e2fcf3c2434c5ce212090f2a4e90c24e084fc8f1504a2944b27b38d8d8dcb47439e5512c9bba417d809 SHA512 a34746f76b263295bb9a8bddff816a388b1eaaad55634268fcf5cbf8e2f6f67edef675db5331c2fd20929c252f77cdf620659d0c4633bc2037042f3125c42f21
-EBUILD protobuf-3.15.0.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.1.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.2.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.3.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.4.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.5.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.6.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
-EBUILD protobuf-3.15.7.ebuild 3756 BLAKE2B b13db7aaf2bbdb55d9b1fcfd1caf625e8824561922d52ce185cf6df708f15513290a3dccf09a7998409298a79f26362d1349ad3dd08dd197bf6f98cf167941da SHA512 dea1b2d5eab02b0db51e19d11a7500bf2f02a0e07d5ad3e2d5ff1fb824bb7f84f1db217979c0688bbbb15766d575dfbfe9edac93edd3a2e456e5035eded0ee5a
+DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
+DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
+DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 EBUILD protobuf-3.15.8.ebuild 3749 BLAKE2B 12ba8cd774d1ff1961c54253cffd729f30f37da02e3d103646b966e261d819b4b85fff402eb3a917bdd41153ab07883d416eb288b20801aa89d9a41c3ce85ed7 SHA512 1dc4105d31dec058a611c6c1d05060854e904fd5018e75d1718aeed3a719d22746e94b7a1fefcf6ebe894fec4211f17729ed8a55289a43647aa22cd7b16720c1
 EBUILD protobuf-3.16.0.ebuild 3756 BLAKE2B df0ebf61c08a5dbb4fdeace2bfd04d1fa9929cb20878802142044aa13d417a59b61f7a81246ef7595fff417d17590ce43e14ee3c2b513aedf92d79d3a9be7015 SHA512 d3d3fc384d2fd1d0bfcf155c5fd1a5140057d39c6350362cea4d19cd77154a49d0b9efd4265dd6983299493ba4b7c4ba471bbf2bf170085e6a2abcb74aec25be
-EBUILD protobuf-9999.ebuild 2672 BLAKE2B 1be60ee1c1f0fcf3a2f083711461ca2ce6697ab8fe577641855016f9ac6f3391a3a342fa88ec5a95ffe46887010d8d04f5835a4abef6d9caf5f4fd82ba2977bf SHA512 8cedca7db3005bc86113eb9704fdd98d7b0e27b116bdcd1cef1b907c80eb36ec7cfa004b99775e9c47eb9cd3dc96daed8e621015d9b295f954970739992e5092
+EBUILD protobuf-3.17.0.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-3.17.1.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-3.17.2.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 194e9d88477eb97f57cb544d733c61661bcd2fbcdb9cd1c1353ba1b9fd1c22de8e3ea291cd5f9bfbdac939afa316c6ca2888a2fc790d5f1113a2c416d9f3a3ed SHA512 c55a151753fe1b845d5566999064640fb3ccea13c222b37e4563eeaa8c09788ee74bb89407f4d68d17288d40ae0fd5761ad556989e8d2803c9317c7626ad24e4
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch
deleted file mode 100644
index 0416aac68f67..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -997,6 +997,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -1005,13 +1027,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -1049,6 +1078,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1754,6 +1788,12 @@
- 
-     codec_type_ = value;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -1890,29 +1930,50 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2258,7 +2319,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -2270,15 +2333,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -296,7 +296,9 @@
-       GeneratorContext* generator_context, std::string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -428,6 +430,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<std::string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  std::string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  std::string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -95,7 +95,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const std::string& command);
-@@ -2627,6 +2627,17 @@
-               std::string::npos);
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2721,6 +2732,19 @@
-       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  EXPECT_TRUE(
-+      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-+          " --encode=protobuf_unittest.TestAllTypes" +
-+          " --protobuf_in=" + TestUtil::GetTestDataPath(
-+              "net/proto2/internal/"
-+              "testdata/text_format_unittest_data_oneof_implemented.txt") +
-+          " --protobuf_out=" + out_file));
-+  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
-+      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-+}
-+
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
- }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
deleted file mode 100644
index a36bdcb734a5..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -1109,6 +1109,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -1117,13 +1139,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -1161,6 +1190,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1904,6 +1938,12 @@
-   } else if (name == "--deterministic_output") {
-     deterministic_output_ = true;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -2040,12 +2080,15 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --deterministic_output      When using --encode, ensure map fields "
-          "are\n"
-          "                              deterministically ordered. Note that"
-@@ -2053,22 +2096,40 @@
-          "                              canonical, and changes across builds"
-          "or releases of protoc.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2416,7 +2477,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -2428,15 +2491,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -296,7 +296,9 @@
-       GeneratorContext* generator_context, std::string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -428,6 +430,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<std::string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  std::string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  std::string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -97,7 +97,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const std::string& command);
-@@ -2638,6 +2638,17 @@
-               std::string::npos);
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2761,6 +2772,19 @@
-       "Can only use --deterministic_output with --encode.\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  EXPECT_TRUE(
-+      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-+          " --encode=protobuf_unittest.TestAllTypes" +
-+          " --protobuf_in=" + TestUtil::GetTestDataPath(
-+              "net/proto2/internal/"
-+              "testdata/text_format_unittest_data_oneof_implemented.txt") +
-+          " --protobuf_out=" + out_file));
-+  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
-+      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-+}
-+
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
- }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
similarity index 95%
rename from dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch
rename to dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
index 1c583fec0fdc..eb1598c945fd 100644
--- a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch
+++ b/dev-libs/protobuf/files/protobuf-3.17.0-disable_no-warning-test.patch
@@ -2,7 +2,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
 
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -708,7 +708,7 @@
+@@ -713,7 +713,7 @@
  GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
  check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                   protobuf-lite-test test_plugin protobuf-lite-arena-test \
@@ -11,7 +11,7 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
  protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                        $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
                        $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -895,4 +895,4 @@
+@@ -900,4 +900,4 @@
  
  TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
          google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
similarity index 96%
rename from dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch
rename to dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
index 990081ae1abf..3d5069dd1478 100644
--- a/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch
+++ b/dev-libs/protobuf/files/protobuf-3.17.0-system_libraries.patch
@@ -32,9 +32,9 @@
  	fi; \
 --- /configure.ac
 +++ /configure.ac
-@@ -223,12 +223,5 @@
- esac
- AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
+@@ -236,12 +236,5 @@
+ fi
+ AC_SUBST([LIBLOG_LIBS])
  
 -# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
 -#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
@@ -47,7 +47,7 @@
  AC_OUTPUT
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -702,19 +702,11 @@
+@@ -707,19 +707,11 @@
    google/protobuf/testing/file.cc                              \
    google/protobuf/testing/file.h
  
@@ -68,7 +68,7 @@
  # Disable optimization for tests unless the user explicitly asked for it,
  # since test_util.cc takes forever to compile with optimization (with GCC).
  # See configure.ac for more info.
-@@ -806,12 +798,8 @@
+@@ -811,12 +803,8 @@
  # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
  protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                        libprotoc.la                                   \
@@ -83,7 +83,7 @@
  protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lazy_descriptor_test_SOURCES =                        \
    google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -832,11 +820,7 @@
+@@ -837,11 +825,7 @@
  # full runtime and we want to make sure this test builds without full
  # runtime.
  protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
@@ -96,7 +96,7 @@
  protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_test_SOURCES =                                           \
    google/protobuf/lite_unittest.cc                                     \
-@@ -848,11 +832,7 @@
+@@ -853,11 +837,7 @@
  # gtest when building the test internally our memory sanitizer doesn't detect
  # memory leaks (don't know why).
  protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
@@ -109,7 +109,7 @@
  protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_arena_test_SOURCES =       \
    google/protobuf/lite_arena_unittest.cc \
-@@ -862,8 +842,7 @@
+@@ -867,8 +847,7 @@
  
  # Test plugin binary.
  test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
deleted file mode 100644
index 25ec4601ee41..000000000000
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.13.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/7682
-	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"T is overaligned, see b\/151247138\");$/d" -i src/google/protobuf/arena.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
deleted file mode 100644
index ef5249f79dea..000000000000
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.14.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.0.ebuild b/dev-libs/protobuf/protobuf-3.15.0.ebuild
deleted file mode 100644
index d1feac0db819..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.4.ebuild b/dev-libs/protobuf/protobuf-3.15.4.ebuild
deleted file mode 100644
index d1feac0db819..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.5.ebuild b/dev-libs/protobuf/protobuf-3.15.5.ebuild
deleted file mode 100644
index d1feac0db819..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.6.ebuild b/dev-libs/protobuf/protobuf-3.15.6.ebuild
deleted file mode 100644
index d1feac0db819..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.6.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.7.ebuild b/dev-libs/protobuf/protobuf-3.15.7.ebuild
deleted file mode 100644
index d1feac0db819..000000000000
--- a/dev-libs/protobuf/protobuf-3.15.7.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.15.1.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild
similarity index 95%
rename from dev-libs/protobuf/protobuf-3.15.1.ebuild
rename to dev-libs/protobuf/protobuf-3.17.0.ebuild
index d1feac0db819..6391fd499f34 100644
--- a/dev-libs/protobuf/protobuf-3.15.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.0.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/protobuf/protobuf-3.15.2.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild
similarity index 95%
rename from dev-libs/protobuf/protobuf-3.15.2.ebuild
rename to dev-libs/protobuf/protobuf-3.17.1.ebuild
index d1feac0db819..6391fd499f34 100644
--- a/dev-libs/protobuf/protobuf-3.15.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.1.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/protobuf/protobuf-3.15.3.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild
similarity index 95%
rename from dev-libs/protobuf/protobuf-3.15.3.ebuild
rename to dev-libs/protobuf/protobuf-3.17.2.ebuild
index d1feac0db819..6391fd499f34 100644
--- a/dev-libs/protobuf/protobuf-3.15.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.2.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 48b75b4e2cb4..6a5eecd502cf 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index f7c86f0d1c33..629d11c29eb9 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 EBUILD ptexenc-1.3.8_p20200406.ebuild 1309 BLAKE2B 0ae99cd71415c2f06d42137dc44d8a5ef23ee8bc11fb262056b6b3c4bb529f0f19a1272977fa6fc5cdc3f385661175c79e53803bd3d8ecbe508cfaae9d125e75 SHA512 07d7ea7e9cba8b47c86d1758d84c189f5a5c8b171de68f9f9383822bd8695dc2ef17f8ea39fa0ef6c1c65b5475c0f2100c0496f8a719f200e60c0adaeff9de01
-EBUILD ptexenc-1.3.9_p20210325.ebuild 1254 BLAKE2B 1d62f5a28813e0b2ab46d45a6202f22db61bc30edf5f759536ac5dbe713b0f137ec9387246111ab006aeefd503e1357f530a07dede1bd89bbaf84da35c0b927d SHA512 1d76cf17e7bf30ad2cdbe826acdd88dda1ff8d67b0a93bbbb9008cb40132394977d61b29314866326663b19ca0b8713f7c04cf3da7185aee90c7ebfdb38890a0
+EBUILD ptexenc-1.3.9_p20210325.ebuild 1246 BLAKE2B c1ea0d72f61bed46649ab0c6e91f8447c235da3e57e789680d274927e4f7f225ebb794ebd3dff959e28b3786b8bf3ae5bbba5e02420e302a31843754cb3e5f33 SHA512 e2250cd30a429310f540f850ab14709064737bbbea0715c0ac00424b23dbbb968d6cc4126a94fdcb0e587932f1a9f7fbe93573e5d52aaf36a2b73aba3bd1c450
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
index 94d3676e1748..48ca2a23a9b9 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4be251aadd0e..b1404bd2084f 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,5 @@
-DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
-DIST re2-2021-02-02.tar.gz 402958 BLAKE2B 824afc7f6f92cfa7070f37e975469c995e9d4aa4bfb12a6e22a739199b74ea414536278ca18fc3a61250aa8744d56eeaaa203f4a8a37378fbf554750c9c8db9c SHA512 643ebbd998ae4089f1cda259df98f7c973df716f2959c3c01dc0c9ebdad685a5392d26e2149a1f865a93334dfec42d2e133776a39a4bf6a36053829958fa86db
 DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
-EBUILD re2-0.2020.11.01.ebuild 1345 BLAKE2B b3a7f6feafc1b6cbff0d3e1200dbe7996a3f2cd39c67bb2775865f1719acd90c989af1dc0e3fa2588769b40fdf3a28f48b1f2089750445a7bfff629bc22d4e5e SHA512 4fc6557ace46266151cccd8eefd2edca56c7cdb8bd64def30c9b5e364bbe8529ecefacd25a9882ee01ccb69d8eabfc216c5f9c8608ff5c95553648c9e521bf22
-EBUILD re2-0.2021.02.02.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
+DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
 EBUILD re2-0.2021.04.01.ebuild 1345 BLAKE2B 895b1d92d1ed990d5cdc63041fe39e2fe3bd10cb7247e28a6461af5c170ea2215f5ffbd8dda0812443379de0f2131d5da2032a33240a3f210a72184b0f9c53bf SHA512 3f65ba7cb020840448c228a03973a387cbc282fb8e605f274321d7e60774dcf33d8e76e854eee9e1e716a428e89c49a748ec8a5b9673f1e605f9d08e1a5e86bd
+EBUILD re2-0.2021.06.01.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild b/dev-libs/re2/re2-0.2020.11.01.ebuild
deleted file mode 100644
index 48b29137b04d..000000000000
--- a/dev-libs/re2/re2-0.2020.11.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="9"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2021.02.02.ebuild b/dev-libs/re2/re2-0.2021.06.01.ebuild
similarity index 100%
rename from dev-libs/re2/re2-0.2021.02.02.ebuild
rename to dev-libs/re2/re2-0.2021.06.01.ebuild
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index bb7d2c1c3ba8..bce70999c345 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.19.4-r1.tar.gz 2869856 BLAKE2B ae010a66f5fd51175b474e1418d36965cea8ed87edb5d186c9a554cc2a193233046148ffd8f7764b61c166e75eb94866115d948b2a367a5e1140f5d41c9f8505 SHA512 cc6adba489f4bbf3348b24f6d0d4039ae8bd80164d6e6bd5ee313bea064ef978d43aa78f7294601f65a95501b4fa0a914af879fdc362e54f429ca2255f70ae2b
-EBUILD tree-sitter-0.19.4-r1.ebuild 730 BLAKE2B 1acefd32f4e55acaa31f04c447f87c0642d509b61fc2caea5b3ebc7d41e14a7abb1f2b4f7055d2f4cce0a002bf425afa1f48706be9164b02943d442b7f38f42d SHA512 fac2eb94f629306a7762414a7d4077e72e2d1855e0249c46e6dcc13d742e4b0c30f6b017570d8622402ceced13ddc090b524f368fe362094918c7cb36c999521
+DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
+EBUILD tree-sitter-0.19.5.ebuild 727 BLAKE2B c1aba20f561d00e1d33a76b9fb6f99a64535289f10ec4e360a1caeba3249d50306904ccfe1b0e89c3eba18ba3685e07d8fae156566c42e11aaae9ef8f124e6db SHA512 ce3866390881221235b0d11b83a99994ae2abfa40bae9234c6251f94e6db078fca54a53244e64708c37c4511b56caf0ac5a49bb47ebe2fb8c8ed0715383701f9
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
similarity index 97%
rename from dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild
rename to dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
index c21aa2ec8804..20f3386f7f32 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}-r1.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index a74db335f763..ea1a2f800ee3 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,3 +1,5 @@
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
+DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
 EBUILD vala-common-0.52.3.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
+EBUILD vala-common-0.52.4.ebuild 653 BLAKE2B 636ec05dcaa3f7c8f972cf86a1e67aad7044b9a0c59b12b6842c65c283065bd9d0235993d4616e8c61ea0e987a6bd0f4578c7228ccc8c015e073580a46360361 SHA512 83d831d84a48749d16fae9abb1d4ca8935e76a46973569de316a32edf91e27287faecd39c595073c912f153d2ceae82812b15f4899c86c97e692427bee584a5a
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.52.4.ebuild b/dev-libs/vala-common/vala-common-0.52.4.ebuild
new file mode 100644
index 000000000000..043fa5ecbb04
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.52.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 4f9bfa632d32..59e17ac4945d 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index ebfc70024a7e..8db784dba40c 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,3 @@
 DIST luasec-1.0.1.tar.gz 52370 BLAKE2B 4e90adafc5091fe462f2413f54aae9d3baf699471fad287ee58cc033140587a93e15baddea6fd6bbf7a90378e99f6fa12e63eeecab24d31c91a1ee2f9924df70 SHA512 21ae200e40f13a35eebca95cdac25ae13532a3008b2f9ec97a079033b9efde69e81954354453623eb77340368f482d3c69adb26881a6c0d7c4897df31301af93
-DIST luasec-1.0.tar.gz 52264 BLAKE2B 0537592ec9a33559c233448bee84a5b1b4e84448e89d50adbef75ba9b67c175e8a10739d727991051e48afca9bf78b0b115f70b2a341d25217b5b730a66a690f SHA512 70e81291b71111fb4976477d1c8ddbdaace17f017476b4e74b0ed88498e9e016d4ece1658f7fcce30f21aecab8dcf3734ce620940f61f2c70efb911c09a95bb9
-EBUILD luasec-1.0.1.ebuild 1539 BLAKE2B 460e723e4737efdf296fcaba182da50c6ff60e4dd2f7c39813626066b7ebbb8a41924adfc44306b032d857d49290c219a4adc2d35e53d8303875e8e5d3cfa89f SHA512 a5492f49b150d05ea83b941cea50af9a21d1d6faeab4d5a3b59fd848ee6959e982e93a2839f686ede33a9b8ed53ef3c5f8aa1eb620444797c452ccad62648702
-EBUILD luasec-1.0.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0
+EBUILD luasec-1.0.1.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0
 MISC metadata.xml 596 BLAKE2B 0116422318c66247af5add321ba97b4d48a27b5871a2edb2eab81f03611ddad4f6e616c16070e89f8df7ef1dba6fdc94a070325e24f90df6f6095c2afb0af9f7 SHA512 97f09d268b8bb90d82707f6a39a2339a8cdab827b4fbf70292904e580f15b3503d0473855dfb9141c9384579339df4073ad2926662ff8839ffbe73ce009b3402
diff --git a/dev-lua/luasec/luasec-1.0.1.ebuild b/dev-lua/luasec/luasec-1.0.1.ebuild
index 6a5be6fe0b5e..a001f3ea42e7 100644
--- a/dev-lua/luasec/luasec-1.0.1.ebuild
+++ b/dev-lua/luasec/luasec-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/luasec/luasec-1.0.ebuild b/dev-lua/luasec/luasec-1.0.ebuild
deleted file mode 100644
index a001f3ea42e7..000000000000
--- a/dev-lua/luasec/luasec-1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	dev-lua/luasocket[${LUA_USEDEP}]
-	dev-libs/openssl:0=
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-lua_src_prepare() {
-	pushd "${BUILD_DIR}" || die
-
-	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
-
-	popd
-}
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2//g' -i src/Makefile || die
-
-	lua_copy_sources
-
-	lua_foreach_impl lua_src_prepare
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"INC_PATH=-I$(lua_get_include_dir)"
-		"LIB_PATH=$(lua_get_CFLAGS)"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"DESTDIR=${ED}"
-		"LUAPATH=$(lua_get_lmod_dir)"
-		"LUACPATH=$(lua_get_cmod_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
index 1e0298c861d9..a0f420b9cd4e 100644
--- a/dev-lua/messagepack/Manifest
+++ b/dev-lua/messagepack/Manifest
@@ -1,3 +1,3 @@
 DIST messagepack-0.5.2_p20201025.tar.gz 19652 BLAKE2B 5f85081daf2ab7f57399cb47782fbde0dfd2afe9514fdb652da1ba0eacd832e5c0924258b788d919b0a07e227f37ee58a239004086e7d6759b4727922ea57d76 SHA512 245790163ec819438fd3426f59ab2e5672864be647748dace35155be712ad4eaf78f8d7228d5a0ce94bfb92f6a1d1071cf871483bf99e02ba18872c31b3d0682
-EBUILD messagepack-0.5.2_p20201025-r100.ebuild 1035 BLAKE2B cc6fc3be86d52ef63e8871467423d3a3b1c27f04dc7eed5c910a258f46bef374beb8b595b2b7641db1b30c4a1c9c7376c3cd7f5e0f6eeea6bf8c304f476b1603 SHA512 6683df3932390ee71dd39f5c848f8711886196460bca3dda811ca2c7c21b7c2a4c1c10946e50042fc78dbc38068ceb2dae6dd5f5cd213ea317e6147a924a6659
+EBUILD messagepack-0.5.2_p20201025-r100.ebuild 1017 BLAKE2B bf8aec79256402be64d73bb98566566ce5ce5bc62dd3bb285e79ab80cc428db50e86627394551511ccdc40185a15562d0526884675a415ae48589c15a7d12405 SHA512 5ddb764e24435b9266f0b683a332de53381dc602a28b87add60882868b3129522cc205e8a2ef5214173dbdf20f5f8fbb1d5e0363d2f93e0b81025b7f51ae542e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
index 4dc5d4b18fc3..ce45b253a163 100644
--- a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
+++ b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,9 @@ LUA_COMPAT=( lua5-{1..2} luajit )
 MY_PN="lua-MessagePack"
 MY_P="${MY_PN}-${EGIT_COMMIT}"
 
-inherit lua toolchain-funcs
+inherit lua
 
-DESCRIPTION="A pure Lua implementation of the MessagePack serialization format"
+DESCRIPTION="pure Lua implementation of the MessagePack serialization format"
 HOMEPAGE="https://fperrad.frama.io/lua-MessagePack"
 SRC_URI="https://framagit.org/fperrad/${MY_PN}/-/archive/${EGIT_COMMIT}/${MY_P}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9ed32d3eee1c..c5074d1b5df3 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 1576785b7f2a..21b6548ce658 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,4 +1,7 @@
 DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
+DIST dose3_6.0.1-2.debian.tar.xz 23320 BLAKE2B 0351a715756b76c1f81fdf5599d10373ce85554f1d63b4dcbaa647dcf81b099e59c68f93413ca391bdf17b52831b085a7d2b86bc64d86676763bbabd7804a6a4 SHA512 219bb7614d1200adb5d22032cb3d7442c16cdce785088f58b3fcc188856b93817f0157ea6ed1bd72e1f565b9a98df145c188e0fa5d7f538d616b7eccc20ab706
+DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912fffab5ef74b7f3332799ae350a371307bd06a24abe6565d2d00aedc01f58d0a2583db6d2d76fc2ebee634b05405ab86 SHA512 cb9dad4ae296b85317f60133bb9dcc63dad8560486e2bd83139205810643e701de5e9834d8d2de34d8237d0abfd394970088c73eeab08956fc9c4178411303ea
 EBUILD dose3-5.0.1_p16-r2.ebuild 2257 BLAKE2B 7fc8cf9ce79d9f692c0cfa2f3afbb8072ce1467c2c5eceae04e5c32160cbd8c9488bebe52d8df46b6650d52e4e2cfc53f0ecc0a16ebeb51e2f28f6db802a7f5f SHA512 d46c94ddbd9226422025536a090c54f6800825d01745099c138242c3177208e7993cdd96399519868d9d4378f6b3584e5dd5f378af36a9488fa839f625b62bea
+EBUILD dose3-6.0.1_p2.ebuild 1266 BLAKE2B 63218c0e646371d4289ed7d1e726c78ad272eaaa6659312cf44c0fa3b5979b3ecff6377de0fd07b550bfbcbb38ff92863557b9f6bc3702aa64daa327955902b8 SHA512 3626d32a3eda4594738e86cc2d236095ccd33169a9999b97f05711da17681f8c885e7275876c92e1d18b37e94048560e3933ede4e9192686e50476b917c5ff88
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-6.0.1_p2.ebuild b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
new file mode 100644
index 000000000000..ca51186d7fa3
--- /dev/null
+++ b/dev-ml/dose3/dose3-6.0.1_p2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="http://deb.debian.org/debian/pool/main/d/dose3/${PN}_$(ver_cut 1-3).orig.tar.gz"
+SRC_URI+=" http://deb.debian.org/debian/pool/main/d/dose3/${PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+BDEPEND="
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.03:=[ocamlopt=]
+	dev-ml/ocaml-base64:=[ocamlopt=]
+	>=dev-ml/cudf-0.7:=[ocamlopt=]
+	>=dev-ml/extlib-1.7.8:=[ocamlopt=]
+	>=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=]
+	>=dev-ml/re-1.2.2:=[ocamlopt=]
+	dev-ml/parmap:=[ocamlopt=]
+	>=dev-ml/camlzip-1.08:=[ocamlopt=]
+	>=dev-ml/camlbz2-0.7.0:=
+	dev-ml/ocaml-expat:=[ocamlopt=]
+	dev-ml/xml-light:=[ocamlopt=]
+	app-arch/rpm
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pyyaml[libyaml] )
+"
+
+# missing test data
+RESTRICT="test"
+
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+
+	elog "Applying Debian patchset..."
+	for file in "${WORKDIR}"/debian/patches/*.patch ; do
+		eapply "${file}"
+	done
+}
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index b47c4bd65ead..bf0ff1342059 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,3 +1,5 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-client-2.0.8-r1.ebuild 930 BLAKE2B bd5bf6476fb1e5f58690af8a054eabd734663dd126761041e27926343d2571d7e5fbcf2d218ad4ef68dae5ba2280d5fb17d301d879766bb7bf3bf94372d0016d SHA512 b71350fa281f0e755b4d0da5592da810dae78684fe1e1d7d443e6ecf6b7d61b8cf78d9b05339b1f2b18fa5710588067af1f7e8331b7a9b260738bd7687267d25
 EBUILD opam-client-2.0.8.ebuild 798 BLAKE2B 4ee97d0154b58106d99c2a298dd52d254e13e18dd7104d8f4222cf2d7e3397036c22aa03b23b529a42712b6a5eb099eed7d9f4d9d444046f0c22cfbc82efd0d1 SHA512 e5f5a45fe8cd9b85e2369fee75760049ec06b2aaa712deae2952fada604efe462fa4c2135382f98249a19f716f51cf5116d828fd2b0d2783898df3f635590fb7
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-client/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..f4cc53ef22a2
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam client libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	~dev-ml/opam-repository-${PV}:=
+	~dev-ml/opam-state-${PV}:=
+	~dev-ml/opam-solver-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+"
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 7df558dad308..18ff16e2f3f1 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,3 +1,5 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 EBUILD opam-format-2.0.8-r2.ebuild 817 BLAKE2B ad9a97d3d0439fa4fc6382c423be2d9202e322426c4d58e8bcad567aea6569862365f24dd21275efd4b74ee5e6f9a97dc564e0ff564a39a8a666d69d72adecdd SHA512 973f9bc28a2fa479bb84f5fc9ef8a5852fd606a1d936d15bf8c3f225ee8fd08004d7daa4b834fe69724686db7767771a2938fde776b320eef76396776ab82e76
+EBUILD opam-format-2.0.8-r3.ebuild 955 BLAKE2B 86c11520092a8d973e3008b5c8d89133c057f45de779740cc8c4daef9f43c4df47f8d54548d08c01a4ef2102ef9bda4f9dc9bae90e5c5cd4a495ec889f787634 SHA512 a6c100e2e5cbefbfe4c589cea482eebb9c352520fa02d133c2db7ac3d1f69426fee49e3c5a3a77f8d3f5bc3dcc53d523fdda0cce1392bbb14618688afac317a1
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-format/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
new file mode 100644
index 000000000000..14bac276fd50
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+inherit dune
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	~dev-ml/opam-core-${PV}:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	>=dev-ml/dose3-6.0:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index f561d2a100b7..b035f2c3bce1 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,4 +1,6 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1020 BLAKE2B a2b8afb4a80a772b812f7394aef05b7d1d8a30c23c8e6f8fc9d6d46de38b8389e8fe975be391f620f94586e459712c5522289bf74b1aee15a9e0a9da1a28404c SHA512 e8a63747de673e5fae11313803192c585d94e91c5d99eb36f8816013e905c305a5bfc21833a40f9291670201288aabe427454d4731d609e6702a891876925717
+EBUILD opam-installer-2.0.8-r3.ebuild 1175 BLAKE2B 677c10ed2872a5b993de10146926a9623d621ed63e0e15890d2d1b117316ce885d2f0fad2ea45c14187d8feb872ad8911b6cdbf038441c6fb0742bd7f7eb8a74 SHA512 a05b98da794574536c68b9c4ceef03a232f6772762f18e1107d87e8bd57bb3759faacec32dfd0c40c77b77fbbd609ed3e5a79c8c620e91082fd97e4e67af37da
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-installer/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
new file mode 100644
index 000000000000..7bd84a692fe7
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3
+	dev-ml/cmdliner:=
+	~dev-ml/opam-format-${PV}
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+	#passing -jX to the dune build leads to errors
+	#see: https://github.com/ocaml/opam/issues/3585
+	emake DUNE_PROMOTE_ARG="" -j1
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index f6b824d05f6d..939f56eb7159 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,3 +1,5 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-repository-2.0.8-r1.ebuild 892 BLAKE2B 48d12e4c328565eab0a382cb58bcca30b160cc4d919a5dcfe0f0d424ac443c41d21bcee0212eff05e22e040fb54855ff475729efff39806518f119279e2b4344 SHA512 8545b279a0d4999634176ea76d9c0c70f3ee30c0bd02e334cb8349c435599729c5e0c0cd8af9640cb5d2df2f519b3d2da2b39ca011f787b28be4b9dfe11e869f
 EBUILD opam-repository-2.0.8.ebuild 754 BLAKE2B f9d6d9b652e5bd1911cc8f9596a1568928915001d1e1dfa826d760d967d0c867468332496400a844f4d35fa6704656a6718fa9c25ff52ac5469b28cae92da817 SHA512 4f19f6d9dfa8760338fb68b843e6617d6b0cd96673ed4c5ae6a1229c09c8ffabb02e3ed41363d1075988b1f0fbe526cc7b3162cf0cdb01653b6bf57cfb746e42
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-repository/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..fa548b37d018
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam repository libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/re:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index a8e194775eff..7874db42a534 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,3 +1,5 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-solver-2.0.8-r1.ebuild 962 BLAKE2B 2efc4a0981d389ecfcc4e2c1622799aac50446a27a61226f3e27cf6f2e2f325b936aac34b1163bce96622c4c175e1eefc362378685e5809ee28f311248352357 SHA512 88ea1935a9f882cacc652c634240cfd7b42f19f6de7d91d824ee43642e378a2c2c2dd05ac5452bcdbfd67deedcb7671a8110c27a761f17116627680909c6d3f4
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-solver/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..d520ec1b78c8
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-ml/opam-format-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:=
+	>=dev-ml/mccs-1.1.4:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/opam-client )"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index d40cb954e944..fb080a4be7d7 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,3 +1,5 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
+EBUILD opam-state-2.0.8-r1.ebuild 869 BLAKE2B e0f17c0df5dff1f0b3903a7e7315207b42ae7cf2d723b187d399241fdc7c3c31c68a0d05b5baf28556ed7c29e2ec883af1a93b1c0e9a2cf262faa52d944dd7cc SHA512 b11b9886aa98cb4688d231618695b5e3b0580e2e0670b43f125090b16b477fc8fac10e31175403b1e9f63e698133540bd8624c91290aa30a281b2910acc9f283
 EBUILD opam-state-2.0.8.ebuild 737 BLAKE2B 31e5398a6fd835fab9fe0cf31eeebbd2ca587853b8de942ed54511c04b858b2e3f5fd1a3b46c84bd920c639b606db65fea8c863d5ec746ce75dee0bda3a04c83 SHA512 19caab930f0f43ec38319248a23e89e5e3ef3edb46d84a69ad2db8054a13a806deb3846f1bbfc8e96e1d5a27de9f3a0505316f92a5c34d22cb3259136fd96f00
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam-state/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..8befc76416a9
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam state libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	~dev-ml/opam-repository-${PV}:=
+"
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index bc88798bebea..63c9095f719f 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,3 +1,5 @@
+AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 EBUILD opam-2.0.8-r1.ebuild 796 BLAKE2B 83b7753c328cc34f0b96c2609b97e4c9ecced2e759e678adb8f4a4d9b69718b78918d258364431a47d86066db0cec6d8741344da0e0921c2c8cea34362233203 SHA512 a4e040c25560f328d8e533dc348fce084c839b5ad001dc41ea58823b64e437730e0bf2b4826f2d8d4ad0bc988f4f4328115562a5b28534f99cd9b01690a0f15f
+EBUILD opam-2.0.8-r2.ebuild 934 BLAKE2B 3c060d532b8bf8e3f4659d1cd555232fbfe83c2ae62ae2012994742b2a34aaaf302e8d66f727f0eca15c2f79a946497518b321d6ea71e3eee0465bbf1f20e392 SHA512 538d1532379ee59c3dfe671dbc40d2c5f90e329ef3b95c4b3d092b01307490d31199c78c7b34c8282b0d86329a6f1d9ec40a2e21dfb88a00245c8ecde11446ad
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
new file mode 100644
index 000000000000..a8af27416df1
--- /dev/null
+++ b/dev-ml/opam/files/debian-Port-to-Dose3-6.0.1.patch
@@ -0,0 +1,142 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 28 Feb 2021 19:27:24 +0100
+Subject: Port to Dose3 6.0.1
+
+---
+ src/client/opamAdminCheck.ml       | 2 ++
+ src/client/opamAdminRepoUpgrade.ml | 2 ++
+ src/solver/opamBuiltinMccs.ml.real | 2 +-
+ src/solver/opamCudf.ml             | 5 ++++-
+ src/solver/opamCudf.mli            | 4 ++--
+ src/solver/opamCudfSolver.ml       | 4 ++--
+ src/solver/opamSolver.ml           | 4 +++-
+ 7 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml
+index 05543a2..f23bfc4 100644
+--- a/src/client/opamAdminCheck.ml
++++ b/src/client/opamAdminCheck.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamPackage.Set.Op
+ 
+diff --git a/src/client/opamAdminRepoUpgrade.ml b/src/client/opamAdminRepoUpgrade.ml
+index 0be53b2..635e792 100644
+--- a/src/client/opamAdminRepoUpgrade.ml
++++ b/src/client/opamAdminRepoUpgrade.ml
+@@ -8,6 +8,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamProcess.Job.Op
+ open OpamStd.Option.Op
+diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real
+index ab39ab3..2b41982 100644
+--- a/src/solver/opamBuiltinMccs.ml.real
++++ b/src/solver/opamBuiltinMccs.ml.real
+@@ -35,7 +35,7 @@ let call solver_backend ext ~criteria ?timeout cudf =
+       ~verbose:OpamCoreConfig.(!r.debug_level >= 2)
+       ?timeout criteria cudf
+   with
+-  | None -> raise Common.CudfSolver.Unsat
++  | None -> raise Dose_common.CudfSolver.Unsat
+   | Some (preamble, univ) -> Some preamble, univ
+   | exception Mccs.Timeout -> raise Timeout
+ 
+diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml
+index e07ff54..ad7293c 100644
+--- a/src/solver/opamCudf.ml
++++ b/src/solver/opamCudf.ml
+@@ -9,6 +9,9 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Common = Dose_common
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ 
+@@ -634,7 +637,7 @@ let call_external_solver ~version_map univ req =
+       let r =
+         Algo.Depsolver.check_request_using
+           ~call_solver:(OpamSolverConfig.call_solver ~criteria)
+-          ~criteria ~explain:true cudf_request
++          ~explain:true cudf_request
+       in
+       log "Solver call done in %.3f" (chrono ());
+       r
+diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli
+index cb8158d..c928ccf 100644
+--- a/src/solver/opamCudf.mli
++++ b/src/solver/opamCudf.mli
+@@ -24,7 +24,7 @@ module Map: OpamStd.MAP with type key = Cudf.package
+ module Graph: sig
+   (** Graph of cudf packages *)
+ 
+-  include module type of Algo.Defaultgraphs.PackageGraph.G
++  include module type of Dose_algo.Defaultgraphs.PackageGraph.G
+ 
+   (** Build a graph from a CUDF universe. Warning: dependency edges are towards
+       the dependency, which is the reverse of what happens in the action
+@@ -180,7 +180,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string
+ 
+ val make_conflicts:
+   version_map:int package_map -> Cudf.universe ->
+-  Algo.Diagnostic.diagnosis -> ('a, conflict) result
++  Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result
+ val cycle_conflict:
+   version_map:int package_map -> Cudf.universe ->
+   string list list -> ('a, conflict) result
+diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml
+index 03486f1..2651373 100644
+--- a/src/solver/opamCudfSolver.ml
++++ b/src/solver/opamCudfSolver.ml
+@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+     in
+     OpamFilename.remove solver_in;
+     if not (OpamFilename.exists solver_out) then
+-      raise (Common.CudfSolver.Error "no output")
++      raise (Dose_common.CudfSolver.Error "no output")
+     else if
+       (let ic = OpamFilename.open_in solver_out in
+        try
+@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) =
+          i = "FAIL"
+        with End_of_file -> close_in ic; false)
+     then
+-      raise Common.CudfSolver.Unsat
++      raise Dose_common.CudfSolver.Unsat
+     else
+     let r =
+       Cudf_parser.load_solution_from_file
+diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
+index 3748e75..bbf995f 100644
+--- a/src/solver/opamSolver.ml
++++ b/src/solver/opamSolver.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Algo = Dose_algo
++
+ open OpamTypes
+ open OpamTypesBase
+ open OpamPackage.Set.Op
+@@ -84,7 +86,7 @@ let cudf_versions_map universe packages =
+     pmap OpamPackage.Map.empty
+ 
+ let name_to_cudf name =
+-  Common.CudfAdd.encode (OpamPackage.Name.to_string name)
++  Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name)
+ 
+ let constraint_to_cudf version_map name (op,v) =
+   let nv = OpamPackage.create name v in
diff --git a/dev-ml/opam/opam-2.0.8-r2.ebuild b/dev-ml/opam/opam-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..2e8c70b94dbc
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.8-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+S="${WORKDIR}/opam-${PV/_/-}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	>=dev-ml/dose3-6.0:=
+	dev-ml/extlib:=
+	~dev-ml/opam-client-${PV}:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:="
+DEPEND="${RDEPEND}"
+
+# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
+PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
+
+src_prepare() {
+	default
+
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
index 89231e4c487f..9914bdd1bd36 100644
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index 7a4fbe5d374d..1ca5eb87be9a 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,5 +1,5 @@
 DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
 DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
 EBUILD Config-AutoConf-0.315.0.ebuild 676 BLAKE2B 9eb69c1d3712a637d67637c2bd13b2bc55a34d0f691e543553fd68b5a5125a32fbb58864411a85a9f535a8b0327f8a736648b39a47d328df4bc3039a7f0516bd SHA512 b4232d65d0d2c1715f6c704108f3db2e0201cecff3194b01f62d2e682cf65b294a9a10337ea9802677cfb5f7453bc49fb113cb15b1a0bcce63b7e0a77cdfe114
-EBUILD Config-AutoConf-0.319.0.ebuild 719 BLAKE2B 6fba21d0ddb6eb544b32c5232916f259f25ca6440a15c5bbfad2afd0518eda44558b46b23512de4dffb8965f3919136185f5079bd3e84bb49ae8a643f2befffe SHA512 f9d2f3abca408a4c0c6536ed8e9e5250beeab28cb3efee42ae7abcbc7b1f939e5452984da66804fc8dd5f024e99851da7cb176e44857606214fb294681bf9e9e
+EBUILD Config-AutoConf-0.319.0.ebuild 717 BLAKE2B 125ae7f44812b64dbb440b8095a383b417020433689f1c84affec037b042f86fcfb2597069dacc49463536d3ca1188bde80e2aeeb343a15fc91474caf4bd4a75 SHA512 396e995f9a87d1bfc20fb3b1eeac21f50601d6d7610dd8791a62154992ccdf41ea8e4d92e211fc1585d2242deca15f395b43736e6722f7670a0fdde22399519d
 MISC metadata.xml 402 BLAKE2B 4cdc91bf4199fc7257fd8e1e24844b3a7e5dc6dc365e9f2e1d62c8928427138f43219dae7d87168c6706d59da3218f6da9668937920fef89942e005e6052eb56 SHA512 89053a14b4b092051ebb66bf194123691701f5a4c85cf31a3d0c4b6f063c93f1bf2211bf38f98318fb1dc2bd5705eedc07ef6c37e83683cbdf9114512cb1a25e
diff --git a/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild b/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
index 23d02c212a56..ba0b2a80862a 100644
--- a/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
+++ b/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interactive command shell for the DBI"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBI-Shell/Manifest b/dev-perl/DBI-Shell/Manifest
index 6d690eccd103..ad51ca5e4c68 100644
--- a/dev-perl/DBI-Shell/Manifest
+++ b/dev-perl/DBI-Shell/Manifest
@@ -5,5 +5,5 @@ AUX DBI-Shell-11.950.0-sprintf-warn.patch 732 BLAKE2B 4866aa33b1cc810201ad88ffe3
 DIST DBI-Shell-11.95.tar.gz 51147 BLAKE2B 299d553eccd1c295b4221997d2ee95ebb1f0b865691e78d9864ab6ad39190593e3286551f7484f8e5dd028e126c3e7a9d5c3e3e73fa52ab7cdaaea6318257365 SHA512 a19fa2573dc20cb6844a523653f588da1eca56b4e8138b789cd7aa5c50b255ee4b374eda9baae588b5bdcd42183c9384f1fb8234d11022e02cb7f81dc0bd6c84
 DIST DBI-Shell-11.97.tar.gz 57123 BLAKE2B 0c4d459dda185b6fb2ea292912da4624e1a4ed33aa4487eabf5c6c5be6571c1e8d32b29b703749fe562ebbd60aa389f62d5e3461863c5777490345451bf8cad8 SHA512 74bf7244691b8dee967bae4076b59b912d66ac08f48f8468531d003db6d85d43d836116f8314961602a002b58fc9f6d3bea88076e1d7e2783d430137dec68f4b
 EBUILD DBI-Shell-11.950.0-r2.ebuild 536 BLAKE2B c3a807838ce300c2c5ffab50b5c366cb2b7a03798bf7cea239ee88a43b92a526db58583d7b9e2db4bb2a9c971a74f0e89f94eb9f41196b15c65e19dad4b1cd96 SHA512 c89696be45dff3644be42c5e31817d0e823d837be5c71ceb20320b98bf05c1cd535a102446301d82211d74d1dc5b61db278402d1d6a54e0bfd1861b07a4c69db
-EBUILD DBI-Shell-11.970.0.ebuild 824 BLAKE2B 6ed7e0ed5e9132d95ffd2e76dec8f562349abb775e0b43f2112be3835493bc40b0731654295282046cb13da0a278285c44891d82515baa84d03cc5a6fcf7d434 SHA512 301be84456f4c687dcf5adbcf3b986fa808b888dd855e3f20d5dbbb4a2c89f0741c3b48e88d7dedea7141393b48a8855984a5f7b94a5ef0c6390893dfa99555d
+EBUILD DBI-Shell-11.970.0.ebuild 823 BLAKE2B 3044528d43019ce7ae43c9e911817b2ae20366587bd5be11ff53399fe0a14c34988b4f6f1373f19b363980fc6f070589c7bde4011f3f6ff0c28db95cf69551f4 SHA512 cf80a94a1568cf484fe30513cc1fddb98d433c6e89d321c0da18de1e6af41043e488a485f2fdfaa751f75bb32f2d8e4a3ffeb0921bcd32d8eda3d44c5a8ef1d8
 MISC metadata.xml 1566 BLAKE2B 352004488429827dfe8163710f775a349755fc3bf9c6765134843806ae2031de390b08d832ffbe79e79f799762f7af3c1bdbb7cea5969f7568c691bcad2b6b2f SHA512 934918cea42ddc00fe782b37176250008b04bf5741cd4072b5cbac572c6f508fc615b9a2fd6fb4f93bbeb87f62503aa0262abdfabe2b4ef16eaee402c96b7fbd
diff --git a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
index ddf2c853c4b6..f2027a0f27ad 100644
--- a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
+++ b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-CheckOS/Manifest b/dev-perl/Devel-CheckOS/Manifest
index 65c31970a0a2..2c32c616b4a4 100644
--- a/dev-perl/Devel-CheckOS/Manifest
+++ b/dev-perl/Devel-CheckOS/Manifest
@@ -1,5 +1,5 @@
 DIST Devel-CheckOS-1.83.tar.gz 33177 BLAKE2B 3c328c02d5fc18ee1af01ed28fd04520de223abaeec35fde926006896995c3fadcd8102fedaee44b6e2763063d6ebfb2d9f4fcd52afbdcfc9c9c88c113783e93 SHA512 3fef830aac2fef3946c40b5aa29c74e55137485ec6cd7dfe851bf961ddadb462811bbe1560e972be5b6ace603123af18a43f4df9c6df72e2fdfd2205399734f3
 DIST Devel-CheckOS-1.86.tar.gz 33703 BLAKE2B 5b9906bef035c1f388bf91ea00ae1bc371375b3c2387e5b5f362f36fe77d7e7f67e8d0b570e9eeb3668e39b24de9715de8533d9c28585aac8c90c306972390d1 SHA512 8f3c87a18a014549b0c1490c09e365e53ee016c8a19bd3945396b1f449f373ac1f2f89ddca3f9fa4c6051cbad1cc32fbb42c76ee9ddfa3d3e2e7ca3fa125a6f0
 EBUILD Devel-CheckOS-1.830.0.ebuild 540 BLAKE2B 045bd9a1082237640a40a5d89749934872e5a7e61357be93469194fc9dbad4b777a1a0f0aee76bac7dcb2dc414ba63640503e4eeb7ae3757b29015d3c13ba4e8 SHA512 6fc579d238d58b0eeaad5991b00056cbb25eb44c8d58c713660527ce43d1cdda6421094649f6f97a15cafe446274b0617e31a1cb93cb25673ac80fd925056674
-EBUILD Devel-CheckOS-1.860.0.ebuild 522 BLAKE2B 37b8e7d6bb6d7ea402c95e02b3046974c95a727883efbf230ee62e61894f2a2b19987bad4628aff20f35d0eb252a65746daadbfd3777490b497326c471569975 SHA512 9f11c4f413d5acd9b290134cdfa1f93337ad21d5d62c26f6c40386a7d8cf30d0e17b65e16401e0a5064275ca7b2d279d02c7d1436a51529a97b71bb855416015
+EBUILD Devel-CheckOS-1.860.0.ebuild 521 BLAKE2B b050cc6421ec10fc27994346ee581311b8ad4607f7cf27c884c7289bcb25c9e701d044a0a4cc0573aa847d3589417c508968171813c6e6b4c2d6c596bdf24476 SHA512 83a5325990a15b5635b0f411adff5d14f9bc12d24386697204b140756edf3961f0b8181cacdaa6e8a7aef4e78461a71c5116729c80371ca3161b7f4807942de7
 MISC metadata.xml 5699 BLAKE2B 84f8bc868fdb5f575f17cb0e5e85d1c2fa52021da57204d42bad4fb83f822337bc9f4c3f6ab3d88e56eee5cd98e116f8532caae316f37a880e987fe24d00bb12 SHA512 9b25d99f8a6a4b5ee7d2941f2dfa1a07d22be5df4a0093d5abff4138d242607fc4529b18b504f449c90f53609a69e6786fa1b3c684be86d6fd5a334558b819fa
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
index 20c549c387ee..4f2a68277edb 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get home directory for self or other user"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+xdg test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-HomeDir/Manifest b/dev-perl/File-HomeDir/Manifest
index 44ff4df828e7..9f2cfa11b875 100644
--- a/dev-perl/File-HomeDir/Manifest
+++ b/dev-perl/File-HomeDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-HomeDir-1.002.tar.gz 35441 BLAKE2B 01cbebbcc18958cb0056160383880c9749a1e43a4c27e2da9d6a190985929b53b25d3cb50d84766a1a9bc9607c64265c2fd622dc1d0eb4884d7c799edb02ff12 SHA512 4862c78f65785579d4978d3c4d36ba2a71fb78f069b5671d0cedabd6d187fb4377ae40be45b0abfb00df8dd362fbc28032aab2f39acbbe9f1d7bc4a5b24863d4
 DIST File-HomeDir-1.006.tar.gz 35855 BLAKE2B d6339d483dfa32158138cb17e632074236ae67a0ae1ae1529a2bf38efc6fa3d9c83b4163cf6e1b9850353ead5d287625d3d1d1cf753f5757c16dbb664b941e0f SHA512 1ea90d68ed059ef5e890f6afb1280673dd5a597956f282c4ae8b4471c1751aa3cb2fcbe9caa6b2976937d11fd7233aa85a2dea611f87c79e0ddd1a501ceb890d
 EBUILD File-HomeDir-1.2.0.ebuild 745 BLAKE2B 8e97b4bf23ee87442c50419b9833a96575e7e821dd40a5c9cd1b8aa9f8b2aaba4b64622cfbd523638a8ec18502cde65efb9dea14b97de16d6bf8e567604446bb SHA512 a7e665c68dc45131c74e23d4193dcfc477494b6123ea5d3f3700e47b851455efd40708afdf9c3c7d7682d714db6a82a62bbf95b513fd502e02343ad11529d996
-EBUILD File-HomeDir-1.6.0.ebuild 760 BLAKE2B 8e0f92fb4e8551b3b5df1dbf73a6bde3726a03e938043f543604de5ee915de8ed542658ddca4a77c1adad4f3987e59904dcfd76f72d634ac75ca25ba095828ee SHA512 f52f5e97b8aaf3578549c7e8250fcbea5d1af0785907ad905ae8d67e5bfaa8060183c1b7d1bc925b8f47d190850620177cfc0a71291f7691f4c013e206fa360a
+EBUILD File-HomeDir-1.6.0.ebuild 759 BLAKE2B 872eadd5566f8adc93f5d563b66bc3a4902379b018191bb868a61339d6b5f4b78fafdf7beb3295164fe76658bc3d1da66e1297829c5b173b135b9ad541bb270e SHA512 0a2f35a74c9c2e72a043d66bc4718728aaa0eaef691800ce5e4803c83b44c25fb010c4532b8f37cbf8ab05f8abb4d720aa8048b46cd73402dc5d28f57740c748
 MISC metadata.xml 1137 BLAKE2B 4ce7a1606a1369adc17ba42a2af8aa1df1ab6023143a903b20d36c9353dba085f3c68e674defc3fba9870821b1da1a1ae3dbb9540d14799dd3eeab9d38cd2bc7 SHA512 e415430c594769a7bd66bccbedeb6171236c3d70629bd2e1266a67684ff878a74e0480020fe22a52426f104577e5a998dc9bd42de9febcdd8be5ab46277c2fe6
diff --git a/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild b/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
index db71c88d7535..782d4948f0b0 100644
--- a/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
+++ b/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl wrapper for libmagic"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-LibMagic/Manifest b/dev-perl/File-LibMagic/Manifest
index 2172b3b47927..f112363af519 100644
--- a/dev-perl/File-LibMagic/Manifest
+++ b/dev-perl/File-LibMagic/Manifest
@@ -1,5 +1,5 @@
 DIST File-LibMagic-1.15.tar.gz 124847 BLAKE2B 84767d73b6a3c160bdbcd202b807011bcffefd93e69f3c7d2e072ba1be87ab0ec9864e5deff03a62e609ef270cc9dbf32a6cb2f06ccdad4171d24d57d3532305 SHA512 bd6e2ac57bf7a4443ceab5143b9381805941600d436fe1b04364f9ab26f60a3a9d142576619135b3e4fa7449b2aa379960dbe24dd19c5fdaa379963a13490d5e
 DIST File-LibMagic-1.23.tar.gz 167761 BLAKE2B a409cdfbb7ac448858202ad79ee7b5cceb7d0bd17e42de108818ca6b03e8f8688f15dd5b5b0adc8ccab1a97174b02ccd93d5660dce2c04f585449182bd25a2aa SHA512 894ff64051e607f3b788f52568221cae3a99b7386b534c62c33fccc46d1242d3e851970cd9063a1c1535732f76e2bc2111568a8e83b4ed6efecfedd8facc5cbd
 EBUILD File-LibMagic-1.150.0.ebuild 696 BLAKE2B 57a10e90ec9673dce5fe95f89b78feeccb08dafff4f68f9810118f881efe15b5711261684788b12a9587d647858e999af8eeadbfcf969b718dc2ccfdb015a441 SHA512 036bf04caa5339bb994335134020fe1a2f1e38a326464f7f3755c94f68a0f611d6d7ed8c7d1038000b4b1aa7690b1e30adc65c436d50f61aa3f7285a9226c640
-EBUILD File-LibMagic-1.230.0.ebuild 849 BLAKE2B 19bafd6b38a04ddbeaa976d1e7342777e73edf2d4d4ca8dd71c593930c5f279b044e7eab6aee1c65bbfe728283cb2a4bd4bfdb05cbb11593195cd3eaf982cde5 SHA512 069f9698f4e9e84a48aafd32de8df4992fecff478fa78a7a72272f145b4f0bb23e463a1216b10810db2f40e6a4e7b7d7a2b659882630328ac9ead09040ec33c1
+EBUILD File-LibMagic-1.230.0.ebuild 846 BLAKE2B 8cbee4d54c45c6df1f9937dd366f258a79d7dca56a20561ba0d45efdfcbdef22f8fb5a3ee95128febac4e20eab0bc3c160b33c3ba8aa53f1b1218fd0a952d667 SHA512 bfc46a22705a9eccbe332ff5c0c8920c0ce1b599c1a41c6e2aae061bd1b4f1d4e1e85de99afd8a033a1a3a0eed5433048f1c162a1d4148c4f2c72b59e48cdb1c
 MISC metadata.xml 585 BLAKE2B 3a7ad3d16e1452026e42fbde6ef7f947baa0d7e71d9bfd2295eba3ca8b80e5513c803795f00f8ea9ea588ce867d8484a4128ce3e48354b956e5065e0f89bea0c SHA512 b798c56c67255dc74215d401223377d669dfde623b14640d271aa65c90ed1e78e8b86c28d8deb8b970d7937ae628380025f03ba8c235bd4a10f1ae2e68095f17
diff --git a/dev-perl/File-Remove/File-Remove-1.580.0.ebuild b/dev-perl/File-Remove/File-Remove-1.580.0.ebuild
index d87d2796ebdc..7771178a504e 100644
--- a/dev-perl/File-Remove/File-Remove-1.580.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.580.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index 185974ba19d3..fb6ed7a22245 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -2,6 +2,6 @@ DIST File-Remove-1.57.tar.gz 22157 BLAKE2B 1dff9819789795497491f17f24887f701e519
 DIST File-Remove-1.58.tar.gz 25575 BLAKE2B 20673b6384817cc93378a1bf7a6b0cae52815a8d4d5ada2727d0adf26abcfca31e144bd9ad8267cbd1fa8b1f8860cc529db9e336e8da7cc1a6d568701920914f SHA512 2d616751328d57ff6975775189f92745fb3cb1d69675049ebddd96a2612c11c62c1995a70720efe4e73a9c10b9a2ec5528b90d468815e7c2ee395145241608e2
 DIST File-Remove-1.60.tar.gz 25997 BLAKE2B ffb98155d757bae6ec0d4f56dabdb78749fc968845e284797d0f0611fe9068722a007c7e0e890179720745d1451c926575949f36642dceef7071468a2863c7c6 SHA512 7781629896f16f0b34574a879803473002249c32cf03001f4c1c290edd379571d96d5b1049874f9f71bdb8d7881c3f30a86dcdd0d4f42b4e78998cd6a96de750
 EBUILD File-Remove-1.570.0.ebuild 696 BLAKE2B 4087300a325e12c6b1bce6159319ca749fd3618ae4c1f52e8fc4e233ceec860f0d22252b3d93c59cc81cc20afa20b39535947c248ba3e7c7ad309ec203995694 SHA512 f68781624ead53acfaf9b983263d3c8bd3a9145944cdc10c68740147baebd8a1a9ed891c294a3367de7091be6c1f1c83c6ccec2c61d11fb7721aeda7ac60b4b1
-EBUILD File-Remove-1.580.0.ebuild 723 BLAKE2B 6ffb900fa38d057bd76d2aeb60151b90bc05f3a2baa77b93f380df0644151e63dc325bbe97f2209f813141b618d53d661e1e86349a5375a90aafb51c98b19b9a SHA512 1bd7071da76e14cb23d88aa345ba431a369fd4ea2d2c9d80002852c8814845c48d563bd68ccc83c4fb03fc5dd224f041580e2cc69c7dc67c17abdfc8539de205
+EBUILD File-Remove-1.580.0.ebuild 722 BLAKE2B 6ea759b7afdae9a9de30a2ebd0338ed0241ffb0a8b8a6cf085fa2d54a39c2c224f2ed5378930ee523dd859b80ed6cf920864869e7216e03effdd83ce5f4b8969 SHA512 a5cd7ae4b9fdb16ffb11cc49be49a912abcdde2431c21d09fcc34e4738cb0c798b20ad5a76ce48cdbe49d175b2f1e0a8aac5d8678a8272e43c30e0723237736a
 EBUILD File-Remove-1.600.0.ebuild 707 BLAKE2B 19a50f323a7e0d9b7cc82717387df559354b6d843b7c15446a38fed8cfe2538d6bc0663a7657312c192f1232fe66457d7c4a8ac32cf3a35bf546da371048d4f8 SHA512 42384718ac9f51d8995a8bc50a763ade5ff4ab953b5f218b4a51af228077ca1759f72a4ea57cec31a72054ec5077640c471c3b18819275c2c1f36f8d2df14d70
 MISC metadata.xml 394 BLAKE2B 12f606d262b6dcc55390f4d23a8aa7624ac0c09704ca261e7698404b20d16d4f31cc09ed6fa6516cccee1f20bf7cf895dbc13af15d7e2fd08008541ddb6c932e SHA512 a7ac4d8ecc1b0e4be8268ce717e2ccd67dc652719497f8906665347e8c33d6c85c53e88e340fd34382b9cc41c62b7e098d491b8a999365ec11f6fd02b363723e
diff --git a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
index cc620b7c0764..b5d60e097b0e 100644
--- a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
+++ b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Install shared files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir-Install/Manifest b/dev-perl/File-ShareDir-Install/Manifest
index 88e009c1991c..43ddc3ad0270 100644
--- a/dev-perl/File-ShareDir-Install/Manifest
+++ b/dev-perl/File-ShareDir-Install/Manifest
@@ -1,5 +1,5 @@
 DIST File-ShareDir-Install-0.11.tar.gz 31187 BLAKE2B 4be6bd829fc9b2784069ba3ee8f54fadd390e3bd003d43a7754f3469fc14c01a5587044f045abe806688ed4442088256264d983ccf4080caec8b8062912e2acf SHA512 6611f6c3221ec52db7582f30b2159dba22ca8d899666526c069298b3350ced9e3b46872baaceb30f7a27e3c744c929ca4967fa820d14bbfdb41e5ed5485a9f72
 DIST File-ShareDir-Install-0.13.tar.gz 31191 BLAKE2B 53bde507e8fcd0c75030bd977bc6a55d6da810c99102269e46042ebe3873d8fbb224d967cafa87dee4bd02ca18b968f525129986bf7204f84251d7f86f0588b3 SHA512 a119e38491fad8ae0ebd95913e3b608e09a2b99376a5160e75083a28abe4f83c4f6a36df216365527ff87bf8ec095254b16a2f6d2515c69f34609df8672605ca
 EBUILD File-ShareDir-Install-0.110.0.ebuild 867 BLAKE2B 0ba01b0efc73eda28fc16a1beb910272b2227bbd21c971cac32707fff6e0fb79e8d445c3db3eb1ed63367b4baa118ba00de7c0e6e80b3c39925740775fcb3ea9 SHA512 12342830cbd2a3d884073f47266030dbbfd4fbd2081d5e261ea446d5a570ff31243ba3540e0fd4d4e55a5d69038b3d61dbe923aadc3ed3046c978cc6a9ad0859
-EBUILD File-ShareDir-Install-0.130.0.ebuild 665 BLAKE2B 9e367610a34b2cb7a1e4b47d914172ef3f06554dd9088fb178f4653c595e75043b0a68aec820c3e7648665ade1a9fc82e6f714856db7181488160a9456bbe3be SHA512 f7271cff763fc836c68ece274839febb145ec35c144c154ee2262c3a45d2e74b17eea01e083482090889d11667f888ac47ca11aed3a243b620fda98c661011a4
+EBUILD File-ShareDir-Install-0.130.0.ebuild 664 BLAKE2B 8968c7e73fe46998357c0975aa9b8060d7c253de2026feb61c39ba7b4adea39ed16140a43ca5f2d9d662efcb6fbd718888bf6039f0e2026b2aef75291e706b1a SHA512 31ff3557787555f6ec8369eea1dd1c2fe68f92576f635941183852ea8f54dcafec6e3d2543335afb7f2111fbf1ec7fed42b0b382f7254c97603fdef55cfd8f5b
 MISC metadata.xml 415 BLAKE2B bb5f387e0912230ab8096ba0ca1542b30665647f37d0989c7dc11619978bef2ac9e64b0668f46cd70205fc20b820f879657e705a96e35e481aa98388d232db5e SHA512 0bda1e6c71c01da3c4062b9d29b71377874971cebb570d0cdc5289680c864f5ff6879b557698ef4fadf86475ae62ba6904d59bd85a6bbda3be9778f4f21eb986
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
index 78ed0d633f1f..ba0cd68bafc8 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 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 ~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 ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir/Manifest b/dev-perl/File-ShareDir/Manifest
index a99499f29564..3a324fa51866 100644
--- a/dev-perl/File-ShareDir/Manifest
+++ b/dev-perl/File-ShareDir/Manifest
@@ -2,6 +2,6 @@ DIST File-ShareDir-1.104.tar.gz 20500 BLAKE2B 567327d46e5ecde5c3ca8044c6ff7af5b5
 DIST File-ShareDir-1.116.tar.gz 27487 BLAKE2B 88b898ea6d139b21bf9f64f183c808192e3bcfcd260524aa5e03b4ce05211fc8d5e0d5ca8cf9f1cad8e58b7ff029835cd35cb343588a9b2e862e612549cd1c0d SHA512 5fcd75254c446f02ee377e6b5848baad95c73779b8525b0ee1699fe675ddd2bd67d0dc057f47b0991ec136de16e06a4891a4b14a78bd96c3e2468640053bbe0e
 DIST File-ShareDir-1.118.tar.gz 29631 BLAKE2B bdb2c2d786efda84567d56611fdfbf027665e6d0df21a1e4bcd92824dfa32ac9272cf4b2fb0eb2260317957af150df8a6919027bc664c594ac931ad48cec3f0d SHA512 890f33e96333f7b07707d722e59e7da9a287112062814ef294594ac67f2f7349f905c009e6cd70d3af3a4de85335b074ec5a61194f9b0495f3e793d6ca635853
 EBUILD File-ShareDir-1.104.0.ebuild 720 BLAKE2B 9817613cc6cb6efc67ce96f2c86036ed45640c43ebcca8127134f053d6e9e05a3c7dcf8962f070d5e37c73ca03f2a4895566108b188b526366fcf5538fa1fb54 SHA512 97c1ddc784812006ad4c79c23754fd9943fc919662697c855bf439c21ebdef695208b43db1be614d737f1370dbdf7d6ccdff3f52adbaee7a43e4a19e14426939
-EBUILD File-ShareDir-1.116.0.ebuild 1022 BLAKE2B a69c054eb413dbea4f65cbe0f2f730617df1ca706da75590218229d5c06c5b88ef293f4a22c1eef4b4761612c87a8a94ee04caea5708df2c6b837e2127f247bd SHA512 3ad1048b15cac9118952e2eb61ce46d9f8fc3785012eba656fb36b53d314b775470c3bedf895abb8dd0a7ece7522f34fe476c7c19bdffa4f9fcb2c1fe8b02808
+EBUILD File-ShareDir-1.116.0.ebuild 1020 BLAKE2B ec6ad3c45e0bec582e47c080616154ce689a39f400523e59db043f7ffd6611c78c9f6f0f2c6d6ecb9b5f73c22b864b2fe68e7f063760c00c8f2b27f17acafa4a SHA512 5f8a1b16fc3f213392a7b47d261751bffee3eaaf32e93588db49c29203e1f611d7b873281f670f9c9f80c68a821b42f08e4d1e55103da4d86473c531e5424ce0
 EBUILD File-ShareDir-1.118.0.ebuild 826 BLAKE2B 88aa4c4b1cef86202086e29a473607d7cbb90a63e0fb458b033932ba8c9220bc442c0060e2cc1f4ec594a6fc2b53feeabd0c52dd4abd619e086f92d9313a405c SHA512 7d1395e6333f7cf1f639523a11a75a682a389e13b7107ba09d99d3d57b515a71b4d495bc4e850ef17272ba4093295bfe3d7c58709015a046e22b16ae71510e78
 MISC metadata.xml 398 BLAKE2B 393f7f6723e23146e3c509b6fe955eaaed1800a4fd5b07bb01e793a4f4fa4045e75bb9e8fa19a7fc3ee424ef4e890465fdfb1d33079fb05771c8ce3b6ea9a185 SHA512 f13082c7aa0e876a02c76e56d91d53fcca5e0bf56b4b32c8219a4f18349287d07ad93f61bd2db22b213a90312534112fbe2d7cf493dbbc91633ef63115bf72f8
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
index 2fdf50f23302..a8e8fa4ee709 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Slurp/Manifest b/dev-perl/File-Slurp/Manifest
index 99935924dcb8..51bdf3462d70 100644
--- a/dev-perl/File-Slurp/Manifest
+++ b/dev-perl/File-Slurp/Manifest
@@ -1,5 +1,5 @@
 DIST File-Slurp-9999.27.tar.gz 37734 BLAKE2B 2e2589b834e1092a869a9527395d9ed589f0dafac99b13ca3e802c4bf159ebc55f7b28284a13effdcbd476b7c7d7727a9b25735dc9f9b1711a9ec63444d44888 SHA512 24a5e2b93f7fda65cbdf0e54687de3af511cfd3909dcf4c79610882bf4f119afdf2bd60de28fcb8d9155b94a29ca4f901e28930a810949e490ba1c584d7a6ee0
 DIST File-Slurp-9999.32.tar.gz 34574 BLAKE2B d75d7253945908328124ef46f53d86fba7ba0751e87ae493f071b03844d17b969371d1b26fddbc94f4b788475b09b5ee76c3d2c0b6f1c0c64959da0be95dd0f0 SHA512 413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56
 EBUILD File-Slurp-9999.270.0.ebuild 772 BLAKE2B e08445df8db472e70fc58bd69a2fdb24a9f194d4853286cdc9c72238c63bd2eaaeb3a27532234bb622b11b2174e2b5353146cc97033c007a7142ebf1f46cf64f SHA512 9fbd6cae17584030acc8d45a7a92fa09a72cbcf6a1efc50033a453960c978f10a35a1f999cd07510b63e82b6b47b62e56f1038683903a60c8e705ec0d3d1fabf
-EBUILD File-Slurp-9999.320.0.ebuild 831 BLAKE2B 083469a8e23cd68479ef9f855b956ad831ec92d497a5db91e741f06627cb95d7db6c8c51cc8757d71f7b0b834e561f43c5c95ed7b1469e8bc2892dba03b81e29 SHA512 517c7a93de382fd968dcfba9c052fa27b3d6ee732376c6d40f44401563b6bd1f58d23aee92a3eaa3d36e42108d0f8b38c3c253379238d08a54b7cc46dcf4c4c6
+EBUILD File-Slurp-9999.320.0.ebuild 830 BLAKE2B b21e3bc7cfec028114209db3ca3ec77124a02c026c0c9bdde50b7128b2fcfd791419eb844c6a6eff8399bf323a598da75054078f85e04c848c203fcee9b3aa7a SHA512 1bf3927fe43734367b0eb275d5bf58d41ddf1efb6f21e788ec0b9b7caeacdc6c098a0bc8f947a7673c56ae6d1869ba5319d8df5bc20e28395120ecbbce1b2c7f
 MISC metadata.xml 392 BLAKE2B 1f26c92590188aceac252580091405f51e615666b62b9a6ad2b0ae2a980a42aecd02abb1179d848d1dc7de16505599697b544e182c58f178eaa4d766642fcb1a SHA512 0523fea20212b3d74c23ec0ab59a1ee4db16d81ce91f742569c9d6c04e23e7637a7a0aafd7eb8b42cbc059bfdef27ee8794b8ca89a82f8d284f14916fb4af7b5
diff --git a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
deleted file mode 100644
index 775296a1c87c..000000000000
--- a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LEONT
-DIST_VERSION=0.010
-DIST_EXAMPLES=( "bench/*" )
-inherit perl-module
-
-DESCRIPTION="A simple, sane and efficient module to slurp a file"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/PerlIO-utf8_strict
-	virtual/perl-Carp
-	virtual/perl-Encode
-	>=virtual/perl-Exporter-5.570.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		virtual/perl-Test-Simple
-		dev-perl/Test-Warnings
-	)
-"
diff --git a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
index 4c9ada1c9f34..9b949edaebb4 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Slurper/Manifest b/dev-perl/File-Slurper/Manifest
index 7fe30f4db3a7..4a68949f8e3c 100644
--- a/dev-perl/File-Slurper/Manifest
+++ b/dev-perl/File-Slurper/Manifest
@@ -1,5 +1,3 @@
-DIST File-Slurper-0.010.tar.gz 15905 BLAKE2B 92ead775ff7c796c0cfc7631160e7483b9defec4d603e9d5a7f7f3380788f6af2a2463f1c0fa66f21339f8a61651e4e9b48ffc829ba9765158c911df4531ec2b SHA512 a6e2a86d76d2e4c49a8df17a453a3da530cb62324cb91793c4bd6e7cabc4f5b4b4fadda8aa0f98390ac950a94a4b82cb3ec547caaba88bf61ec0aa086e298832
 DIST File-Slurper-0.012.tar.gz 15517 BLAKE2B 07f451e93e5fa8641a4b8156a61b9a9c1a9c9dc36b33c4991e1686e44b37730af3a9541de33396cdec6bac1d08ec1bf9db505e6fa07f3c95187c4901016955a5 SHA512 276b510c85b4e28fff4b8bd77c81031367b073426138743efb5d54fe01fa9825409f86090788779e96625b43207d1f864f348cc11554c51d36868dfed568f2bb
-EBUILD File-Slurper-0.10.0.ebuild 783 BLAKE2B 78886f385c875e4194b98a9c25656dcdf45fa35f6c895c90d029b71896987203ccab3c4cc4d395dc606786e9d2c30bd9f54d3d7ceb7bba908e8814ec39f20108 SHA512 60bebe87fd076192bcc4ccb0ef2193cedd076478eade8d406e84d4a55559abc1da8823c3e183ad125384218d7eb64e31504078bf4af9413c819859f19d7feb28
-EBUILD File-Slurper-0.12.0.ebuild 793 BLAKE2B 73ba584895790524350ee85fc70fcc9747bad7c3ace0c9c8d3981915972ca0f46a9bc799de604e714271f2e661a19ebb08431247dfcb111bfeb0e9fc11c63923 SHA512 220d267d1cc39781a9799b142dc32c021385ce13df9adbfc3eb91fe0f06de53cd94bfe638eda5fa5b2ea03ee24783729ee7f4fb3a0c4125312a9a7cb16ca3a24
+EBUILD File-Slurper-0.12.0.ebuild 792 BLAKE2B c6c475dbe22be02ce39a881848f8db7a0f86661ab22b08306da65d03c97d54ea2d668f196c2d607eade5493536b84bf3d5c907e5aed265a9d2ee7346fff83786 SHA512 1db3b055a35c1719235a6b5885124c50d3a07f8ff112ece7bddc38351461dd042c38c5fe2a2834345bebdea7756646e6cbdabb08ae275c4d4df94d3c282f7e4a
 MISC metadata.xml 481 BLAKE2B 2f8f554f6beb1ed6ac889fe379ff15c4bd76fb8ad050ea6a14f400572aebce11a7bf91468d62ec2844c00c1827928809fb48344f326b55b61f3e4913842641cc SHA512 62906c3487d2b3b8ea9bdf5a5d6fd6aaed39500bc41346fb918363771220742c31de061eb825916f3897a229e8b92bbff87a9181551718cc3fde1eccd9b60600
diff --git a/dev-perl/File-Which/File-Which-1.230.0.ebuild b/dev-perl/File-Which/File-Which-1.230.0.ebuild
index 2941c024b325..fff8522c977d 100644
--- a/dev-perl/File-Which/File-Which-1.230.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl module implementing 'which' internally"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test pwhich"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Which/Manifest b/dev-perl/File-Which/Manifest
index d763e29dca8b..b7116362f76d 100644
--- a/dev-perl/File-Which/Manifest
+++ b/dev-perl/File-Which/Manifest
@@ -2,6 +2,6 @@ DIST File-Which-1.22.tar.gz 21685 BLAKE2B ec2ecbdaf9e5f25e2d8928611a63438b0f2372
 DIST File-Which-1.23.tar.gz 23293 BLAKE2B 8a02bcdb27c052a344297c70cfea6b944ba004bdca9680d910cfd7b7ed30acae6365e13e00bab325254042cd8754da9557ee4cfab9d2291e5c505cff7e1662f3 SHA512 73c48642f448abdab2a3cf39409db50bb311cbd7ea352f5dc70f6e97296d9b09ab7e1738482864aa7f7e300a8f74b19b7ca9949fe3102f61e08fe08c9be2a4ac
 DIST File-Which-1.27.tar.gz 25146 BLAKE2B 9252da514e45eac03bc415a0c5eede6731f0cd05df0a7894b975edccdac338e711f7793da75a94419e1ae737034c612f595a312d20a59244b2f6572eda2822cb SHA512 8a6164c4af915e93924b1d62864e492b1c5067856e505c50b9a5cce0600d73bdcda5f7e35a9f37134d9e89949b45bbd0a5426cb56121604aea1a3cfe48d55e5c
 EBUILD File-Which-1.220.0.ebuild 723 BLAKE2B d388d476d9634df5edcd8f6a203ef288c3c83eb0abcf1a99ebfc42ced90fad7a10499f308c39bbe12a010d44916323aa8a024fb1b47f4788af19480e93fa53c4 SHA512 33b2d636ef1440b5887d50037682533c432d84a7414b743b76d35a44aba71d364f5241f01f04380ee71306c2d19648cbc03ede5fdf5b967ad41ea278ce210519
-EBUILD File-Which-1.230.0.ebuild 714 BLAKE2B 4427329fce7677225c6f5c7d142a0f95f515ae14b46cba9c1510e06c6a66b6fb04380d9df60a690574235789bd99b62787ab1d91ad2a7c0e7f8d92edd7090621 SHA512 795e7e267e4d291c49d43b21d1aeed04a90b4a8f69b8afe7804669078b5e3133b3e52758dd87ecbd24027fd6986811a570cc60e685c51a7b6aa34c1bdca69107
+EBUILD File-Which-1.230.0.ebuild 712 BLAKE2B 7996d5834ff47a97cced0d0fb387b595a054b749c06b0c7b28e8c53b71b72f6217f9ffeb7e19df7c4d98158db1ca9d766347e7745f6639fa84a6a48007c7722a SHA512 93160b91169009a6101c345f8e91e155227c649629a027d1968636e4ffa526a910d2ea2c1209e4f666ba1209603131598f40b81d988d7474c131c0673892d3e1
 EBUILD File-Which-1.270.0.ebuild 728 BLAKE2B f46299a6d4765eb1903e717d72d4aa42944885f429488c05d9c3e2ae819d66ea48882ec625c640f276f9ddb1be69b72c0bb33681b153841f720bfb43d0f0736e SHA512 d432ef90c64299c5fc34031b0747f228402539f7f71547ae6c67b3268265d1679eb3a276c260c3cb10aecc8f7acaef71d5f43b8ee3961c698e1cfd47898043cb
 MISC metadata.xml 519 BLAKE2B dad66f597916a87de8fdaac5afab5aac9a4f6aeb21e492a2eb61e15bcd354cd3e4d2dd02934b2463553c8f774ca945859103d4d127ee13c843f5cb8752dc0c95 SHA512 2f7f593061c1a254bdc712c25723fadfbbb70f9d680250cfd5d8077608dfe27f8472edc2bcf1ea50c029a1b36ddeb58cc1af900178275d6ea6720e4242a33a49
diff --git a/dev-perl/File-pushd/File-pushd-1.16.0.ebuild b/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
index 286ca1f7a8a0..3e6fa1a895ee 100644
--- a/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-pushd/Manifest b/dev-perl/File-pushd/Manifest
index 2acddf87a0fd..1d4c8ef8b0a2 100644
--- a/dev-perl/File-pushd/Manifest
+++ b/dev-perl/File-pushd/Manifest
@@ -1,5 +1,5 @@
 DIST File-pushd-1.014.tar.gz 20674 BLAKE2B 0e06d1c527aa2cf34c2d55302ec255e4aedbeded7a9c3cc0c4d40bec0b97ddd3c49fa13ee1e36764b9ef17db293cd4c63580bc471a723bfe9eb717eabc6f2aea SHA512 f81b852b6c64d330291b382df83b6cd15c807bbefb00fc51ccbf709ee7c6deca57f996cbe86322b81adf0b14e608d4f63f969330561b7c25a4a7b32f0e3df6bb
 DIST File-pushd-1.016.tar.gz 19798 BLAKE2B 1bcef90dac2cf9f086fab915f108d01f047f532cedc9aa2ce32f1e4b5d164abdf3f6826a3b5e959b6bd745ae5067047a45b579f98e988267eeb25d2a32335866 SHA512 f80f24831c28aed6efcb036db8da2404aadf1005ed751a82c10071a24572c05758eb1785cd9d1f9fdee86a20cf83b41bd73125862d8d24bfa240cc0d6b33ccdd
 EBUILD File-pushd-1.14.0.ebuild 740 BLAKE2B 85797301668e06a00d458154caf89b42b023daa738b1c16d785b41b62a5ab3b328c6821e47801618efa9f48da8b4989bae8696ff536267c3a9ef65e2b7546b93 SHA512 516086bdf87bd42976220f1e4a3f67850af1e18dc9098320b5f51f1e2db88a15730d345316eb609488c3da4f68ede0fdf57fae6d35acd31e07dee9cb911f59a1
-EBUILD File-pushd-1.16.0.ebuild 719 BLAKE2B 0bde9f4a1f7a53fedc628b373e9b72485968a7890db45495e366685cb81e2e544b5e1ba906be8fc9dafd19e03d5c3b35510ed693b5434868c7fbf6126a928a20 SHA512 04a5a2233ad4c1650c1f896bd3a91333d40fa7764758f0fb519d844fd9ab0aabbe12669aca48cd48ee63ff36dcf6c823821ae6559b3855dc94eb027c4ac98efb
+EBUILD File-pushd-1.16.0.ebuild 718 BLAKE2B f8f242ae4b7f16228b8c52043d44a5890beb621359443148f832924fafd3aa3a7208e363c68a5de4b3ebc986ca2a8df45be3bb17ae056e4f2620964fb40d4518 SHA512 e81c210f13d9a70c3fb158c5c36ecd5681b3c18850f5b7522b6d36b47ed29141745573f638c53d028113298e17b385bf7a39a2d5295cbc186d2bb08649055f37
 MISC metadata.xml 392 BLAKE2B bdc5e64729f046e151159ce2c8003b077054d1196a911595c80be4becab313fbf90a3889334d76e661497e4a180cf34995c907cff823271772eac0cc0ee97c8d SHA512 af0eeb03c65f2b1b820087db10cfb986f176dcb78f23ff98e883e9f31878867d5fe6d161f01e9c5baefdc80fdb025c1623f50993f83df9cd24405846ba4c53d2
diff --git a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
index cad27c8129ab..7d0632ad2e28 100644
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/FileHandle-Unget/Manifest b/dev-perl/FileHandle-Unget/Manifest
index 8a57e08e3b7d..fc9e742f2bff 100644
--- a/dev-perl/FileHandle-Unget/Manifest
+++ b/dev-perl/FileHandle-Unget/Manifest
@@ -2,5 +2,5 @@ AUX FileHandle-Unget-0.1634-no-authortest-generation.patch 1660 BLAKE2B 30127d74
 DIST FileHandle-Unget-0.1628.tar.gz 40259 BLAKE2B 6f63e89d8a25e1296c8af63ab138b0032de63a5e9557a77ab99a76747516ed6c098e23a2b1542d88da5034db28b2c5a9884712f42e83b5818b773bdfddb5dff1 SHA512 7c4aca0c7d22ab7091c19b7bc5876ed4f83ff961e49900e0ec70124cedc4e34109a31edf5180c6958772f85a021e2be6a8a9e69c393b495e413c24a8b2b6ff3f
 DIST FileHandle-Unget-0.1634.tar.gz 42660 BLAKE2B b7f4993e1247ac5b80828ba56137acde6660576934d42abb9628ef4afbd82b69849a95670625ce56044c12636fc81b5aab4297135b17cc4af2f4651beabaff4a SHA512 a649eb586897d4ae305e2e71325e322bfb5fd26e1352c92241c9a2a499bfca85d3322897598abcb25404a06d4f32dd4f945c5d7369024eabea793c6a500bc36c
 EBUILD FileHandle-Unget-0.162.800.ebuild 755 BLAKE2B f94ae3d10159740667d151ca97fd7aff9bba61fedb1be0212c552db6683a0e0d9fc3f8a6f9edacea7e1aaa724933421b87c3cf9f6b22309faa03803c93ee6e52 SHA512 86c48df6a56cbb52c35adc4cc18b44725c9ec1978853e2508a3e119d84a3ccf946ecb95ee7d308173d7f40931b58266c002e1a53db55e42882bb3e468b286044
-EBUILD FileHandle-Unget-0.163.400.ebuild 687 BLAKE2B b0960dddced8c15f149bc4e7b0938af207008a0852d53492986572c0838fc36252a749b28f7523daf46cf67234f6121487ef4225d0c39d9b0deaeb2ea659ce06 SHA512 e564595655fded8c4a7c233e42a98a7ee66afc1ffdf1e4c62ba873a56f625ef5f86c37d4ab0d4ca6d0b6a3dcb5a9858303e67cfc83976919b5af0d9d9b500a15
+EBUILD FileHandle-Unget-0.163.400.ebuild 686 BLAKE2B 6ec387975b6fe98fb54af0a2c779608156ff7d058906543f75cc2443495f0396753cc52a04686dc4a9787870ea7b2c1db4fd026bfbbfb769f62ffec2e7388793 SHA512 91233ac8f9e2cb46d828ac8f4644758f1ade1c98fd06408496bc973c73b226f48aadf2b9db9952c0179678e9dac4f617f32b4914b5f83c3ead8727798e00a2a4
 MISC metadata.xml 473 BLAKE2B 8be9b7251069b656a763a9d2be6dc207215d2d5761566f3d901cbafb6c6f9155af907e56ed9c771878af352da100ae53ae3178a1f8e0a8ac0f63106e594167fc SHA512 85c994ee5aa379b8fb4b289cdf4c3575de7d63d147b7d8851c45ddc015525f77e11fa4b3c5cb0cc14c6d6973f8efd2f29d7b528042a059001e8279122e895df0
diff --git a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
index 9414f8ef1abf..455c90b42881 100644
--- a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
+++ b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple and dumb file system watcher"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Filesys-Notify-Simple/Manifest b/dev-perl/Filesys-Notify-Simple/Manifest
index 6dcd712b071b..b1bfefd1e18c 100644
--- a/dev-perl/Filesys-Notify-Simple/Manifest
+++ b/dev-perl/Filesys-Notify-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST Filesys-Notify-Simple-0.12.tar.gz 12935 BLAKE2B 835e45ca61fe7e624b5e14df16d897a56c8f108cc17a9002a8192f01f46a4542a9a6dce5c75ddce40323db87713cf1ddb59b8300be096bc1e8d195bc1436b4ee SHA512 3edb9a5087b82c87bea1b4092a3c7c264ec6f8da391052593e504b16392ea1a84771bbcbad21d623f727682cc6ab4474fe6a7e346c8bebe13f60d39e83594e2b
 DIST Filesys-Notify-Simple-0.14.tar.gz 13429 BLAKE2B 303b1576f1f98fe016ad31e435683cc7535f3f0270c358a6ca5878d9872c792f2ead8aaa737f915bc27a605146a3f78353c8b5301da300448afa3f26bf7c709f SHA512 45fe097beb925e913af9c48704f5f550931c70673455258249127dff27abe1955e0e968f37c7c0f4c798a20be78b1055362c69ec2906e8e2633b21f68b198208
 EBUILD Filesys-Notify-Simple-0.120.0.ebuild 429 BLAKE2B 2e42499cf133ffc656bde40559e48fd72710cb408b45a79bb149dff16b0f3ad6e05d58cf22d378fbd315f41f03eb5b5a917afab1c4a02f08df8ce1e55d41c3aa SHA512 cb2c96f148f76183af54f9fc9f47a4de9d5753c1ba55a728550d1fae38a29b6bf7f0b9cb45f5a4353f446aae268ed6584827cd60002f92dda7ff064212fcc869
-EBUILD Filesys-Notify-Simple-0.140.0.ebuild 501 BLAKE2B e53c5bed9e5f4fadf5fdeec08d88337f031b9b50454ec820ef2f0c460548e51e9347eb3cd8dae20235c609b338855460dfc7ae3d3da71e28e7f003d115686e96 SHA512 32935fcccb51e3d4ecc4c092956ff142b98463051a42bcc4a251b6d0aaaf59c38aeebb5878cc36f649c797959b07c8d5df053414087d8d497eeea5ca59eca7f6
+EBUILD Filesys-Notify-Simple-0.140.0.ebuild 500 BLAKE2B c6be5be2ce46cd17135bebb09d9b21d3c2027837f544e852e32f716babe31ad39735d3ad254b18dd3d3a99d75792af3a4f0d162da811d80f91c9087325e6ca54 SHA512 dfb5534d45f2921c7d3cffb6c764ce69c5dd80bdb1b6d1d84aeae3274c915f6c4e24d63b9d34a3c5f4bfa18dae0afa779642567a348cbb4cd2ec02b52114b235
 MISC metadata.xml 415 BLAKE2B 5389cfa2f8af1168b08c31219e255fcebbbaf14388e38b74ee08a2b97e4065100b31331048f31320611561737d5182a5f8b84c191759d074970424af15830065 SHA512 311d3b0d79d16f7cb4d9fad2441fdcd66e56cbddd7b683e4e96c7eb86c4b4c4ffe5cbba73491127e72db9fc900564891f17df4da702955c3875dabd92d4c1bdf
diff --git a/dev-perl/Filter/Filter-1.600.0.ebuild b/dev-perl/Filter/Filter-1.600.0.ebuild
index 2c19da853d8a..12d10c060b7d 100644
--- a/dev-perl/Filter/Filter-1.600.0.ebuild
+++ b/dev-perl/Filter/Filter-1.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Filter/Manifest b/dev-perl/Filter/Manifest
index 79d59bbbd15d..8fe696be2bcb 100644
--- a/dev-perl/Filter/Manifest
+++ b/dev-perl/Filter/Manifest
@@ -1,5 +1,5 @@
 DIST Filter-1.57.tar.gz 92255 BLAKE2B 33eaa676892f189e8e6ad8a86bd1a3769c3f7db08b65b7d0b349a884be44f1e098dc15c5c178406575c3c553af79a5c5ad6dbb58d0a5768eb96c81b378dfc050 SHA512 6e0fe52ace85b329a73a79522a8227b64017701c9949d89271257bc6c50c263074084a50c500a3250959617707261ea71abd2432678c0741f4ad713e03ddefec
 DIST Filter-1.60.tar.gz 95351 BLAKE2B ac7a53644e4423a5b34432f11a9354ff5ee9cbf56a3d790d86ec7ef2c5dc7468d6ef793b4c23b8258c8b8aba74198700c0b8800bdfdfea9fb890b6c78be20e80 SHA512 be6ecb9d37c8384de34e842e1e46a24c43592cb1995178ef7a100ef8b028e506d26c044ae9fd1e4672344cbc2dae06b9136b27eced5470cfce683017129cf248
 EBUILD Filter-1.570.0.ebuild 564 BLAKE2B a2ab75568e8f9229c6a7292f828d5cb61514cd7c6293516ff3f4fff40f462654a7f2ae0fc95830dc6ce4c1fd445273d5714f9dcb00ebd09fc86fb36e1784ed95 SHA512 2531ba595bfed301b653e48cee7b392d481eb9735a2d44660fa2b4bfe2ef5b240745b1aa0bd2317ec8945c519a71c480e97bbf6c65880e2a82d9448952950f83
-EBUILD Filter-1.600.0.ebuild 698 BLAKE2B f996eb7fbb13f04004986cbb1f39c857c8251844d8b78891dfe6ab837c5f91df61455db45bd3c9da7d7320b13325d04a9d6e8725f23515e16c3169d492d33bad SHA512 bd74f904c1302330cfe097038c21c61291fcee4626c4dbf92eb6892fda05c1f43140951183af528b0748d7a169909ac5a7f287a1505829d96bf0cae8aa731d67
+EBUILD Filter-1.600.0.ebuild 697 BLAKE2B b7dae02e0109bda2b441ad39ae633133aae5168548e1d98d4581f65f4afdaf3f9ef94784f569165d1d97950f12fbdec5249aef9a757855064a6c05aac88181e5 SHA512 0c074f986a7ec0a403792fe48f8ccd68ce1ba7ea1c5149603f59a77983958a9e2fb273b55df774fd1902544d1d4288f27e2dff92127d7e992ad5fbcab36fe08e
 MISC metadata.xml 811 BLAKE2B c9d1834f90abfbbafb088a12301aed652a32e42919498da65e0b403483074c6ea3cc2d3c8d1025372ea548ca7c063bbcde932d9dadc82ae041bd70290df48e44 SHA512 f44f5fdeeddb28cc350e61f8ed6e049f78dffce1849441662c4560fb9315fb2fb29c4fa99a2442679105315b0dd2d2826b08fce8388ea80fb0b131314896a4c9
diff --git a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
index 6006866d8609..b272abe52ff1 100644
--- a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
+++ b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Get stock quotes from Yahoo! Finance"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	>=dev-perl/HTML-Parser-2.200.0
diff --git a/dev-perl/Finance-YahooQuote/Manifest b/dev-perl/Finance-YahooQuote/Manifest
index 7e0183a4c820..46a11c77b702 100644
--- a/dev-perl/Finance-YahooQuote/Manifest
+++ b/dev-perl/Finance-YahooQuote/Manifest
@@ -1,5 +1,5 @@
 DIST Finance-YahooQuote-0.25.tar.gz 20650 BLAKE2B 5fb69ee7c82fc5f58218dae74fd7ea827a55c0cadf56db5ff744d28403998ca7ca6f65ce5b23a8dba9aec2ad397d2dc61e8f711226af82bfeab3bdae9a0ddf42 SHA512 be1d906187916a62b50775a42e6b7ead983e65d2d3738ff8c76e4fb3c4c67eb8c01f8c95f181547547ec7624119b6be41b4299731e6a8dc76ecfc1c38779bf72
 DIST Finance-YahooQuote-0.26.tar.gz 21407 BLAKE2B 2fcf0051d5825b5c6eda50239222eed375082084e333d98bab8eb4ac8dc2cabff5775e0813fb8ed919b9ea8c41d137ed3036dc08e4620e473cb2610b93729203 SHA512 c0ac83f413566b7e9f6009256fcd60315140fcecc919b92865f10da314d181ae37a4e5ab7de8cd0a7e6af83ab03b5d5d96e0d51815065c554c581e0e3d82df2c
 EBUILD Finance-YahooQuote-0.250.0-r1.ebuild 1243 BLAKE2B 9c76285df35f2b99c43adc3a39c24fa06fccc3a2e802f10b3a966e0133a7c2175e987d76b08565c6443af40e608f22b0c381d70888ac76d0080c9e5d29de49a7 SHA512 685132a00bc36d9007fb280755c917f7f5f47cf3b2d605a40c1dd6b102cec2a4bc1ea006b9e1087d0f9d059c18cc34783003114d4ff718e521fc0af3e63b2d94
-EBUILD Finance-YahooQuote-0.260.0.ebuild 933 BLAKE2B b462af5af1284e0c559667738651d1f83c1a8b3bb717f5310d95a62bb635b5f1822b7327ba07ad3f7f515d17fe838f0d4d18c977c44f5d488c34d33ff6be20fe SHA512 54e1f11f07981af51887576c0528a9052ebb6199963a06dab613d97fc895f0e32aba035754b1d77decabc11011ffdc9a5561b5984e0a6b39d6b2fbc26940deab
+EBUILD Finance-YahooQuote-0.260.0.ebuild 932 BLAKE2B 222d05a3324e689938cddd981597375cc0339d5f295abde25b8130a9b710df58cd5126dd991601b4c059420ccad8eae0de3ebd14eede90d4b6e2bec9700af320 SHA512 6a693dc78c5b4c7c7485d3bda777cc66fbb55b889ccb46489703b16b9e60d3f4c6a84c65d754c449cfbe6edc822c5c573096e7a3c03fd5de631cf941b6926fbe
 MISC metadata.xml 467 BLAKE2B abd033bd791fe1135f3a5504f4ea7070aa1181b80634aaee4e210d005cafc42d99bc174f22bc3f67c9e0a6ae9e9f4c6ca8fdb90e27c8b9558e8ff813a9f0b341 SHA512 edbea61456d99f3d4677bfd7e181a09c2c22f3ef2e161d35396ffdd70f0d957bad8bc13480457caaeb0d8c12a2726566f003eb45ea7ced9a83b888d7cf54d86a
diff --git a/dev-perl/GD/GD-2.730.0-r1.ebuild b/dev-perl/GD/GD-2.730.0-r1.ebuild
index 6d099c37daa2..eda866da0b0f 100644
--- a/dev-perl/GD/GD-2.730.0-r1.ebuild
+++ b/dev-perl/GD/GD-2.730.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
 IUSE="animgif fcgi test truetype xpm"
 
 RDEPEND="
@@ -58,7 +58,7 @@ src_configure() {
 
 	# The following flags do not work properly. This is why we force-enable
 	# at least some of them. See bug 787404 as tracker.
-	use gif && use animgif && myconf+=",ANIMGIF"
+	use animgif && myconf+=",ANIMGIF"
 	myconf+=",JPEG"
 	use truetype && myconf+=",FT"
 	myconf+=",PNG"
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 9968440bb79e..7216c4ad3444 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -2,5 +2,5 @@ AUX GD-2.560.0-rt106594.patch 1253 BLAKE2B d7d05d2c492782a90e877932dd9a12aeedc5d
 DIST GD-2.66.tar.gz 253000 BLAKE2B 1a1d5374c06fcb07849e504c8c5c6f00443890cfb728fd02b4c94838d754c2f04bbda80cfa8e2a7b08a3c07cbed32aa6a499468dfb044865f833b3486965d2b8 SHA512 37d3da70f4e0b89b0166488a1f8a48c508ff5e515653fe1b10602cb708ae0ce713c617dcae21c48ec795799fb0e061762696e6a65bb8ba359859223d15677c61
 DIST GD-2.73.tar.gz 261203 BLAKE2B 088cb4d3c846d61e89631c7fef6b0273489297f0613e1ebb98c33b404a613431c79a5e72c2b757450496ef8d86aabe387b102a4c8d22d69532b8d8e989bac9bf SHA512 0c360c86307c8a2484bd8e1fb4cf24e27f7976bcfd830d9070fdc3775d233845734c59796082d498276aa715f30c9452c492b0d5bd75e488c1e9c5fa76490709
 EBUILD GD-2.660.0.ebuild 1489 BLAKE2B 7f5d3c7fc11662353a27be7eebc9e5ba69f24fb11a0d7bee6dd1cb4dc8b2d844fcf20ad15b408c8baa0a68172d823648a057df6989e9e636fdcd286cb1e9a7f5 SHA512 e4c72da6ca0757b4d06fb92e5565244bf56b1b093c80fb073fd1eb42ad4f4816d942387cd42a24f0c7f12ecf84bb9c3f38160f7e17a597048658542910de8c1e
-EBUILD GD-2.730.0-r1.ebuild 1562 BLAKE2B 57ff09924d6f375b28388a3cd869960d36d6646d419aea1f5aad77c7fb89c9275b708102a2d121db0bf47fb44adfaf3ea05e17ff5c1790340bc4a26d29a2cc9a SHA512 5f7c61c3ac92fbcf571929ec4692838630dcdfc63eefb2971dd728894cc6678eecc5bc575ddb4f153cc34bdd7ed9d3e5fe19e9907820b6ebe15bcf8acab95363
+EBUILD GD-2.730.0-r1.ebuild 1558 BLAKE2B bf0d667996444d394fa59a2990769f31c9bb24e98e7be583962657d9d7c348af139e557fe51862f8bd556b0f9f9f4de918cfb431945d6dc54b86267666ed8dc2 SHA512 d85a2294bdff01fa91edcac7be7ad15802e51d171a7e04fdc69820aab63110c28739700de0fb370ddb4c799c9de34591aba40f30567a80d8a54f7cdce4567882
 MISC metadata.xml 852 BLAKE2B ab7abbcbf4d6d62266365794525899c41cb9119ac9173363eebb2573e682671c3e7b7cf032d450d90c19a9ba692915f2cbf706e2a90260c80f8e8eb251cee763 SHA512 7b5fe91b323a991d33efaa0b4eb5e4cb96ae8b279035e72a9d9937e08d64cfc7ae39d6ee720becabaa434d55088f05bb4352ff57e7abd63abe0c1949771a3f86
diff --git a/dev-perl/Gearman/Gearman-2.4.15.ebuild b/dev-perl/Gearman/Gearman-2.4.15.ebuild
new file mode 100644
index 000000000000..7f88f74bf37b
--- /dev/null
+++ b/dev-perl/Gearman/Gearman-2.4.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PALIK
+DIST_VERSION=2.004.015
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system, client and worker libraries"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-IO
+	virtual/perl-IO-Socket-IP
+	dev-perl/IO-Socket-SSL
+	dev-perl/List-MoreUtils
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Socket
+	virtual/perl-Storable
+	dev-perl/String-CRC32
+	virtual/perl-Time-HiRes
+	>=virtual/perl-version-0.770.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Which
+		virtual/perl-Perl-OSType
+		>=dev-perl/Proc-Guard-0.70.0
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-TCP-2.170.0
+		dev-perl/Test-Timer
+	)
+"
+
+mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Manifest b/dev-perl/Gearman/Manifest
index 95cfcf6e6bde..cd5640ce9ede 100644
--- a/dev-perl/Gearman/Manifest
+++ b/dev-perl/Gearman/Manifest
@@ -1,3 +1,5 @@
 DIST Gearman-2.004.009.tar.gz 47063 BLAKE2B 4917d711407231d392844cd37390e0a73dc0a85d2e08584177f0986fa7dc16122d03280baf22a1121ea8478126caa3c68af961e59d007874ba5327736e61d2cf SHA512 4c0ad8dfa8af1200f29b61954efba03fa0d629a40bfea379025b5f01b2f8305394a516680fa7564d68c0231359ed5866daff9278b4350fbdc1a0b20bdb34eeed
+DIST Gearman-2.004.015.tar.gz 48847 BLAKE2B 60613a622c238c4736df6d07dcad714d882f6ef8a83831b18461857d3ae560966fd3ac5ab9bf83ec1dd1fbe994450ae2eb7e4fea5ad44802403bd88d10c325d5 SHA512 020eb3ca55f8ef33f546f60c6cb8c70d2dbbae21f11e0c165443569805040df7b2a0c89bec9de1d3c7733c3edf25bffa8faf69857c29f8b2371b5e06f5b0fd11
+EBUILD Gearman-2.4.15.ebuild 889 BLAKE2B f96efacb499f2409836360654887993bc8784f4660428b68e05f2ab2498e3e4f04793f3402f45dea8509e132f39618d5dcd4e9dfeff0264454431388081fa6ed SHA512 6880785b43bb03d01ad73064b76b88ab247c629afb551759096cdbc72f08330e20553d19dc7f6ebd58d81382962c207505084befd0777396f627e8a635c5adbe
 EBUILD Gearman-2.4.9.ebuild 888 BLAKE2B 098d60cb71b462fc327bd488983fc07342cc4a96b55767fdba9371b327d995276b8b2973dcdc41243920e3a69ef616dd118cbaff13857ea277b209075cef2861 SHA512 ee8f9e77c868f1f5843e82ac7e292ced4ab7436eb64bfa885272771ace2452fa7485b1ae06f3e6b47c31ecd971ae2094ec46cb7e62e3e8dc5962d114007dae8f
 MISC metadata.xml 1057 BLAKE2B 98993ea6f4d1af5edb863a219ccc5fc3960cd6887e8c42847c061b969a4c75272c9613e5498b86d8d981bd68bbb696e88f3670f1c36b48532098e2046f378774 SHA512 36394554c8e32d2e9812f19ef5597b3f36d796459380a1e61002f1b8b9850d968f61dbc13c9dfa378891122f8bc955ce34b365b98d4b5af098c27a3c0ac20dc9
diff --git a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.510.0-r1.ebuild
similarity index 81%
rename from dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
rename to dev-perl/Geo-IP/Geo-IP-1.510.0-r1.ebuild
index e742c4b5e111..2985be70e374 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.510.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=MAXMIND
-MODULE_VERSION=1.51
-inherit perl-module multilib
+DIST_AUTHOR=MAXMIND
+DIST_VERSION=1.51
+inherit perl-module
 
 DESCRIPTION="Look up country by IP Address"
 
@@ -15,8 +15,7 @@ IUSE=""
 
 DEPEND="dev-libs/geoip"
 RDEPEND="${DEPEND}"
-
-SRC_TEST=do
+BDEPEND="${DEPEND}"
 
 src_configure() {
 	myconf="LIBS=-L/usr/$(get_libdir)"
diff --git a/dev-perl/Geo-IP/Manifest b/dev-perl/Geo-IP/Manifest
index a175cf9623f7..74bc4b53a10f 100644
--- a/dev-perl/Geo-IP/Manifest
+++ b/dev-perl/Geo-IP/Manifest
@@ -1,3 +1,3 @@
 DIST Geo-IP-1.51.tar.gz 155629 BLAKE2B bfbbc00f53b6f564bc26252cff89e4bc97a2840c59014349c6f2af50d4130bb54068c9e96b4eecc4d7285a180da97d4da7f1c1364d36fdd3cd5f86bcd79ab17c SHA512 1149a2457a5a971a47585300ac68e71537fce4af3396aafe12ccb298b4a9e90b5fb0bc8bb01dec80698c3c57ae8e045a04c53747cc0ce80f8c4d3dd033ed76b3
-EBUILD Geo-IP-1.510.0.ebuild 485 BLAKE2B dd5e1eef83dc68e293868e753bb0314334c3fa1ea2fd52bc59ce0ec7bfc07efc4d2f205f527070fa7a89a5d27700908f84eb67fb9425beb08e2fcc4090505f2b SHA512 56503bc96c6bad4b3e81b11c9b1be178add03d1eea0bb971a70801269571911d88d366adb50334be075d5520db2b34610781f5293d531fb7f0a3b3079fb3e3a8
+EBUILD Geo-IP-1.510.0-r1.ebuild 479 BLAKE2B 6013c0c3f74e066ef6980700dbf86a3be1dd7391ac3dafb47df9eece273fba7a35ef8360917f59449a66632230c029a9e1d3b74cdfa47ea64f92017c7298cfe9 SHA512 8d51cf33b50c8784f3cc8e737c5ed86f65915b57e9f02c91e3192fc237d2f658eabc114ac8445a09f6c1cd866d7bba9cae54746dcbe104a0b025e8e1a7ee4c04
 MISC metadata.xml 651 BLAKE2B 5db3030b2bc6bfff69a40bcec5fd896e16b47848d8f41f157d1677fda72160961b0144bd71f2e41ca239d8790b08cef4786ce85405256514e765e48c9feb8ec5 SHA512 dc66b597cf7c8486f5a67318a99236df001ae8255876b7a4d09db928334bcce4756ad5253bd613bf87867e4095c32a4d403f09440bf976539f19d2562a8ace75
diff --git a/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r1.ebuild b/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r2.ebuild
similarity index 78%
rename from dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r1.ebuild
rename to dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r2.ebuild
index 0950d54e1b73..ff1c249e66c9 100644
--- a/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r1.ebuild
+++ b/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=ABIGAIL
-MODULE_VERSION=2009041301
+DIST_AUTHOR=ABIGAIL
+DIST_VERSION=2009041301
 inherit perl-module
 
 DESCRIPTION="2-letter, 3-letter, and numerical codes for countries"
@@ -12,6 +12,3 @@ DESCRIPTION="2-letter, 3-letter, and numerical codes for countries"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Geography-Countries/Manifest b/dev-perl/Geography-Countries/Manifest
index c9fa4e72c27d..917ef2111177 100644
--- a/dev-perl/Geography-Countries/Manifest
+++ b/dev-perl/Geography-Countries/Manifest
@@ -1,3 +1,3 @@
 DIST Geography-Countries-2009041301.tar.gz 10545 BLAKE2B 10be8c1cd0081f5ae418a13ddef86ac31272ce300f130d1b3bc33b235c3abc9c7ee5a8d655199d227fdcde53dad30b2f04ed775a2abf50bead6ea89cb8a23259 SHA512 4197edced04c7330dfd8ba7fbf137c3b6e47fe6402b3f90bacbfddf790dc38420c500846fd1abf0a4b99a2558d651086f3daffb0e52df9b679f5aacd9a1a203d
-EBUILD Geography-Countries-2009041301.0.0-r1.ebuild 369 BLAKE2B 1125da767430f9b59ed514dfa7c548b5c82a140ffafa1737e6b03ec5a132d70dab9278bf415d8cd6ead88f62a5c468f23557f8618c6562f83b2bbab2e75670db SHA512 02ed79c07a18e10fb6687b55f21ea7e0589d1866d44152d17450f8f57d8c36585702037128d12adc987ab6f67ec4f10d0f0086e629ab772eaa2804c472a71db5
+EBUILD Geography-Countries-2009041301.0.0-r2.ebuild 342 BLAKE2B 0f87cccca150c17e0ef903651ef94c3c8b87663cc29413cd38f5f74f98b27b035a2ae1b1f28784111f5330870855be2639c8e3dd6088508430ec8f7ad98318dc SHA512 29e19b0fe552756f454bad51c5c06c76cc4a597b0428f8ebf9477355d076621dfd1c5016fc4e155ec17959777765f2f1b8ce2c969df3b19cdf80ed9da59c9fab
 MISC metadata.xml 410 BLAKE2B df19d823e9d0c2d1fdda15609858c6e3322077301785fea7e01925c7e9d8daf5da1f9ce6516e1cab68bc6cb0c67ba489d85bb2cbea5c953f487163eb77f17138 SHA512 cb707d523fb0bfb1a540885ef581568da22c1b53115331b20d5e14f2e1a65d6f78c7f50a964c3764ca44b7cb0634b5628cb7373765c40c6803bb4682faff3050
diff --git a/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r1.ebuild b/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r2.ebuild
similarity index 70%
rename from dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r1.ebuild
rename to dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r2.ebuild
index 3e189174f0b3..adb5a9d06336 100644
--- a/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r1.ebuild
+++ b/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=JSTENZEL
-MODULE_VERSION=1.11
+DIST_AUTHOR=JSTENZEL
+DIST_VERSION=1.11
 inherit perl-module
 
 DESCRIPTION="This module is a simple supplement to other option handling modules"
@@ -12,6 +12,3 @@ DESCRIPTION="This module is a simple supplement to other option handling modules
 SLOT="0"
 LICENSE="|| ( Artistic Artistic-2 )" # Artistic+
 KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Getopt-ArgvFile/Manifest b/dev-perl/Getopt-ArgvFile/Manifest
index 8bca682f8668..364a9f5c3a4a 100644
--- a/dev-perl/Getopt-ArgvFile/Manifest
+++ b/dev-perl/Getopt-ArgvFile/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-ArgvFile-1.11.tar.gz 19469 BLAKE2B 10d7a55fb9c88408cd5b39949b13b0bb42e8f71e010048713cc8725053a6785aead8b05755a2bcaf0f6f9403f3bcc9bce0ac4a690b51cd75f97ea2674a818824 SHA512 832e9ec6de3dfa4aaac68faedd3561cac570761e0de805e084e8dc7b386579cd0a18278aeb262ea82fddbdf8277b17bbd7593c15d41b1d6d7de4739fc8cc8f11
-EBUILD Getopt-ArgvFile-1.110.0-r1.ebuild 388 BLAKE2B 2a2e32e4f5c72a8eeded0131541b194d82cf68526c9086caae0dd24f4917dbdd7c3daa1a4976ccd1a633531fb74024cc67d4ffa37fff61db70f7922da0ae721a SHA512 c12bb380901e4d0360c6324d9ed022d7e3d0e04c6475b037679c3782424150e4ec585b2340c76790c00a51f1fcf092c26cb7bef3025a2c326ebdacf3c4472e1a
+EBUILD Getopt-ArgvFile-1.110.0-r2.ebuild 358 BLAKE2B ac24bc78e752980fb2fc3d4da5a400a3bcf6bf17ebf1b20cf8fddcea29e41b3fccd12f64a5718599fba6cc188eb4355fd9503ad6fdfa5719f6400c208c56b051 SHA512 521d6e80cf389279233fda645674b2a91d6e3ac3be91bae1d26bb9db98fb866e33bbb40b1728f0d3b7098e639993924a688b954d26a4d29f7e41c6dcbe4a8352
 MISC metadata.xml 402 BLAKE2B 8de2b4a8a59056728f8778c3edeb504d304f1253fdf7a092d52737fa0481f5cab913a8f435402893f888cb5b390ee0df70d941a6ab417fee85d3ea85769a1d19 SHA512 e5d0266528fb33f50c167681a9d6e903757ccae940c88f6019ad1b03e88636a7401638d41dbf1fdb682d4fe4fe2bfeabd662733c9321aeea0b9d288f63eed1cf
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
new file mode 100644
index 000000000000..c975095d9c6b
--- /dev/null
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.109
+inherit perl-module
+
+DESCRIPTION="Getopt::Long with usage text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0"
+
+# File::Basename -> perl
+# List::Util, Scalar::Util -> perl-Scalar-List-Utils
+# Sub::Exporter::Util -> Sub-Exporter
+RDEPEND="${CONFLICTS}
+	virtual/perl-Carp
+	>=virtual/perl-Getopt-Long-2.330.0
+	>=dev-perl/Params-Validate-0.970.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Sub-Exporter-0.972.0
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-Warnings-0.5.0
+	)
+"
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index e3b150015a17..759ba40f14ea 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,3 +1,5 @@
 DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f
+DIST Getopt-Long-Descriptive-0.109.tar.gz 33959 BLAKE2B c936f820654a5a14dfef706f26514334463b119b161643bbeb831802d9b7403c49f1cccd0414da855ef1bed424d88b78a220f037fb2d723ecce8d7ede54840e9 SHA512 9bd3af84119264c9e7e72b470f54782fe0a9e37e6071052a7b43af9529087841f77f06f81a70e4cab05380558216893b0902aabefcfbc970916f65614666969a
 EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 977 BLAKE2B d787db62716b270cb9d482392c0b24d46c8165dd1b3a1f6edb80635dc009143ab300c84d64e0cd1a8197d602d2d47c2ed72a5ebd2404826d4cb6be4f7c7f8689 SHA512 8d1f30fc8ab4f7ecf381f67bc3737912acbc4873472fa9a8a681b2a1ff7a971d3cc19976e7e8920cdd79f559bb5bfcf7b2c2380c2c388cba12ab1e45ea8c131f
+EBUILD Getopt-Long-Descriptive-0.109.0.ebuild 984 BLAKE2B 6085b004a80182fccbb9851ccd5d10ffe211c743ec8c4a27e07d168bf85ef1c95d6c1e0f46b110ee0942f24426ce8f3fcbc2b4c332039b60ec670c0e447a1445 SHA512 25b56721637e037e5698e3d39f4ad9c316c9d77f35961d7a17b49db0d81dd5fc85eb6b6a1436e8f84b26034ee1d6236ffd1dd3d7d7755ff032be87d146d8ce31
 MISC metadata.xml 576 BLAKE2B 284499ae9040033acd83c3f9ca6f5263c1b0652146333fff6e808587149264f7114d523c116c84f1e133cb558da9095403197da0c90f917777791e869515aef1 SHA512 4a83ea267c2c7d62a81da04c2afd355b6a6d35a1fb6dd8e2fb22b23e59b269b01ce6a91e1a76ca36ae6c621bf33e0fad295c733cc7f84255416c0aa146162bcc
diff --git a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0-r1.ebuild
similarity index 77%
rename from dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
rename to dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0-r1.ebuild
index bd4ff962a2fe..a0559a6b79d0 100644
--- a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
+++ b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=CJM
-MODULE_VERSION=1.12
+DIST_AUTHOR=CJM
+DIST_VERSION=1.12
 inherit perl-module
 
 DESCRIPTION="Getopt::Mixed is used for parsing mixed options"
@@ -18,9 +18,7 @@ RDEPEND="
 	virtual/perl-Carp
 	virtual/perl-Exporter
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
 	test? ( virtual/perl-Test-Simple )
 "
-
-SRC_TEST=do
diff --git a/dev-perl/Getopt-Mixed/Manifest b/dev-perl/Getopt-Mixed/Manifest
index 5d5b087d29a3..541c2cf93525 100644
--- a/dev-perl/Getopt-Mixed/Manifest
+++ b/dev-perl/Getopt-Mixed/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-Mixed-1.12.tar.gz 21423 BLAKE2B a3ddc209c0c3308aebc922316f72072aab1579a288e7de46b1b263b5736f236f8d03f14a95b5006bc858fe68c9aabd3a2bd8296405e4ddb8abea1e60d2986af3 SHA512 74e7d0e7cf854d18b69cf36caf9647f78660db1b21ceb6750aae15aec5e40947902834d7f178adeae442f83958157809a2f95f1873c120dc3093c35d1fdc0ad2
-EBUILD Getopt-Mixed-1.120.0.ebuild 501 BLAKE2B eb29af35fabb820a4b95e235ae2179a917da281df661d43e4f3b4f261233de66209ea171b079bdc6792fb2dbd099a59ab0eec777eac3790ab5d42f1bf7de6900 SHA512 b947b6c432435da1adeef4649b27a9d483ccd73a64e43c943c10569192709343c9aa036cf235e7f14c7b456d99a64258fa84e5b3964c30fa57b2f52d68e0cda2
+EBUILD Getopt-Mixed-1.120.0-r1.ebuild 485 BLAKE2B 75d26fea07afacf15fd3036efb127b33f0207021496a21b9ec85d6c510ecf971a6ff25000a3073a640dd1d46e07817fdba68937dffa05b4d305f7f8ddf27e258 SHA512 55ecd1cb200084b9f8b391a67307b7a72f74c67ab92c14a71e9750de1c965a10089678c7d71a93e4ad4c9f7d176e760ff910b2a797ff9853360724d7c70c76be
 MISC metadata.xml 396 BLAKE2B f571cfd6f95fc59f06a46ea53dc2682706b84b755a4692e785400069a8ab0792a1bf252cf577aa20a977aade983005ee3ab0c816d691bece37f8d1adcb87e8ab SHA512 47dab0acf571b2e97683b7635b2d006aa3ac31bb80769053df689fcc7549186830b0f0db2a18e96a5a5446aa0c2cca2ac68324fdd6405c815e23e492e6c8bccd
diff --git a/dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild b/dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild
new file mode 100644
index 000000000000..ef88907f9d71
--- /dev/null
+++ b/dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GENEHACK
+DIST_VERSION=0.048
+inherit perl-module
+
+DESCRIPTION="Wrap git(7) command-line interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-vcs/git
+	virtual/perl-File-Temp
+	dev-perl/File-chdir
+	virtual/perl-IPC-Cmd
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Sort-Versions
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Devel-CheckBin
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Spec
+	test? (
+		virtual/perl-File-Path
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+
+src_compile() {
+	perl-module_src_compile
+	local MODULES=(
+		"Git::Wrapper ${DIST_VERSION}"
+	)
+	for dep in "${MODULES[@]}"; do
+		perl -Mblib="${S}" -M"${dep} ()" -e1 ||
+			die "Could not load ${dep}"
+	done
+}
diff --git a/dev-perl/Git-Wrapper/Manifest b/dev-perl/Git-Wrapper/Manifest
index ff1ba7f48110..cf56457d28d2 100644
--- a/dev-perl/Git-Wrapper/Manifest
+++ b/dev-perl/Git-Wrapper/Manifest
@@ -1,3 +1,5 @@
 DIST Git-Wrapper-0.047.tar.gz 30416 BLAKE2B cfe969bd4d60ec0252cd9d78d753ff3200a8bd1a522617dba5436361817eee969d9310bc40aa68651697c75ead5a6764d4e8b02031dd70d256b2124f0c8d9181 SHA512 9a2c9bf30a9b803170adfeae9bbe41e1b0fc9e67fe477d4fdf1d20a57917c69c1c6be2a90fbc382f85cf83a209b39a9a3431276b33a6e7655b8cd240d1a68e78
+DIST Git-Wrapper-0.048.tar.gz 31531 BLAKE2B 18d74644a0e3d37b60e69a86f70b5a0769627c5dd2b7d1986c960443f4bb7a2f9cc3f1cd3e6bb120c27cfb5bc5e6fc5bcf7a11ece27af7abdbd4cf42914ba3dc SHA512 2dce8cc1c05a321ba31c3c78cfb6e3c793fa3d47d03c459ee559540eb31db71d9c641b4c1dbcd5782d84031a7aaf6024c5b60c2ae71b94d0a7a1f19f9746ec03
 EBUILD Git-Wrapper-0.47.0-r1.ebuild 933 BLAKE2B c56c59329441b6ac62357a7c0042951ffd9493b7162c502ca869331b1ecb11ca5c1b620e39e634828b181f80659714756722b14b4beb70c740c9c173d18ba9e8 SHA512 cd0804da117c994bc43826e3c44d3602e88e85d6d2b9d7eb14a781d0720533927cf39107224f232df33f0918fbded8beaef7d126f302b025ac86521036c813f1
+EBUILD Git-Wrapper-0.48.0.ebuild 935 BLAKE2B 391bec3cd05ce2d6f895506dccc1000e651fb9a4a6f2a0ed799122cf4e95e8dbd9dc92ba118f59b4c69cd1c3c803cf80b2df41adc144f93132abae95c0f9a6f3 SHA512 609af96e7f182fd3d1be6c33b726d5b68b1b1f3803822e486e9fc806eb7a96ea29d9ff972b287bc331315c37b7acac0f0be47eec0d676004bb4ba9235577fc98
 MISC metadata.xml 746 BLAKE2B e27db1b09cd2083e08a0aafc0eb8abd99716a7798b61a1d06a1201f093eef3d8751e640d447addc35decee772ab211a8a90604ba5883668365f87f9a034a162d SHA512 e6bf1104078cada85479ce7570723e369f5f049d1c10c16745453d579c99270d69fb6634e5f88af4c138968641e94da3f554833fa985ba60d5dbda49749a9f74
diff --git a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
new file mode 100644
index 000000000000..5512348e7a2b
--- /dev/null
+++ b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.049
+inherit perl-module xdg-utils
+
+DESCRIPTION="Dynamically create Perl language bindings"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/glib-perl-1.320.0
+	>=dev-libs/gobject-introspection-1.0
+	>=dev-libs/libffi-3.0.0:0=
+	>=dev-libs/glib-2.0.0
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/ExtUtils-PkgConfig-1.0.0
+	${RDEPEND}
+"
+
+pkg_setup() {
+	xdg_environment_reset	# bug #599128
+}
diff --git a/dev-perl/Glib-Object-Introspection/Manifest b/dev-perl/Glib-Object-Introspection/Manifest
index ff139efa0216..a7f987f8af7c 100644
--- a/dev-perl/Glib-Object-Introspection/Manifest
+++ b/dev-perl/Glib-Object-Introspection/Manifest
@@ -1,3 +1,5 @@
 DIST Glib-Object-Introspection-0.043.tar.gz 80985 BLAKE2B 2f921b35167c45bc04e8d3505f85978d485d4f1244001cd2de7d1b1d3370731345757a0745852e0a047583e28d7b9ff0b18470714170c1d09b11b1e72a760c11 SHA512 b812ac4faca2f1df1192f7ac2374f5552811c353a363a33b3e6877c568ef68f0b4e1b8181a4738988017150317eb27e43976989cca802e7ba24d2a3cc2fa537e
+DIST Glib-Object-Introspection-0.049.tar.gz 88081 BLAKE2B 4d7d114dfe9b39f19feb4ed9ff40f7058e0c6b0e3851e45f3aa653b8222c1d3b3e68d1e900663435fcbae8fd627e41b44fc06b1775d0910127b32e1eff812a2c SHA512 fa927661dc761bfae9dba87e1e2d519b10c3aac4d6dcea37764972a0413a4f5025a12df640d66928b631c2933d4b0e6d02b559ea2c1eaa38fae6f7a9d98fe322
 EBUILD Glib-Object-Introspection-0.43.0.ebuild 577 BLAKE2B 9394da410e57aaf744450bf04f19e5c42b2a5638c31128aaef70eaa10e3a1e63a86324ee3bb6c9cc91a4652548b6b3fe28892c71464866b2f7b30e73354a85d0 SHA512 4b49f9c694dd7efd1d9955ed529aba3e1d19e8dc5a8fa0c170641883b0cfdb650d3087b8135de6bde8ea48e1700be5181feabed32e9d4622ced24dd7a08f7e53
+EBUILD Glib-Object-Introspection-0.49.0.ebuild 595 BLAKE2B 39c6d30c5732254f20968956c51a11212eb935d3dcd543208888fbcfa0c8fb0a4911e9fda321e16de949ba1ccf65972601a9baf249364d44daabb08044bf8da5 SHA512 f25c2df49086888141d885e7817095d2ad2de783a92f3cca77954373272393880ae2fc9e969641a4daea80c9779befc4e9fc2e06b72262ee97ef714fd50af5fa
 MISC metadata.xml 411 BLAKE2B e0ca06fe4a914e212161185d5563f93c3a958541dcb41d3ae3f863faac466f03b73e8051d94d97378e2a990208d29650367db65fe3a1f724ba6029db668b5e4a SHA512 c8bee7700599fbe4d559b1c1fbe4ff14933ccc01964dc4e40699e931681d667559de418ce301f4404a7aac0ecbedafcc15b4e5c3fab8c91c87c9727254b2a10c
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
deleted file mode 100644
index fd6f4ac222a3..000000000000
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ALEXMV
-DIST_VERSION=0.52
-inherit perl-module
-
-DESCRIPTION="Perl module interface to interacting with GnuPG"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-crypt/gnupg-1.2.1-r1
-	virtual/perl-autodie
-	>=virtual/perl-Math-BigInt-1.780.0
-	>=dev-perl/Moo-0.91.11
-	>=dev-perl/MooX-HandlesVia-0.1.4
-	>=dev-perl/MooX-late-0.14.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-0001-fix-spelling-error-settting-should-be-setting.patch
-	"${FILESDIR}/${P}"-0002-Generalize-the-test-suite.patch
-	"${FILESDIR}/${P}"-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
-	"${FILESDIR}/${P}"-0004-ensure-that-test-covers-all-signatures.patch
-	"${FILESDIR}/${P}"-0005-add-gpg_is_modern-to-test-suite.patch
-	"${FILESDIR}/${P}"-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
-	"${FILESDIR}/${P}"-0007-test-suite-match-plaintext-output-across-versions-of.patch
-	"${FILESDIR}/${P}"-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
-	"${FILESDIR}/${P}"-0009-clean-up-trailing-whitespace.patch
-	"${FILESDIR}/${P}"-0010-fix-capitalization-of-GnuPG.patch
-	"${FILESDIR}/${P}"-0011-ommand_args-should-be-command_args.patch
-	"${FILESDIR}/${P}"-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
-	"${FILESDIR}/${P}"-0013-move-key-files-to-generic-names.patch
-	"${FILESDIR}/${P}"-0014-fix-spelling-s-convience-convenience.patch
-	"${FILESDIR}/${P}"-0015-added-new-secret-key-with-different-passphrase.patch
-	"${FILESDIR}/${P}"-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
-	"${FILESDIR}/${P}"-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
-	"${FILESDIR}/${P}"-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
-	"${FILESDIR}/${P}"-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
-)
-
-DIST_TEST=skip
-# Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the
-# emerge sandbox. However, the agent architecture is not really sandbox-friendly, so...
-#
-# Test Summary Report
-# -------------------
-# t/decrypt.t              (Wstat: 0 Tests: 6 Failed: 2)
-#  Failed tests:  5-6
-# Failed 1/22 test programs. 2/56 subtests failed.
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
new file mode 100644
index 000000000000..e7ab6efaf1ee
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BPS
+DIST_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION="Perl interface to GnuPG"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-crypt/gnupg-1.4
+	virtual/perl-autodie
+	>=virtual/perl-Math-BigInt-1.780.0
+	>=dev-perl/Moo-0.91.11
+	>=dev-perl/MooX-HandlesVia-0.1.4
+	>=dev-perl/MooX-late-0.14.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+"
+
+src_test() {
+# Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the
+# emerge sandbox. However, the agent architecture is not really sandbox-friendly, so...
+#
+# Test Summary Report
+# -------------------
+# t/decrypt.t              (Wstat: 0 Tests: 6 Failed: 2)
+#  Failed tests:  5-6
+# Failed 1/22 test programs. 2/56 subtests failed.
+	perl_rm_files t/decrypt.t
+# Needs to run a setup test that spawns a persistent daemon
+	DIST_TEST="do"
+	perl-module_src_test
+}
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 54f303e34f24..1914df0517f8 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -20,6 +20,7 @@ AUX GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-i
 AUX GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch 1897 BLAKE2B eca30b9a8485f7cb960ff343d1b575f324fcf6895c0fd723d14ebcccba14c69dd775ae315130af94a3246e3f8ddedb4ea9ba9c4c894f5e63b05fa8197e82f584 SHA512 5826dbc85925ac810dce695ea747ab2a4d361811295ce4f83925416c8c5842f8486e4275a3e610069157fa37e377413a39f1684ce94f618a99c46e7f6884264c
 AUX GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch 1511 BLAKE2B 3eee783efd64848bc0e86a0e0768c8dc77f8e28819fdc466913ac029cef7fcf42ff67edf89762b4b023d58df7c740b7d3d6a56ea2598699637edf5fb12840464 SHA512 7f8597d4a25e1492475810e47fb7988d74411cbe6ad537889c65bf37119572d1ae0c24e2f5c99d77d12edee3c46dd0e635125ee7a7dde99abeddd19d43fe7aa9
 DIST GnuPG-Interface-0.52.tar.gz 63733 BLAKE2B ce068177b8467356b57aae95a61e4746e4f690272083e465c877533a5ab0eedaaf271586aaffe7e4f979034d04bd49fc483047654426f23cfb904a98326454c3 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49
-EBUILD GnuPG-Interface-0.520.0-r2.ebuild 2551 BLAKE2B aa027817241c32443debfcfd5152d5405b8d49d532dd670b28c8f2914924e708ed42951fd70c540b4b927202d0e2de72bbabcd450df0a4cb3efc63c0242e2e8e SHA512 af359488b27f603aad2c051ce001036f2f2c9c3f52a8e36e9c2a53c6e0f7ef26fa0c9231f278b474de57fa1bb9b532e6f523ce5fbd1e056ef373cbfb30158af3
+DIST GnuPG-Interface-1.02.tar.gz 75523 BLAKE2B 4b1311bbd930ae6719db9d7d25e247804c1f71f29da52b1896086ff4905cfdf09792d85fa9e90da462e974279cc673bacdcd2b6a32171eca1be861df5f712a98 SHA512 ff4365aa75fbcd2dc77c915ec36c0b578219ae1a2148e936b4769221f91c78a3bc3d371159b5130e7bee36ecf0e169b6a16e3a160d2598811d6f70850119f6e4
 EBUILD GnuPG-Interface-0.520.0-r3.ebuild 2758 BLAKE2B 760a4a62c7d5413bce55f5f48d4068d6744cdf4efc2db42a62c902cf6704204a95b7dbf13fef3626f6c5e7ca5a9ef8f7de8dd8c349d97d1ccccfe587adfac844 SHA512 e90a32bd241a390d2f6ac1f2aed15dbb8e1c7e0bd343af52aa70cfdf36df803490d9a19c16e2666b30c4757d2f1207ed47354fe50fd7df6d7f1f7ad8b0b0c9b9
+EBUILD GnuPG-Interface-1.20.0.ebuild 1025 BLAKE2B 52f953f3fed485f4a78212ef9a76d97fafbd65957273f895423572089f4098d8299dcf4c84efde9d8d076369b7246d7fdc2053c71f60b467bfe7f558502ab580 SHA512 3d73090c93b78e31820551d1dc1ebd5b19a67fde4d3705067bb3baee3df1c2d40d8ab1454e8a4bf4a657f13999a394d6e9fb4db3e6ab62fa9d3f0b1501d369d2
 MISC metadata.xml 1209 BLAKE2B a29e49d03ea5216897ae8d8ca55472c4d41d75a2722133dd2782b504db464740f15b5c017e09efb9a76da76b482f3f33e5b8cd8279402d51e14c201c8840d9b3 SHA512 3589a6d227ccde1efd9a0842e98b7f4c3d4f5434a9e62feba4a6764d1fdc4c0dc7390bba15bb52053520931c4ed4ff05235ec98efbe0239a4a9da12b30092cfb
diff --git a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild
new file mode 100644
index 000000000000..e12f6564ae26
--- /dev/null
+++ b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=SUNDQUIST
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Google AdWords API Perl Client Library"
+HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Class-Load
+	dev-perl/Class-Std-Fast
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Data-Uniqid
+	dev-perl/TimeDate
+	virtual/perl-Digest-SHA
+	dev-perl/File-HomeDir
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	dev-perl/HTTP-Server-Simple
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-Parse
+	dev-perl/LWP-Protocol-https
+	dev-perl/libwww-perl
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Log-Log4perl
+	dev-perl/Math-Random-MT
+	>=dev-perl/SOAP-WSDL-2.00.10
+	dev-perl/Template-Toolkit
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/XML-XPath
+"
+
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? (
+		dev-perl/Config-Properties
+		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-MockObject
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Google-Ads-AdWords-Client/Manifest b/dev-perl/Google-Ads-AdWords-Client/Manifest
index 9490f6c2a28f..ed23fe77bd4e 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,5 +1,7 @@
 AUX 4.14.0-no-dot-in-inc.patch 2576 BLAKE2B 599a34aabdea3b3995704712e26ffa0a88c545185fe205f37b3c618fd7063e0ede55895a9797aa1de1490cd0ba634653aca235892f17410b257b199ed16ce612 SHA512 1fb62aee9081303c1d1186a1fd388e698f519ea5856fdf86e65af2044945b85952c2dcd96b0a0a5ec4234fe82361b2e076143918193218f54934c93120b54ccf
 AUX 4.14.0-unescaped-lbracket.patch 1656 BLAKE2B 96bc78ecbc3a2ed7408a509184f88a9ee2c9ac2b2d0b4ad8c8567dcf57646d823bc92938097a7984678c18569b9d8ceb1c9f27ae76afef6ca906c4f5997f85b6 SHA512 8ba173dff927bf5dd7193d88fe110bdaf71b44b54e3e5a3a0d8ff161ce492a36324c5e69dfca268577ecbbf81d3b99247f7fe305bd4bd2f172e59ea52b9146c1
 DIST Google-Ads-AdWords-Client-4.18.0.tar.gz 8921326 BLAKE2B 6e012147b212f734b7c6910b2f59085652acf45a4971157cd6854d37316bc238edb8b1bb1358c1dac200ce43a326f104d02de9ffea9f0ac19839180936943602 SHA512 b0905c69f52909f160e563fd4e24413256d14797d7d9bf40bb1193d7bb42deb65c4030a6d117a9c6a3b1fa6bcbb20ac6a5922dcfc4ba7c67566157e4097d5391
+DIST Google-Ads-AdWords-Client-5.8.2.tar.gz 3194633 BLAKE2B b2e05294dbc60f8725d2f764defe1108db8a93f5f5e10da9ff8b7dcfe1aaf0877f92bde4ae3937310bed6ec5c73225f5edd243c5864beeb8f070ae1235087437 SHA512 d38689358872511613e0d596ee0233070848f7ea5368cbabd0b13e91bb8fa9259af83ec7cd3d852e9aed1eac0769d7c4a097adda3da730eb49aaec127cff54f6
 EBUILD Google-Ads-AdWords-Client-4.18.0.ebuild 1230 BLAKE2B f5d36e6ab69e3f0d70ef3d0ad4f001e29656a91ab164a512c91d7cfe96f7b29e71bf2eec2ecf8c4aa52922a1b49c7cee4777ef4fe1826ff91c441b8e871d0011 SHA512 dbae42f3c6d52350397a470bf6d5fc433043d0f6e60d433f71275500b5e112b5b637856ca36af706dbf1105b495642132454b3354468a8d5dba5f56229d5b7f9
+EBUILD Google-Ads-AdWords-Client-5.8.2.ebuild 1195 BLAKE2B 78f8a36f7834cb2654e46345442aa7f007603c6fab7f23c4adec5cdb7b021ae8ab8fcf834148847cab10474cc30119b617e82bd9f96a1342ce4b9aaa3a1261bb SHA512 52c0dccbe39ae2b5fc04194521d395cf5b1bb50c3532f0849b6071324f7a7afb5d398a03c1654b9f3209405974fd691890ff5522d9a880200004d20767b4cbcb
 MISC metadata.xml 4424 BLAKE2B 517363b807ff8182aa3c6568f66054962e69528681a9549d4bbf6c6648414dc65e0a20f1201c2c2640820c9333f0a74eb84eb30c5c57ec57c6b041ea3b6414ce SHA512 a561f60bdeec595bd9bd11b80aca2c457aa652f01260fd49602c2568f8cbab269d7d49a71466726dedc2cbc5e789aa693c1856995c73a7239f6bf5d5cbbeff50
diff --git a/dev-perl/Graph/Graph-0.972.100.ebuild b/dev-perl/Graph/Graph-0.972.100.ebuild
new file mode 100644
index 000000000000..e0aed49cbcd4
--- /dev/null
+++ b/dev-perl/Graph/Graph-0.972.100.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETJ
+DIST_VERSION=0.9721
+inherit perl-module
+
+DESCRIPTION="Data structure and ops for directed graphs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Heap-0.800.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	>=dev-perl/Set-Object-1.400.0
+	>=virtual/perl-Storable-2.50.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Math-Complex
+		>=virtual/perl-Test-Simple-0.820.0
+	)
+"
diff --git a/dev-perl/Graph/Manifest b/dev-perl/Graph/Manifest
index e597ff92174e..29bd61a498c9 100644
--- a/dev-perl/Graph/Manifest
+++ b/dev-perl/Graph/Manifest
@@ -1,3 +1,5 @@
 DIST Graph-0.9704.tar.gz 146930 BLAKE2B 38c4be274166f3c3d7443fe75981f4caf44a06eedf8e562e7259c771c47bef4529db2ce980ea8aa250936b898efcb24dbbd9718f37ee57f133ed88cb7de6755b SHA512 1eed5049577112cc2e41a83f6b3b6a22a08170597b5cb89e2eab6cc68386bfd989d3953d7ceab85bcfbd7d097a6925bd8eb43f48eed1ac07469ea4b2432149da
+DIST Graph-0.9721.tar.gz 146928 BLAKE2B 15b5390afbf6e6076daadfc5c3a8d8729ee1322f5a676276d5a3e1b63cfaa379e9d0428431a36d7bd50caf27b62c9e2fb2cbb23faf2806233fad06fa7cf62bfc SHA512 38edc400214c60be475c7b733e769b4bf1fff680eb70b999d46d037cd314d50cc882d8b6547161abe2e765a5c1385166f9b5489d2df1b9a4332acd98eadfbc7e
 EBUILD Graph-0.970.400.ebuild 418 BLAKE2B 48d2a295e06b9e92d7d6c24c7421c07fe784200670f575007bfc50f4cee0c13bc106b30796cc35df904d71d4535880ed262d32207e4dd3ed14a93fae0c6373d3 SHA512 227db59bb51943536d887e9a655b3c224e57414414e93cfd6172fe4041595ce46f77de6037630781718c4d1296462447ab494ed192f8f19fbf0d4ab8e69ff6fd
+EBUILD Graph-0.972.100.ebuild 579 BLAKE2B 3525c91ab1f5577bb7c5ec5658c53b5ac6f1b781d5ff12b8097b7ce7faae13e9a7ee2a8d619918511aa542002a7a2a4d05060cba261772ad948af3716d27cf68 SHA512 91811ba0309bb790717e2a60acfabd33d44930445e5a8b5c3b6490373471b321a53cf631ff3da0924043f092277d779add98e3bdfca5c3ae2584760e82893f7d
 MISC metadata.xml 1715 BLAKE2B d1af15c3828ffb05e866b0023b1f6219b0edcf704d57ad31c5e1c62c9c1d347cd03ffbcdaee6fe0253de2610bbe07f9f137d5cb1019b700ca17e6fdef7ff944a SHA512 59ec40b275c4f427d3c703f4834605d7c2e0d4feb3c88cdb83d0768c7d42aa6566d22fbec6b8e5188db63c87eebe13d69c00d64299af6f8dac76d635d2413ce7
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
new file mode 100644
index 000000000000..965552235b88
--- /dev/null
+++ b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RRWO
+DIST_VERSION=v${PV}
+inherit perl-module
+
+DESCRIPTION="Defines RGB values for common color names"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	>=virtual/perl-Module-Load-0.100.0
+	virtual/perl-Module-Loaded
+	dev-perl/Color-Library
+	dev-perl/Tie-Sub
+"
+
+BDEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+	)
+"
+
+src_test() {
+	perl_rm_files t/90-pod-coverage.t t/90-pod.t \
+		t/90-file-port.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Graphics-ColorNames/Manifest b/dev-perl/Graphics-ColorNames/Manifest
index 1373af3a8c4b..68314b0ed855 100644
--- a/dev-perl/Graphics-ColorNames/Manifest
+++ b/dev-perl/Graphics-ColorNames/Manifest
@@ -1,3 +1,5 @@
 DIST Graphics-ColorNames-2.11.tar.gz 21686 BLAKE2B 2e96f32f166799249aa30986a8426df9e72c60228e4b3a00e4937344a742e89913b32b885192b621f8e13748b447ede6c3a4cba21e0d0ca58e775b2f20dea6b8 SHA512 673baa5bf623011abd84f01644d534867113d40f1142dd87b4c05c62b13f0eb3ac4aa32df01c7fb20788f03d8527effff696b9cfaa9f30d0557ec42354259e93
+DIST Graphics-ColorNames-v3.5.0.tar.gz 33955 BLAKE2B 7cadd3dd0d4d31c497cafd743a49b95da2919ca39739b4a358c6cbc5a1292a86fd308b33e88a696c382a5eb6914477120857393c2ba605bfb256add7342cf0fa SHA512 7577d3a52307eb53dbca0eb6db19accd44cb517b9d5d6d1912c51d537fe3646d88834844487ecb500e988f222bd24848d15c9952039376d159f2286ab6157a1e
 EBUILD Graphics-ColorNames-2.110.0-r1.ebuild 778 BLAKE2B 562a217cc6821c6733fab978bfea7e0614ae3167eb6e8779185245e69c5d678d7af0e3cdfaee3ac6253493cd0fe71e8f245a71c39d34fbc8ca7a18e67628948a SHA512 4251cbd09251412fcb183760f14c053b183ff66cc7aeb98a1ffd5298bb0cd93352d220c98dd7e4bf4ef037d63a4e00233b5be43101ddb9991d6ef3d5196624b4
+EBUILD Graphics-ColorNames-3.5.0.ebuild 697 BLAKE2B 13b3d7befa737b5ba61702a3716250ab44520c026f8fb6d0c836764981ffaadeac3c21a0abb2c8486d12d0b1ddbcc0fcffe0f2742bd54b0ccce2838cc2fdb1d3 SHA512 7753ca51ebafe276d952327b16aad78876c19bf84bf4b23bd5c14230871f08ca8b6e895387755da3ce40e160a8c222ecab827fa3554484b8785ae2adc6cfa88d
 MISC metadata.xml 795 BLAKE2B 66d645bcbc8adee6f96620eab5824598130c3c2489f71482c1341ba2707573ea0a01556c73680b5f8e71c3c36830171c26f2cade29b0628494c118e3168bc5f6 SHA512 4672c2e05ce2b34920a1c26a0c89e1beddbc6fb90aa8948d9d6ba4d7cfac4fd826f06007e6fff252f5775a5a326ca77b5b6fd3fc7a9f5ce9d14369a2276c7057
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
index 3acb6f7352a1..30537a8f237f 100644
--- a/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities for interactive I/O"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
index a9d0b10da583..8205e68f9ae0 100644
--- a/dev-perl/IO-Interactive/Manifest
+++ b/dev-perl/IO-Interactive/Manifest
@@ -1,3 +1,3 @@
 DIST IO-Interactive-1.022.tar.gz 11791 BLAKE2B c001a709531a48d4f4756712caab14ec8b9f2f21478f545fd4f858b3619fc625d75ff9bf744e4c3223a4b9ba39f2b97bb0e38b9eab8297d7d76e5aa0d88b7647 SHA512 159bd97912a848e20df3ac9f3f7b3063788c7bbe2eafd35c6cc9b798027c6e7c12d2488385936c87669877928707603729bc34b2d7b8c108534fa8fd42082074
-EBUILD IO-Interactive-1.22.0.ebuild 557 BLAKE2B 5ea9e0d7494c05881284b320e654317677a6480b668b7f778dd1d832453ac677134f94d84760894a9a82780233627484523c3f17efbba0a2fed06e3807777f4d SHA512 378ecd17c1033ddc661ab9b826428caf0302910260414f577c638558b7f2784ae6def18007f68c378208dbc91ec583fd87d407a840cee55244d67a36c26eaaed
+EBUILD IO-Interactive-1.22.0.ebuild 556 BLAKE2B 12287b73f38528bb427b3649c8d3e03b71b512e7482c57ead80bd432bc57e5a83330d188f0466f8cdc49dd8fb2ab51fa706a5d1f8895662877c32429215ca50d SHA512 32272d0ca33dacd21063bd4689e26409a747f4e1ff643d2a7611d4faa7f4f73c13befe5f999868a8546332dca32c69e4eeff08fc6d1603816327f1d5d87685c4
 MISC metadata.xml 388 BLAKE2B dc1672a835764e0e69828043196dfa51abde9432114a289c88e38985b112a03e36fe86b6076b8c21ce5799138035326870c166b9eafd382131c422d1014dd4df SHA512 c3bb9b7804e6dd2c6e958f8e0744959a28cdc632068b7e1d9e039602fc0f98a4397457500c3d90abd4522b482b66d758f6e569640d41235a9b16f43fd73c8dfb
diff --git a/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild b/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
index 852d12601a41..13f4bff80381 100644
--- a/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
+++ b/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 # Feel free to add more targets after testing.
 
 DIST_AUTHOR=NINE
diff --git a/dev-perl/Inline-Python/Manifest b/dev-perl/Inline-Python/Manifest
index 232854ebc660..b3702a1614d4 100644
--- a/dev-perl/Inline-Python/Manifest
+++ b/dev-perl/Inline-Python/Manifest
@@ -1,4 +1,4 @@
 AUX Inline-Python-0.460.0-insanepython.patch 652 BLAKE2B 86734b5c86d7cb5affabb76f950ae6086581a0c5d1eda278cdd27047a49a57b3f2ce1a520e745b040179c945ba2f2cd7dc896e9a321702a05c7d935782196dd2 SHA512 f9fc8e8a287801f331ac92bdbd80f665648f9fee8dc43383fe563c6ca8e0aa4d01e06b09a25408b7908e5394cb4bf496e76441c6ee5dbf0fdb7c65dc4222bac1
 DIST Inline-Python-0.56.tar.gz 58224 BLAKE2B e422c46cfaaaf77a0a683ccf2818db62e5f2c726b9ede71f446bd2bb4fe66ba8ab8d99b30ce26168bf47cc23f06afc5b9839a403cd6b52781aa288a29cbedea3 SHA512 d5fffec8a377ec10c8b21ed9324e2de5a77d10304fc2a89196df89984e55869e3e4e0ef970f1aa4651068b8a6d834fa8eb18d70a052c646ddd98ef338f772e7d
-EBUILD Inline-Python-0.560.0-r1.ebuild 849 BLAKE2B 4ef62f31490b6e1ab35b32bbf1be96e2aaf32074573990b954501a78cfe75be20c10c424537ffb959014df172cecb9beecd5a022c6643cd474ca56f44c52312d SHA512 37d613fe5777af78806fefc361c4d507a2e3ca7cd5157d7b0c93836dc605f2c328b4948f666dd3a5504f8c5d85efe210c6ee026661af6578a666709806b4ebb4
+EBUILD Inline-Python-0.560.0-r1.ebuild 859 BLAKE2B 0c7c4de6215b0458055a9e8fa688df9bc8639a3c2bca755c85f70b946bd61c732de513f11ce387d8e1181b9d500f94121e33f3cd39d2f0b950b505630a5e67d2 SHA512 421441a9d5884998d6afcfc46d76e55045a1d46b9dd30bd9047d167a5c2f3ac1ec67084420f6cd1eb6b806f769dead3f245ed0a3165e1f31af84fdd38dc8e796
 MISC metadata.xml 683 BLAKE2B 07299e0bfb8310004e589f3255875189c1ac2d8caebee63fb5229aa8acb83968215c8d80bf8ed89ecbb01d7672d6100795133b580536fc8490c00e89240d0812 SHA512 03b3a3f8697b678e054251de5bea03f3344c063b1ae93e6f674e30375062ac9d125af3c428d4f0869d333ded2831617af14b7908ba55c01638534970329ea17d
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
index e3e37480e3f3..820cf71fe994 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 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 ~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 ~x86-solaris"
 IUSE="test +xs"
 RESTRICT="!test? ( test )"
 # See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/Manifest b/dev-perl/List-MoreUtils/Manifest
index e0bcf8324d53..ed234c775092 100644
--- a/dev-perl/List-MoreUtils/Manifest
+++ b/dev-perl/List-MoreUtils/Manifest
@@ -6,5 +6,5 @@ DIST List-MoreUtils-0.428.tar.gz 146030 BLAKE2B 8a2accf028ab4c3c9f48f0cdb1762402
 EBUILD List-MoreUtils-0.418.0.ebuild 707 BLAKE2B 76ba3c9771a5d25ebdcae10b1ab9b5b1031fbbd8f15b18fd4d7de68cbe158e55e9ae04708abb139f6d93f225870ac7785f6f4dc702617158adfa17fc6c494fd8 SHA512 43791bc0ff5b6e1cdfce318de0ca7f0b4a5ea774ecbdf53f7642f1fc51744168c48c5ecfdd5ec0a9c900e3914ee8208003ddf84f6cad6f99e216cd994160ab98
 EBUILD List-MoreUtils-0.419.0.ebuild 714 BLAKE2B 290f515549c6f09018da61735a947e57610c58c6ddc7dc33188e5c49c8f4cf06e7ed414b498fdbd4e5819378d037ac180ac4c0bbb22dbe4a5d369fbad77f16f4 SHA512 b2f427d5aa7f3ef6acc7c1a6e2fb5169a32bce559372fb0a8eb60465ff48cf88848677941a634e2d06ba30c74a1013512a461a9baebe09a80f22c9870fba69a4
 EBUILD List-MoreUtils-0.426.0.ebuild 852 BLAKE2B 26336cef6430a82b4c8081bd637bf6db5e0e5699ac4a7e197ed4844c04d0c2010c910e4acf0b6086678678d544ddef658bf837fb13ca632c2be362a934dd7808 SHA512 884c21ba10df37173d44018a3b9970fd89ae735fa14a4ac8e6e95ab2d2c6e5af58af86147113811e58cf6ec6f77aa3dda76ab3141ae9708e1be79cb10e0d377b
-EBUILD List-MoreUtils-0.428.0.ebuild 894 BLAKE2B 08dd9638550373a7d85918a7f29af07c06a79bdd3008ea5a5fbeb916de75fd9ce7c478d93e611dc684f1cacbf7746dc55fed894a5f300f2d90e843c5adb471ee SHA512 0e6c7dc94eeabdd0b523748e7a36133f5eec8b54b728026f9bc1b321e9ba77aee085655ecbcb6d6407d319db969b40dd2d013d30355df022bb72a9150bbf16c5
+EBUILD List-MoreUtils-0.428.0.ebuild 892 BLAKE2B fc00cafd4957b4e3225e4596e7280b92ec8762851fe81aeb9506d0d4b3b2031172ba00767e1f9211ac80ec4f6e2d1e41044bd8943c620043aae657ae5da72498 SHA512 b9b94497af5145678f1f67285e619b84a4753f9ed871485265c8bd50c30deae8eda9b10c6fea7445ec4dec1adb945766ab473022005ee04dd96c8c7c25d92649
 MISC metadata.xml 565 BLAKE2B 1d9445527a6329e96a6d38f590f02fa98710bbf649ec5709533b5212402b7beaa4fb9211fe93814de01054a4bdf7c89ea52e8e0f6ee625ffd50f367b2c6286aa SHA512 b4fc48156533446dd91d18f6aac2dd58a61f3e3911357930b3710241f8b3e29a7a9143b02bf348e25c15e5cb323c66dbaf6b3555d64b5b333bc7281bded865be
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c6674268d196..823454a8988b 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PortageXS/Manifest b/dev-perl/PortageXS/Manifest
deleted file mode 100644
index a6bcbf2577e1..000000000000
--- a/dev-perl/PortageXS/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 0.02.12/PortageXS-0.02.12-prefix.patch 8739 BLAKE2B fd7617b4e68c15948abce7d7fe54af7c0aa89bb23059b3af8929cd23870dda0338f0598990837075b08eb596c31ee392d6f967edaac550ec062756a757c901bb SHA512 8c1626cd107963c287ed0f24e7508ec28effbdcf3cde4695c9c294c7924f9c987593ff73b5719bb59b8e4cf6f7e790209d2aee97038fba7080f3ccd296074197
-AUX PortageXS-0.02.10-portage_path_fix.patch 4165 BLAKE2B 9a648a0f08ebd69d214b2728194235472132debdc2a3e78916f196d2c1f95e6d9a8d0f66b697045e559e542fb5505b74acf4140ad971c871a22e89d0ec8b4a12 SHA512 4e99f0db05dae2ca0b08c1750ba7f3218eacdf2e6cf4a01c08de53f4f7c81cf261a902b8fc5429a8349effeb2f1c2f6e3a0a8bee07257c48cf6fc7010f971695
-AUX PortageXS-0.02.10-prefix.patch 6463 BLAKE2B a18061842464c7c0544ec0f949b282498ddd0bc43e0eaa2309c7127528381d171a0a2925c325bc71cc76bb8433ec34b87857ab92bae52c5386e8f423b2fe31d1 SHA512 1225da7ef7911f8a3ada93f2d23ffd23e78bec735152403b809db75cda99fc576bc34fbbcd8487af16b3fadd946bc4c48497db9a4e9f9bf27705b91793d5ea37
-DIST PortageXS-0.02.10.tar.gz 28890 BLAKE2B 66686516b975ff0da641c75dec63c3c6afe9d5bf7762ffb1f4a81c31550e601601f6190fdb992fce0a6e694bed46d4c95f599cf7a20bf0c069493a1e07dec499 SHA512 8f5a6cf8fa415e13401fd7901c81fef42e0cee81b7a9c1f276cce9582c705ac7e2004ec213033fce065f965445342ed0140d8b752d2e857dd40c620ed4af6b1b
-DIST PortageXS-0.2.12.tar.gz 41772 BLAKE2B 81583e73189908cd3b1588e74d5b291d1955995ff1d283682c245264feac7ed9eef4cfcd2ef4497c229f3d007ebd0a8b275d7c7c0e64ea3059dda3bc01eb66d7 SHA512 e833c8dab25ed6fcfad999e4b0bb803d69523ff57fbcd86ea0c29c671889a66c81f0081d6242039788a73d090e3245776d12a8286114b77f72d39514dfe425bf
-EBUILD PortageXS-0.02.10-r4.ebuild 1414 BLAKE2B 9b2ec45db7b54c6e69ab85aa168eaa53732df15c12423178076f0f1f2d8dbaf2bf4578858db40b78a0f16ebc87f539c08592435d343f143cab415e4f67f5fcff SHA512 3a942091c95da27b72d204fe5233b808fa1e382b0c209f001268fe9a95a9e84f42ddc14efaca111337cdaf85e18db518191fff7124d2917f66ad5dcb57f4a4b4
-EBUILD PortageXS-0.2.10-r5.ebuild 1508 BLAKE2B a94825ae899418d3209d32fc9def3153cdcf2009ea219e9dc0212c63b664ea75447d11a65aec13c2f770d9a249b32f4eb27262baa25e576d2de88f5c76f432f0 SHA512 fe502d5c04f0ca80a93e9cec04bb5137f5a7f74e4242a84d79784a491329c70006e55cd4fba14e709e04cd480bd3e3103bb7353e3c9a345e46eb8b5d3c1db3cb
-EBUILD PortageXS-0.2.12-r1.ebuild 1467 BLAKE2B 4c0c87429e300f0e9badf387dec9fd393b02be3d57d5bb2385528f807bc77fba1a697237fde041c9b54235688b6c97d9863af3047a3f4797da7f883f28ed1fcb SHA512 4bdae9346c197835b8f4ca4b0fa27d0d13da552aaa87a9fc892379180a9b9ceae3167e6b8360c8b8815b83e8654f4452101bcf0cb61ca72c817b82b4808e3e8c
-MISC metadata.xml 664 BLAKE2B 13c9057323ee7e4ecf4f2c438eab7d0ec90874083e14345ac81bdb0062f8f0fb61722a2beae0e054381fe482618f7c28c5e6dd1cc31b83e4c136bf6282265a6c SHA512 7c9589797fd90606f29f56ef2844748515d75d158e4cde711943825619c96a56a4bd77d4e540670a782d6da04de58be0acf01b5d13d64723814fb2f8efd2578f
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
deleted file mode 100644
index 7525eca6f514..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module epatch prefix
-
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? ( dev-perl/IO-Socket-SSL
-		    virtual/perl-Sys-Syslog )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch
-	epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch
-
-	eprefixify \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd
-
-	if use minimal ; then
-		rm -r "${S}"/usr || die
-		rm -r "${S}"/etc/init.d || die
-		rm -r "${S}"/etc/pxs/certs || die
-		rm "${S}"/etc/pxs/portagexsd.conf || die
-		rm -r "${S}"/lib/PortageXS/examples || die
-	fi
-}
-
-pkg_preinst() {
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}" || die
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}" || die
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild b/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
deleted file mode 100644
index 137c3757d252..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_VERSION=0.02.10
-inherit perl-module epatch prefix
-
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${PN}-${MODULE_VERSION}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? (
-		dev-perl/IO-Socket-SSL
-		virtual/perl-Sys-Syslog
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch
-	epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch
-
-	eprefixify \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd
-
-	if use minimal ; then
-		rm -r "${S}"/usr || die
-		rm -r "${S}"/etc/init.d || die
-		rm -r "${S}"/etc/pxs/certs || die
-		rm "${S}"/etc/pxs/portagexsd.conf || die
-		rm -r "${S}"/lib/PortageXS/examples || die
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}" || die
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}" || die
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild b/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
deleted file mode 100644
index 798620b905f3..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=KENTNL
-MODULE_VERSION=0.2.12
-inherit perl-module epatch prefix
-
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://search.cpan.org/~kentnl/PortageXS"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-
-DEPEND="
-	dev-perl/Module-Build
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? (
-		dev-perl/IO-Socket-SSL
-		virtual/perl-Sys-Syslog
-	)
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.02.12/${PN}-0.02.12-prefix.patch
-
-	eprefixify \
-		lib/PortageXS/examples/getParamFromFile.pl \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd \
-		t/01_Core.t
-
-	if use minimal ; then
-		rm -r "${S}"/usr || die
-		rm -r "${S}"/etc/init.d || die
-		rm -r "${S}"/etc/pxs/certs || die
-		rm "${S}"/etc/pxs/portagexsd.conf || die
-		rm -r "${S}"/lib/PortageXS/examples || die
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}" || die
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}" || die
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch b/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch
deleted file mode 100644
index df1881118c9a..000000000000
--- a/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch
+++ /dev/null
@@ -1,198 +0,0 @@
- lib/PortageXS.pm                           | 16 ++++++++--------
- lib/PortageXS/Core.pm                      |  8 ++++----
- lib/PortageXS/examples/getParamFromFile.pl |  2 +-
- t/01_Core.t                                | 12 ++++++------
- usr/bin/portagexs_client                   |  8 ++++----
- usr/sbin/portagexsd                        | 12 ++++++------
- 6 files changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/lib/PortageXS.pm b/lib/PortageXS.pm
-index db57a25..6cec46e 100644
---- a/lib/PortageXS.pm
-+++ b/lib/PortageXS.pm
-@@ -71,8 +71,8 @@ sub new {
- 	$pxs->{'VERSION'}			= $PortageXS::VERSION;
- 
- 	$pxs->{'PORTDIR'}			= $pxs->getPortdir();
--	$pxs->{'PKG_DB_DIR'}			= '/var/db/pkg/';
--	$pxs->{'PATH_TO_WORLDFILE'}		= '/var/lib/portage/world';
-+	$pxs->{'PKG_DB_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/';
-+	$pxs->{'PATH_TO_WORLDFILE'}		= '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world';
- 	$pxs->{'IS_INITIALIZED'}		= 1;
- 
- 	$pxs->{'EXCLUDE_DIRS'}{'.'}		= 1;
-@@ -85,17 +85,17 @@ sub new {
- 	$pxs->{'EXCLUDE_DIRS'}{'CVS'}		= 1;
- 	$pxs->{'EXCLUDE_DIRS'}{'.cache'}	= 1;
- 
--	$pxs->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
--	$pxs->{'ETC_DIR'}			= '/etc/';
-+	$pxs->{'PORTAGEXS_ETC_DIR'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/';
-+	$pxs->{'ETC_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/etc/';
- 
- 	$pxs->{'MAKE_PROFILE_PATHS'} = [
--		'/etc/make.profile',
--		'/etc/portage/make.profile'
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/make.profile',
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile'
- 	];
- 
- 	$pxs->{'MAKE_CONF_PATHS'} = [
--		'/etc/make.conf',
--		'/etc/portage/make.conf'
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/make.conf',
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'
- 	];
- 
- 	for my $path ( @{ $pxs->{'MAKE_PROFILE_PATHS'} } ) {
-diff --git a/lib/PortageXS/Core.pm b/lib/PortageXS/Core.pm
-index 5d51023..3dd0b84 100644
---- a/lib/PortageXS/Core.pm
-+++ b/lib/PortageXS/Core.pm
-@@ -122,7 +122,7 @@ sub getPortageMakeParam {
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/usr/share/portage/config/make.globals /etc/make.conf);
-+	my @etcfiles		= qw(@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/make.conf);
- 	my $v			= '';
- 	my $parent		= '';
- 	my $curPath;
-@@ -166,7 +166,7 @@ sub getPortageMakeParam {
- 
- 	# - Defaults >
- 	if ($param eq 'PORTDIR' && !$v) {
--		$v='/usr/portage';
-+		$v='@GENTOO_PORTAGE_EPREFIX@/usr/portage';
- 	}
- 
- 	return $v;
-@@ -193,7 +193,7 @@ sub getPortdir {
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -210,7 +210,7 @@ sub getPortdirOverlay {
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff --git a/lib/PortageXS/examples/getParamFromFile.pl b/lib/PortageXS/examples/getParamFromFile.pl
-index 416b1be..9ea88bb 100755
---- a/lib/PortageXS/examples/getParamFromFile.pl
-+++ b/lib/PortageXS/examples/getParamFromFile.pl
-@@ -8,4 +8,4 @@ use PortageXS;
- 
- my $pxs=PortageXS->new();
- print "CFLAGS are set to: ";
--print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n";
-+print join(' ',$pxs->getParamFromFile($pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.globals').$pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'CFLAGS','lastseen'))."\n";
-diff --git a/t/01_Core.t b/t/01_Core.t
-index d01dc31..6daba99 100644
---- a/t/01_Core.t
-+++ b/t/01_Core.t
-@@ -14,8 +14,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir());
- 
- # - getFileContents >
- {
--	my $content = $pxs->getFileContents('/etc/portage/make.conf');
--	ok($content ne '','getFileContents of /etc/portage/make.conf');
-+	my $content = $pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf');
-+	ok($content ne '','getFileContents of @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf');
- }
- 
- # - searchInstalledPackage >
-@@ -26,8 +26,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir());
- 
- # - getParamFromFile >
- {
--	my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen');
--	ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param);
-+	my $param = $pxs->getParamFromFile($pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'CFLAGS','lastseen');
-+	ok($param ne '','getParamFromFile @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf - CFLAGS: '.$param);
- }
- 
- # - getUseSettingsOfInstalledPackage >
-@@ -65,8 +65,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir());
- 
- # - fileBelongsToPackage >
- {
--	my @packages = $pxs->fileBelongsToPackage('/etc/gentoo-release');
--	ok($#packages==0,'fileBelongsToPackage - /etc/gentoo-release: '.$packages[0]);
-+	my @packages = $pxs->fileBelongsToPackage('@GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release');
-+	ok($#packages==0,'fileBelongsToPackage - @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release: '.$packages[0]);
- }
- ok(!$pxs->fileBelongsToPackage('/this/path/most/likely/does/not/exist'),'fileBelongsToPackage bogus test');
- 
-diff --git a/usr/bin/portagexs_client b/usr/bin/portagexs_client
-index 598d05a..688cb97 100755
---- a/usr/bin/portagexs_client
-+++ b/usr/bin/portagexs_client
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- # -----------------------------------------------------------------------------
- #
-@@ -54,9 +54,9 @@ if(!($sock = IO::Socket::SSL->new( PeerAddr => $remote_addr,
- 				SSL_use_cert => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub { return "" },
--				SSL_key_file => '/etc/pxs/certs/client-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/client-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 				 ))) {
- 	$pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n");
- 	$pxs->print_err("Server down?\n");
-diff --git a/usr/sbin/portagexsd b/usr/sbin/portagexsd
-index 638f662..e93bdfa 100755
---- a/usr/sbin/portagexsd
-+++ b/usr/sbin/portagexsd
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -t
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t
- 
- # -----------------------------------------------------------------------------
- #
-@@ -50,7 +50,7 @@ else {
- sub main {
- 	# - Parse config >
- 	my %config	= ();
--	$config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf");
-+	$config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf");
- 	$config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen");
- 	$config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen");
- 	$config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen");
-@@ -60,7 +60,7 @@ sub main {
- 	$config{'cfgfiledata'} = undef;
- 
- 	if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) {
--		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)');
-+		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)');
- 		exit(0);
- 	}
- 
-@@ -70,9 +70,9 @@ sub main {
- 				Reuse     => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub {return $config{'SSLpasswd'}},
--				SSL_key_file => '/etc/pxs/certs/server-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/server-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 			)) ) {
- 		syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr);
- 		exit(0);
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
deleted file mode 100644
index a9968cd7e79e..000000000000
--- a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur PortageXS-0.02.10.orig/lib/PortageXS/Core.pm PortageXS-0.02.10/lib/PortageXS/Core.pm
---- PortageXS-0.02.10.orig/lib/PortageXS/Core.pm	2013-01-03 09:32:10.477597366 +0100
-+++ PortageXS-0.02.10/lib/PortageXS/Core.pm	2013-01-03 09:32:12.707534858 +0100
-@@ -94,7 +94,7 @@
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/etc/make.globals /etc/make.conf);
-+	my @etcfiles		= qw(/usr/share/portage/config/make.globals /etc/portage/make.conf);
- 	my @profilefiles	= ();
- 	my $v			= '';
- 	my $parent		= '';
-@@ -166,7 +166,7 @@
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -183,7 +183,7 @@
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 	
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff -ur PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl
---- PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl	2013-01-03 09:32:10.477597366 +0100
-+++ PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl	2013-01-03 09:32:12.707534858 +0100
-@@ -8,4 +8,5 @@
- 
- my $pxs=PortageXS->new();
- print "CFLAGS are set to: ";
--print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n";
-+print join(' 
-+',$pxs->getParamFromFile($pxs->getFileContents('/usr/share/portage/config/make.globals').$pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'))."\n";
-diff -ur PortageXS-0.02.10.orig/lib/PortageXS.pm PortageXS-0.02.10/lib/PortageXS.pm
---- PortageXS-0.02.10.orig/lib/PortageXS.pm	2013-01-03 09:32:10.478597338 +0100
-+++ PortageXS-0.02.10/lib/PortageXS.pm	2013-01-03 09:32:29.710057966 +0100
-@@ -77,7 +77,7 @@
- 	
- 	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
- 	$self->{'ETC_DIR'}			= '/etc/';
--	$self->{'MAKE_PROFILE_PATH'}		= '/etc/make.profile';
-+	$self->{'MAKE_PROFILE_PATH'}		= '/etc/portage/make.profile';
- 	
- 	# - init colors >
- 	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');
-@@ -89,7 +89,7 @@
- 	$self->{'COLORS'}{'BLUE'}		= color('bold blue');
- 	$self->{'COLORS'}{'RESET'}		= color('reset');
- 	
--	if (lc($self->getParamFromFile($self->getFileContents('/etc/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
-+	if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
- 		$self->{'COLORS'}{'YELLOW'}		= '';
- 		$self->{'COLORS'}{'GREEN'}		= '';
- 		$self->{'COLORS'}{'LIGHTGREEN'}		= '';
-diff -ur PortageXS-0.02.10.orig/t/01_Core.t PortageXS-0.02.10/t/01_Core.t
---- PortageXS-0.02.10.orig/t/01_Core.t	2013-01-03 09:32:10.476597394 +0100
-+++ PortageXS-0.02.10/t/01_Core.t	2013-01-03 09:32:12.707534858 +0100
-@@ -14,8 +14,8 @@
- 
- # - getFileContents >
- {
--	my $content = $pxs->getFileContents('/etc/make.conf');
--	ok($content ne '','getFileContents of /etc/make.conf');
-+	my $content = $pxs->getFileContents('/etc/portage/make.conf');
-+	ok($content ne '','getFileContents of /etc/portage/make.conf');
- }
- 
- # - searchInstalledPackage >
-@@ -26,8 +26,8 @@
- 
- # - getParamFromFile >
- {
--	my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen');
--	ok($param ne '','getParamFromFile /etc/make.conf - CFLAGS: '.$param);
-+	my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen');
-+	ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param);
- }
- 
- # - getUseSettingsOfInstalledPackage >
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
deleted file mode 100644
index 755bb13bb503..000000000000
--- a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ur PortageXS-0.02.09.orig/lib/PortageXS/Core.pm PortageXS-0.02.09/lib/PortageXS/Core.pm
---- PortageXS-0.02.09.orig/lib/PortageXS/Core.pm	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/lib/PortageXS/Core.pm	2009-03-18 20:56:20 +0100
-@@ -94,7 +94,7 @@
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/usr/share/portage/config/make.globals /etc/portage/make.conf);
-+	my @etcfiles		= qw(@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf);
- 	my @profilefiles	= ();
- 	my $v			= '';
- 	my $parent		= '';
-@@ -139,7 +139,7 @@
- 	
- 	# - Defaults >
- 	if ($param eq 'PORTDIR' && !$v) {
--		$v='/usr/portage';
-+		$v='@GENTOO_PORTAGE_EPREFIX@/usr/portage';
- 	}
- 	
- 	return $v;
-@@ -166,7 +166,7 @@
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -183,7 +183,7 @@
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 	
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff -ur PortageXS-0.02.09.orig/lib/PortageXS.pm PortageXS-0.02.09/lib/PortageXS.pm
---- PortageXS-0.02.09.orig/lib/PortageXS.pm	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/lib/PortageXS.pm	2009-03-18 20:52:29 +0100
-@@ -61,8 +61,8 @@
- 	$self->{'VERSION'}			= $VERSION;
- 	
- 	$self->{'PORTDIR'}			= $self->getPortdir();
--	$self->{'PKG_DB_DIR'}			= '/var/db/pkg/';
--	$self->{'PATH_TO_WORLDFILE'}		= '/var/lib/portage/world';
-+	$self->{'PKG_DB_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/';
-+	$self->{'PATH_TO_WORLDFILE'}		= '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world';
- 	$self->{'IS_INITIALIZED'}		= 1;
- 	
- 	$self->{'EXCLUDE_DIRS'}{'.'}		= 1;
-@@ -75,9 +75,9 @@
- 	$self->{'EXCLUDE_DIRS'}{'CVS'}		= 1;
- 	$self->{'EXCLUDE_DIRS'}{'.cache'}	= 1;
- 	
--	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
--	$self->{'ETC_DIR'}			= '/etc/';
--	$self->{'MAKE_PROFILE_PATH'}		= '/etc/portage/make.profile';
-+	$self->{'PORTAGEXS_ETC_DIR'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/';
-+	$self->{'ETC_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/etc/';
-+	$self->{'MAKE_PROFILE_PATH'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile';
- 	
- 	# - init colors >
- 	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');
-@@ -89,7 +89,7 @@
- 	$self->{'COLORS'}{'BLUE'}		= color('bold blue');
- 	$self->{'COLORS'}{'RESET'}		= color('reset');
- 	
--	if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
-+	if (lc($self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
- 		$self->{'COLORS'}{'YELLOW'}		= '';
- 		$self->{'COLORS'}{'GREEN'}		= '';
- 		$self->{'COLORS'}{'LIGHTGREEN'}		= '';
-diff -ur PortageXS-0.02.09.orig/usr/bin/portagexs_client PortageXS-0.02.09/usr/bin/portagexs_client
---- PortageXS-0.02.09.orig/usr/bin/portagexs_client	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/usr/bin/portagexs_client	2009-03-18 20:52:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- # -----------------------------------------------------------------------------
- #
-@@ -54,9 +54,9 @@
- 				SSL_use_cert => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub { return "" },
--				SSL_key_file => '/etc/pxs/certs/client-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/client-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 				 ))) {
- 	$pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n");
- 	$pxs->print_err("Server down?\n");
-diff -ur PortageXS-0.02.09.orig/usr/sbin/portagexsd PortageXS-0.02.09/usr/sbin/portagexsd
---- PortageXS-0.02.09.orig/usr/sbin/portagexsd	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/usr/sbin/portagexsd	2009-03-18 20:52:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -t
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t
- 
- # -----------------------------------------------------------------------------
- #
-@@ -50,7 +50,7 @@
- sub main {
- 	# - Parse config >
- 	my %config	= ();
--	$config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf");
-+	$config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf");
- 	$config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen");
- 	$config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen");
- 	$config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen");
-@@ -60,7 +60,7 @@
- 	$config{'cfgfiledata'} = undef;
- 	
- 	if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) {
--		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)');
-+		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)');
- 		exit(0);
- 	}
- 	
-@@ -70,9 +71,9 @@
- 				Reuse     => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub {return $config{'SSLpasswd'}},
--				SSL_key_file => '/etc/pxs/certs/server-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/server-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 			)) ) {
- 		syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr);
- 		exit(0);
diff --git a/dev-perl/PortageXS/metadata.xml b/dev-perl/PortageXS/metadata.xml
deleted file mode 100644
index 799ea06246fc..000000000000
--- a/dev-perl/PortageXS/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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">PortageXS</remote-id>
-		<remote-id type="cpan">PortageXS::Core</remote-id>
-		<remote-id type="cpan">PortageXS::System</remote-id>
-		<remote-id type="cpan">PortageXS::UI::Console</remote-id>
-		<remote-id type="cpan">PortageXS::UI::Spinner</remote-id>
-		<remote-id type="cpan">PortageXS::Useflags</remote-id>
-		<remote-id type="cpan">PortageXS::Version</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-perl/Sane/Manifest b/dev-perl/Sane/Manifest
deleted file mode 100644
index dc86f27993d8..000000000000
--- a/dev-perl/Sane/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Sane-0.05.tar.gz 39417 BLAKE2B a19873adca3254a693c353433ba3d584311f3f39b4ace8ef26c1a42c968597b115b85e15a8b05b9c89194bc94e2363e2f1af153d81d5cad1d12217849f12510b SHA512 03e67ffbc5d89b3e2b9c7d4c0221c1dadfd4f2ea0c33c761f599e1ea953dbbae24d5d78780d8a3e660550105550901b37a4ec67a3ccaf7c56a1b713e1fc69473
-EBUILD Sane-0.50.0-r1.ebuild 498 BLAKE2B dd95ae07006d84d5e9a1c66113b855d0c72f9f42c63c8cee7c94ac329b4fc76b89be267f7f73a782cd19929994e486040e87939a89593720264efc7b0f49b046 SHA512 233fd57fd23827c32dc9dd1554ca333a6eae21b2008af911e4d96f0cf7effbdeeb3b870648fcc7857ff5bea758d8de17850b3cb53b9d475d62a2ac2fa3173db8
-MISC metadata.xml 497 BLAKE2B 8cb29f93bb509041d66cb7c98c7a2adebd2b75bb771fcbf7bbb68a3442254249eab47ae681e7959e1192b9af0b179b36128c6c673270d7e4c86bc72d516713cf SHA512 fd32f728ec83f3a5f66c2b3d4f59bd8616f4e1e431c4406a389fbf114a44ec6ce1790f5462ec5e0dfd4af82261c525cbf4058153753eca3bea8ec1d18233b78b
diff --git a/dev-perl/Sane/Sane-0.50.0-r1.ebuild b/dev-perl/Sane/Sane-0.50.0-r1.ebuild
deleted file mode 100644
index 7e8ef9d930af..000000000000
--- a/dev-perl/Sane/Sane-0.50.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RATCLIFFE
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="The Sane module allows you to access SANE-compatible scanners in a Perl"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=media-gfx/sane-backends-1.0.19"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-Depends
-	dev-perl/ExtUtils-PkgConfig
-	test? ( dev-perl/Test-Pod )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Sane/metadata.xml b/dev-perl/Sane/metadata.xml
deleted file mode 100644
index 17301e03e2c9..000000000000
--- a/dev-perl/Sane/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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">Sane</remote-id>
-    <remote-id type="cpan-module">Sane</remote-id>
-    <remote-id type="cpan-module">Sane::Device</remote-id>
-    <remote-id type="cpan-module">Sane::Status</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/Set-Object/Manifest b/dev-perl/Set-Object/Manifest
index b9b10fcad1e2..4db2805c15e1 100644
--- a/dev-perl/Set-Object/Manifest
+++ b/dev-perl/Set-Object/Manifest
@@ -1,4 +1,6 @@
 AUX Set-Object-1.38-no-changes-pod.patch 948 BLAKE2B 34eefbc5e164e646982bb5926331996026273a9e858dfb7d4fd35da96a9b1b7450ba8d739a20f1f82fb4cdc4330828ada97555572f08603c2fb585e6c4e0e62c SHA512 3fe3d2a8ed4fbca0cca4d37cb8a5e4f9ea833174fb4b85f1a6b49d5c0ab7e9d9fd5cdae21a65c43a33baa3bb62c2fdba7120474c176a24882c5b93ab4313153c
 DIST Set-Object-1.38.tar.gz 80719 BLAKE2B ff7a42a2fd1f368d58bbc73bf10ea3579c952b49a826e47ac9e7ea3c64a792117fd55b2f52979c51ec8964f2abd9c0f5c2f05211e0c7a407e7f37e91ab3486f7 SHA512 fa0411f543fe1837d7c07a07a99d3b8a3735162fb7b665060870cec8edd40ab39eed74791ce2aa96b9ca04a8e773d810ba979508b03f8d4698e8d844f62bee1a
+DIST Set-Object-1.41.tar.gz 82292 BLAKE2B 84f54851704d0695a59838cdf0b75d010eb8600496842c206ebee9df2f2221401d39df7d1fb35a086fb427b23fc2fcb1debf9e8795bdb7d0c8fb3c62fe7d2112 SHA512 e7e701439c32acaa79c579d373d51db1ed908c2fdd48943910e53fb99578017d06fb3925a3d68c13318267f2940789fc8c775004c2f8a3a06d0b8f03c685fc33
 EBUILD Set-Object-1.380.0.ebuild 659 BLAKE2B 59a3dd684fd6194328130bbf6402342133fd48771c4f59ae1feef27c0923283e8dff344592fe20268c982785b5e49591389ecc7954b900fe2b0d9b045ca1b8f7 SHA512 f0bb47841425bf804204bb8d808a5f4d60287de86a1a6d4a362a45b7f7bbf2393adc9302fd61583e50ef57a32f4aa6c9c83d29344a0f3a3bae436a6c2f158787
+EBUILD Set-Object-1.410.0.ebuild 604 BLAKE2B 4ebd95804ff4c768f50cf4dd671104ba1219430b18e0e6e60331910a5706cd42b0119b7ca9b64e3092289e1f94ce062a7737c7e4ae2e2938e38f1a7884330222 SHA512 3e4774f14ba4618620db2309c309907c8c5be651414eebca1e3d0f3594e3a2666deb8fd9f3f1ee482d798fa19595be30fb7edf12cefe46456086693a80189832
 MISC metadata.xml 591 BLAKE2B 290b35c34d36e140473335465675bf100a15cbd05e362075987899fc87ed7708cfa2fd1107a7840f75d85fdbc95af0477f18e63a4b28ac91a0f5479d57b4053f SHA512 097eb18b763d48e54584bc8d03e305105e7af1329976be0a20c9244605bfb40bb941963fe2178ca28da7d8a8a1e7f3f5716df6c63345f9e9188d8e119b6f11ea
diff --git a/dev-perl/Set-Object/Set-Object-1.410.0.ebuild b/dev-perl/Set-Object/Set-Object-1.410.0.ebuild
new file mode 100644
index 000000000000..26dc5a310a29
--- /dev/null
+++ b/dev-perl/Set-Object/Set-Object-1.410.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.41
+inherit perl-module
+
+DESCRIPTION="set of objects and strings"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=(
+	"t/misc/kwalitee.t"
+	"t/misc/meta.t"
+	"t/misc/manifest.t"
+	"t/misc/perl_minimum_version.t"
+	"t/misc/pod.t"
+	"t/misc/pod_coverage.t"
+)
diff --git a/dev-perl/Test-Compile/Manifest b/dev-perl/Test-Compile/Manifest
index 29ac9e8425fb..e4a876bbfd52 100644
--- a/dev-perl/Test-Compile/Manifest
+++ b/dev-perl/Test-Compile/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Compile-v2.4.1.tar.gz 18425 BLAKE2B 604626b07772241f0ab306b06de70223a25673fe944e66c1c031dfe0e55610f7ce1cc0222bfc839331b2f10bd63168100b9e07b1013dc8ca96d03bd53848d3dd SHA512 e6878fa16544be75581144d125f547a799cc79210b925b86f07ad236395026bdc197c22af1820e893f5887e53933f0ba827377ae133752f63076cb436b624aee
-EBUILD Test-Compile-2.4.1.ebuild 818 BLAKE2B bb5c1d7c95aa72335a41e7896182a889b4745166b62f3b73132921d13fbc2dbd5586191e5d8992420750250bb7bb5e6450065fb604a34e610e09cd0045035f1e SHA512 d7db0a744925fd0313a032c3951ec6c3ace2c81ba982f9f97a912d1ab431d7c65cf27c2f595bf9c59285a12222e2edf1399b4adafe9cf120c775a32facd7494d
+EBUILD Test-Compile-2.4.1.ebuild 817 BLAKE2B dac73ecef37b46ba6c9063a85131d3e85de449f0101b528b01022ea464a6e77213858e83e65887e73d3878a2e4c78fe4dd6ab2599fdf9b49f5085ef0a328d11c SHA512 723cd97c65465e13f13a97585fb7be9f1af4f2691215081214ec3bfacb9b833e0232a717b30a91743f61a1b7a6de62026e340df327b5c622ac4a2d9a24fbc132
 MISC metadata.xml 466 BLAKE2B d130f7563653c0c2ece62d8550ab310763c769b34bf3629df95c6a74fcdf62d6522c4643525119057fc6fd29af904a26f5711f8d991980fb62a766b7ac43ed8c SHA512 a5ebc2d397ea684f950030e00f144fff6832b9adcd5b84a8f743622b0629c6c4cf96f2c6da58b850650b770906f48eba4ef032fb10d51de3c5e6a28c85547e10
diff --git a/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild b/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
index cdddbfe11d9b..33904272b421 100644
--- a/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
+++ b/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check whether Perl files compile correctly"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-Fork/Manifest b/dev-perl/Test-Fork/Manifest
index b9c60be38202..f9af420624e1 100644
--- a/dev-perl/Test-Fork/Manifest
+++ b/dev-perl/Test-Fork/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Fork-0.02.tar.gz 4368 BLAKE2B 4e26f2203587a2ca66fede0c864d7f232c58fd0e172a26fdad537af95871784838acc4cc3c8c6485773ea9504778632d0b5e3b7790bb972528698ea7e2d35a7d SHA512 854f92eabc786735dfbc3c7d0ad29e4e65ee8c99bac1bebab79876c064dec60cbdfd7ef1f5a04d7a5f5dc73b633e903d4d68c4caedd5890914707b829bca46fa
-EBUILD Test-Fork-0.20.0.ebuild 346 BLAKE2B 262dd49ccea42154d48d36815f5c215d33c6fa0e39d150d0c2cc33b03c27fdadc39cc89463692ebb64b88042ed01805093bb17d1a54f9c0c99d53382cda12a0f SHA512 7628109997de14b0525ed98bb7b745405d214110a3c5b1c5d1d27ebedb951b5ecb451f9deaaeb8334183006c5b5b8c04fc0820f96a45a56154935be5407ad3b7
+EBUILD Test-Fork-0.20.0.ebuild 353 BLAKE2B c702c0d9f8c6f20f8fee33882ba7157ad08af76024d88369e0afc5e8ec76e4738a17d8555b31192af6543c4c2d9cd6a2c939e6186e9895ae9463d1812eb3f284 SHA512 590c15eef7471ad330fc48ca05dc9afa509bd3c68962d455bc22d5dffb53580aea5406fe719f01fe7a665f7041e5e0a612eb008b64e196a113531ea0f77256f0
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
index 80a2d26293ba..a3aa326c0594 100644
--- a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
+++ b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="test code which forks"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest
index 1711dd6e39a9..dc7bcd61304a 100644
--- a/dev-perl/Tk/Manifest
+++ b/dev-perl/Tk/Manifest
@@ -5,5 +5,5 @@ DIST Tk-804.034.tar.gz 6937691 BLAKE2B ee676f82bc805ecb193c2fe999c3d451281a16a4b
 DIST Tk-804.036.tar.gz 7024993 BLAKE2B 0ec47bc7f24af7ea5cf3fb539b2636e978a22707d591cea0a5c1ba9182a70afcf749a9fbc03fd2bf7e969ddb1a57572bd6e1b7b68210ad38b1804c877cb771ee SHA512 7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812
 EBUILD Tk-804.33.0.ebuild 1443 BLAKE2B f71521dffd03a23e126f5e200f69c5aba9a7dc6cbfe005e38320aee405be972cf004e2dc3cdb301470abcb422757a53a90c87a0151225007100f0d9a26aa8b23 SHA512 fbbd3e9ac68f6ae98a35350173918dca50d3f3759c920957d2debc68db73032713be935c189b4362b766f7327b17ad9eee8fd32ac39d9b5f2e37b43fc10c91ed
 EBUILD Tk-804.34.0.ebuild 1827 BLAKE2B 277e2ef72c9cce580cd1be5600cd815eeb4fe342d7c441adcb066a94fe3a488e7e9f8fad843948f755befa17dcaa66b275400297597eb080adade65f03d54475 SHA512 61bf0804f993fd7ba082fd47c2498a70b491e444f0a2c2c44e846082ab9d84f76068319375ad81e885ab93d2b7438f9c049a25e141f2c3e0c25957fc8811ad5c
-EBUILD Tk-804.36.0.ebuild 1824 BLAKE2B 13e9cc8d30838d272a22fd4e099e31c2142de067f7b2aad063913d83ad1343915ab1336ac5426247a6babf38d3a3763dce76c67e03cecc047b054383956bc580 SHA512 666d76ec6475538e32e7daf40d77e614fc09096818ac585d2649b696f9462e7cfb3f01ec993dc387c0252c65c2467ae92db1d5bc325b5db7f11ad903ad71e94f
+EBUILD Tk-804.36.0.ebuild 1823 BLAKE2B 13877d0ed2000e65ebea998c9d0aa4c94a2658c68b19efdd6e6ad1d4b74e25a6ca76d8bed5850b5d78f249438f5208f07166c8c3e1958a11ee39545dd83429cd SHA512 40e584ab9eee31482b014663951ebaf89047b884862b89eed174eea24ca361db4145555afdae0caf4be8a9f600939367b7b69cfa6aa733b7f07b2e6ad8ba1865
 MISC metadata.xml 7605 BLAKE2B ce28a121fb707f71f6c4566086bb03e5f1b092ff1143cd73fd63d1b098de0757859514f7d03015451b0385af06de4df56bab939485625d07370e51b20d1b35e1 SHA512 cdde0fac0e4a3ef20a35635f5cf5b05340acd7ae205f5435800c1beb710cc2cac87ca2d4efb0c7175ac04dd5cf27cce08b6e85e12b45bd98623069afbd646b42
diff --git a/dev-perl/Tk/Tk-804.36.0.ebuild b/dev-perl/Tk/Tk-804.36.0.ebuild
index 030262a28cb9..553881d55d1c 100644
--- a/dev-perl/Tk/Tk-804.36.0.ebuild
+++ b/dev-perl/Tk/Tk-804.36.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl Module for Tk"
 
 LICENSE+=" tcltk BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/UNIVERSAL-require/Manifest b/dev-perl/UNIVERSAL-require/Manifest
index 31eec3da9bcf..1d5928b033cc 100644
--- a/dev-perl/UNIVERSAL-require/Manifest
+++ b/dev-perl/UNIVERSAL-require/Manifest
@@ -1,3 +1,3 @@
 DIST UNIVERSAL-require-0.18.tar.gz 5885 BLAKE2B aef7f3e50978ddd4fac08eae9f41b2b7c49297a2175a19b40a813296980cdd2a699c678b13eb4f37b60e21db81097d3726bbb025cd1eac6452fb21a33e6ae7f6 SHA512 4e1dbb62f850a2f3da3301e37862d03ad89106e9fd55ac8161ae56eff936948f87b9215c734c103d8031e1b712847bff86de43329f65f00e7e34ee83bb66c22d
-EBUILD UNIVERSAL-require-0.180.0.ebuild 521 BLAKE2B 0272e2048dddde9002d7b3bcc2993163867d0a24e42dbafad610f77d7f94cad77f4d82359cbf6d153bc60666c1e39def240290abe6b203542f0a83fac8c2b4d9 SHA512 5df5612ab5dfe7ed6d04b294238d0dfcd0134ea7094e95aa9cc0d3c83035e37af3609a19bf259245ce4fc8ab0387c398ce8288f7f6d335967b524cfe7323267c
+EBUILD UNIVERSAL-require-0.180.0.ebuild 520 BLAKE2B 66351ea45a79e1f65fa7be8681c212772d53f08353fb70a491a9e8a8d114db78cca31cb0a76da6d292ceff51737bd13c0c85eeb3f087fa7c4ee0d6b5077c50a5 SHA512 f62cffe43e4ce63f9af8056e2fcc7b54513374669000241ed465dc1288a77bad5375320cb485e9e1cdfd52ddb2ad8d0d5ae3fb0bcc66f0997bcc26ce68b989a6
 MISC metadata.xml 462 BLAKE2B f80c2cb0b82bcaa4c74fe93dc6e91bea4533a73b413f897fa7ad50ba74af9b6be40f4d257c6482187d6932bb71e7bb23971cedeb216550b6c508a25b9453e6e4 SHA512 648f7218d6c5e82054e01156f7e041f605ce8ba1d20f82b0110a3ea28ac507e95e82da440177a241506bd3d6b5a37a475375d413c67fb646c7c15fee958145f6
diff --git a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
index 931da363d3d9..c467808e7937 100644
--- a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
+++ b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="UNIVERSAL::require - require() modules from a variable"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 9b97ab4859f9..003c60f15b04 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 58d04d790311..20171e307c09 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -3,7 +3,9 @@ AUX autoload.php.tpl 253 BLAKE2B 421f8bd3aa659c6add54e46094ee1d8806ab4fd33ee9155
 DIST composer-1.10.22.tar.gz 429521 BLAKE2B da7a340b63fd2540886e0fe9252a115bffdfdddfb9cc5063b296fa4026275390641a761260597f9f4421bfcde62c5f8c9fd4757e41a8278ff0063f905d3a5b50 SHA512 e1a9e22d3e0673a0bbdbc4a97a330e15ce2b6b9e81a6bfc97a6d5918713d02fc414a36393e8760830418d9bde0664cbbcd8e454d6c6be14db585565a3eeb452b
 DIST composer-2.0.13.tar.gz 497819 BLAKE2B ab51556ff65b0c2822d5419bb6dde2c775c91ed210af6ab84f272db0ea823866d75090173663d517cd36163bbe04ce06f597c670fce45b595716baaf05253d8e SHA512 b16425e0553f69c23e636cc51711e2e433125ac55a29d21c66eead4b40080379449868810e9b443996e3959feae2be6ed9c9a100bc5e3f84d210654dd160887f
 DIST composer-2.0.14.tar.gz 498661 BLAKE2B 0b454ed6a00b5cab169a4ff82e9a3d7ceb0d885bd1fe8f70ed495bc28e13a93f477c24df7d9510d0611941addc894d914b6856ef823762f0aeb596fef9332526 SHA512 7eb87f8454d38a091bf97ad470c41f6d1b82bc153618312093935d2b7b5890bf3d1eba25f9bd8e46c5f8ae462729e85ea19eb03184a4484332694a6369a82917
+DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16f4c2de30739c40a1fae396e7f188173c5ef9356c6f55922457ea52c7c3e19e9040c37e86fdb4575016aac07808 SHA512 22105ab3f831ab89cf80e247c6e6f6263f3116a24394b9367b7e7c1e1aebfdcf9bb833add4763c34c621714dd8f22c87327ccf6c8eeef113f753ba800a111a5c
 EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
 EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
+EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 MISC metadata.xml 804 BLAKE2B 7d5f809e3017ddb3836c494f03798eabd9f604ba6987ee1c0b6a21b0b6697e7142557f03b066e7b236c9330cf8505a87c906591fd571545294b70f3b70f2377f SHA512 cada8e3b771827502011a1f074082ef7193b014b7ac2e1efe3f17e6fc126d712e64afa0ec6177e8c0d37681d5d57daa04637e89cb10a783c6278c58606e12ab5
diff --git a/dev-php/composer/composer-2.1.1.ebuild b/dev-php/composer/composer-2.1.1.ebuild
new file mode 100644
index 000000000000..a86e72a98bc0
--- /dev/null
+++ b/dev-php/composer/composer-2.1.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild b/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
index 5c10dae1bfdc..ec77d48706e2 100644
--- a/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
+++ b/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -14,6 +14,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-python/ply"
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}"
diff --git a/dev-python/CppHeaderParser/Manifest b/dev-python/CppHeaderParser/Manifest
index 080da6ce1a20..8241c51c93d6 100644
--- a/dev-python/CppHeaderParser/Manifest
+++ b/dev-python/CppHeaderParser/Manifest
@@ -1,3 +1,3 @@
 DIST CppHeaderParser-2.7.4.tar.gz 54445 BLAKE2B a089df97dcb9aed7821614bf354d0fcadd67dfb387bf5873c585683401d531e465bc05631147b4d5c5b47fe93eecbab1faa34fb517bb92bca6d6c39e07c316b9 SHA512 223550add1e391eb535d1b8be08a54b9d6fe97ca6dbfc54407cdc17a5530a91ef6be4ac920d6841b9f479bcbd6c823512b08565ad433f62a87e993cf393932a2
-EBUILD CppHeaderParser-2.7.4.ebuild 437 BLAKE2B 5c05994d4c79b91744e20a330e143cd0ccfb9e6707d43d07ba20ac535f9779ebdafc706394726bd14ee906a0577eaaf734dc31e9ff8733150cbfb57b1c14556d SHA512 045ecd04af61566667c0bc21b5b0f39d7b5b9c654fda9354cdfb9a648d2b6d6e324e30c6d5fd2109ed3b030c79f302be02161bdf64bb4f45bed4cad553ccfab1
+EBUILD CppHeaderParser-2.7.4.ebuild 457 BLAKE2B afea87240cab2951805d5861923316b564913ed40d26b14679f3eec3169aa450ed862e90b30d4777663f8dab6ec430bd36292abb80f9584add2b2bd2ef40c764 SHA512 446788208e643a65ec6af7e673e85da01a240229a83fd2e8584657cc809799e4d163b86d906a38ffcbc6da287c8ed4bf537e938e800f9e28b583450023daffce
 MISC metadata.xml 585 BLAKE2B 4c3991dc4282c3f5cc79a464a6c70ef1de00dc362302c7e02017418508022215a50be0889842f11f946f1253344874998ec50a48df165feaca168c389c6094c1 SHA512 915be82d315f5cd592395f275e76fd0ac253640cf503c59837989dd9facacc65bea240e3d6145cdc38e5edf74cc3fcba6ff8146b9c5d7c9f9851e3aab9542801
diff --git a/dev-python/GitPython/GitPython-3.1.17.ebuild b/dev-python/GitPython/GitPython-3.1.17.ebuild
index 159956c1f92f..058915920815 100644
--- a/dev-python/GitPython/GitPython-3.1.17.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index fd950789fe4e..2aff371ceba4 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -7,5 +7,5 @@ DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 EBUILD GitPython-3.1.15.ebuild 1724 BLAKE2B 41e1ade8e6d756561c3bb44b30dd00517a6dc0065e6889366a9c2366c1c51461d15e1c7daec35c24f91662f2bd856f99f69dbe78b83b1460c164367d9913740f SHA512 18c6d02db8ad8895a55f63925c9d28e76a74682872eea299d2cef016b15ef14455619ca9ab9f4b22cacbdbcaf40da5d6ca72b8c63e5abae64e1fdd60e354a956
-EBUILD GitPython-3.1.17.ebuild 1931 BLAKE2B 181671fc07f158ae02d7079ff0d738b3923e087e555c087faca0190c90af1bd393d73723138833a72af65db0472e607ed7b17f34b7371fde6958e637c52bab34 SHA512 c135f30c675d31ea2f3b0008d2a6606373f203e60e908cafc61ddadf36ed39ae0264ca2665e37c0f86251218e382d50d8c83d650f8014df9ec31e4ed5482048c
+EBUILD GitPython-3.1.17.ebuild 1932 BLAKE2B afc4d78a25819b3fc365f650b697cc50754d06377d6231fa455fcf4a1c7bdb6717c7759ee7685070c20c6688ae6f1986715ac724c982e559108325273cae0e20 SHA512 f39f578930daf8ffda3da9a8d88389b65b04100ef6014dbcdfe93d8934fb6c9466c466a1d51b83b74e4de0a1fae48b33a5e894f331d053369c02602efe4027c9
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a5ed52993d1f..80b35d78e211 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 80bb664af97d..dc8adb3dfb0f 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,3 @@
-DIST PyGithub-1.54.1.gh.tar.gz 3117667 BLAKE2B 1cf44acf8e69674dee8440162151236eead3af78e2ea9d1c57d7c9217b7249fbc1d8ca10f15e79f8f27ae9cd5ad126376b1702ac4d9758e4f0b0acf6e85eab22 SHA512 72aecef168c8741b773560bee31b0b6159abeea97cc9f659363ff9204eed610686fdaf6461dab0c643adf00140a53aa86d70b9011b39522650aa872f02e5e67e
 DIST PyGithub-1.55.gh.tar.gz 3123996 BLAKE2B 58522db764b44286bb4b65cfa13fcce8fcaac99f1b71d62afe6cfda2bc8b13537de0b0db65e0cbc5c6e4a346cfdbf0084c0c8f4c13ed046d8bea33b10fa51382 SHA512 7ea9e67428e98330f90f1d78e5a003dbe1a6d5cd98b6c729f2030a73d21b4a72a7957382c888fac0b7bae4a409cfb53473a19e7e73df46b251df0327871e173a
-EBUILD PyGithub-1.54.1.ebuild 768 BLAKE2B b85cc043e8e05dcef9751c18a7f3dde27ea88c220d727751ecfc2dddd42a188338daba0bed0e951024c1372c57c1d4ef21185bf600fc6d6287a19e51beb89ff5 SHA512 14c11a22ee6e427ae1f2077c507d8b4e3aeb933892e7473144955117043d34942a374afafd4a3c1550a71afdb4648fb0d6d05d94cd4bdc146043323ae4ac0a65
-EBUILD PyGithub-1.55.ebuild 818 BLAKE2B fd75c4fdd3cde4bbc7d5028239413763383f27e56178ae36e3cffac0bf9fab30df8a54a44f254664e4948c0a84c0d4a2bec6b5d523cc3359513613dfb6aebad3 SHA512 25ea54d01f31f56a49b19c1659f145a5da8ebfe7204e5bcd0e368e3c44a1cd66530ac7efe60488269e00591da70603c5e630a4e59f58819384d7425f868a6a54
+EBUILD PyGithub-1.55.ebuild 816 BLAKE2B 1c7cf624d4af9ec9b765550e969ccd9ddf39d15b73b6d5d11c1cdf98f07367fd9daf5cf874fa1bfdf141034cbafa66bebbfb2afd29839a22dcec4fbd6e49cddb SHA512 d2325aae4bb3b7822483a5f3858d272e60d08c995d9355351468bc07aa774ee560b7c4e8b91079c3386ec497e9dc0f0d271ef440a3d9d0f9a668c366aafe387f
 MISC metadata.xml 500 BLAKE2B 54b420b2aa57e2056d12b79a352a13cda1e26e28478fd724863949c30db61df7b64f79de17c8f75562e295468146b439d43c1beb37dc42e5bf1e3733b671e579 SHA512 184b8b3570d44a06976dfa1bdcd1af1ddcc2e59d9791e0df881325c90bca711923ed19c342886cb950263129b28ff8f04fb3c41ad31423e8b9cba20bf586661a
diff --git a/dev-python/PyGithub/PyGithub-1.54.1.ebuild b/dev-python/PyGithub/PyGithub-1.54.1.ebuild
deleted file mode 100644
index 47e468c1999e..000000000000
--- a/dev-python/PyGithub/PyGithub-1.54.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
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	<dev-python/pyjwt-2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.55.ebuild b/dev-python/PyGithub/PyGithub-1.55.ebuild
index e11fd559bfde..358c890eee5c 100644
--- a/dev-python/PyGithub/PyGithub-1.55.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.55.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
 	>=dev-python/pyjwt-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 7a041e5d04a2..a36178d0e090 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -3,5 +3,5 @@ DIST aiofiles-0.6.0.tar.gz 13585 BLAKE2B 4b81e8369f91b0406c9bd5025c4b5da91418dc8
 DIST aiofiles-0.7.0.tar.gz 23245 BLAKE2B 5dcb743912555de9a4c58a37925ca08c4be7065ea78924854d548b32f31f93bdf1b231db840aa9ac822d467ffd8c7f57c506c5f6d550c662013008899da8b716 SHA512 75287266cd86c572db0795074d625dac8b3476c4d8ef9a193ce01ce80a423a4aa39f6e5ec5005fb441375ccb2a2ec84913634919ee5000bfb7623ac77a030b92
 EBUILD aiofiles-0.5.0.ebuild 558 BLAKE2B 887803d5fc7848bd9dedf53d1023a184823ec5e4b70ec2f47b75f39cd86a20d5f3c2843fd3ed5d985c092f4ea94eb29a09f90c68aa22738041141acc8825c56b SHA512 092fabb0391bb5d1f4dafd0e3a73092a2add492de61a6ce8a60dcc8f2e33ca0704982db72db83cf56d5717b9e73a7dbd7e34f5202d4672c407b56b09bc4ffa59
 EBUILD aiofiles-0.6.0.ebuild 490 BLAKE2B bb2a36efd687f42e147783b49d1c5c1dea02541eddbe8c267eb3a98add168a37e1eaf2693be26602a80cd797a17bbe1ee727029b36285b1150d5e4b70ffa661a SHA512 a8e39c7aada13241ac7d2a033015a27add05cff3fbd70f74170e267e0f3ff2343b54f2400e2f5f678fde68aedcc5ec581548418f890163ad182c6552f564a466
-EBUILD aiofiles-0.7.0.ebuild 529 BLAKE2B df1e2fcc1c3de684c565698019e03e0744e2e0e1778ea8b2ed846c1f08d8cfe1c635c38bb143a6b476f62e39efc213c2f51101e2c5b5a9b0b9add0eb09d969be SHA512 52a816667e47e21ae4a7e3937aeeb2b27404d675e8ea3a83363e82a72aa4c2280961a0c35f5e202f7c6477059fc4067d4ebb0256a2ebf98545566a1c457bb908
+EBUILD aiofiles-0.7.0.ebuild 530 BLAKE2B dcb7b80dfbb8cb5960640eb7ae0abaa8ff9aca1c3452338c3c225698f83bb5223b69cb6510a0e0640f427d04de3f5a59369b6457c43e72f8597ec7118b3610d1 SHA512 e31fd786d21709811ee7ad5fce311e35e23f7f8dad4cec3b0f4cd73ea93a2334e254e7836f7c8903c966d8c596d25389e040a439a14ac1d7709c61583f4e8768
 MISC metadata.xml 610 BLAKE2B 8d1109f3a6895e60aee18ed8a4a8118cc932f98594ca66e2442fa68f95f6998548512b3b78b74d0dcb0ef24d0b47ce2d568e97b0e554c0010a4b8f9f2ec44b4e SHA512 18fe02ca00665f20134ca3cda280705aa489b929e79a4fbee72345d994b741ea6ea27e6b9f2ac5f494672d7f85796e908357e51146126a729bdcccc46d094afe
diff --git a/dev-python/aiofiles/aiofiles-0.7.0.ebuild b/dev-python/aiofiles/aiofiles-0.7.0.ebuild
index 9c3987ed4e4e..21d2b385d7c5 100644
--- a/dev-python/aiofiles/aiofiles-0.7.0.ebuild
+++ b/dev-python/aiofiles/aiofiles-0.7.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 3aa9d8e384f4..38d7b1cd058e 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -6,6 +6,6 @@ DIST aiorpcX-0.22.1.gh.tar.gz 75206 BLAKE2B 92c481388198fec94faa10482ad4195fe6dc
 EBUILD aiorpcX-0.18.5.ebuild 861 BLAKE2B 6f13104a6bff221918e00c198b3fc3596e43dc37102d4ca53eec9774ef0f237d0bfe7ea3ab002584497ca59f448fa64e70dbc0a6fdf4d25c55eb45b0e8af03e6 SHA512 ce74a01085c864f0427da094a6073fce2a002dc32ce93ead0d03b671ec0d25d2600f7be278ba2621ef35d1ee00bc96922f2c0a18d9c97a45d3fae1ae2177ab1b
 EBUILD aiorpcX-0.19.1.ebuild 861 BLAKE2B 866c72aeaf7525b91bb1eec97bc933944a78a33f5413e9976881100c4c80ca42b4aedbd3af4ecdc342530e4b6991b4cfe48987f11730a76b6999aa9ef79cb6f5 SHA512 b4546861f9523c91b95c098696b7c75ef62706f925400516458be4d5cf9e3b32f9ebd48ee07d25d7901b1df8b5f8daf86dc574e1c7ce093671928d5a9c289585
 EBUILD aiorpcX-0.21.1.ebuild 818 BLAKE2B a5c074310e0f9ddf2014558eb950166fac2c2312dfb3ff604e5a1c3fb08600cfc7b115bb3bf0410837ea39c3fe3e56a606cea4d7461fe8ba0c997b281697dfec SHA512 f9b33ccf24bbfc6d1c554450968e0191b0c34219f13af349a6b591bd33327d0de93312e99e57c4f68fb1217d7773221310aa542eb134074646b23772ab98b481
-EBUILD aiorpcX-0.22.0.ebuild 812 BLAKE2B 10679fe911cbe607b3f32c2c98c1d1fe0e32b8a92fac6d6c75b39e20a58c34874af30e761ab52ea9d21808b622de34abff3cd8ed53e4b86159df9f17e7a89a2b SHA512 8ccc50c71514326a5b1416f6159bf0e686fd691561f8a692894be0925441d6e0d861505c3540967ebfc349c984eec9706ef92140bd35904689488f1c760c6618
+EBUILD aiorpcX-0.22.0.ebuild 810 BLAKE2B 5afcc27755c93ef73d852600b521e6694f1e7943f752bf78cea4be9a55aad50defd32a4168d1fc2bbdd148f2281c311c529103b21e27b39bdf57ddd3efd7ba23 SHA512 b2e3992fed8d2fc4133b2ffcd96e421de4c41dc1cff5c4d58186cac73ec4023855f711e669aa6f09c5db6c0b7c5193208f74f33db8456decfb766e5a1b7fffd8
 EBUILD aiorpcX-0.22.1.ebuild 812 BLAKE2B 10679fe911cbe607b3f32c2c98c1d1fe0e32b8a92fac6d6c75b39e20a58c34874af30e761ab52ea9d21808b622de34abff3cd8ed53e4b86159df9f17e7a89a2b SHA512 8ccc50c71514326a5b1416f6159bf0e686fd691561f8a692894be0925441d6e0d861505c3540967ebfc349c984eec9706ef92140bd35904689488f1c760c6618
 MISC metadata.xml 405 BLAKE2B 6e2904d4bba224f3ea6898a0050b43aebb88132ab641533837cc39f2404b867aeba63f0466827199a4a4d54bce5f08376328dc1f3a9e50965be06ebd8fa02133 SHA512 5877ba7a1e6d5cd3bd6a5d1484e7abaa524a16d880c15e4b78d47986be8de8d290ebeb0bad628ff3d68d8dd7a85930d05e56c6954ec8e78c6f4e73530f27f12b
diff --git a/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild b/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
index 8ba0167288fa..02ba5dea0c06 100644
--- a/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 71af92c17ee3..5cec170fbb0f 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,13 +1,5 @@
-DIST alembic-1.5.8.tar.gz 1154284 BLAKE2B 704a7aeb15fcfae8746238ef7ae4533ecbaaf83ab9248035c35cea343a4d02e02c00dfa3c8186826a437c839053fc6292c3f8343945ca32273ee608f6572f513 SHA512 e68f3709ed969764cff4c9f755781a10123631d2d07a970674fda2226c84cb92c140bc5ae81e44c8b279823718d4f0544236d260fd04fb7107f3d8293c85b4f0
-DIST alembic-1.6.0.tar.gz 1166934 BLAKE2B 1d1473ca55bf2e5f8f6dcdf2fd7cbd5246e11e7a14e5964a5891c60e5ba814eabc2fe8550b87317c3b57268f649b46c6b611ef1b2c81b5a025ca4e8e537660c2 SHA512 bfef894f13762420128b01d2671639de6361848387d4661d92bab66d8c5820ebe9ede62d335b4cc5915f60378e20a02a2b2664a7bf815294fb4cfdee7414dd33
 DIST alembic-1.6.2.tar.gz 1167842 BLAKE2B 0b61282987e974e81b1007d4a66620b1ac2393b175f91011d0d6c450af1038a9ea553f4a7c1906b2e463f7b95617a00629f337547788821b250373f0de18d0b7 SHA512 d5b23812d3e65e9642f39e2596ab86773476a77959938f518438d7659c2da5436432fdc020a5fbda33fe866a047d9558f7a4c5eabe032a6d3f2e6d04ff7928e7
-DIST alembic-1.6.3.tar.gz 1172826 BLAKE2B e405589352bc06b6a80e532e564b69b7095e57ff150a519654737c9d5ac43827d1ddedeffd12295419eb0fc7555c346cdf0e32fcc21fcc9c301015fc0c9540f5 SHA512 4a73e67962d44de719b9873e4b61153607cb2ebcdd15a19172fc4ea641e2909339ca448e83fa8ecb871a270ccd980f16fcf4a880e9742a177649c4dc44cb30cd
-DIST alembic-1.6.4.tar.gz 1173603 BLAKE2B 24c7a7f5431db4856ea7f7ea7095b1a992e5c41c1d94235098b6c93b6a9dbd6b0261297019b01e1274a466d5b9236d6c0890a08a8720191f77c20973e1b07afa SHA512 019268060d0552da87d0ab4d624d53f2c7460dfd3018c2643b71adf0c7a574eeb92b238d777c786ecc6f9bb94e8e25655f07f64258b17b9cadccb7ba83a091e4
 DIST alembic-1.6.5.tar.gz 1174376 BLAKE2B a1bfdf611b30831363bd29a63f2a50d7c31e348ab6f450f709d1e8dbd891441263d8e0067de38c09351c26c26d07178e3079b30b5c976dfa90cd24d5973038d8 SHA512 8e5ce4bb41a47fb2c263d3542d7fd2dad04bd76b81a6a565fa93cef80a38a016944924b9eb57895ae71d7f8eef428bf440388444ef750bf281616e514a61c79b
-EBUILD alembic-1.5.8.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
-EBUILD alembic-1.6.0.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
-EBUILD alembic-1.6.2.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
-EBUILD alembic-1.6.3.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
-EBUILD alembic-1.6.4.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
-EBUILD alembic-1.6.5.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
+EBUILD alembic-1.6.2.ebuild 737 BLAKE2B 79af54d503298e0f13e8dc308c610cda74c0d7896c174038881390a351494eddb648806072443a13a825f05b7f0fa5c80b02d94debf2cef0ec321b740200e997 SHA512 ac4d805bf5ae7d4a1d394db2ad669f870b46ec161816edc548f31346f51dec4bd6deab764babc8f37b6d14bcac9f4cb3b5e778441a0cecd906971a9775322c06
+EBUILD alembic-1.6.5.ebuild 740 BLAKE2B b052f784a540d32d6845d9cd689ecebfbff5c1aa75d342f117d6175695b11137bb92111e30c80cb826d5fd7c033d896d245e9a59aabdf2b88872470cd9bfa1c7 SHA512 346ece73bc8650a26d35812e026a200b1e0e25ad6a423bd39ae6b9189fa17f650fef2ccac1ae3cf16a8430f2ca894be4fb251af3208594c4cdb78660a5b08da4
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.5.8.ebuild b/dev-python/alembic/alembic-1.5.8.ebuild
deleted file mode 100644
index b0a59134f8e1..000000000000
--- a/dev-python/alembic/alembic-1.5.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.6.0.ebuild b/dev-python/alembic/alembic-1.6.0.ebuild
deleted file mode 100644
index 6105a9e2d89c..000000000000
--- a/dev-python/alembic/alembic-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.6.2.ebuild b/dev-python/alembic/alembic-1.6.2.ebuild
index 6105a9e2d89c..e34136d4cd96 100644
--- a/dev-python/alembic/alembic-1.6.2.ebuild
+++ b/dev-python/alembic/alembic-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.6.3.ebuild b/dev-python/alembic/alembic-1.6.3.ebuild
deleted file mode 100644
index 6105a9e2d89c..000000000000
--- a/dev-python/alembic/alembic-1.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.6.4.ebuild b/dev-python/alembic/alembic-1.6.4.ebuild
deleted file mode 100644
index 6105a9e2d89c..000000000000
--- a/dev-python/alembic/alembic-1.6.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.6.5.ebuild b/dev-python/alembic/alembic-1.6.5.ebuild
index 6105a9e2d89c..47b70503fe5a 100644
--- a/dev-python/alembic/alembic-1.6.5.ebuild
+++ b/dev-python/alembic/alembic-1.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index e94f7871d748..5bb5c5f4e4e9 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1,3 @@
 DIST ansi-0.2.0.tar.gz 5173 BLAKE2B 436caa8e1f36e96f1844e79e3a0ff0c4099e76b25ce9f56c9d8663aeeb650f32fba75a14fe8548f557fb020e2340707272fdda4cdd3c245c903a4f801ae48413 SHA512 22c69b5030f03eca9470e288c16e62042ccd02ef2e232600a4fab629354601d5da0f7c16b60dae7293c69255e5d4125298890d99dba8e5387960a5be60b92d61
-EBUILD ansi-0.2.0.ebuild 464 BLAKE2B 85e50ae40ae38610f5e321a1ee795ebec8169a063b10a258ab56dd059ecc6b15a0a95f37efc09793669f7f2d1371e1b603afa0c3bba437bdda1f73002c46036e SHA512 c45e5fdbcbaaa888e1df0a09ca73ddafeefbb9405e526be05cd7147be00fddf3a685f1982bb1c92b4bb1726c03e61596fabe7eae0a66d6ef2b052b61ab522886
+EBUILD ansi-0.2.0.ebuild 465 BLAKE2B 2161a95e1dd66b9b0d0706a086e760df876f240584a54081b6d6e76ed6a110d239b99b72730b1e34281b669641571bfd3edafc0e03c93bc5ce6e54b8eac8e748 SHA512 3b37844d0d03f3586da45c015e224e8146360e4b683ff454ad77a4b05700c3a1d02ae41a44111aaa492bc024a2f861ef7d9309e0adfea7a4bad849cc6912d17e
 MISC metadata.xml 390 BLAKE2B 22d724bcfc7292001167a0ea7e69f12916ef601ddf61ee09226a27147d5ca5e66380af85d112a525456ca0634fbbdd17800c0bb451536b832a1640ec25ed07f0 SHA512 f4a04692f970eeedafa4780f027179475746eb1034830ee7ec9c916f24880b0dd87655b0634930e921e7eafd2ed61b1f2d64c3a78ebb246c5f2f179d3773a762
diff --git a/dev-python/ansi/ansi-0.2.0.ebuild b/dev-python/ansi/ansi-0.2.0.ebuild
index afc8d0584e2f..969860654680 100644
--- a/dev-python/ansi/ansi-0.2.0.ebuild
+++ b/dev-python/ansi/ansi-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index f0a78016b967..00990c5dc497 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,3 +1,3 @@
 DIST ansi2html-1.6.0.tar.gz 36053 BLAKE2B deb63c6c9f431ff225cfcbbd2995f0fce9535736dba7d8c92f1f2e51d525640e69bc4269ab073438239edb35815288fa17b2d69c89cca7627ba2b5096009611f SHA512 35e5fb6cee96fe41a658c005734a58b08bc05e8ad5903ad18684c316bdad351a70c534b4162416225bc2ca774d01b4ac1bb8a8dad3170d0738aa7b3daf46b3c0
-EBUILD ansi2html-1.6.0.ebuild 1154 BLAKE2B dff51a5fdd44fef710981570b1f2c8e8c2826c6544ba7b740c8c122d2fc299187a6ecdb7c60f9213dc8adf9cfd783c656850c2282c3c3197ccd638855c453c41 SHA512 7c1e2f149e30d9e2f81278815c0881224ea9bf566bd545fb9e1d1d07f8ab96750ff9d7b6c49786c15b0c7cc3c1d9dddb5b1c392838d5e8c28a548846f8f51d38
+EBUILD ansi2html-1.6.0.ebuild 1017 BLAKE2B 14011b39f85e16a4eb5fd9d4bbd212fdada092701ba2abbaf8b176a59b5d4e4c79cd590f7c29131285f6e953e96ca93593117969d45b3e691291150d9c1c08b5 SHA512 66203032b334df2d92374575b697c1a3ed942cb4cd16a0c67ec195c1b55692fe0439790ee811dece0c87071ba25d3cb250bd3cefe7fdc3adb167aa39a50072c0
 MISC metadata.xml 405 BLAKE2B af420cb627ec9f6a472370674e49c22b519729a726701c364524e5c454a00ff731d5eed16a4208754a4f7e428df33bf244f93e697dd56952efb82ba059a5db3f SHA512 8e6bb50be6d8ecaa43a39c47cfa9d8243b2529e28b246623a6f32b5263848b73632c245483d6f6f7c146b8f8e49769370a76110f4490f61bf6d996ebf7a213ef
diff --git a/dev-python/ansi2html/ansi2html-1.6.0.ebuild b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
index f6cc43ef6456..fceae73f627a 100644
--- a/dev-python/ansi2html/ansi2html-1.6.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.6.0.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
@@ -31,18 +29,13 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests pytest  # for BDEPEND
+distutils_enable_tests --install pytest
 
 python_install_all() {
 	use doc && doman man/${PN}.1
 	distutils-r1_python_install_all
 }
 
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
 src_compile() {
 	# Upstream https://github.com/pycontribs/ansi2html/issues/124
 	use doc && emake man/ansi2html.1
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index c7226fcb6798..909b69d42dfc 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,6 +1,4 @@
-DIST ansicolor-0.2.6.tar.gz 6224 BLAKE2B 38ffd0e9a88c886ebad25c4f0072f2f8f833e028c3bc14eb89252c1c0b501f973c9b3e371b4c605a3b98df33eb7203a963797d3ee56cf87b0afb927b19096fd5 SHA512 44c7dc6f621fc3044d4a52acb96e7e497578e025090633bfc8cbf686d7461da018f64502b477a6090e60747481f320cebaad00ee0776c9f4c52d4abbb1812121
 DIST ansicolor-0.3.2.gh.tar.gz 118221 BLAKE2B f3f621298858974522dd05665c66ffebfc335291b61c6f0e6f835aaddf099559412f12979ad2a43001690b430125c8e1a8fd5427ad3268393d75bd736353d598 SHA512 de1e1bc9d8a02accaa57a64e5d2ea1f510545b3ab83218c47c7a1861e8438862c222147c9dcab0fcb1ec4055dcee07d6cde6d7bfecfbf9ac55c3bb76ac0fb0ab
-EBUILD ansicolor-0.2.6-r1.ebuild 705 BLAKE2B 947fee39b97c8d54cd417a6a0dd7f49c23f9cb85f3c60f9abb2ee14915a5e097353bc848db31a6da73a7dec9d2b500c8ab127d185169bc69522307b449e9292f SHA512 758eac8f5f525bc8999a0306404d5b276c2db89591f6515cf1801524b8e798adec081f0de7e0024eca1857ad95d7572b3f4b5eb395650fd5573ef261624c4ed4
-EBUILD ansicolor-0.3.2.ebuild 509 BLAKE2B 879325f2e1ec8f4f33b24553ac5f73f3fa182f2d2937b494e439ac1ed835ebfd55db192cec0ba7116f22ba2ef09a73121e6273b3aaad1ad38cfe75948aca7fad SHA512 37caee11f10bb3b990d6956f53030ad5a1bfc8d1473b649f6994ad6c7bfd354667535b453cb285f2fae885a492cadbd0e1bfba499e52bd5536c1f768323cfb4e
-EBUILD ansicolor-9999.ebuild 707 BLAKE2B cb535dffd18e59e94fe635d7910856496ba16404decc460e17cd5c147cf40858c2dbae20d97aa9724d25b6f2c4d35ab84e1c219474994e876ee2f93f7d73fdc0 SHA512 6b8c4bc62878bffd9c6198ca67c5f5828ee7c40f401e8484783992e4a534462f8f3c0ec1166ddcf0cf219273e8fa3d816b9d96214c06e12ec57fe88da47f0ca9
+EBUILD ansicolor-0.3.2.ebuild 508 BLAKE2B 45a8286dbccd031d483b1112b909f2c0b5b4e68f8d4788ee3cef2536ac34858d426804ec9497474713c1713f9fb322785a67de35bc8e901eed908956fcb24b65 SHA512 f37d1d0f039cf9a1b6bf1e09ec068a41f938f19594c293415821dd61aad5a26e77dd997612965bcd7f9c03633d557b8beb8d30e8d8017a18f7d147c364ffd014
+EBUILD ansicolor-9999.ebuild 709 BLAKE2B 073ee48e67d63ad8b23fe0d712c110861e8bd9b53eff897af34a705984aa8e483fe842122ea7b3c151224b1eaf0d940468db3b59d6d294f34fc7cae879a139b3 SHA512 4bb1371073e06468a3c6080ccea1fe54ef024d97cfd352a753d8943f979ebd7cfbcfdd0546d4a034cdd9dae76bb1d67be90c8093ce2bb12636cc73e21cd5c6c4
 MISC metadata.xml 650 BLAKE2B 05b096ef57e74cf06badce53c95477473a04e8c3b78944b9fbd9754d86434130632f8fb25dc85fba856bccff83bb8bcf81cfa356088830ee5cddc6d9d71cc7e7 SHA512 0bc8789fe7c349f8a2c0ba557773372704ef0347ef5218ab8feb98e64ca05951b900ebe015561d89a49c69bdd341fd468599767fa65422363e90e89b34ba7863
diff --git a/dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild b/dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild
deleted file mode 100644
index 8ea693a0aa45..000000000000
--- a/dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
-	# pypi tars don't include tests and github repo is missing release tags,
-	# so only enabling tests for 9999 at this time
-	distutils_enable_tests pytest
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
-HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-python/ansicolor/ansicolor-0.3.2.ebuild b/dev-python/ansicolor/ansicolor-0.3.2.ebuild
index 510a58e663bc..6151096e6f14 100644
--- a/dev-python/ansicolor/ansicolor-0.3.2.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,6 +15,6 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ansicolor/ansicolor-9999.ebuild b/dev-python/ansicolor/ansicolor-9999.ebuild
index 82e29392ef6b..d678863551e3 100644
--- a/dev-python/ansicolor/ansicolor-9999.ebuild
+++ b/dev-python/ansicolor/ansicolor-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 0c0744dbef44..eab1202c74f0 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,5 +1,7 @@
 DIST apispec-4.4.1.tar.gz 64424 BLAKE2B b46390659334f5ce5aa83fd15207f5d1ad6d0e9c530f9e7d2b1a0f6a787498aad065153cde9237ce1ab408256e5cd698bbc674dc0316eb4ed16b874ce34611c4 SHA512 fea0787598ca93711eaa231675f97623eb3d6eb224e11c40e66857b95f48724618bf7a9bfda476b56c1c96fe70bb61675966b1f3fb073fe3f7e4da91e78d3d90
 DIST apispec-4.4.2.tar.gz 64660 BLAKE2B 1e53d4b3f8856e76565690773085dfcbaaab4e1771186eb8ea35f469d7c65b8d5bd6319af0ee32539de96ce5ff1889a15d74ac764d7bb9d0b415648af87d28db SHA512 8f8070ec1a084e5c5dda02d30103ff25a2fe096839aa2b1a75858297377e312e29a2d1cf4d373a53b7bffcbe9108489c2a2516e0e053c2de12ef90044b6b7e17
+DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934b9293c501b5305b4a6ccbd22e8b12a163e20e5e02d571a8177adb6d5b3196ffa46ae68f2931b6c3ced2b4d0c SHA512 0abb186182513a6d7e4aeeeb80cd8976eebe7c40932ca7c53cd8be149e65a768235436382bab2006a79bcdf345cde55fd69eb3f28f8d14cde5fe064f7c7a76ad
 EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
+EBUILD apispec-4.5.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-4.5.0.ebuild b/dev-python/apispec/apispec-4.5.0.ebuild
new file mode 100644
index 000000000000..3db198fe80a0
--- /dev/null
+++ b/dev-python/apispec/apispec-4.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/marshmallow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local deselect=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index a5844b017baa..bc7d825fdc11 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,5 +1,3 @@
-DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470 SHA512 3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
 DIST argcomplete-1.12.3.tar.gz 76128 BLAKE2B 6924e53af37e4ea614dde4c76f44e5c2b777f8daa8fa8db53d6cbe06f56f2ce3edd11a9baad6fb2571e701fb74e02fbb8eed8ce1067c599fbb156ebd8289cccd SHA512 b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
-EBUILD argcomplete-1.12.2-r1.ebuild 837 BLAKE2B 1565ba57d1d7a32be13986eac83db7a3684f38edc17a5163c6e813c2f927a933444dd41ae4ef0e107818004cb9d7412078fca4b4a372ea76b5f03943f3092d2f SHA512 1a668032c7bb747c7c65cdc44baf37e7ea890a67217f2bf3cacb79db125ad8948395698b5d782195fd3b2a996aead1c43501929f23dffcb9a91fb0601fea4011
-EBUILD argcomplete-1.12.3.ebuild 1014 BLAKE2B c473b0cffd95ea7684c161faf6c3f1a371613e9d2b4d965b510fc5fa29479ec5c095dc4ca021c4df9a1c177558ec1a89a65ce080f155f147e0f41afefb652fab SHA512 b3569897e9fb842dff330f139697e1fbb33091e0befcba288c5cafd113e6c11ca0e335816a23d2102539345cb5a1d2dec8787a809ad3b698bfdabda4dad9c042
+EBUILD argcomplete-1.12.3.ebuild 1006 BLAKE2B 87d4c1fda4b3911a6e15ecfef13aef1fa03534e84186f80c7910bd4c4bbcfc9e1de29d933f2903308d2aa4f3048392d2a936dfa75062b21b22f7a472d371d617 SHA512 b0cace6380f1dbfc1880d099ce3217b9d14d5baf3f154fad13076b62d761b6febb91a354f967e34a098a1c0565d3a0a7d45e9fe3d896582dbc08e748c9a37a0c
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
deleted file mode 100644
index bef8f77c23c3..000000000000
--- a/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,35 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.12.3.ebuild b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
index 657c99a754c1..24a8a72ae2f4 100644
--- a/dev-python/argcomplete/argcomplete-1.12.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index f9739bd0e3bc..ac85737efbef 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,5 +1,3 @@
-DIST Arpeggio-1.10.0.tar.gz 766416 BLAKE2B 75898c5be536998a12ec0efb8ca0729913e9ac7ac8481f614cb1bfd5332015bd2c22722cc6836511e1b77d933fe497538db1a00804e2cbf409af7cc153ba15c6 SHA512 368c478114ddedbf40c94b4e656945063df5661deacc9c75780ddca18198a9e3e504718fc6c9a1e84c11c5c8f2b454584d1cfc5a14ea2b783e97b8e317047023
 DIST Arpeggio-1.10.2.tar.gz 766747 BLAKE2B 91e828731757b6ca1e16900edca3f45378c5bb05469e1d32571f9185dbb887f5cf6ae54afecf77f352f882d9056a0814c65aabf51424b482ae3a8cb90f11740a SHA512 c6a162f9ab854bac7e2bc9e5d5553c2dbcc068fcf61607149727cd4c8a7c87c63cab765b423c8ea76e09fa81ccc42157d724388a81e22864580ccf734998142a
-EBUILD arpeggio-1.10.0.ebuild 733 BLAKE2B e73197fd0d40baf580ddf3e002f213950bbae63eead370728dc4102a21334f12151a556aef26aef13621eafba90d59abe232ea0bc51b5838474bed5a80b70f45 SHA512 55e09752b77c83a289ed03a441977e3dafbf64913ce8ff5c39761231526ea2f1fb4c4f16e165057b6a2df728489a9c43038d2b37945d7043cc2c9621cc37611f
-EBUILD arpeggio-1.10.2.ebuild 735 BLAKE2B ba30f88d575068581fcf5552ec675590d1ad75c1a22a61dbb2f7419617817b130da3b6a8b8ce9bebdc482e3590c26aa239085df808dbc277aa2ba965a449342d SHA512 9d37e4cdd59dfbc145021e544dc19057f4bf81fc3c51477886b3adfd1beca02d3a3553ef4b0a6258705fbeed22289613dd790cb3634939408e319f766d410e09
+EBUILD arpeggio-1.10.2.ebuild 733 BLAKE2B e73197fd0d40baf580ddf3e002f213950bbae63eead370728dc4102a21334f12151a556aef26aef13621eafba90d59abe232ea0bc51b5838474bed5a80b70f45 SHA512 55e09752b77c83a289ed03a441977e3dafbf64913ce8ff5c39761231526ea2f1fb4c4f16e165057b6a2df728489a9c43038d2b37945d7043cc2c9621cc37611f
 MISC metadata.xml 446 BLAKE2B 6e4098d8e271d02b11f0986d7aecdceb30a8a420ac6f164e80eab2cdaecc7406a401a7ae42dcf98c117d9e9cd037ea232f2adc305bc985d9d0ee200aebced655 SHA512 304f89bf2f69ff09ba62b813eb3afa6e17689cfb80e9625a64f5a7016d155200ad6d4dfac3663f6a6c40a89106e710a06bb764b8e769409010ed25664a5775f9
diff --git a/dev-python/arpeggio/arpeggio-1.10.0.ebuild b/dev-python/arpeggio/arpeggio-1.10.0.ebuild
deleted file mode 100644
index 0c29de142a43..000000000000
--- a/dev-python/arpeggio/arpeggio-1.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio"
-SRC_URI="https://github.com/textX/Arpeggio/archive/${PV}.tar.gz -> ${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		dev-python/memory_profiler[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/^setup_requires/,/^[^[:space:]]/d' \
-		-e '/^exclude/a\
-    examples.*' \
-		-i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/arpeggio/arpeggio-1.10.2.ebuild b/dev-python/arpeggio/arpeggio-1.10.2.ebuild
index f11ba62fad56..0c29de142a43 100644
--- a/dev-python/arpeggio/arpeggio-1.10.2.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.10.2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index e3bea318b65c..8574503ea059 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,5 +1,5 @@
 DIST arrow-1.0.3.tar.gz 102536 BLAKE2B 020b9b12a529f31c8054cfe98b99ee791cd1f2889422e4bb1b0bb6873ff4c1748951b63d20d2526af2bea3ff13b26d809b35eed36984d1063c35c334d76ee416 SHA512 f8da6574758ca1f319ed9d71e4fc6e44d3c3db0a6fe36c8868c3515ab789093660e3d57d6de60813cf2eb57c7a3a8bfe92facbb410a383528cb1fbc37d860b49
 DIST arrow-1.1.0.tar.gz 109692 BLAKE2B da6cf4feb0048db4f808fc8d8863d59b1501c9e5ea8b171aacd36945e7dee874fb088c1bdcf57858e9126b42b312ec24511ee69e8846cb28c5d97b0cb5ece237 SHA512 9ec39458069d9538bd0f05fcbb03f92c6cf613c4bb686037a92ffcf7fa2f6306fa84ca6bcc2b7ffdb84c2fcf4cbe281ad7cb6698d1886da29d9121805140be49
 EBUILD arrow-1.0.3.ebuild 787 BLAKE2B bc09a63555e5a833d0e1a9dfd645cd37963fc187a664fe0300b9963ec5e11a8aca745c8b35a7ea8b3866f40f93efef8c08dd212c50143aa11748cc58862fc976 SHA512 fcb1145f467ae6d0f66e420c265206b451e6511bc2cc3844214a920efeeb84a6ad7a1848a2816522f8c08b7f438a7716e55619c335d4bd177cd3c6063ecc87c1
-EBUILD arrow-1.1.0.ebuild 789 BLAKE2B 7103cf7ba5f93bc9bdfe5ff77c046c959a0d26f3473626bc8c9d07a6248d643574b46d2fe167face9133bffad3b98f29b933fa901a4390cd29a92651c5e8a0b1 SHA512 5b14ba5897482c520d5eccacec6dd7470fd5787d8e0add04cc26ec91c01800ab90c0faaa680158bc484312d1443590af1917c53d6da2b41f8104ab19e435cfbe
+EBUILD arrow-1.1.0.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
 MISC metadata.xml 386 BLAKE2B bc1174a003d7041b7741307be147e5d1e6035982b4174cef130017825d20b6a35835f3decce36e7c8c5fd4cee7d9ea77cb083850bc820f241fee1407665bdb5c SHA512 88ca68a6095f8c900c55d4ca1159d78c4ace39b326b1d5c9086d27177c9f5026d83d32e7c8bed3813a623e2be22243c3fd6a268d79ca528ade6f42bf3fe5a7e7
diff --git a/dev-python/arrow/arrow-1.1.0.ebuild b/dev-python/arrow/arrow-1.1.0.ebuild
index 81e5cb7ef66e..2a7c7c5050b3 100644
--- a/dev-python/arrow/arrow-1.1.0.ebuild
+++ b/dev-python/arrow/arrow-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index b8320f543383..7b4b09cd01e8 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,3 +1,3 @@
 DIST asn1crypto-1.4.0.gh.tar.gz 672812 BLAKE2B 7545d424c244c04c2639df45e0bb56c50de95d0a7ee1e56933720dd7215c2be2608ac7889e2e901785592592e9ac6cb116fff3cd00536903c392a9e3912fc08a SHA512 989e4e0650252c29477d71263549b99f2c51c87f0768c20264b3de65f32edd8e7922e8af23bb1a7e29567a4ad8c4c5d596cdf7db3c766352c7f19d4f93361cd0
-EBUILD asn1crypto-1.4.0.ebuild 741 BLAKE2B 202f39a280d13102c2e7c3693e8ef5dae36117721dfd29778990593c2489ccbab769452439b467652478ded3f0ebc4161de0dc30df81c8bf00b5bded9b9b5e01 SHA512 8a34681f0473d31599fd61085dd2d7c16f5d9d6fd69a1f160da646972145dd6a6f9171335e9c3dcc6cccffaf7de56982eff2495f7627de85c31d1e8fff92de15
+EBUILD asn1crypto-1.4.0.ebuild 742 BLAKE2B 2f9d95b41671e22a1c2e8e04fdd84782475b79d11426ae001e00f8b92fe2c13bcb6fb6da41ca24be813d04ebd418688c510c6d8f6419792712108e7038c727d0 SHA512 6896d25a8dea69604de1b5703cde9df74c89df06256c2fc95161f7d9f43954200cc063d12ae542762ef1b0cc848022fd8e829134a60d800e93ad6e9e8b6e6339
 MISC metadata.xml 393 BLAKE2B edce1806cf0fa4ec30cf33fd39d226fb027b884b6eafb2a11ee07037415f33383d2a3c8694e1022eaa204ddd815c4b80737edbe53ae0f0c15b7adb9af7332c99 SHA512 e2f39330abe7ecd12c73521c7e48565dbe67dcb354edb95468161c41c0f3321298b61010f6c06fbf044a5979224bd43822bb872a0f2baac2aad2c6686e813c99
diff --git a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
index 80f7356a0891..314bdcbed32a 100644
--- a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 6c05fa7a6ba0..878c369c1dd4 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,10 +1,5 @@
-AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
-DIST astroid-2.5.3.tar.gz 317721 BLAKE2B 66566287fa65489064056d6dba65fd7c59cbe9e4e3d88ba5a33d08dbcf6af48b6f1eb4aafb4f7483a1fc0eb6fdd92a7bc8f1991d05cd4d589fbcc6ed6f5db769 SHA512 dbf480e86023f7d093386cc68b259d5b721717638927a893b3ade0a397b212f5f24a17c753b705cf499b47e12ab255d51126b41b5af167d5c3018f5aade1abcb
 DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
 DIST astroid-2.5.7.tar.gz 352082 BLAKE2B ca52339422da3a35cbe34e4b216dbfed3979dce96a8d5fcc508083c0ef9509c491e78dcfea281b79b07fcb7289a9f40aade0da21ca38b6abcf7025b84909a4fd SHA512 17fc185752510396fda9cce842df8ba72473e469b61c037195a9d6ff72af3ec8d3df01bdcf61d6059d4f90c95278928eba3e3380048bf5c6b4fa2a3c9b267176
-DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
-EBUILD astroid-2.5.3.ebuild 1111 BLAKE2B 5834800bf11748b8c7090be868e482733daaf6ca567f288f754a352caf4a8acf2758702dfd86da744bb3c5f8e1609336de19dbfafa98956d40810b48002b02ac SHA512 a57a0365c892129fdbcc700f0258c830e0fd1a45fa354e2b17630dad27b1846765366dd5e1f4736a0b535dace1488ef2d20bf2979ec9c875727450c49c32d4f4
-EBUILD astroid-2.5.6.ebuild 1198 BLAKE2B 8a6555fcbb19261889ec9ebb482d800b001b9d916ed1001a5371225026c063440897decb2cdb51de77a5ffdbc84617572166c6e7021b8d54b23ef10148e52f0e SHA512 2d412f46f147d714719c7501cb04d4bc72bf1feb0f49a22af4cce003e8ca13efe0eb3e4f2e624ad4ffbdd113e64710c8eb7d0aa70916e56f059c1d8c909b5c1b
+EBUILD astroid-2.5.6.ebuild 1191 BLAKE2B 375a0f2a91178e9c08211ec1ab11dfff40009bece3be7466a109743db3bc78e9f0d13240e910867ddce46d49f65828632bbc4dc3f696609871b74f3d70b826cb SHA512 b548a364d9d5b94cf31712912319688a893dfe3e2a212f562b8d2f622ea22b85152d5f816996ffb8e31d898aea56f70a3aa6178df5fd4323e864743621c8d57a
 EBUILD astroid-2.5.7.ebuild 1341 BLAKE2B ee60d0e8fee5fef7bb8f53b5792c8862cc568ad6b147cee743e0c65cb12931c7fa2866ca196513b22884928d0cf7da23f86666e34e864723ca1d75e65cba5ee2 SHA512 22af5d34ed87dd6a3b14ecef3b085aac0794dd18fe215e72217d6238f202c3ba03199872a9188328ac5c72498aa1d7b9c3b5d860949ca8ff4d31e333c6480224
-EBUILD astroid-2.5.ebuild 1830 BLAKE2B a35caaaca26422269b69e090aeab58f3bbd7eaff296d19af8bbcd18ad9d321844dbbae11fb5a5e8127dc7198e29d0542a03d6d99581235be60e95670e241547f SHA512 487c40073e0b032c8e5a9f45ec562954f94d4f9d9fc2ab5799df8c576f4cea5237b91838044654dbe20d2acea5e9f7455fd3b6817292564dce31b603815ec5e2
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.3.ebuild b/dev-python/astroid/astroid-2.5.3.ebuild
deleted file mode 100644
index 2622684a306d..000000000000
--- a/dev-python/astroid/astroid-2.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		--deselect
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker "${deselect[@]}"
-}
diff --git a/dev-python/astroid/astroid-2.5.6.ebuild b/dev-python/astroid/astroid-2.5.6.ebuild
index a1a4c659cf62..74cec72405fe 100644
--- a/dev-python/astroid/astroid-2.5.6.ebuild
+++ b/dev-python/astroid/astroid-2.5.6.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.5.ebuild b/dev-python/astroid/astroid-2.5.ebuild
deleted file mode 100644
index 54a703340a6d..000000000000
--- a/dev-python/astroid/astroid-2.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/astroid-2.4.2-no-pytest-runner.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r -e 's:"(wrapt|six|lazy_object_proxy)(~|=)=.+":"\1":' \
-		-i astroid/__pkginfo__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		--deselect
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_args
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_fields
-		--deselect
-		tests/unittest_brain.py::TypingBrain::test_namedtuple_inference_nonliteral
-		--deselect
-		tests/unittest_inference.py::test_dataclasses_subscript_inference_recursion_error
-	)
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch
deleted file mode 100644
index cae04e05a33c..000000000000
--- a/dev-python/astroid/files/astroid-2.4.2-no-pytest-runner.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 016fce18..a6825d8b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -30,8 +30,6 @@ with open(os.path.join(astroid_dir, "README.rst")) as fobj:
- 
- 
- needs_pytest = set(["pytest", "test", "ptr"]).intersection(sys.argv)
--pytest_runner = ["pytest-runner"] if needs_pytest else []
--
- 
- def install():
-     return setup(
-@@ -48,7 +46,6 @@ def install():
-         install_requires=install_requires,
-         extras_require=extras_require,
-         packages=find_packages(exclude=["tests"]) + ["astroid.brain"],
--        setup_requires=pytest_runner,
-         test_suite="test",
-         tests_require=["pytest"],
-     )
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 5976c7cc5b93..60060506926d 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,3 +1,3 @@
 DIST atomicwrites-1.4.0.tar.gz 11790 BLAKE2B 98a262f46acdfb94f56175368bebe3dbd5d46c1bd694362f5c9211c7be2016821c9a833f1061f41f77adadb3a26b6c6d3ac1761a13bec1f9ac2c3c0a35a58ad2 SHA512 493fd15174880917650643db1fe85e2703add730189c23fcff11ceb87175f546b9251050ade506d0b48300e0f2a39ee5a4dcd4da8cb3e27680fd05553d6662cb
-EBUILD atomicwrites-1.4.0-r1.ebuild 564 BLAKE2B f965dee1fe423d796ec5f7fc8bb1f43b77453c74dd19fc44e826579da45a143c8697081c8dd2017f513512ecf0d1d778a7df0ab54221b3af64002b32e053b999 SHA512 e8405fe277904852b9920e4599af1282254de29e8eac4355544ebcc105e24daeed760ebe3b7529c9f09a1e7e20c41b89de1a49262f09209d1ca08ad880f18c5b
+EBUILD atomicwrites-1.4.0-r1.ebuild 564 BLAKE2B e4e6d7b78c3357f6d7cb7ad664bb51b5e97dbd58eb92ec628e0578f5d736bae2265167d60f611329b27bf4c3b8458152e45d113db9da31836533b4bab38e26fa SHA512 29f9d1c46b94fd960128d96af4c1222eb33f3a9db66679bc3524b5f6305e97a1a72554fa6bb842c4b26af88a561c27266dea8628ddbfeed44c208d5046ae28e2
 MISC metadata.xml 563 BLAKE2B ffa883428c4ec7d5c5eae8233a498ab7bc8c2497d48c2b928223129e7a90b3f92b5f778d1838bba84330a07d1e68875374ecf9162bb3d4797bd9f12ff87a4eee SHA512 62f4bbd25c63975370e0a68bed597840b8202eb7b168aad660902f105a8b073b1be0ee2cae56f925a142b853e1aabcf2813799befc3e3b8b189b5e74285c34eb
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
index 66c76708768d..9a602787b4c0 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 91c252b9b905..3f6ab6481ec5 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,9 +1,3 @@
-DIST attrs-03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b.tar.gz 170688 BLAKE2B 1256cb115b3613929f9caf7f31907a51c9afdd5f6e0a10a172089e920d6604c41db3fb11726ab71a698b4ff9e6420e827d5ff25c4127ef7c6cf12536a66a9bb3 SHA512 3007f8c502c0bcd2481ffbbb00bec4ed677d1be9514e417670c4adb791dc67eee76b8a7c07a4a972cd4ece3291e2c996944bb1cdb282682086551cbd571a0011
-DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
-DIST attrs-21.1.0.tar.gz 187841 BLAKE2B fa3c4294d5b4f01ec7a8903cfdeb2ad37a77ac6a3d37cca8e559226ff8c28be989128132c0cc8a08963b095f2dd1b279522f5fe93b0ad497a030a09291f1056d SHA512 32110d74fc578a94edd959868cec491f22b9f63637fea72522980e3c1894eaa7ca4fd3a4c0a3f9a8a6d10d9186e6f04c52a18b66698947efa13e0922d61e87be
 DIST attrs-21.2.0.tar.gz 184694 BLAKE2B 5c960f7c1a4623186c7a0cec8a9096df8df8e7d3022b67b281dcdd3a512ce6f105dfdd5ec10dc85a2b9971564f44e7b4474d760667e53cd2cf0f0543153eb6e2 SHA512 35863f599076357e40f72a62968f4a2f9bc2af9f59f484fef051be4f9730ce9e28e11568915d690ade7980df8998af22e2ff8b9568a205d7745e246ba5f3a7e1
-EBUILD attrs-20.3.0.ebuild 833 BLAKE2B ce05df27f8e418a6bf0862c00136c5d7629714d67bc0eedcf064d449c031f6dbb1cd08b562ae4123cac790bd53dc3a4bf4f5586f5bc8b6ba6b08fed023249c9b SHA512 5080069c8c25c9fa7311b7882baf115f2f65820095545aa471e5b574fe41b86ac756f02c2c2afe41b25cb744ed5e990a132b18518e2b08e3e570058aa7e2e30e
-EBUILD attrs-20.3.0_p20210222.ebuild 991 BLAKE2B 50a53ee9050d38f8a3603cd3f0e81515c4ae82b94c07063a1c2a2c3bd6e2ecbed834d6347a3d7d8f292eba41540c9a906b5e136b9b56a62a3a54de5c2efcb457 SHA512 c732af0c18ac2da05389d493c9419a847e809ef7b34d538fd439419fe0a7a4c2839fe19772c62f8661820bdfc95f0469fee4c8f52513486182f1fe2599caefba
-EBUILD attrs-21.1.0.ebuild 842 BLAKE2B 4f6a9f503fd54f3cb9c8cbd131bd1ef06fbee8aaa425e1599cfe039163520c808eefbf4a5eec9c8574209c69f1c40fcdbb4d99c0e3a09a503d2c09fa5c985843 SHA512 4bf5878fa38487239e553d2e9e7f249f98934db5dcb2d497a6d2178acd12aaa967efe612730f2fdbaa562c981f125873ca27b4e5aba1ca73ee4d162b8b07f110
-EBUILD attrs-21.2.0.ebuild 842 BLAKE2B 4f6a9f503fd54f3cb9c8cbd131bd1ef06fbee8aaa425e1599cfe039163520c808eefbf4a5eec9c8574209c69f1c40fcdbb4d99c0e3a09a503d2c09fa5c985843 SHA512 4bf5878fa38487239e553d2e9e7f249f98934db5dcb2d497a6d2178acd12aaa967efe612730f2fdbaa562c981f125873ca27b4e5aba1ca73ee4d162b8b07f110
+EBUILD attrs-21.2.0.ebuild 834 BLAKE2B 8f0f084f77ecc36fa86224d54fed167f261f2d2849f93ed574e8515ab71ce90bff54378355a37a7d876e702d5108d41b2f443e10dd8dce89ece2e30449cc6076 SHA512 8d79750bd49caf82bdeb3bdb9c1b4fce1afab4edbb23de615838727ad7de97789241c9338a8db256c931b7821d6c46f43a8ad561f8f10bc76835648a04a92913
 MISC metadata.xml 520 BLAKE2B 48d3940a42f60eaa0359e1095eebfed747fff50cbf51f3a7bf2f8c569340e7474a4e5b4ac98ef24ea2ac21c4ab77d6a04b9a0ba435578826f1c3e769e79d7435 SHA512 d1c5ca93d410b922d97a6dd6dda32f4c2d1c47ec686cadfb6bda0846a5b623cdfd09671eaa6ecfc29da0dfaedaa02eeeeda24bbf5e97b8aa2fcd6beaaba95177
diff --git a/dev-python/attrs/attrs-20.3.0.ebuild b/dev-python/attrs/attrs-20.3.0.ebuild
deleted file mode 100644
index af3ec98234cb..000000000000
--- a/dev-python/attrs/attrs-20.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-20.3.0_p20210222.ebuild b/dev-python/attrs/attrs-20.3.0_p20210222.ebuild
deleted file mode 100644
index 33b6eb24790b..000000000000
--- a/dev-python/attrs/attrs-20.3.0_p20210222.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-EGIT_COMMIT=03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/"
-SRC_URI="
-	https://github.com/python-attrs/attrs/archive/${EGIT_COMMIT}.tar.gz
-		-> ${PN}-${EGIT_COMMIT}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-21.1.0.ebuild b/dev-python/attrs/attrs-21.1.0.ebuild
deleted file mode 100644
index ac6abdcf46ed..000000000000
--- a/dev-python/attrs/attrs-21.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-21.2.0.ebuild b/dev-python/attrs/attrs-21.2.0.ebuild
index ac6abdcf46ed..9dc86dc85f16 100644
--- a/dev-python/attrs/attrs-21.2.0.ebuild
+++ b/dev-python/attrs/attrs-21.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 2d1f68e28519..4fe3bdce1b42 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,3 +1,3 @@
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
-EBUILD authres-1.2.0.ebuild 553 BLAKE2B 0201cc3c4adddbc73191f683efedd53912cfcd878c176903e481be3dda01c67a763dc16cdaac72c7cfa64a50d0e1b01643284eecc8acab3ac0f127081c960aab SHA512 60063592675b7010ff6b0f86e239bacc4790acfee3b3b033507e4c1d70c0782ab0ead01cce19dbcbab1b2e958e235d3f5b26e77bd8395e87d55fa817dc698970
+EBUILD authres-1.2.0.ebuild 546 BLAKE2B b0d91da6e1744447675c74732e997596d177fa8a6cf17341050b35ccd6e91af702d1a538f3239e69014f802468809f161ade549f7c79f0ef4d5c42b87a2b7207 SHA512 1045bbb9e81ed1735c0872e7afee49e67c3bb9e9012167dfd71e3bf9aa31f3a9569200ebafef9141f6979dbf359d0afd3676b2d4fd6040e296c24965c7bd91fa
 MISC metadata.xml 683 BLAKE2B 8c66c741930afb427905ccbca0c529b1d8f1d53dd4e5b90714675fba5fae17240bbf4e4262b3dd4740c66fa54b936ed9bf2c027b52a43275d717dc0eb9f9062d SHA512 5070d5e73efb249f4f15f5a5fab3340fb64797ae728b30ce01c99ad6b8cff50d8c0d8455dd5c555dff5c953d35b2705196f5fc47faf1e8dfd4dcc6c071e71f6b
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
index 49611c6558c7..3eb7608b317a 100644
--- a/dev-python/authres/authres-1.2.0.ebuild
+++ b/dev-python/authres/authres-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 KEYWORDS="amd64 arm64 x86"
 SLOT="0"
-IUSE=""
 
 python_test() {
 	"${EPYTHON}" -m doctest -v authres/tests ||
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 863dd3213a94..cdebc7a66544 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,8 +1,4 @@
-DIST autopep8-1.5.5.tar.gz 117991 BLAKE2B 74e9bfed663d68f4a73088fccd879c538d40c564e7527b067d549a15361dfba2adcb853a8895fc61da50972f947ce23900f8067f5b8e715f73d6a80c6c27ef5b SHA512 9982271805131a7330d4a2a46eda65c05f079925393686f2df7eb92dc9e172003f9d788663cb8c0c8849dbae4f64c518c310eb65c3df308a12700abab084c39c
-DIST autopep8-1.5.6.tar.gz 121134 BLAKE2B aefeb4cc53ac66fb6eaef4d7af286d6249e7139e5409fe6f6b3568f0c6216d758dd73a950d043e36b6f19cf5de83f62e28ca318c45a7e40ffdeac0f7a9e06cdf SHA512 d283c3e2021025097c6b2f95faf7db12664b7d1f69f82acf9fe94e20fbd49cfcb28ad47437aa3148503c59cf5c2690a842fd795f869731290c80dc9feb86637b
 DIST autopep8-1.5.7.tar.gz 121537 BLAKE2B 06f107cab210258fe71b8e912312520797122fd38e3e67fa0d6cf640806690e1255fec63c74c11ec39952a4a50964a3f622ca1166d29299c4f7a7031a1013202 SHA512 b8fb8b63400e74ea978f576cb47c99b0a4bb15a5d1cfeb6ffc25d2ecdad301762f99ddff5c75af3900b3560797d9289a15bbb87ddcf74077d39bde0abadd4da7
-EBUILD autopep8-1.5.5.ebuild 848 BLAKE2B 611f5c07e00f65d96e6b9937c3901a1e8eadbd5935305930f5cd51dda81d08161a936a826efc84e360b3200c642e3eb0e17fd13129596a8ba410734090bafaf9 SHA512 e2676d967fd0e231c6a10ea09f779bd9248d531e881d35c841f6062058d2bcb3a683745076db4c2a468752d7a15c5c5fa34e3c307fe3153cf63aac8aca9f1c37
-EBUILD autopep8-1.5.6.ebuild 848 BLAKE2B 205cd40a83de7fe8682c537ea8134937a3673539eb9dc349180fe55581f11b4f8de67e386536dd6abaadfaf23e26639bd6e625a71042245b0a3ec7c9bc7cb1d6 SHA512 dbfde3ea39422b65a370043e0f970a1b2d959e478825b1462107fd7f4428580f32437fe6ed6a58062912f94a69fe31cbf91bb44df2dadc897bc48658a21ba349
-EBUILD autopep8-1.5.7.ebuild 819 BLAKE2B 227e3e1fbcbf9ad1b46d6906afd3e297e0908952b1008caba6929855d6d055dec0c41173bb6e0909199ece7412ef6151c94acddb849933df1b206fa03a188e79 SHA512 70ffd4093b06a99ab068992569aa3aa141d5612da0c4451e59e9080111462ee471e3d8a91061a7a56e31a6d8df833e4c6d226c6ae1aa860cbb5a59786e114a5d
+EBUILD autopep8-1.5.7.ebuild 815 BLAKE2B d184f19b981e804c6f2ad1ffdbd55705aac904b29c1bf356f27e1e0c82833cd11980a525871ecd510caf4f52c06afd9f5522f6de8eb2f62b768fed90a7a16356 SHA512 cf3b19a0565741f455ff9a6ec5e677393ebb4cce3a79381a911d5ce8446abdf7e15070c8df31db3c4bd807e8af418f8ef8e512d8e962efc401da73bc3055a768
 EBUILD autopep8-9999.ebuild 819 BLAKE2B f5e3ae9fa936bc8265acfe2b8d15dffde30c039758de979f8ecb9f514123750205b85937930f291d083448a266ab183f2db4e1672c9129219e9fe43337724077 SHA512 f201ff2476aff8d1126c59300741556bd6d774c8c000044f2de27390a58708ee144ad8baae49c7f2b507a0d9b6e995ef1b31f4e041b31829046a4f7ec723e430
 MISC metadata.xml 403 BLAKE2B b84ac94eda3fac9977c2a936d006626b0fbc918c24d8f08f4b7620b778ea5ffec298945bbe6baf5353fc00888ee97c7f3c48493ab1c83ebe1586a9196da13a59 SHA512 7e2fd3edd7e82fa2474441a0e54ebbca38dd95f2dba7ba717fd839cf11bd21cb00d5ee56c7b8dc1b377e24a33b098d2932cc06de6c367e1c812b448a9395f18a
diff --git a/dev-python/autopep8/autopep8-1.5.5.ebuild b/dev-python/autopep8/autopep8-1.5.5.ebuild
deleted file mode 100644
index 861696f391a8..000000000000
--- a/dev-python/autopep8/autopep8-1.5.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/autopep8/autopep8-1.5.6.ebuild b/dev-python/autopep8/autopep8-1.5.6.ebuild
deleted file mode 100644
index 6c9336c713fa..000000000000
--- a/dev-python/autopep8/autopep8-1.5.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/autopep8/autopep8-1.5.7.ebuild b/dev-python/autopep8/autopep8-1.5.7.ebuild
index 809832964cc6..e0ed8e204c7f 100644
--- a/dev-python/autopep8/autopep8-1.5.7.ebuild
+++ b/dev-python/autopep8/autopep8-1.5.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 7d8637725a2f..a5556d0f46da 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,5 @@
 DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
 DIST aws-sam-translator-1.36.0.tar.gz 878204 BLAKE2B 027837687709d2bbe166d4c40599156c8075b1902fe9f75aa5f29bc1f725e2cb97a1f7020cba2f75d5a7180e658e1d47cf4ff03ff3336b0ac21458426f6241fa SHA512 8af9e54d9a02ac3a315b1274d71a5e7413b5a39c6913036f0cc57cf1cd94d6d079f78e4810d5b501003bf5b06a4f25c2481c8abce0836c01da6f962dc0163651
 EBUILD aws-sam-translator-1.35.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
-EBUILD aws-sam-translator-1.36.0.ebuild 1332 BLAKE2B d4a6f42398e4886fa6f7e102c5b5a6d7cbc10cc0b4f07050d5c0fa85607d767a1dbedb30fe58781465a826008df77d9dbc13dece02087a482481c4ce12c082ad SHA512 9f3e91c9b7ad3d160258b36b72383a4ce605d4a62661918201f80f4392fb59a8368831d64f4bb287cf0be019940125c9eb5be2c4ada1a14e524146bc4b0b8e8e
+EBUILD aws-sam-translator-1.36.0.ebuild 1216 BLAKE2B ada96426305b989e71ae43b086230e4033bad4b426c01500a0a98692796eebcf1bd1a5aff3b3a211121330a74ef2b4d7835cba8c5899c6393b6c9a2b40cae2b9 SHA512 aede80a780473633841976a0a6355ce31bac5e8862692556b0af76577c7bd6653a194152f7c008d298f5a468b3c0ed7b90b9812e62f90fb795709d3ce8099311
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
index aa02cfea0947..aa73432a351f 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
@@ -36,9 +36,6 @@ python_prepare_all() {
 	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
 		-i pytest.ini || die
 
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
 	# deps are installed by ebuild, don't try to reinstall them via pip
 	truncate --size=0 requirements/*.txt || die
 
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index c2190cf3fd16..3b6f51300536 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,5 +1,3 @@
-DIST aws-xray-sdk-python-2.7.0.gh.tar.gz 265934 BLAKE2B f697c2bbe21db4b20b200ba9e9c264df81e3a6ff64d73639756d8f51a1abe0ecfaf1b852a3befde535757dfa3f75348e2eee1d5124147f04d11f5b5f20976b95 SHA512 d9ff1a190e5503f904258ac47cd7b1c686a9c74d0699f69f053df19ec7ea197da1c9c29a97624ff0758346a0dca9e3a292bf54ba3f340fcd392248602a85bfd9
 DIST aws-xray-sdk-python-2.8.0.gh.tar.gz 267880 BLAKE2B 7a433a0b1b3ca38a100f3b23c79e9b0d7f84cb096f6d30832fdf16f171f9528aee8b81aaf3ba263a90d46f791de8b2f37a919651f9699e5fcf3073db83fc25b4 SHA512 e0fb3fb0bfbd963863714537ea12771df7ffa2857aaf4cdb6414d71ecdfc65c2623fa40a6a48c4eab30f4370d545a595db2762932133a6eba56121a4048502fb
-EBUILD aws-xray-sdk-python-2.7.0.ebuild 1891 BLAKE2B 6e46f1947edc500732116be631caa143b0aadd685365274d76e3ca57019c9d689fecd5bcaee83d406aadcd9dbdef5dbda23a79d27b586c7ececf11ea67431954 SHA512 f779664389e7ef9de9d2d4a4184bad281c8000ec682b38a638df367ff517e42519a4dd108ee3043a8346cea09faff3c0da146047f9ca7b126fb65be52232fb29
-EBUILD aws-xray-sdk-python-2.8.0.ebuild 1961 BLAKE2B b7a5fb71d6916d2421d067144249ade2514bee0be5fe53f7403c1329dac1435088607472c51ff5ac37f7407c334207c05da9328523de1fc673e1b99007c1f086 SHA512 2b2a2e64b7fd949e9aa414afabf7b1579fa67af55fbb10b860968db8ea93dedb28180851cfed140234d739c0a2d84cccd3a8e8b49f93fca1ed7181ae42eac3c6
+EBUILD aws-xray-sdk-python-2.8.0.ebuild 1959 BLAKE2B 4cbfd1a75bfff81594827f5e30a620e2e77e79ff04e477c23dc9b12712b6a21d97fca09737a21125d4f276c5f735a7ea6b81ab03d9f479d393534ad2e59ce8a8 SHA512 801b8ce365aa8f8a8cd8027e58ad06d3e6bdaafdd1b552eded48769e6ad02ed41178e2cdb790a2aacdce9522dfd7cf1c438be5ee575dc88a307391bb972e4c27
 MISC metadata.xml 477 BLAKE2B e68a8686e491164d7f547d858c230a47290cec6062dc7feff60322135dcb269d59ee0b53208d8eaed14eb6b3c03183898888bb42663309818010a6ab3529b45a SHA512 fdfad8d869df01fccdfd19b3395374c67793cc2c96f9e8e02962921d8357df5ddb0fae391907c7f1e987ae57618616a3263a1f0dcde0a8f84576f605ed15ae34
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
deleted file mode 100644
index f4c4bc8ece02..000000000000
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="AWS X-Ray SDK for Python"
-HOMEPAGE="https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/"
-SRC_URI="
-	https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
-	local -x AWS_SECRET_ACCESS_KEY=fake_key
-	local -x AWS_ACCESS_KEY_ID=fake_id
-
-	local args=(
-		# unpackaged deps
-		--ignore tests/ext/aiobotocore
-		--ignore tests/ext/pg8000
-		--ignore tests/ext/psycopg2
-		--ignore tests/ext/pymysql
-		--ignore tests/ext/pynamodb
-		--deselect tests/ext/django/test_db.py
-
-		# Internet access
-		--deselect
-		tests/test_patcher.py::test_external_file
-		--deselect
-		tests/test_patcher.py::test_external_module
-		--deselect
-		tests/test_patcher.py::test_external_submodules_full
-		--deselect
-		tests/test_patcher.py::test_external_submodules_ignores_file
-		--deselect
-		tests/test_patcher.py::test_external_submodules_ignores_module
-		--deselect
-		tests/ext/aiohttp/test_client.py
-		--ignore
-		tests/ext/httplib
-		--ignore
-		tests/ext/requests
-	)
-
-	epytest "${args[@]}"
-}
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
index f1434194a8ba..560c3e416dac 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index 09d3463003dd..0c381fe1b517 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,4 +1,5 @@
+AUX babelfish-0.5.5-py310.patch 1777 BLAKE2B 0d3871c4037f159a8e20f96e3005f5984fd9ba4cdc7364047dad74b4388b8a42bf264028f64e73de10903886bc9fb082e8eadc09268c5a2b340e11a940e92faf SHA512 194050cdfc90021d0cfdfbb3fa620f46d3fa96dd601ccd58a0eb62b75d7569952ce7560e8787a7ae51b1d86a305883bf2d13818eac62507ca4284b15a24b23a5
 DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
-EBUILD babelfish-0.5.5-r1.ebuild 461 BLAKE2B 5d5ca29c4b43332d8ce49d6b994949dd592a84a7a00f11b7cef034c77df60b3b632fe0430c7e6e7b29fd1e3a65edc005acf7b8e6528feb75143dafbbf3bdc47f SHA512 52797ef04dd9346ddf50b8b9ca523deda8e64d9ed3518a9a221be928767b80a634180b2248e323a4bbe0e82e6fd356dad3a2761acf5c725fa69131207185bba4
-EBUILD babelfish-9999.ebuild 435 BLAKE2B 92e29c09eca9a5362b6fabc4e2ee7eca4820c9d192b0762465fb2846295d57754f2175d35f0df72d632e1388696aa2f9982a1d6bfef75afd428c621c0119caf6 SHA512 89d6949ef625f4e04589c5bd62bb50cbd28ce3713a7f50090cb022fa05eff427c27f11773310fd2e3f41aea519b880327b1923376e798972caccc472f0120a04
+EBUILD babelfish-0.5.5-r1.ebuild 506 BLAKE2B 34c92e5aec893e8862ee9c9925b7cafeb72566c83ed6ed135a93ff29c002de913c9659d3494b2975c0e786cba84ef208d10eaa844b70e0eeca4fe7a10f190fbf SHA512 c5873af559df194d4eabdc5613c633799e4be5fac487e92eda693e808f252b39ed8ecf2d4fc36863c0c67507b7ed462dac571885643689bbff88dc1ffa3d2a0b
+EBUILD babelfish-9999.ebuild 435 BLAKE2B a091661f9f47b0d53b6db1c30cf6b907675647dde51d24089b91c41877bed820c15dcaf651f5f9895d557f66f4911d7e79539c43ec57c9c3295938c94f5edcd8 SHA512 b5f99bc67286f2681e2c2c796db3e982be47fb4d632fc2ab36deb4d5051b033989992bb41cb9bef6a753582ae75fc3f1f930684692f233bce0b6c885c1c69106
 MISC metadata.xml 391 BLAKE2B 50571e0848293806a2da838c5c50c207f0440ce080c594dcee6033d7fd676e58a556d8e0e30e03f83b89fb52e719f9742812e80e69a3ee84ffd205456f62ab9f SHA512 38a98f9e4702451aceba493adeb2284bbcd86246b48fecffdc40d997a588a7db3168df3c966614884a46980c83233aefc62644226b9771250f7c04dd2e215494
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index eafdce09e132..5e101e351f9b 100644
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -16,3 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}/${P}-py310.patch"
+)
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index 382197499a3f..78c32c6b1e2f 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/babelfish/files/babelfish-0.5.5-py310.patch b/dev-python/babelfish/files/babelfish-0.5.5-py310.patch
new file mode 100644
index 000000000000..3acd3c55132e
--- /dev/null
+++ b/dev-python/babelfish/files/babelfish-0.5.5-py310.patch
@@ -0,0 +1,51 @@
+From 7667fb3179e421d4af78821132db8e2557fa2dc6 Mon Sep 17 00:00:00 2001
+From: Hugo <hugovk@users.noreply.github.com>
+Date: Mon, 20 Jan 2020 18:14:46 +0200
+Subject: [PATCH] Fix imports for Python 3.9
+
+---
+ babelfish/converters/__init__.py | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/babelfish/converters/__init__.py b/babelfish/converters/__init__.py
+index feb687b..d27f849 100644
+--- a/babelfish/converters/__init__.py
++++ b/babelfish/converters/__init__.py
+@@ -2,17 +2,22 @@
+ # Use of this source code is governed by the 3-clause BSD license
+ # that can be found in the LICENSE file.
+ #
+-import collections
+ from pkg_resources import iter_entry_points, EntryPoint
+ from ..exceptions import LanguageConvertError, LanguageReverseError
+ 
++try:
++    # Python 3.3+
++    from collections.abc import Mapping, MutableMapping
++except ImportError:
++    from collections import Mapping, MutableMapping
++
+ 
+ # from https://github.com/kennethreitz/requests/blob/master/requests/structures.py
+-class CaseInsensitiveDict(collections.MutableMapping):
++class CaseInsensitiveDict(MutableMapping):
+     """A case-insensitive ``dict``-like object.
+ 
+     Implements all methods and operations of
+-    ``collections.MutableMapping`` as well as dict's ``copy``. Also
++    ``collections.abc.MutableMapping`` as well as dict's ``copy``. Also
+     provides ``lower_items``.
+ 
+     All keys are expected to be strings. The structure remembers the
+@@ -63,7 +68,7 @@ class CaseInsensitiveDict(collections.MutableMapping):
+         )
+ 
+     def __eq__(self, other):
+-        if isinstance(other, collections.Mapping):
++        if isinstance(other, Mapping):
+             other = CaseInsensitiveDict(other)
+         else:
+             return NotImplemented
+-- 
+2.31.1
+
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index acf26afb0691..891db576b866 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,3 +1,3 @@
 DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
-EBUILD bibtexparser-1.1.0.ebuild 554 BLAKE2B c8da668485d980fc2fcabde8743dcc4d5d18dc7b28bc5a627a28fdcc1af1749b802f46bf6e07fa2301286e9f14da494648cc7f70a42efe433f231de36e71d428 SHA512 955862dea72be8f701f10511b0901a17d4088272c99cc8c76772257ce80df1f9ec3ae6b2faa00038d4d5768ada24b990b61411697e62daee0004c033720b1cf9
+EBUILD bibtexparser-1.1.0.ebuild 754 BLAKE2B a71827b9a9935c9b1332b13fcf698a71c5ee118feef195d69672bd5fb1d376e7a805253f7e9020eb5d37dee777af5d34054b388c7bd9971f93730f61f9809756 SHA512 5476178fc2f8b85f8e4488bd5084daf112e424e71922b4a325acd4d28d93eb8551654c23798c857dd4d824c02b491c5fa0ffd41df388d808bf18833a837100f5
 MISC metadata.xml 395 BLAKE2B a90ac8a252adbf69d27b96abc5294fef318a174dea0cc54f57987304bab488a9f38a1eedf2595cc98c492df11da377112636e901e93c8dee9bd07f5ba806a513 SHA512 8134c9842f5db5fb3f23d737ae26ae95a5d0a916e9eb0aae15f836c2e6cb4f3e8123725d4ba542ae4e4c4b8737e8cc00890a32d315f58cbc3999011214b47b71
diff --git a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
index 070a81e1b0db..89963f80b88c 100644
--- a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 python-r1
 
@@ -19,3 +19,10 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
 
 distutils_enable_tests nose
+
+src_prepare() {
+	# fixed in upstream 5f98bac62e8ff3c8ab6b956f288f1c61b99c6a5d
+	sed -e 's:unittest2:unittest:' \
+		-i bibtexparser/tests/test_crossref_resolving.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 61967d763932..05a1e06fa555 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,4 +1,4 @@
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
 DIST binaryornot-0.4.4.r1.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
-EBUILD binaryornot-0.4.4-r2.ebuild 798 BLAKE2B 3eb6c8e097a49cd48f35cd57ed6682e1658e9fe18d548a12421eb9ef3436a9f20f820dfc2ade83f7a38722ea2fb949e84aceeca043e606e5c07110f15e78fdfc SHA512 977df2e0a834613fdb6b4a850dd5c92dfbdc48f2067b798f37e638ecf8b5f04f0349597ca24790b1e74e26d49704cfa522957ee6e93b601578a7a1ed4dfb02c6
+EBUILD binaryornot-0.4.4-r2.ebuild 799 BLAKE2B 949b0505ca66fbd56af7fc08188cb7c59428bd9e7d1de86720fe190254bc77119bad3d2ddc883033242d5b858abc79ff9627b093766fb458d82f3d5bb97558e7 SHA512 a5f75ad7af842d0a154543c6eeb746e4dcc92262fa132393bec5048cccb7be01a7df8dee5615eb12896b5620174f5feaae8fb28a3c696fc611243b0c652bc810
 MISC metadata.xml 403 BLAKE2B cc22b681c189bd3191848e29b7702eb7e2b2c8fdb7b85f33b8df9372170663610d48c10545776c71d2d8374905613f864757f9acd1f7f8fc31b2eba7e0f1d1f3 SHA512 24f9eb00e18e218bd9c59df90ce8dd22faefe53ad6b93714ed3539c4d0cce7e5578028680970a8061020a3982dd7b1f5a294d6c9cd0d3906c85a4a6c42880a64
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
index f53260760261..30a0c7e21fb5 100644
--- a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 382e05400756..28a620cb1f68 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,3 @@
-DIST bitarray-2.0.1.tar.gz 69368 BLAKE2B 4acc490998e058e3882db2d58ad80b8c275999f49a7a76604091beae8015e7290691f6b34947c3376795b9dc5643592ab7fd09ef5a482a29e4e154616926e444 SHA512 091a0e7b1ddbdb804241eb4f51c9167dcfefb55d5bcef1eaa617ac77593a58113b47f57be83ceed47a91bc5d8d15a8a2e6053a10243323b9f7c0908444ab03af
 DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
-EBUILD bitarray-2.0.1.ebuild 555 BLAKE2B 4f7e2046976d57a5add057dbc5fbff927a02ec2047d981db903eadd48eb1f0d24eb7e6392df94f1a4c1d5c117e628f34300649ca6d52c2b2f0fb707dbc5ccb33 SHA512 dbadef341d58ca5ba03615f7c775c4be0215c31c88ba6bee3ebc8295436b2719d71ff01ac41015f7d5d7b3b657134fcc5a6d73635dc8976b4a9e55a0a416dfc4
-EBUILD bitarray-2.1.0.ebuild 557 BLAKE2B 8f81af04ad46b51cf1bfc379351aa819db64227ca7be4f102dc2b7f8c23a85be90870a1bbaaf70b7520ff919799cfec246687752aff39809fc7dc937c04e8c6a SHA512 71f2b2048733258c572def3cd92a47cbd45305de8fe3a2c13076ac97ffeb8e248b8d1fbdc1bb8f9fc5a82c64d669b5bcd68cc49992d32af205a878081f443d28
+EBUILD bitarray-2.1.0.ebuild 555 BLAKE2B 4f7e2046976d57a5add057dbc5fbff927a02ec2047d981db903eadd48eb1f0d24eb7e6392df94f1a4c1d5c117e628f34300649ca6d52c2b2f0fb707dbc5ccb33 SHA512 dbadef341d58ca5ba03615f7c775c4be0215c31c88ba6bee3ebc8295436b2719d71ff01ac41015f7d5d7b3b657134fcc5a6d73635dc8976b4a9e55a0a416dfc4
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.0.1.ebuild b/dev-python/bitarray/bitarray-2.0.1.ebuild
deleted file mode 100644
index eadde2209108..000000000000
--- a/dev-python/bitarray/bitarray-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.0.ebuild b/dev-python/bitarray/bitarray-2.1.0.ebuild
index d45cb4b43340..eadde2209108 100644
--- a/dev-python/bitarray/bitarray-2.1.0.ebuild
+++ b/dev-python/bitarray/bitarray-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index c8e9d92da8a0..67571011d038 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,3 @@
 DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
-EBUILD bitstring-3.1.7.ebuild 608 BLAKE2B 658b7476d4015f57c1d1f427c4a29e7f33e717ccf76652cf68959c0fd46efedf1637a1c1ee43a226a2508cac2e31a63f49c24cbf110b9e3c4a253a1fa71a8a6f SHA512 e01f5886dfe096d502d877e0c521fc9c3fecc800cdcb3cc0f905a21de18962e0a523413fcc8478ad0a4185c1182765218216480cb3bd5bc025e53d94689f0270
+EBUILD bitstring-3.1.7.ebuild 609 BLAKE2B 0df85b6d07998bda4615101776e33312bcc85da3fae9ea4cd1358cdec33405ade6f7999c050d8d7ecfc95e62e02117427e43305a01897f631730ee8b9fc88f8c SHA512 f6506e19231a6ad124693af8baacbb0251573e431ff83a5e7d34306355393ececb3d7166d640fba61545eeaba118ff26ea5f889e231c99de06ecf27f89708987
 MISC metadata.xml 732 BLAKE2B a9b70595fe02e148ffca9507d10b32167a12f8c96d10e5c37a33be5c469d450ace9f58e0c2002334c2519c2927b2f074f0b38ba46fe8404353737ea65e09993c SHA512 c192d76abacb6e82cc65877ed9cf211e79e944aed79242c0a01808dbef8c2ec2dd5d254c0022cb17d5acae33fc8065362f0c4d512f3f440b64e9247daa52d557
diff --git a/dev-python/bitstring/bitstring-3.1.7.ebuild b/dev-python/bitstring/bitstring-3.1.7.ebuild
index 44752fc4cc6f..f3abff5bc825 100644
--- a/dev-python/bitstring/bitstring-3.1.7.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 039232a47dea..c62c9b3a7305 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -7,6 +7,6 @@ DIST black-21.5b2.tar.gz 1143836 BLAKE2B 90e24ef83241dcccfe9c43e62e8369db8c96186
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.4_beta1.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
 EBUILD black-21.4_beta2.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
-EBUILD black-21.5_beta1.ebuild 1577 BLAKE2B a2b7fff6faf857c077f9655ccebf82a603123f0611450f2431e8197f0311e6f25e7ec9420e9c7faecaeceb83f89b7cc4d0f1dacf71c3eb885372b92e0e38234b SHA512 c0bc951cb9e1502e3bff52ffe8a1120c95ca2e8299b02ff3850cbba4a536e37c5b47f5b7e59a8e10ccd32a602a7eabcf31d70b6ac64b47d6001b8ad141148882
+EBUILD black-21.5_beta1.ebuild 1570 BLAKE2B 36a46285c92482e188e63ba6040fe94befb6bacd02cc0be842d3ea61a0d96f6efa24433d86119084984c27d4ad2ed00b8c65b72ab09c1a15fd2a88d1e3c5d044 SHA512 3d7130a3f28e142de9b53328ab88bba1a69dd0c3dc2ad41fc370152c7d03fc78dca81a50130fcba577769097b0555ff078b6d1a4cc4437902dc563a45c6a1b7e
 EBUILD black-21.5_beta2.ebuild 1544 BLAKE2B 7e8af30c33fda87f7d24aa2aa396f4cf748cdcd862ad747b7e012dae3b3b65c9c2556e3fbdd5bf5bbb6e79a4e3c0293f035cf1547664a2517aa0b9cbdc694337 SHA512 461b9e04c506c68497e0cbe6fd7eb6cc5f6f6ee36cb2596916f4dd0cf0a59479b112c1b03e8cd6d7d621a0690c315fc2e6a3e57a74dd4c64b8a3d345c3517746
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.5_beta1.ebuild b/dev-python/black/black-21.5_beta1.ebuild
index 2d7f8f18159d..56f28c5fe855 100644
--- a/dev-python/black/black-21.5_beta1.ebuild
+++ b/dev-python/black/black-21.5_beta1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 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 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 79938b179f3d..d18bd13916c8 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,3 +1,3 @@
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.7-r1.ebuild 864 BLAKE2B 899c123cc31121feef4ca494ff30953d78bac4aea8c748c5acf99e28bc18e4174f963a6f282f410181b256d2bbd5dea08c11ceab44cec02cf3c541821caefec7 SHA512 641a73b4d30796c56d3f77495a560b8647d35b44458744aa4ddbf83ab64eccf604ecd92443fec634f172d3d59bc2f7c1f766c4816546da689c34998a8b50ac10
+EBUILD blessings-1.7-r1.ebuild 865 BLAKE2B c38b5d255776817a9e7897a5413584ee575b79840b8081ce95dcfd6b6ab0d3b89bce2fd794cf7bdb863a05c5a1568c68509055be725db1004fcf355e6eae1d34 SHA512 d2b4c58bdb263be1f5aa6058772901af9a0e88ea4a5fc099dc771319b9e0f5c4aa18591c1c8f59b31d6fa7066766b11f6e1a8f12cd81c9dda23d582caafb7400
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index 218d3a9a97a6..6b58627ad2dc 100644
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 55a8b086cba5..da6ddfe47cfc 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -9,6 +9,7 @@ DIST boto3-1.17.84.tar.gz 377284 BLAKE2B dbbc6b8643b720a8a5409c334e268b6de465e7d
 DIST boto3-1.17.85.tar.gz 377940 BLAKE2B 7fdfa25b7fd6467f484dc988bac280b0e4e7044f2a064625efdc5e6f9725b038f08b88f63442452b151541ae4f0ff26ae395816f6422b49474d2e8d93df3a7da SHA512 126e78056b8ac52cba3db5965563c4b6c1451f5aeba2d7d775f358e75f810229102328230e0f5dd1ef3767468106f1d7f3af5575e51422c6b63ef6b509318e70
 DIST boto3-1.17.86.tar.gz 378144 BLAKE2B 35d6bfec515c985ead488811e7f2ad021f671e8eee1e63ae1aaade8f4a03dcca228483ec81c4911d12c290b3e4b3363ae92e9153eda83a638258394d0c7b4fcf SHA512 0b267b2333925e830237c830ef5258fa8834fd584f6f4132c012141b4ad5e38b6e6977de019d60f0ba93e3c8b4d9a1036d0c989366145a9d25ac0e5e7e4d39ae
 DIST boto3-1.17.87.tar.gz 378759 BLAKE2B 21ad4c735f34edbd82767043653ed0cee9604f0b36328f40cb22c4f9cd57758e0bc89ae93fd798babc1dded019e2b1531bbffa0574edd7ce3e07515374cd97cf SHA512 da3f2cb772d3f9708f5cbb102907ef58622435d4acdec8fe0abde80511f0734e6cc9739f0652150edc9e4f12039c0c7ee62bcc0059b42d86d5af0e809d779fab
+DIST boto3-1.17.88.tar.gz 379248 BLAKE2B 1aa238efaf5a22594b90903e1090f4f66a04effe93c3506ad36e0a96aa607eef9506f6fc579981a919b0f55ab1ba7a5d7e02a22a3d2692a9442f143a63f1b282 SHA512 989f8f879bdcded758f7b0be93e9355f91be859de7f2eabc7760cb8ad6e3317fa999cc5c092aac53bb2645ea0a86d0a6ceb03237b5164b89850b8c34d3eebdb5
 EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.78.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
@@ -19,6 +20,7 @@ EBUILD boto3-1.17.83.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb76956
 EBUILD boto3-1.17.84.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.85.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.86.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.87.ebuild 1342 BLAKE2B 9911e230e74b709278e256fe2dd9963a843422496a91b402d4ccedd30c716f3be0cf65bf075cedf0c1e08663c51c975c35602b844a9c4fd594eb4206550d194b SHA512 5a0a26292b57d17c1ddc603d99d3531628d15b85279d4b48871a4c144afb978e45fb9114db9f716017d96073b61ada302e375e802e6b7b330a0ec528d0845590
-EBUILD boto3-9999.ebuild 1342 BLAKE2B 9911e230e74b709278e256fe2dd9963a843422496a91b402d4ccedd30c716f3be0cf65bf075cedf0c1e08663c51c975c35602b844a9c4fd594eb4206550d194b SHA512 5a0a26292b57d17c1ddc603d99d3531628d15b85279d4b48871a4c144afb978e45fb9114db9f716017d96073b61ada302e375e802e6b7b330a0ec528d0845590
+EBUILD boto3-1.17.87.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-1.17.88.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.87.ebuild b/dev-python/boto3/boto3-1.17.87.ebuild
index 984809e5128f..666cbfa63e3f 100644
--- a/dev-python/boto3/boto3-1.17.87.ebuild
+++ b/dev-python/boto3/boto3-1.17.87.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="The AWS SDK for Python"
diff --git a/dev-python/boto3/boto3-1.17.88.ebuild b/dev-python/boto3/boto3-1.17.88.ebuild
new file mode 100644
index 000000000000..666cbfa63e3f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.88.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 984809e5128f..666cbfa63e3f 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="The AWS SDK for Python"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 4f5758591a61..72aa50e1ade1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,6 +12,7 @@ DIST botocore-1.20.84.tar.gz 7792555 BLAKE2B e9459fad976bb81541ce933666edccdbfe9
 DIST botocore-1.20.85.tar.gz 7795550 BLAKE2B 483b6fef456de9a37b00dbaf0f2af766079447f70fb992c96f0ab8208c3ce0e39a459d89a29e07b7e9fed9e1b39ddfeac28c3de5bfac1ddde1aac2cbecfe4056 SHA512 1a3e07da2c1b60680c858e4b732fe340563b18ec10aad7a9250bff7e7a11a97ccd3e952245187b90fe84b2fddd8f48568d70d69a03612782da5d90a8e2d06de3
 DIST botocore-1.20.86.tar.gz 7798788 BLAKE2B 93450262bf1e34a627a64f8972e4d8b02dc24e1646633e89d4911751b0c919b9dd3515021cfffcd0c79223b237a8bb283220f6793c8e411d399a75321cd7b369 SHA512 fd630d93645861a94173a38b50c7b2ef1c646e33ad30d75eccb4b92bfa0ce08c06ac39ea6bb38f7e5c551f625b919b00170c4a243e67d5d66789a011ee5390a1
 DIST botocore-1.20.87.tar.gz 7800088 BLAKE2B ba98b0f910216a340f48adb5ddf14aa9239ca44202641c97ca91da69f34a67716c50d9bc6a330021fd630f7c309062fc0326543e46ee1207c294870baefd0aeb SHA512 b922e40030a1708ce2e5a2fa60012e21e28b955c6d30fbced5d1a93dafe189e83430b5cee162e2ab73e80c7dfa18657c2ca42057c17e943c0d421c6cd9969b53
+DIST botocore-1.20.88.tar.gz 7806185 BLAKE2B 21c3e3420fc9810712a462cfab4f43509ebd25a4cbaee4a51f2d82cc90a530c4a170b66cb6551121148d284404427eca7d9dd979ead5a9f4132ded47b4adf180 SHA512 aa36c39147d870758b9561e569f6b8a616e69437d775b1f68d522574a24f0e8252e5332d6e20b92448bc3189ec50232d89134bf86d12a3b72d63962de0d9cda6
 EBUILD botocore-1.20.54.ebuild 1541 BLAKE2B 2a87a90a023a6f4a203b686d8ebff52dcc013ecd083a103e6b77f9f738c4cd9fbb04d6c8a63311aacb867f46328676c296c0ac0fc7c8923eeea6b310295a9bb2 SHA512 293c8a55e0f1c424026e395c05e901ce2f233a42b1105d7ec03c85a99c7f111a4701553598e009210ac6f7517ca7d9849592b81ca7ec62d99265972a7dd5cd00
 EBUILD botocore-1.20.74.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.78.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
@@ -22,6 +23,7 @@ EBUILD botocore-1.20.83.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502
 EBUILD botocore-1.20.84.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.85.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.86.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.87.ebuild 1515 BLAKE2B cd9cdd65aa72b4dd472c87f8893f4761618a2c5fe4e7e6f7291a57f0c792ebf9feee9073cb9917cec338d84e0b29c13ab032a095b06023c73d6fe2b89cc83a85 SHA512 3c51dbb18eb3f0dd6dbc6423267ef2ea56ed9849179abc059fff5e45c30d2c2278ac46404313aad375cf643e4ed473bfee3f6c63cf13ff8147d63ec0fbb9435f
-EBUILD botocore-9999.ebuild 1515 BLAKE2B cd9cdd65aa72b4dd472c87f8893f4761618a2c5fe4e7e6f7291a57f0c792ebf9feee9073cb9917cec338d84e0b29c13ab032a095b06023c73d6fe2b89cc83a85 SHA512 3c51dbb18eb3f0dd6dbc6423267ef2ea56ed9849179abc059fff5e45c30d2c2278ac46404313aad375cf643e4ed473bfee3f6c63cf13ff8147d63ec0fbb9435f
+EBUILD botocore-1.20.87.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.20.88.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.87.ebuild b/dev-python/botocore/botocore-1.20.87.ebuild
index fd6eb700f304..762144aabf71 100644
--- a/dev-python/botocore/botocore-1.20.87.ebuild
+++ b/dev-python/botocore/botocore-1.20.87.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.20.88.ebuild b/dev-python/botocore/botocore-1.20.88.ebuild
new file mode 100644
index 000000000000..762144aabf71
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.88.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index fd6eb700f304..762144aabf71 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 2a64cdeded1f..85bda1754557 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,7 +1,3 @@
-DIST breathe-4.28.0.tar.gz 187954 BLAKE2B fc17eb9fb47f01907a3edeb316a427c9f06b802189cb860fa43bf7333a2897c36b2ed6ed008ca30e6e5c856d10fcf55df53ed05997ea60c29aade84cc1e5111a SHA512 a02ff717e4f50d336c91aa943a6a15b7ad834e3896d63c3ec31b3d10ff098400c53fb80fd3441e115194942722e5fce8f9b858fc3a3ba691aac900e0b415906a
-DIST breathe-4.29.2.tar.gz 190695 BLAKE2B c3ecdc02f7ef8d83a63d4c6077f3ddfa794ff9113428a0686e37dcb281bb05a27a885b0664a3eadeeb2efdab5b51a1164c93fe67954bc3e71f54e1c6bc114c84 SHA512 1a47a36f9ebb4c863dd3d06d19ae1dd18af3b9468561f2b2370f57da8573faf4489ee3f1c9aebc84d867a51a6a7032d1a57a3430b804c5dd5886a0fce4c0adfc
 DIST breathe-4.30.0.tar.gz 190892 BLAKE2B 19723ed2f979eedcab73a9920c37cf6d3f6e02ff08703d601cc38fe55ecbac28b8ef8d319205723fce75b5e679a75fbd8e712dc134358e1ba6c23dfcb999a472 SHA512 fa09ee687a8e67fa480865a0d33affd9aa0ab48b0cb5b685731ec393045d8c9e1ae0622a1315f805449d712e99e6982ed229bb79314c69f69da0c705d075f7f9
-EBUILD breathe-4.28.0.ebuild 834 BLAKE2B a09da622d4646499b9c537c885b285e8278f300a6716868c4f050e7ca3d0b9a94d4f7a683b07f819e0b8a86e8b7d9def2fca888cb7e284a03a9fdb3e0d80df7b SHA512 a7650e8e0a6bbee6797c8fe0c8e03acb1d0e49c85e4d6bb26899c62cabbae116198e22b2b342438bd67d74d22ffcdfd16f731db9af9611b6efea7c9273d77397
-EBUILD breathe-4.29.2.ebuild 818 BLAKE2B 188022411f27208756d58061b7165700c928ebf75188e8a72ef3eb6225cf08c889717dd685cfc1318614e5e420639919f685afe940cf5522bf5cf9ae5eb323ff SHA512 ed554d7c0f6293d56ec6f91b277bb7110a9d32cbd8feec666f09441cd42bdff982b50733fe38d773bb8cc2d8a20683d71bf120b60f3ef96866401adbf28bb88b
-EBUILD breathe-4.30.0.ebuild 818 BLAKE2B 188022411f27208756d58061b7165700c928ebf75188e8a72ef3eb6225cf08c889717dd685cfc1318614e5e420639919f685afe940cf5522bf5cf9ae5eb323ff SHA512 ed554d7c0f6293d56ec6f91b277bb7110a9d32cbd8feec666f09441cd42bdff982b50733fe38d773bb8cc2d8a20683d71bf120b60f3ef96866401adbf28bb88b
+EBUILD breathe-4.30.0.ebuild 812 BLAKE2B 14bff5c389afe107bad563dab70edd042e7b9b7b0284f886fccfa51a221821cb4dcb00287cc27f0f612369f4c788f6372b5f8ca380fe922a5d82b03367b8ef25 SHA512 c7fe00015618bd0cf3756d7df994e25ac5358ff6c00f7da6e9e05dade7b16e13f5ce27f7669ea642d2e674f1f766b763d7dc73eb1ddd8956fae480f3dc69d28b
 MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.28.0.ebuild b/dev-python/breathe/breathe-4.28.0.ebuild
deleted file mode 100644
index 74dfdea18311..000000000000
--- a/dev-python/breathe/breathe-4.28.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.29.2.ebuild b/dev-python/breathe/breathe-4.29.2.ebuild
deleted file mode 100644
index f3976fca0bf2..000000000000
--- a/dev-python/breathe/breathe-4.29.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/michaeljones/breathe/"
-SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/breathe/breathe-4.30.0.ebuild b/dev-python/breathe/breathe-4.30.0.ebuild
index f3976fca0bf2..ec91bb36a878 100644
--- a/dev-python/breathe/breathe-4.30.0.ebuild
+++ b/dev-python/breathe/breathe-4.30.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index d474b16e1827..ef7b4e706055 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -2,5 +2,5 @@ DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a
 DIST brotlicffi-1.0.9.1.gh.tar.gz 22589 BLAKE2B 14ebb3f6168d334abe3ba72bd88697ee98aba87ace6aaf634395ef50ecd9325723f0da0a9ce56a5e4dcfebfe3183a190e2ec183eff95492b25e3542161b32322 SHA512 669c73ed6dd18be6b916bb8cfb240657dcc10d67df5a32b3359f05cadf75aa654c27b53e8b964251f6d6cd74870e159efddf87ef0cfb59b7777eacd3cda66852
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
 EBUILD brotlicffi-1.0.9.1.ebuild 1423 BLAKE2B b9ae8a682323abd0a1fbd306554f7bc0c81cad737ed613154678690b91c5294d59fe824bb4e922e7cdf22a4113b63bb6e49663edcabbab8be88fffc683ac12e7 SHA512 0f39e19b66b0675c0ffd2ce374ce609bfad05f0369cc8656cea8edad6716d2c0b959b8b74f3ecbf888311b357ce735fda91b6a31bd44f15d47f1c3ce79bbafd0
-EBUILD brotlicffi-1.0.9.2.ebuild 1389 BLAKE2B 60a2ff3516080b4d06721fa22282550cea6f77744048b6ec0ca09dfda61a02bdaf58d5a5d027780ea87d33b2aeb5241e2c1d8428a9947307ba2018602be04453 SHA512 e2dc1dbba5c440c09e9e86a22af89e2900e97b6515e0f897c1d7cca500c978867000e80e9be3b1cdf1906327fc110a94cd956cfeee2bcd694b0bee2200d7e66e
+EBUILD brotlicffi-1.0.9.2.ebuild 1382 BLAKE2B b9ebfde8ca4fcd73badbbae9b5cdb672e0787880ac6e3922cc35aef73dbc8d3d39fb33694ab9f02a729bf27dc431c4775ffe9d12cdd1d3032cfe805c63223e06 SHA512 e1f17c1a90fa7b4edb15c9d865aa4095f9eab5c476c146355965bf6ea04962871d044480a41dbee7f25a6af3ec8767483875ae0ffa47ddb1dd06855dceb95f34
 MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
index fcc4dc52ed60..ec85dc212f30 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index c6e36bf47565..34df9be0e666 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,4 +1,4 @@
 AUX cached-property-1.5.1-test-failure.patch 366 BLAKE2B 1df343e43fb74df2913c222d2a1f37e703de34480e325df68feee7575682005be6d0f41f34e553c3ec2cde11c6907b1d79a73e67ac88c5691e366b7bc64d6970 SHA512 bf005bbb986140dab7949e015ee9453081b72a9c377b6f330f8ffac10f73d7ec0e2a2e20c9d65879c3c18b3c4b2735b3329b30f48e1e4bd01ece475833f2a58c
 DIST cached-property-1.5.2.tar.gz 12244 BLAKE2B 26981dcfa51925741962c60ad8659a165af6d7f242f4abd392932aac20e966ad6c1763a25184bbabdeb5bd75f8063a430c41f0241afdee8013ffcb437b3ff7da SHA512 626d98a8891a70d858269859cf4e49416464c836d073c1331c21033a4cd9e0e47dc89b53bf393375439992f4993972517dc3cdcbb2cc6f8286f282d3c973e600
-EBUILD cached-property-1.5.2.ebuild 739 BLAKE2B e5becd5d436481d5d976acb4a9993ff53991afdb7137deef06dd43f38676f5a4915334162db8f297c356a03b06673a2d707cd613052a831a0ebfa8576a46b070 SHA512 7adc000ee312491c7b44539da7d1cee0f2cd677be023966b509fe4986d7d3960e7d9122c2fe258b7f3a0a32ceb827ad677462aef336c0e4f05388369f78ae69e
+EBUILD cached-property-1.5.2.ebuild 740 BLAKE2B 7a14e80d2e41af7729ff3f87bc48883799c3ee44fe99278951c66b8f21a10a56b5d769ba6cdd72b943dd70e3192a490c1229c00b6e76e3ae58e8234e655f22dd SHA512 325b9af04523dd9b5035379f95a8455166cb27fa7df0c847fc65e9a9be3a3ab6af4e8deb31c776b8fbff473a108acd6cfdabaab867f7187e8f8ec6d5bbc5defc
 MISC metadata.xml 405 BLAKE2B 0320edf752069f587615589a2ae1ead8287893f715a7bcbd9639b20d4fd3a7d65c079b621639cae8bf69dffc713cc45932be03fb9c034ac02b827286e6f82775 SHA512 fce7e0c5467b58fbfd45e5a7ff8343fefb84d41fd617ad4d0f410babde067f3cf2ecb489bdb9f922e20ee56a1eccb2f6a3e496fecf355819ad459176cd327a07
diff --git a/dev-python/cached-property/cached-property-1.5.2.ebuild b/dev-python/cached-property/cached-property-1.5.2.ebuild
index f69508ef8676..cef671a3d11c 100644
--- a/dev-python/cached-property/cached-property-1.5.2.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 59be0737a8b2..5b4f474152c4 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,3 @@
-DIST cachetools-4.2.1.tar.gz 24753 BLAKE2B 90345deed94ea6d5ce9c4e3d609ae5a5a8e29f506e559c017fe24e5e8c73e056da4bd4d01e80ccc91686e03ff204e1918375b9701abd8ab571241d09c7556cbb SHA512 bf5a05fc513241f05e61547b5d45813308f20a58319d1c057f3269533a55b739203ba74bc2360d38383cd222a148dcf192f6e58614258bcac2855b633145733c
 DIST cachetools-4.2.2.tar.gz 23682 BLAKE2B 7c1163d216fed3a5258ecb1c6306468d0ace8c629275cfb4f3aa3c4e6d9e2560683ac5504b0ee3439901f1e53b7428e27a78c909f6629d3b006610ec8ef35e98 SHA512 b3aa68cecbd9f20e0ff482c497c5011f4d1bfe4ed106914433c6bcaa203fb29592e056807767efdcea0cf7dbd3a08f3edc9c0ea8b328a1442792f9be2049c860
-EBUILD cachetools-4.2.1.ebuild 419 BLAKE2B 6e4f39e42ad7ac2d499372e585a5a752387e74e330256abba4893866d69c8a115018c71d5209f30d9fe6ed54f9a64135cc7d7a6f0ab5f2f396bd42bc0f764a2d SHA512 8571ea3c64d2a126c1ea7256aaceee63acde2e122f82abcb78b5b18439073ffa92803e9d9026ec5c8ff890f598f5eecb5c1af436630854983fa122c063929380
-EBUILD cachetools-4.2.2.ebuild 422 BLAKE2B 93a5952ff85e0d94915c584f50d44aa10384e13799fb193d7dfc5f6af385cfb17f5350781cfa71429ec72b22f7b1e0c9a4057ae3c3e8a363645722ad0ccf4be6 SHA512 4ea8cbefeef5854b7d2dd1c057917835d37b0d5b38df8bc432580e52fb7194647edf7d983a5e9e964ad977cf7ad880fcf16f66b6222d8edc387ebd375ebb5fa4
+EBUILD cachetools-4.2.2.ebuild 420 BLAKE2B 03a38bdb288c65d3173e58149163fedbf711d64ea77aaaa3399dbbf14d869e4f1188731c0dca39bd930cac1de4b96e954798bdfe3ddf8c5361fcacdc86bed365 SHA512 ed72ed6904d4e4543dca1cb13141a0796d9444c5eecd94ceb39028b1a9cd1b22ceea7516c25d410f829de5a2ae47ba941efdaac252c2653ddcd349b968761147
 MISC metadata.xml 507 BLAKE2B e295e40137fa41a22fbefce74c8eb04bd0bfd920dec5e89bda3c75a524f274aeafd651187e5b86df9a16b63f3ce16e11dfce32aeefb8b7a4ee720283fc773304 SHA512 9d3503941a0c1200e22840f3886a1938c0fe4d9143eb511007e4156118878b39494b4917a68c9798e4a4e24d8f19d18eeef98fa4bbf53e61340c4505ae35bb41
diff --git a/dev-python/cachetools/cachetools-4.2.2.ebuild b/dev-python/cachetools/cachetools-4.2.2.ebuild
index 3f29f4a1e88a..752e73e57ddd 100644
--- a/dev-python/cachetools/cachetools-4.2.2.ebuild
+++ b/dev-python/cachetools/cachetools-4.2.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index a4a76cb936a2..b77a3b3ad48e 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -2,5 +2,5 @@ AUX cbor-1.0.0.Fix-broken-test_sortkeys.patch 1621 BLAKE2B 37336807f72b9bef9be36
 AUX cbor-1.0.0.Replace-deprecated-logger.warn.patch 4012 BLAKE2B 443f5a7bf3b30b8b3b313321c01cf48ffb09326f38f524c45dc2cf33de497097d8276f7f4add58b981fac6a6322c8ae5e0919ba854912af3babe4906bb4a4be9 SHA512 02b8bae3c269808884d9c6f23e3ff429f6e11b6ed3d41da0f2e2c3f69569af434aacd9e6c9115c65869b499c32d7cddc20de5a721d89ea7e7ed9c669348ed276
 AUX cbor-1.0.0.zero-length-bytes.patch 361 BLAKE2B 5422309b2a1f40e6553107380548396cceaf142f09eaa776d415690e71bbd5c7d6899a2c38e43ee479a539995e4c1a3816467d19a9ecfdf084915a6047f20e4e SHA512 cc1d11a5e8169271d3a35a41f850e62de8ebab0d3e2e23e480c3aef08c2a77a4670173523564c8c3abb3f021565acc088ecc3a0e4957c0ccf4a7e0a41c7aeddf
 DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee SHA512 88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
-EBUILD cbor-1.0.0-r1.ebuild 1249 BLAKE2B e726ec4e78d6d6918faa7865394bdb2cfc954307e33afa86d7685b1bf8f092fcaaa70a6231d212936f016e03756251dd7b39c8d7b0c6ad71278ffae4cf00797b SHA512 8b0f94dc4211282a0031e2978a0c6cce7a383e9ddf4ec82d4aa817c683fab39f5c3a2dac1edb93877da84d27c05d1893fc255bd1e6997f52ab019d6af81f5d34
+EBUILD cbor-1.0.0-r1.ebuild 1249 BLAKE2B 45f27793614e765ccab2120c18cccc875fe509d3c037f2668f8031475d9953ec72596579d9ad6822884b0f9e96934d1fff424836affc5e00964bf408e8269846 SHA512 e325f1ad9fdf97a5965f65f04e57e033caf9551580abd648187a1a0764b282b2c81c9f241707b4d8f3909952120ec3a6767bcc415277ff45803e112cb773f27a
 MISC metadata.xml 999 BLAKE2B 46bdaf98ffe5045cb76897112d80887e3b96f6f87b864cc4af8217b918351e37e87a06d36f2a8028a69f75198904228b275243bf6947947218ddcac67e4d5626 SHA512 c79ba66b6fdbfc112de321697eaacaa6c2f5ca40cdbeca4c5d606e3b0c76371bb64d0e62270a3c1315ff058f5f66b5515a214f8e1e4214b1213790262f24efb1
diff --git a/dev-python/cbor/cbor-1.0.0-r1.ebuild b/dev-python/cbor/cbor-1.0.0-r1.ebuild
index acdf39159d1d..cf4921fd765c 100644
--- a/dev-python/cbor/cbor-1.0.0-r1.ebuild
+++ b/dev-python/cbor/cbor-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index b4de58c8ed44..4768150da777 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,7 @@
 DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
 DIST cbor2-5.3.0.tar.gz 81162 BLAKE2B 41bb0f74998260e2612dbd1990970554b906eaca40e52c21fd90d026ce0aad706830b98f10a226bdc23b819d3f1c52f93f25892a1de04f2a673b4d150a5c47fa SHA512 05eacace46c4b2f7025f12613ae6a755aa7fab14f15d0131d4d856ec5c37bea547d3c4a8afdde28c8653139be741f47351de5460df7dd3ec662325c8d1e2f3fd
+DIST cbor2-5.4.0.tar.gz 84850 BLAKE2B f615667fbf0a823606d55e36de42af6ff4cdc0f039e540750ec2663ba660bf11f26b75ed21ffa61ba6de05fcb6eb76982757321430506a4cfde11c1487cc788c SHA512 9fb110ebadbd803af94bbe5b6f35bf6d28dd2c30609d1bacca08dfa01efb07e670fee72aa29010ef6c64051eda6e772d3ada0fd64c444ccc0e94061483131c60
 EBUILD cbor2-5.2.0.ebuild 894 BLAKE2B 36b608216833f231b1474c89d4eb003114e1b1de750ff2044aab51af212c48010275d67ba2849063bed943b423d6cede889cac39bd0f0b215dddd71e213a138f SHA512 32d3439ee5126da0d3574f81683c1b776a8814e7c7fe084f12f54dafaec703c6da3cd10e365ff371bed5a24e5da954399724cf6384417cf69e384fd85a12700f
 EBUILD cbor2-5.3.0.ebuild 956 BLAKE2B d084c44504bc9bcaac1425ed500f4f4f7aead2791155ccf06f46816693775c30f3f0694fd05ce0681638ddbb515aa0578237c92762db35b8e0a9f1a29518d414 SHA512 ccf5ed460c7fb3bd9a751bc9183fd2bca5cc456d4d3ff9736d7796c0b8ecafb42e1badcbfd64ef59d6ab7189d001783060d9cd551dcf553b289238aa796ad196
+EBUILD cbor2-5.4.0.ebuild 673 BLAKE2B 26851d5d6984b6ef4e452f040b404d99fe2b2b6e286e5b6142cefc16c96ba017e2921409ea4fa0876f27b5e11d30134e3a1fb8909f43bb8b1f8402d03154dec0 SHA512 f9bdcbc64d1e2401da8b1cc8fa722dcf6d6acf7778ef108a3b312dbe8944a72513f621a47d83ce1e7e82a48da54071f28061da4cc4a02dc48206d918131e4544
 MISC metadata.xml 994 BLAKE2B 1cbdb43b43bbbdc4eb6e316cca38500fcb11bcb2f4114ed4febda09976b992c5e033b42a8d2669c785a54d310c0513fa665b77f40784a91244942556c8dc0a61 SHA512 977635a48f9e914c7c6d9cdb7acdc4db5eef968214a3e814bd448fda55f418402672f58405278e3594b43cd72825e053cff0a3a38f31d556fb898a190755a4b2
diff --git a/dev-python/cbor2/cbor2-5.4.0.ebuild b/dev-python/cbor2/cbor2-5.4.0.ebuild
new file mode 100644
index 000000000000..aa8f211a2716
--- /dev/null
+++ b/dev-python/cbor2/cbor2-5.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
+HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -e "s/pytest-cov//" \
+		-e "s/--cov //" \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index 7f40857dbced..2e3f7aade35b 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,5 +1,5 @@
 DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9
 DIST cftime-1.5.0.tar.gz 44972 BLAKE2B 515b5025987373499af4ce7f7e1b3001112c5ce1810a7a4a7825f57163815f7784682e3cfdb97a23507848e64689d2e6433be406ca217beda513050bbc66ea8c SHA512 8607d12ac1333e47de1976b0efc96f0f2a141cff19291974300c23b35ea9e389e698de0dc8fe5303b2686c77750e8d4017670c697de16d989c689391109ec510
 EBUILD cftime-1.4.1.ebuild 640 BLAKE2B 210f22b81888505c817c4ce42144fffc9525f63be92b298b7c2a4df85068a8963cbad77eb9535446e0ec0061d1d75559577d09d9b905c3180ae7203e68f701b9 SHA512 a9e5653b73c8d4c931cd7d5909b41f0c6c04252e26ccffbe703a18541f5c38347ad002015ea67cbf71234e3bc9b8b7ea2df6cc895b15aee4792bce9884067d6c
-EBUILD cftime-1.5.0.ebuild 641 BLAKE2B bc5965355fee55317d94ebeac822eeb51bc222519537526a0db300b3258a8799cb97e9c9cc03e0aa63e0b336cbaeadfd84041f2111cd5fabbf1030e3e10044ea SHA512 b39c513482f910d1b57443ec09143a8120b4c5b5eeb7e603f9a7d4eec42502eb06081144c671cfac64f24a8f13dfe329dd09536b564835d0d049e6df713ca5e7
+EBUILD cftime-1.5.0.ebuild 642 BLAKE2B f131dd822758220568edea3edb091ad3e61182db865bb22edcd2acc0ca653e63c0bc3d6967f527e6bc0f56459e856f3df224301739c510db3eef6b33361e39d8 SHA512 22ff72a1ec16a9daf2238f3028e51d750b196726f042642a576a79f94fc03359f1892c235623556211fa5f7ac39445a4f0e1bf07dfd8669a902973a9276dbe5a
 MISC metadata.xml 477 BLAKE2B 2a58e3eed817ebe59f85ab9a43d5c4d89cc46e492808baeeb52b5f35d2b1002cd9b219730be561b79aeda8f13432027784e3eb6f0731db2a755c749ded6ca919 SHA512 5a7cedba92edbfd654eddb4b76177913a8dfe88fb634b184c773460d549822488d832946af3247c5d11fe14626400e81d804cd106b92566cbf6fe6601deaab69
diff --git a/dev-python/cftime/cftime-1.5.0.ebuild b/dev-python/cftime/cftime-1.5.0.ebuild
index f192f36b4209..d0836a075a12 100644
--- a/dev-python/cftime/cftime-1.5.0.ebuild
+++ b/dev-python/cftime/cftime-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Time-handling functionality from netcdf4-python"
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 54ecf6ba26a6..35ed34c19d7d 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
 DIST click-plugins-1.1.1.tar.gz 8164 BLAKE2B 48d75b9445b72dca41516fe81d02c6fad8089630c0d49963f559a847b90c7897c8db64773c4ec5f4c162d0f2f4fdd14fe212d485765d38977145fd32acdd0dcb SHA512 bbd838f50603ac4e76daf3535fd5d27a17e17549addbc8b582df6d6193b4f07d743101ce52f0b71f326995fdfeac159805025770350ca2e7697f212dce0c4b1a
 EBUILD click-plugins-1.0.3.ebuild 510 BLAKE2B e63b33d0247a3c3c26f8a16e2d30905eac38f3acc2f4c45209469c4ba94de8a283c1b24c3f2a8d7667478383c39f402252c24170780642a356c9f80019cb76cb SHA512 71e97d7ba0f48147f701192e90564c4e533b6fc40b2782d4c6c29daa37ae9ee00a90782042388835b1c5b665311771eda4cfa66b531ad44cf9095f1475b222cc
-EBUILD click-plugins-1.1.1.ebuild 543 BLAKE2B 471f7a8f04381974c6c437f4f274c5732fce7a1f9e8d8dd5ab5b52031b556a7dd661d4dfd0c8b8d2c515059f33aa26dcc0c04313ef9c9727e7e16564782d6b17 SHA512 64f25d9cc6606180b802144d8b3f6b7b83a98cb286f38a4efa663603d14768fc2956870e1cdb855a1b7a4ce9ece25add5cfdb19e719560b3779c46bc565c9a47
+EBUILD click-plugins-1.1.1.ebuild 543 BLAKE2B 6706cbf20fad1b49db48693caf05ee5510da160886749f1e6b5230ab48fecdfa3a6a3a869454f3c63e8e5d99c7bb63673274a0411a4a97c367bd4b8858ad79eb SHA512 3ff0a846ed78f19a6e37c0b1b6b9c92f811bfac8b505b04c5a96b2d950dd57bbc6cba4aad61fed7c85e2d294d58ab9d1366b1f2c44b48f8ce01dc4d4bbd4ab1b
 MISC metadata.xml 310 BLAKE2B 6b5b9178909dc6dba63fb0395ac30ad3de9510ce33b933052450f3cdef5bcfd8b67c161ca7c050f7124028353608e21aa24d48ba98dc2048f6d476ce716c4a3f SHA512 32fc9c04ab42bdd5c246166e5e2c44e4b1b8f6dd21cc5ce6cb291bcfbd6babae60d998dce4196a83b5968c63e517132aab79472ae784019fe6fab1c1ad53e1c7
diff --git a/dev-python/click-plugins/click-plugins-1.1.1.ebuild b/dev-python/click-plugins/click-plugins-1.1.1.ebuild
index f6f8c4edcedc..e094bed0b0ad 100644
--- a/dev-python/click-plugins/click-plugins-1.1.1.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 425f4e9a0027..25516bdaaad0 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,3 +1,5 @@
 DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
+DIST cmd2-2.0.1.tar.gz 644705 BLAKE2B 5fa3b89d42252372b1b75863f8c1293182a555e6ab1b257f1a243c87685bd0aa643d2906741636143f7d3aa3be5ffea5f8616c25e99fbb8598573d3d1feada9e SHA512 880c5f2d80f81a850b545052df2bf3efaae8f44deb30186119a2d94277da59cb027da5bf35b2bc106b90c87883c8eec1a869df65988ced1b6a0d0c7e236569bb
 EBUILD cmd2-1.5.0.ebuild 1412 BLAKE2B 5e7640c0555dfa7f8b441deadc7fbf444f6ef7de931d070966695f9e6a5d842dd9a84d4108109fb38f13fa5f53ecf7b276bbec5af5bfa8f5850a777af6868a63 SHA512 aeda875bc85e14c6667953dcac3a1ddf14ac5a7a255ad7d7f46a1b2ee376528d13deb2e5c2b84821a53a1f845743818e614202adacf0bef49eba05054a173cdd
+EBUILD cmd2-2.0.1.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
 MISC metadata.xml 521 BLAKE2B 30386914ac906a5e6f08eff94faed7cc964475aca24a8055cd0636d602a1f8812936ae6a0560e7c31796d3461c07fa010e0b1d4d11eb1f6d3bbb6d414f475e5f SHA512 681e363e25381946d07e03d94649c8be03b50fa2415100be0374a69cf6225a284d37fddb002cadde62ba3ddba88e91c32d1d09e4a81266bd0fcf7eccab963bf8
diff --git a/dev-python/cmd2/cmd2-2.0.1.ebuild b/dev-python/cmd2/cmd2-2.0.1.ebuild
new file mode 100644
index 000000000000..3e35f0efcaec
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
index a649df021a48..484d7eadef65 100644
--- a/dev-python/configclass/Manifest
+++ b/dev-python/configclass/Manifest
@@ -1,3 +1,3 @@
 DIST configclass-0.2.0.gh.tar.gz 4631 BLAKE2B 8e273e539a9f3cce70397ef0bcc420ba7d5b2b007de490bc4347412546b6af0bbea4950218e69590817f41c884044bd7d976c6a188f8665f2de0bc173f1e9c8e SHA512 7f22679d3470ede4106bdd99f1216bc49631c32452dc681fbd6a6b91735bbc82db1babed3cd94f93a0f9f2915d0866ee18704ffcfe477fd3134b6f18a094d192
-EBUILD configclass-0.2.0.ebuild 511 BLAKE2B 02523335e3cc2f352c61082f0dd178e1adfb29d4c98d8809859500cba278bd33d670f9604eee9333cb38f2a2f1627ebcdada9d5befea06d101a805ce6f9d73ab SHA512 3a7253f92eb00746288ae33a97d26332aeb58bd5516ae6a1967be9ab90bbb247c555a8c4d2be8e88951db22462b47054f85428e26d383ee3d483b1278e226bce
+EBUILD configclass-0.2.0.ebuild 512 BLAKE2B acbcdd734e8a90c914dbcf236f1a2b86f05381cbf8c6d595e00f16066697a8101900547b4666cd22142c097675453253bdaaacaf1b61fee96d549a970f805b49 SHA512 e347802c134393b62e5d1cd84177d44a1a1024e7ea47b7033e872975aa464e618d6a18572fa245a0619e126369d45444d2247d608712b30e4ef5ae926eb18ccd
 MISC metadata.xml 401 BLAKE2B b613beaf2d6cf8f338a46e3ccaa9d35f2a725221119f37c3e076d002af317c372a1cac695edeb9a9937f68d184ab81807bc03567acefbc2c4c1446de7d3af643 SHA512 eafb2e973e5a217304de35efb417030cad5c034d7dc30ab89cb91249133130ce14f1879a9a7a67e6da9fa9c26a4f45185e0c7cf794fecd3c21b5bcd4dea1c9c8
diff --git a/dev-python/configclass/configclass-0.2.0.ebuild b/dev-python/configclass/configclass-0.2.0.ebuild
index ab98801f703a..b3fab3ff014c 100644
--- a/dev-python/configclass/configclass-0.2.0.ebuild
+++ b/dev-python/configclass/configclass-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index b38f8bbe4dac..cb402d56bf45 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
-EBUILD cppy-1.1.0.ebuild 449 BLAKE2B a0f5fc3e9a85bad250c51f9b19c3f98a0e4074c45eed04480d7507a245ade459bc31c6cc74b79dfd8fdb996bd785cce6978a00c883a4a113b8931fd94313162c SHA512 037478af21cee122c2402d82938b2895d1920f003f6177b3e191214e63562732a7939168e8af21e091f338be660402537e1236829c1b1f31c6e9e370f840a270
+EBUILD cppy-1.1.0.ebuild 450 BLAKE2B 88c90fa7c53d98d611ffeb8d863770327c1af9399c1cad9f5086f954b3526b295bd62a38049daebdc563a98531b62e728418987b84391b13500de2a59d0a4809 SHA512 44d829f6e7f18014a578bd949d11f99ee4f07bae1478e9b0d40d8d95d6d2cbdbcad9bb7cf219b8b7b8ce9d3042d55d047d179f84af978201732baa007d88471d
 MISC metadata.xml 601 BLAKE2B ea350b20df37a65fb695429ebfe7a7de8fe2c2611b20aed100aee0b84693363d1c3f4d16eec0fc3df0de63dfd79a4d4b89afb175698888fe64c847962575d6f1 SHA512 a8e798ad3e49b58041127be01d4256d62400aaedbdd006a1294df67afc4624abb8c55a847c7f9e75434b1b193a882902685d53ae183b415cd3bfe54dd4b6945b
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index c1be3c8163bf..5f9d6012ecd4 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index 7f95c6851086..738d9b23f506 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,3 +1,3 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
-EBUILD crcmod-1.7-r4.ebuild 509 BLAKE2B 799dbb559225259cafadfaae860f15f02e671658485856bfc847ea8dfc0abbb533295d6fae610440c07b590d488e994ab7e18bcdc3432c86a4e9194828db5e9b SHA512 310774f95e9ecf91368814c83bed202edba8571017706e6a5aa5e8f1af8979560a997af84fe844dfc8d5693c224686e66e49cd0eb63d0a6eaf075bf2b520c80a
+EBUILD crcmod-1.7-r4.ebuild 510 BLAKE2B 2e18cceba34169de5c76f6854b3b91ef226eaa6e80a1876a95e0ab1235a190574203744ac772a9683f02f1f9b8b2ceabc3b98696880cad245cd7813513a6779a SHA512 a364206d75b161f0fe733ab8380fd1cda3d49a01d02e7e6aaae948a6005452f5dfde6a25a8a2d7d03ac592e98ed1564f1c2402b123ad372b6614da1e82556f94
 MISC metadata.xml 636 BLAKE2B 069e35c666b73c29f748950d85e104a0df9106b579ff56a03fcd83113309781d822504dae0199d132cef3c7310ad4c4ffad5c225143c576232bdd3b7a4909865 SHA512 0791b8f3367307f2a8548557601a990a740cc13da7c3ecc65d7a50a521f264bf18dbfe03746190909e691fe6f800628409751cfa34449732d0396c2d3f7d15a6
diff --git a/dev-python/crcmod/crcmod-1.7-r4.ebuild b/dev-python/crcmod/crcmod-1.7-r4.ebuild
index cadce1f2c999..2f430f58105b 100644
--- a/dev-python/crcmod/crcmod-1.7-r4.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index daad1816ba7f..65efb9f9af78 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,5 @@
 DIST croniter-1.0.12.tar.gz 38763 BLAKE2B 28bb662b05d893c782807687261b3bdafa0b1412d98dc8ceebcc0d9fff941f58b22a3abf9462c0f601bbe8701460350dad70d1239aa4f28978444698836b87b2 SHA512 ff5e35ddb0a6080ff95155de2ac5942fa1cab827a4cbb6e639553f8646b89063d0292b7fd69bc38fca90429da0272f3efeeefe0cbde0d83b9915ecb078340f08
 DIST croniter-1.0.13.tar.gz 38907 BLAKE2B 436bb766c39ad61343913e354d0838458e56048115ed5d15ef95b0dc0c22b38fb4e7ec3fe6162856d208d45268fd360c8b18698b7c61bb0f70636b79a6a84988 SHA512 721749a268734e06776ab968a1fb01926f416e1a42678ee28dcac9b4655a92b5cb17984a9b9d886f8d963484f1af7382b17e72fd3998e3e1e8101fa5038a4fa1
 EBUILD croniter-1.0.12.ebuild 610 BLAKE2B cf3d4c1f620c95a3393fdf8ed058fbab4ff2945c569d142c880abaeffa51e5bc5ab4a21074aa7e4e5008ba2fa533ba1042a43e9f49c47133deade5d5d859a90c SHA512 a3107a73fc30c5a8426e250b4b4b6a52ba6b5622058ef82687ab9e6a216b171592ad087049664378ce22de19f2790f707a62fdc3c90ba99eef2d0642a9fb3d59
-EBUILD croniter-1.0.13.ebuild 612 BLAKE2B 98d29bb4022d9d184f3d83bcf11d1d507a3b1a57098e8206bab552aff48b3dc42ba1a40263b46c3f8c369c00afb51b12e63418a34d6981d91e9b8ea9a9d8fdff SHA512 71242c8babd3eada845732b6506d428540397e2df10e852edb447c56918907b68bf2d0551908bd5ce9a244fb1ef26f4805c817f4005ea67576f9c2496c401e01
+EBUILD croniter-1.0.13.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-1.0.13.ebuild b/dev-python/croniter/croniter-1.0.13.ebuild
index 0eecd9d8c05e..e9f104d3af45 100644
--- a/dev-python/croniter/croniter-1.0.13.ebuild
+++ b/dev-python/croniter/croniter-1.0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index c44246764576..6044144e6ce2 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect2-0.4.1.tar.gz 32756 BLAKE2B 86915c39aa5b72ebcdba25b3ac23f59a0fb6c6109019d68e8ce8846572d9412a3cc76cdf9e8b2163605cb942183019eb9170df9a4e61476d703eaf612381a903 SHA512 feafeec3dbe3157ee452d94cd391a09cfcb48ca8bd1563c117c77c9ceb01102c4989611ede39e433ec25d3ddda98a94c4589ccb290b79c729683e673763b42ac
-EBUILD cssselect2-0.4.1.ebuild 734 BLAKE2B 8fca28e712ac0d726f5f9083aadabee6650611924ece70dd5e48a8f2b9b91fdae0c4312d6515d10960ab7976a5b546d98e5c99b267a2ece493fc057b5ee6d628 SHA512 2838b45429c69e4b5adf38118937fbdd4d66cf914c783ee0ea0f024bcec37567469950fe363e03c34848cac67efaa4a52834ec73f79288bd4ee3c4e7b0f25194
+EBUILD cssselect2-0.4.1.ebuild 735 BLAKE2B 9a521bf8a5160ea37b80f00f92612d8d251d5c3c345f661b5e33cbfccbe0a08c2db0aa5e3981d7b60c3e76057776f218609d1b83ea4a20559d2f9b32c30a2964 SHA512 8f80f34ab6b3940f703ab4c39225f13d73472ea2823aa5788180e6f725a70f686d6042054eb83f7667e971f0abbbbdb5047fdec0a6bbb5bd3c3db0d3f863c846
 MISC metadata.xml 393 BLAKE2B e95fef65fc2e47cd5174d88c9903082b1c842b3f9f1df386c2b3361834ff9d44017cd16354b0683840184282404638c34e206c5e47e51ca25d579a545c583243 SHA512 dea924c8ebffb69f3e79d0d2e7877d1bb0064f9019c33f77f5dabad3d6553e5fcc224e52beb92d055fd6a82ae2771e9413bb4d288588c88c7c7e25e973258ad4
diff --git a/dev-python/cssselect2/cssselect2-0.4.1.ebuild b/dev-python/cssselect2/cssselect2-0.4.1.ebuild
index 7538f7a1eb8d..ae7600f92ec3 100644
--- a/dev-python/cssselect2/cssselect2-0.4.1.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypescrypto/Manifest b/dev-python/ctypescrypto/Manifest
index a326a1b15ed8..5bbefeec1db5 100644
--- a/dev-python/ctypescrypto/Manifest
+++ b/dev-python/ctypescrypto/Manifest
@@ -1,4 +1,4 @@
 DIST ctypescrypto-0.5.tar.gz 44667 BLAKE2B abf24a4a5dc5ea1d977427f781e44433aaeac716b4f1f8d6f23e7f8de7debae75cfff80e72c369b64b8b9299f4b058763d42c5f21cd499f9b5689481afa5a538 SHA512 96ca12145be503a5b343d936cde172039057e5a2308fb6f6f65e14fe859d4e98d93ffb996849e391cf0c474425ee6243fd4c7998b088938a21456965d135188f
-EBUILD ctypescrypto-0.5.ebuild 1061 BLAKE2B 5d2fce151f84dbea6e6f6ea89d361fdb18edd39432d495e07b3e75725371962d3fd097e29a1cb3b76be6c5b7bb80252e0ffc78bb7c19e0ed91c7ce78c1a4cf32 SHA512 7417b23812c87fe1e789022ff665c7118336203a7f440678f96241fef8310a38d87e84c9cd24364f1f11f2a803e48a8f139fedfad4fa0f88bfe36818360e5358
-EBUILD ctypescrypto-9999.ebuild 1061 BLAKE2B 5d2fce151f84dbea6e6f6ea89d361fdb18edd39432d495e07b3e75725371962d3fd097e29a1cb3b76be6c5b7bb80252e0ffc78bb7c19e0ed91c7ce78c1a4cf32 SHA512 7417b23812c87fe1e789022ff665c7118336203a7f440678f96241fef8310a38d87e84c9cd24364f1f11f2a803e48a8f139fedfad4fa0f88bfe36818360e5358
+EBUILD ctypescrypto-0.5.ebuild 1061 BLAKE2B b16c510e4f95c59ca321fc161b8b9958534424c66a2a02a11d167f304f68c7f62b065a1ed4d5ed2117a7b52c742d7413ea9572cf422796e7298676900b9ee5d9 SHA512 d4088c7da89e8289c5e5112af4edfce10f0f67a3ad4f5c82a67a16c1b95c0b7fa4f48a37d964ad5104c752e7762cf30a1918a7d25624d0d1e062b257a1c79166
+EBUILD ctypescrypto-9999.ebuild 1061 BLAKE2B b16c510e4f95c59ca321fc161b8b9958534424c66a2a02a11d167f304f68c7f62b065a1ed4d5ed2117a7b52c742d7413ea9572cf422796e7298676900b9ee5d9 SHA512 d4088c7da89e8289c5e5112af4edfce10f0f67a3ad4f5c82a67a16c1b95c0b7fa4f48a37d964ad5104c752e7762cf30a1918a7d25624d0d1e062b257a1c79166
 MISC metadata.xml 499 BLAKE2B 567939aa92d045742041c9fff63529bcb4475d410a6391750e18fa4123878219cffb9f13e4ed0f47648bb2c141987eecedba22c2151f1ab1fcdd2446fa1b30bb SHA512 3bdd3af210f997c7f35667ecd60ae9f95add447990e21419790d9fdd8e5839d9ece74c941ad3ea56026e402c43dbf6897d653d17f2b31b98fc1e8eb469fa7e5b
diff --git a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
index 38eee74eeb56..2c7dccb1cf8e 100644
--- a/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
index 38eee74eeb56..2c7dccb1cf8e 100644
--- a/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+++ b/dev-python/ctypescrypto/ctypescrypto-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cwcwidth/Manifest b/dev-python/cwcwidth/Manifest
index 41ae9887251b..b0dfdc79709c 100644
--- a/dev-python/cwcwidth/Manifest
+++ b/dev-python/cwcwidth/Manifest
@@ -1,7 +1,3 @@
-DIST cwcwidth-0.1.1.gh.tar.gz 9054 BLAKE2B fb907d467a143851cc000061f9787f032788d7b684307341208ed498ade160bcd01d372ee2281fde7d1e1561aaa309d6d0bf9b776abaaef042f8b22e9df8d948 SHA512 b025af3a21d22634fe154f32fdbf380eb56d085e247147b2d0031ca36ef9d8de68aaae8133e611ec3bb36e2bc69f384e3dc23654abde2cb8b715305ba26cb66d
-DIST cwcwidth-0.1.2.gh.tar.gz 9490 BLAKE2B 3bb2e918361eef7887ec3684ad1414a0db109326f435e61fb1e00a52edbda8a6575bc748dc40967c861c08b5707d7389877a87cadf5ae6af9244e86b156eca1b SHA512 897eae8369bbfd52894f3dbd488c0987298ba9a928739c9ecd711a55e189accf3ec0b6c0e4db9458bb363e71cb0804bf97eb9118509a5d8da5b6bd02fde177a2
 DIST cwcwidth-0.1.4.gh.tar.gz 11488 BLAKE2B 8d71a172f60e7c365917845e4e5b7e4c703868c8b318fbf07bce44e4b34f0512af84b939a91aba8db73ad362c1c514151e74c81461ea856f73f57efbf1676b75 SHA512 e9aaf003b44d30cf8fa2ae015c2b1af4552a84274416e79f1c56d075aa55fb238b8726d9a052ed8db6f3a0e265e5e170431f9815f1b1255e0a9170845f09b7f3
-EBUILD cwcwidth-0.1.1.ebuild 575 BLAKE2B 76ecb01cce5e4e615e06cd1d7f9792e5ab3798d1ef72bf18bc6670fe21be631aacb54a61cfb4c478650dcc1e54eec9b792856073a00c21a8f1147de7bb5ba99b SHA512 4575a64e49bdaa1571d607fb90cf36ae773a0db946c2465b6555ee5c77360ed446a6ee2c89525dbf1ca95cdb8088132bc16ff988afbbcdc1cd06b7304dbc7161
-EBUILD cwcwidth-0.1.2.ebuild 575 BLAKE2B 76ecb01cce5e4e615e06cd1d7f9792e5ab3798d1ef72bf18bc6670fe21be631aacb54a61cfb4c478650dcc1e54eec9b792856073a00c21a8f1147de7bb5ba99b SHA512 4575a64e49bdaa1571d607fb90cf36ae773a0db946c2465b6555ee5c77360ed446a6ee2c89525dbf1ca95cdb8088132bc16ff988afbbcdc1cd06b7304dbc7161
-EBUILD cwcwidth-0.1.4.ebuild 573 BLAKE2B 59c4c6b6a8590a3d131e8dd7fd9bd7a4318cda5bb4dfbf524e9fda9ae635dd3d42db7531a77ad1765daba8e67012195bfd4269ba289e81eb25c3a5e67586d0fd SHA512 2ffbdf245cf565492a51ae579f1be469911879eee4e94389dabe435bbea047464ec3d189489bfaa2634217305da0c86cc9b9091719d018937468516f9ec5f2d3
+EBUILD cwcwidth-0.1.4.ebuild 574 BLAKE2B c8332b5e27d779c30cdeec6346c08646dc36222c54922233afd904fa5e364d3498cd9b17959913b34d273f49245cc914780060cf7b0df3708b53e501357c15c9 SHA512 bc007826803a826f32973552d1dc689181d74a74da0ea37c395eff78e22045b6133a34c45c4fa93d7dfbb4e62e532919df01c8442c10de644d329a54c7fe923f
 MISC metadata.xml 348 BLAKE2B 391d997dbacbacd001676563eb369d85e0e95c97b6f10e00aa51ab6b3f88bf4a7c352105075ee9ca1f2a4e96a7e1831a55cccb2ca01166d6cdbbedf485db287b SHA512 912096776825111301ecfc80febe6297b9146ee57a9861c7a7ae6700aaf9eabb2b494fb3398e1fbb4ef1cae37e9fcbec97de875be1cb1cf3ebb4ecc4b59beae6
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.1.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.1.ebuild
deleted file mode 100644
index fc41a3538ac6..000000000000
--- a/dev-python/cwcwidth/cwcwidth-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for wc(s)width"
-HOMEPAGE="
-	https://github.com/sebastinas/cwcwidth/
-	https://pypi.org/project/cwcwidth/"
-SRC_URI="
-	https://github.com/sebastinas/cwcwidth/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.2.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.2.ebuild
deleted file mode 100644
index fc41a3538ac6..000000000000
--- a/dev-python/cwcwidth/cwcwidth-0.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for wc(s)width"
-HOMEPAGE="
-	https://github.com/sebastinas/cwcwidth/
-	https://pypi.org/project/cwcwidth/"
-SRC_URI="
-	https://github.com/sebastinas/cwcwidth/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
index 7955abce4a25..9f0294c4ff74 100644
--- a/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
+++ b/dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for wc(s)width"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 58fe0c52d1a0..b978f060edcd 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,9 @@
 DIST dask-2021.4.1.tar.gz 3702584 BLAKE2B d6c630349f26378c1c6d15de38c112ef330bec6422664b6e5737b7a023800f1705be163cefd79cf76c1213ca6b773ee19e2dc7e3f22eb60edc23e6fd4c153e16 SHA512 55d8d3a1a3eb76ac68eed5092075301ca88ff311f6729952928fde49f90a1b9a825dc085fb38b07a0138b87a109a5913f26d683c5fd22476539f3a8f36397c32
 DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
 DIST dask-2021.5.1.tar.gz 3713937 BLAKE2B 14e9043c9b762773779784b06f21355f2a384e9d13fd13cd8b7cd46d42df265045493ceb7a79c726922dae8133df5f7b3a493a389632b3d2c803caa42b141916 SHA512 e12986065e575b636fdaf5ba910dcabd21c807012f0fad49a3797d228ec47cc7a9b32fdbf567c306e274a7cc617439d0d0784ab65ebab5c6b42c21014d085209
+DIST dask-2021.6.0.tar.gz 3717136 BLAKE2B bc524dc4e885588ea92c0b24b6abe917b6a3989f7faa21d4dffa490f2952f4f7e90ce55e28ed97b34e44bf2c41a753fe80f092559999fa42e450b289c4b89933 SHA512 a4a1e86c286e0796f7ed79dd10c5c0f80e40bb246a7c25d45aed5e73a2d6c1da8743bf6b61ca784a8412403aa6e62007c937bbbdd8ffccf7170443454ff5601d
 EBUILD dask-2021.4.1.ebuild 1081 BLAKE2B 08abd77aba6fcc012541c584c504c0ab6951832e1f04d2d3b167b8f64fb879822b673d47259359c5c2b5e8eacf2ece5946699916319e03b474335d9165916a9b SHA512 148de997d9ab125ca949d4d598c7cc807baa1d5263737fd256d5fc533ad94fc5effeb241cbba5ee20a328d0242ea7fd1453686196c8e3b0b034a86eebbcd6370
 EBUILD dask-2021.5.0.ebuild 1130 BLAKE2B 638753f70cb901a39c94aa977b951e59aa05b79de97a1e96848f761018faa0b09dc26953e0fa81887434e5520b290e043ba7a8cf3a238bcb5fe9da9f08a88937 SHA512 27e4853bb68686b4b576e32be05ede702751d5f8807ea2b82b9959f49b1a00c11b76f7c16c6b01e366fcd0975f34e6a14a3646c51824ae8739099367f3e2ce14
 EBUILD dask-2021.5.1.ebuild 1130 BLAKE2B 638753f70cb901a39c94aa977b951e59aa05b79de97a1e96848f761018faa0b09dc26953e0fa81887434e5520b290e043ba7a8cf3a238bcb5fe9da9f08a88937 SHA512 27e4853bb68686b4b576e32be05ede702751d5f8807ea2b82b9959f49b1a00c11b76f7c16c6b01e366fcd0975f34e6a14a3646c51824ae8739099367f3e2ce14
+EBUILD dask-2021.6.0.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.6.0.ebuild b/dev-python/dask/dask-2021.6.0.ebuild
new file mode 100644
index 000000000000..d3f5be8aad05
--- /dev/null
+++ b/dev-python/dask/dask-2021.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index fdc3f8edb593..1008d78ab11e 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -2,6 +2,6 @@ DIST DBUtils-1.3.tar.gz 91733 BLAKE2B 8fb3fd16208c27fbbbbcbf1e7b9de2d4d2e8008916
 DIST DBUtils-2.0.1.tar.gz 91789 BLAKE2B ab231000211b7a704da8cd43862830e3a6cf3e42d8053ac0391ce68b6f51f0faae9172c83db156c1d8efc8fc1e8afad9c05eee89edbe7061cc7102e84ce08683 SHA512 0e3aedce9b659e717d60106cac7c76d6d488b5629a102a714e6fe57ac162a74c787e31e984cdeb3e375b3add6539325576f68f1779b7f7ce558ba00770eeacc8
 DIST DBUtils-2.0.tar.gz 92911 BLAKE2B 1822f85b9da1bd7936d01f8069deef10e8ab9b7a5c89de718071cf4783f2845357ccca0e85057d430c57f33a2a7c6d239f632032397bb1f0013a40e42383b5f1 SHA512 7818eab572db4798d0a7a2eaed6c4ba91c79c8517da56db21c07525f0097ca80c0beef1c9608b0b80c3a93f1372f37de7c8ec97f2e33dc4dc4a3d464c5981d13
 EBUILD dbutils-1.3.ebuild 1012 BLAKE2B 07f797d18ac9b71d87a21690aeafc8e72446b41cbe2d79726375c32f5feba58fd5d95d9ba038925d4eea5ff52ed5a7cad7e2186b095b54cbe162ce673aac055e SHA512 88c342c551c4e99a7157412bfa6aa1daec371043907c5cc935356e46e9d26f04365f1f85940d51113302cf36a9b6f6eac1d23cc866c6616e6967124599095830
-EBUILD dbutils-2.0.1.ebuild 732 BLAKE2B 0bf3a572fd689c357f27e6e4728b919dc003da11a70ee88b43308589510882d8ecb2c536f9d5643ff05ed0a5fbf92427d82e9592077e9c1e0598975b18d548f3 SHA512 3b9c4a0e5b6539e6161ec1219ac44bd4e240c938617fe691d5961c4c07d7402d3896707c4c58cc9f1e8e88484af209e674fa92dd4e08d332901f0cd11971c449
+EBUILD dbutils-2.0.1.ebuild 699 BLAKE2B 2d51aafd400c972708b424eed7c7f36521f65bd2772da5de44a43fc6d64f9013933ad1ec816f023269ac290a5720d3c195604c9907b6f1575eaed4f6419f4ffb SHA512 77921345e4ac21500376166ebfe64edd89154334264161dbfcee24ad9c018c2e2a2af22b7553bca6805481df4d93b6f44cdb38d457f7165f17d3982bc1923536
 EBUILD dbutils-2.0.ebuild 990 BLAKE2B 0bc02f3d9dff4c30bc423bc01710bc5af4da8d14e826d4fb820ed6a3fc875bb7cc7448a7634b7be326b7383b01f6d2d6168fc8c7578d0ac4224db5b671082824 SHA512 e5d04f01b774d745a5704305b39c5adbc527588b545ce87a37ca4459653fa8602bba253ae2e657758228d192f02337004e34e1fcf0f009cc6dd14ad7c889bd8d
 MISC metadata.xml 1004 BLAKE2B 330246e8175c3bebe3385c11c2340f4b7f44f710491f22d0e09236a29b4e308cdac3260d0dec7517e7405ab08a8b4a3073919afdaa98c9b11924a40ec99758b2 SHA512 b3f5d2239edd7f6c4cda23782f8b180252e9b4139f9fb297bfb7a9b9a050c9dd637d785ea5836d1c62b12a2c0b0dff0368fc4c3f7821ef657b56baecd824cba2
diff --git a/dev-python/dbutils/dbutils-2.0.1.ebuild b/dev-python/dbutils/dbutils-2.0.1.ebuild
index 109737f51670..72882396514f 100644
--- a/dev-python/dbutils/dbutils-2.0.1.ebuild
+++ b/dev-python/dbutils/dbutils-2.0.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="DBUtils"
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index cdc57350f46c..01c39aa7e7d7 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,5 +1,5 @@
 DIST diff-match-patch-20181111.tar.gz 58554 BLAKE2B 2a74294bb9ac88447cdea794a9c3b44d705d93f7e0777d5e5ece4a306f43df47458a4ba0ec8b16624862a6e4540a605695c3a83ee7dad7749b22210ebe65705a SHA512 9b21726b9c0e350553533c14dd86cca823c6f98ab642e7166cf9348952a57b62bcb0576e3d6a3b76655ea1bcc8cef3fe7f33ffb068b5a4bfb4b4b521042484e6
 DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
 EBUILD diff-match-patch-20181111.ebuild 424 BLAKE2B 4990f7c457736e53112ea48de610f33f9c35cae974d33ef7ea8b36720c133e6dbe42fce9220ae19fd299bfd6f933a4bb0d95105f6f5beace28ad1522efde497e SHA512 f47f0304746e4f59310e33bcbf5fa338a86d8f6c44bca7ec02f5693982c59169f76c7926ce2f64aba3b885afa47c3295f0c1b520dae4f2485c5bf2291039aed7
-EBUILD diff-match-patch-20200713.ebuild 427 BLAKE2B d845dfd133562fd3188d239208d74c256c6af868d8227d4a58ea22e5203e88e84d32d85af396a45685914f88ce070c48a7e6595fa723a016675dffdc99d99575 SHA512 f1b43b727789b872e811f2e99164459b4ca5ea7e5546e91b9c46757402ca74669a74afff7227c3de13714c141917425f1ef3332bd7db3bb508b5dd5559a7a588
+EBUILD diff-match-patch-20200713.ebuild 427 BLAKE2B d985cb2f086a350cee3a4727c7f68b71ffcb8ecfa5e4c65747bee0dc39b90831df777d8337c0319a0dd536fed466e604e93b6e908de30936fd9abcaaa77f5a76 SHA512 3a9b876fed72fcc952dab1dea495c3a4705b9374f24b7c10be6d4d4641baaaccea686049eaa6e3fd7b3dda28e2310e9e9457d1e43867d4ad51008489fa2ed2cb
 MISC metadata.xml 1184 BLAKE2B 8379388bd406d14341910141a80b67840dee0c5023b2843c3712dbdb41188b275825737eeed75508b5b66a3911eebb2edcff2bdb84adbae60a9fcff3eabea95b SHA512 53c140a50cd13cdd304c481868b98e1464cfb310dbd6f9de4f7de33dc1a6d62d0365e53c3550c775a2530f5281580841703b5712a17e50b846795f2c1d8023b4
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index e107f94810a1..ce23e3a1b04a 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 648fd0b12366..18c87f4de46c 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
-EBUILD distro-1.5.0-r1.ebuild 535 BLAKE2B 4de5c306679ffd01852ac5f8867ed5888983d962b0461cefc985654996a82cb97d2c8c143eda8a681fdd4b1a4b32306dc2287566b3a88d343366f06f6af8089b SHA512 43503dfb59511d29caa281ec5009730e8336cc06b04a07a661b1028050b422bfaaced9bd72f80e54388bda5c51b88b1b29cab27889c9173b5060f5025ffcd5f9
+EBUILD distro-1.5.0-r1.ebuild 502 BLAKE2B 8e805a6733b05cca24d756491f8adc6d0304b0f33861bb98c214dd58e91834b98ab8a1a48c2ce4a6e7acb80f2e652d8eaabff882bfe5207d83ef77ba4bf75a97 SHA512 602a2387b5341f58ecd63c42b86c8b08b3ea6031b3fde5ed57e2d8204f83653c61b82ac16f94bc1ca1ef8a30894a32f5bbeacc4efe685dd9a5e29a7487f03212
 MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.5.0-r1.ebuild b/dev-python/distro/distro-1.5.0-r1.ebuild
index b9a85477afec..c8e9c2923639 100644
--- a/dev-python/distro/distro-1.5.0-r1.ebuild
+++ b/dev-python/distro/distro-1.5.0-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index a48189b0e48e..8da551ee069f 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
-EBUILD dj-database-url-0.5.0.ebuild 528 BLAKE2B 58755f7c94a03b33539e290c057efe9b3b248a8952dd0204cf01ce78e32c37ffbdb941322444e32e588670ecd7d406d663ead962020e09565cec51c95dca4002 SHA512 8a93bcae22b5ed0912cfdbfba57f762a9092e3ce5471f46b0bff2303ccd47da7ec95a787b3a6280f05a69d7547e093dce2bb3e65abc745d8e7f667c6fe12f9df
+EBUILD dj-database-url-0.5.0.ebuild 529 BLAKE2B e37118f028ed2b9539f0ad7de2842d6f3c76023a639aa5778e030cf4f7729aa391c029d1c7bf6be5bab47594d9aa24fb401b84891c23663cf7c1bd7c01f61419 SHA512 6f3bcc3ee13f995468d0c945303e41cf08938272801886146769a276d992c8d9500047754448334db5e3e69eae3e7455eb7eea7215483049989be11b6ffa4b98
 MISC metadata.xml 406 BLAKE2B 9e373049eda15ee3ac87de1a93c2c6ace80868cd42166bb9d8a895b0d558e84160de131c2e9db969dbfcaf0f8400176919800cb5b0b07202533022d707af1f0c SHA512 0003de2818ac2fb9acdbe55fb3c40d46f1a32fab1e9b4e03c7b9426a7f841d31abb323bb863282ff1b10503d751cb31c67d4ffb693bc56b8f262edbfc382777b
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 36ac1b834478..30d54b5ead9b 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 4c76a8e6ffe9..e704dfb392ba 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,11 +1,3 @@
-DIST django-otp-1.0.2.gh.tar.gz 66885 BLAKE2B be98b68f0aa5df25835afa28a23d25e0353dc2d556e62bdf1610a44a409a8e48422e17f274b21eb7cbd421cc4a25a35d01e5d7b3bd99d9caec8c8060da26f57a SHA512 6fe7f79858bdf362dd35e1aeb87c086edd5daf17d4429fc4cb39f3d287ee4c7cf8fb2d6d8f6a7d1b4606104d6732a705b9285f9fec93e4e7c7ca3f3f52541ddd
-DIST django-otp-1.0.3.gh.tar.gz 67007 BLAKE2B 33aed04898afb6ad3940e06436a1d2b4b9349e8fcd55acba0719084939fb9b111e0c266f4964826491f91f832c16f2e4d505486016bfad416706e3e7ef6f3f37 SHA512 7b661228377fa57812a45888e415478cee49d1e343cbc814ba8631f4c354077901ec82f79e69abd00c6bad1dffa026d3e03f4cf0809b074ae1e02ab2cf878137
-DIST django-otp-1.0.4.gh.tar.gz 68976 BLAKE2B 30908c3769ca9c05c850524d8a3b155f7ac8fcfa8e69073622d83808d7b78293604f9b332e59b074a6737188ca4f53ede13d31d283588605ca17f994bf5d4e5e SHA512 7b37fbc56a708f5c26e6204fba344235c7823db66d7e3e56b74516efc8a1de4150c088ce2d94c04c10855f438b077599d361a4d2c2263e8ff2936309dc0ddb6e
-DIST django-otp-1.0.5.gh.tar.gz 68677 BLAKE2B fd4fe66695faf4a75fc9cdab69241520c42c50d013121375bed2cb0f04a71def8e64588e3ac5727cfb319cb025273cb5adfd5d3b0dbab06590967c58e2b36e37 SHA512 bfdfe6d5058a6bead28a756392a76301cb821b5ea4f61dff8d376aa7732aa92bf8d709cb964d23e94ed37ec0e3ae45768f4fc4a98aaabfb2be0788bb0059f10c
 DIST django-otp-1.0.6.gh.tar.gz 69023 BLAKE2B 82534fb666e27ab654b1587160fd9fd4600d1ecb57f5b506b383c3d7b36a13d6bbff39598603c7c3bc69edc871a6a3ad1aa2531a92ea921ab07798e7e4bb1316 SHA512 ff14a786bc8b3d22c8767fa78d676951c262389dfe00def981c79894d299f393ffc86510c33866482aa246ac1643238a3de5701bb76cf56aea5e3ba0a25cbb97
-EBUILD django-otp-1.0.2.ebuild 879 BLAKE2B afe469a99ffafd9ddfefd04709b6209380459ab1f0e2ab0ea8335bed19f4c6ca30930efd0a71e1f1e3bf676ac6846d2634dd550e54b4d973ab3b47e99e30fdfe SHA512 b8fa48d607c6669660fbfd4c4705d389e9ef2218571ec90438df9c6704a0744b06ca64fa9d810df7c186c137dbda600cd2ecb00a2fd912c59acf2f9cc760f9b5
-EBUILD django-otp-1.0.3.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
-EBUILD django-otp-1.0.4.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
-EBUILD django-otp-1.0.5.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
-EBUILD django-otp-1.0.6.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
+EBUILD django-otp-1.0.6.ebuild 880 BLAKE2B b9ff538f687758c5b75c80dc267658b18f8a40ac8cd8c73391cab2d7e71523dcb4f04bf0a6cda0edb0a7270c6b8902de424b32743a7a51e25f18c17a57a20fc4 SHA512 b458d75c64a71018d6b4e7e9596629d901443bd96ccab7b2ef350d0dc75b8965ed2f3359597662786a3aebafcbb39db8ed4eeb898941c9c60598721449c456ac
 MISC metadata.xml 386 BLAKE2B 089280b44d70d41d6ac97b035d5346c7e484d53cb5cc4505a1953d46c2a618140fbc1a3094a14ef18d3c39023ae10b7d162977537b646563459f3a9912e765fe SHA512 6d181b8eaad8df98a615d06c292284c1f8fe28e6bbfbd467428fc387fb9553221646d2014a10c3d16a4613db7d6f0af75714dacacecf1daad0db053d08deb3e1
diff --git a/dev-python/django-otp/django-otp-1.0.2.ebuild b/dev-python/django-otp/django-otp-1.0.2.ebuild
deleted file mode 100644
index cfb15b23692f..000000000000
--- a/dev-python/django-otp/django-otp-1.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-1.0.3.ebuild b/dev-python/django-otp/django-otp-1.0.3.ebuild
deleted file mode 100644
index 26c9a4b8f2af..000000000000
--- a/dev-python/django-otp/django-otp-1.0.3.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-1.0.4.ebuild b/dev-python/django-otp/django-otp-1.0.4.ebuild
deleted file mode 100644
index 26c9a4b8f2af..000000000000
--- a/dev-python/django-otp/django-otp-1.0.4.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-1.0.5.ebuild b/dev-python/django-otp/django-otp-1.0.5.ebuild
deleted file mode 100644
index 26c9a4b8f2af..000000000000
--- a/dev-python/django-otp/django-otp-1.0.5.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-otp/django-otp-1.0.6.ebuild b/dev-python/django-otp/django-otp-1.0.6.ebuild
index 26c9a4b8f2af..0468cfa46262 100644
--- a/dev-python/django-otp/django-otp-1.0.6.ebuild
+++ b/dev-python/django-otp/django-otp-1.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 6acd62fd54ef..c19ea97178cb 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -2,5 +2,5 @@ AUX dnspython-1.16.0-py310.patch 408 BLAKE2B 7379d0ea280c9ca07e1d3d47dbb21cf1f1a
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
 EBUILD dnspython-1.16.0-r2.ebuild 1341 BLAKE2B 96974c67109cf7b06cd9266886d12aafc4f2fd562d66de61b7e9eb7500dfea21cbea6d07ada8823eb71e3b916d82bccfe9264891c10153486f0aff48cf63434e SHA512 250253fd84576d2ee6b2d65166e6daec2322867d607336c663d56b474d6657a449718534b8e3916bb5367ddb3c3addbd7c0c2e510810091d43e0736894e4eece
-EBUILD dnspython-2.1.0.ebuild 931 BLAKE2B 3e7d0ce8ae971b1825dea9a56dccbbad7206b7457915fbbb20ef0898f539d0405531874a448e223c1063e4ca4293c3f4fa1501d88638b2a1dbd301679df384ec SHA512 fd3ab54001e5b576849c1e12895793e94c1bef9b0bc6ac8a702b988ef8fb54e6945eea4d7eb7a9b96a6896a68ad2329416dd44c72a32f6e546bca3c0baf003f7
+EBUILD dnspython-2.1.0.ebuild 963 BLAKE2B 9d39e73249547eb03aa08f0780f8dd88547b82450b99b7f474f9e139487c09bc979c72798bd65833a78ac945f6cc08e6f1c0dc43d9445cf4fc3a7cd38550162c SHA512 b82878a0aa58ffcbfce91dbf5f69cd8f7694d14b4542d1c26002050d867252e0f95a7234150d76e36acdac57541c820c79029eb310a61ccb22236649cf742707
 MISC metadata.xml 1482 BLAKE2B 52c201915b77d6d2f4379b74b67c8197dcfdc692aa9040a20a1ea4cfdedbb6e953d5764f8b3ef154cc1e899f644fd4e6fc3c8aa1ea5fd6f5d93c334d15f954bd SHA512 01bb39db4729b424742d567550ec05c3093158f12f3b5901029b2b4728220f703b0164d3e8f3469a0fdfd0b9492e85c4ca23a024a85bef37d738c439870ac1b3
diff --git a/dev-python/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.1.0.ebuild
index 2db80186c174..f195de7c5e2e 100644
--- a/dev-python/dnspython/dnspython-2.1.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -29,6 +29,10 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
+python_test() {
+	epytest -s
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 	if use examples; then
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index dffef0d08f90..c8d156234a58 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,3 +1,3 @@
 DIST docker-py-5.0.0.tar.gz 247639 BLAKE2B 7e7f1d0edf228c967ee9252c6dc37e803a2e91601d3dce06db335c4bc4c8af43097864307ad72d4665d13f9ab0ba63b3dfd5ac7baa4dbc903ca57fe67985c1d2 SHA512 fae4afcda91ddf946048f76e62928a4891e1b0ce522b820aefb774dde58eb8e2aac0a381971acca04ca87794989ba675464e7913fab4abf2ed414719d66c91d1
-EBUILD docker-py-5.0.0.ebuild 1065 BLAKE2B 3a5aaf6e50cfde0db4323f0168d584c390bc0bbe3191b7a2e2696cec452f81ca259002d2a082a5eab8d4ae4109d7851f6b07a4185722722c720f7b3921d37a46 SHA512 815167957b5cb6356611516dd5c57f0b378c636380cace7ab6d40cf193d8ccbf494c6dfe2971bd83abe5196aef8664969fd48850c898f5a5b003ac039f582455
+EBUILD docker-py-5.0.0.ebuild 1027 BLAKE2B a3b84e36c310b3314fd43fd6b6317dc886efedeaddfd4c6add31af222eedee30a68164cc9e4e92155e9acd72d071c7305ac437a2733a16e819565d5f8acc9cb3 SHA512 43c19a5b34e07bad6ff31510993f162aa126cad44238adca69a244b93fc80764fa6e2c22eb7ebd49573387cdc0a7762c5ffc7b8cf66467da167caf7a8639522a
 MISC metadata.xml 434 BLAKE2B a6fd9237a338297a004bc72f08239cc92642aba95c590bf7f2f287c5b3d196b632998dfe5c32cf8155498df1472fc84f4d41290880b14161c8d43d0a70ed7f5c SHA512 fb6af1a1021d752928bfad27313ccbba2f09ad88249ddb9cc7db4c1f1fd591035f636eb35d79f675b5fcfb984f1d201fdd7a8d4b38cb2193abbd31f2d62f039e
diff --git a/dev-python/docker-py/docker-py-5.0.0.ebuild b/dev-python/docker-py/docker-py-5.0.0.ebuild
index 911b9fb84a08..55704689b6f8 100644
--- a/dev-python/docker-py/docker-py-5.0.0.ebuild
+++ b/dev-python/docker-py/docker-py-5.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -40,5 +40,5 @@ src_prepare() {
 }
 
 python_test() {
-	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
+	epytest -vv tests/unit
 }
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index 5bf814c5f31e..21c31218f7fc 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 536 BLAKE2B ee85c04bfff5dde8aad41b5fe7507402400d8de49052c564be029fc15d2e7efec6692171e4f94b4cfa22200679fec7b544c3db08b296a85bda74e8af99bf96a9 SHA512 2712f003f234a12f46bbde8371ae92d5f69f9f600c66cd4a91c7770c810e5cbc0c7398fbff2c17bb9ab0d69c384bebce7ae1b2139877e70bd1e2da82060ed691
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 537 BLAKE2B 392cf463652bd4df175139f74b3c184bf84edef00dbe4be512f01d83377ce4bf6bf4f1f2d1aca60eb491f8a9bd6cf80296418abd4848c128b825224135792e96 SHA512 576672555c9a7ab3732fd227e928c28923500162a953f69111c4d924157a87249d0f529963b428a928b2c7b2e77b8e611494804c726138fb2a7c6959f0ec2bec
 MISC metadata.xml 396 BLAKE2B 0d99d9adf86b3df99ecd9caadaa9591c2273a48e6e6bcfb9f27ba779b725fe7eb074db30ab856add3755d38df90ac9215f0326c457dfe834e94ce185e59b8295 SHA512 80229a027a295b73d98c58cd8f00b731324b6ed7b3c6f4c55169f0c5d3eb89521a2ad45611206ec9b972edd9223e7a3c1aa4f601932c1e37b5183106317ffc2c
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index a3d2e964fdb5..cd4a04ef0710 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 9b4402c9b94b..daefd0915fd4 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,3 +1,3 @@
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
-EBUILD docutils-glep-1.2.ebuild 692 BLAKE2B e1484f4276cc280483723eda64069c6f2d0f377af19ef8980a6a08bd0313be54bc97b620fe33a60dffdf82d812f0b10baff27d379a67499323d684ca916ceda4 SHA512 c906a9ae5d546a5542b7096992e153b19080dced134f64ef0f16d35c8ae62ba14d082afb55b0e31e0cca15fc08c72230c48789efaa3259c495e8b5c223574d97
+EBUILD docutils-glep-1.2.ebuild 658 BLAKE2B 11210c6707f5b9d1f863389fb9506690621ef936b9e5d76302339000cfe64d57445aba8474119c34e153c91fe5cc8e0b62bdae9e011ca3ffabc78d73bca9cb51 SHA512 b953d35d3fe58464e84a4044ec4d8fcc79a5f87e677e4a9c83443a25a13f5ad19ca3b84ea9c072b630eb3217f667728cd891360901e67fbf4d0e80b2fe9593fa
 MISC metadata.xml 448 BLAKE2B c9fa61a0dc008ae6c69241a3cdcb5240f0b2814528ad309995fb5095e1233b1c9a3f11e85a30a576055316fcf91d9fef6323baab6cd9c76606e74163c132c2b8 SHA512 57d39f1dc1333568a2efade5da3cca87a94bb56cbfb23728bcfb70e56ee4e310c92cb64dcc2e39e5be5a7d9deec57f309f593d11039b9d1bb9ce4a10c47f49e1
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index 68829e5c2b2c..1a6db5aa1b22 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=7
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN=${PN/-/_}
@@ -13,11 +11,10 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Gentoo GLEP support for docutils"
 HOMEPAGE="https://github.com/mgorny/docutils-glep/"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index c8cd2ee852b7..189994736473 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -2,7 +2,7 @@ AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.17.tar.gz 2014148 BLAKE2B 56d03d755651e9c022eb7ff79dd83bab8f8bbb2c8b6528c673b04b69db2c11084599bf7cc294ded3a024c4c1a688f232ff0f3c9f7a1ecafe1f857513d35123fd SHA512 e99886dc6420f6325426ebbe0d1528249592e372fe2a052548c9cd9c2fd87506cc8b74384a3cf4afb97a1d936a906e157e084785639aad59c4abbc672c33b689
-EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B cc8841d05132c83a3b427902e0a74f936a26b280f7576cae6a143ef5d3549ff947e62e0fe98aeb92a5c96b09f3e3911210c1ef2fbbfd7818b427626bf7f3fdc5 SHA512 70d68347414b440941dee46d9ec3c9eb466640007eb650a76fdb750334b001877c2efad4ab0726efe67cde689bb9fa61d7c6eb0f71a3f8baf05c583121c4985e
+EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
 EBUILD docutils-0.17.1.ebuild 1756 BLAKE2B 0dbab29c0523ecb6cd1aebbe233460222f6e2c71da368f3ae39d1fcf05c19276e8dac759aaf1f9e37b06b9828f6d1193833e6b99b82631b6c148bb27fab662f0 SHA512 b36f39bd95e667799f6d74c5ad8150f7f356e2fec8e4322960a91a9fb46047e7d0f0be4bc1ce74a0e7878b86acaf54685e98b3512e1b5d8125f50a8d14628609
 EBUILD docutils-0.17.ebuild 1755 BLAKE2B f7370968b7426081c623dd6fab4e543d50aac5fddbfc936b918d76237942920dec10b2b1f8e1ea429144dd08fd85d138cb09e8c32f91e96585cb672053c81049 SHA512 f8c6fe9da047aa06e423172fa5a621ce22617d64e3781167f460073de732c15d4d64c8a046ce2f38354591b021ebe73bcc6bc2f7e806d770aef1e150bbab00c2
 MISC metadata.xml 388 BLAKE2B 0781c1ff7eed3e16515aa155bad0f9bb80714c7297eab6840de07aea41d496f94d7c59db363518f914ce13b54cf2c038ecd05b86f6823df58ed01070b46d4775 SHA512 e977e1b753d903ded926f251b30443e07d3080bb33be1e7e66bf2a80e4d81da1fdc2bdff12e6cdb1a1746019adca4c3901f59daa816588301be42a85709995c1
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index 4d307148b564..3e297d6f7519 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index 5ca538a1826e..dc43de3f8ef7 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -3,5 +3,5 @@ DIST editorconfig-core-py-0.12.0.tar.gz 24801 BLAKE2B 10901b1595965139dbc3aa3227
 DIST editorconfig-core-py-0.12.3.tar.gz 19261 BLAKE2B 58cac122cfee19527bc45def7e923da50982de0e2cd443cf67dd824c050fb12352b85a5679815a701bc5b8d88a089a0a98280c364730086d01b80f119ad996a4 SHA512 005d0698c410c8865d177a1e891b5c51b15255f36303b116fddbbbc08e309d1d60ca3003d27e6fd8455e53c5956db0c29e298f22f4b10950e1f7c56c7c6e0ab3
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
 EBUILD editorconfig-core-py-0.12.0.ebuild 1253 BLAKE2B 46d06e17a5e991c02c362488a2c6115f990c66e7cb71f7d1d1a7c8b5144cd530e5e11708cbde5098131cd648dd1f17d607376d89329eff1af71264a9c4ca3311 SHA512 079f493c5fdb97b053af9274921f54c0dfa8143222c78700a16b3991419ef2a06d78a14e469467c924ce94631d10b87593b08cafd7c638fae5ead0010a13b1dd
-EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1155 BLAKE2B 2199401742e44a5019653231a0612133e839140286031349ccaada97393ebe84ea16774d2faef96a9fb4c8242f1e1ee20854c35e55af5f21c939d6b2b7ab7fed SHA512 e81bfebc8c0b78d3f8deb2395eaf0c878d82c60823c2cde7d0188a747214500baf539b23f14824ca94808997a24e771308e45f14c27acd96c476a8253521e9ca
+EBUILD editorconfig-core-py-0.12.3-r1.ebuild 1123 BLAKE2B ad68edaf5141b8422228bad5ba8bcef3844e17860810683db31ea0dac3b0bb3278f1e3da3bd453860fe1de56d928c95ce82f8c4ff883ecf985e108ad3177c7f7 SHA512 c66b67816cc83aa922d69e791a5aee359e21302ed1e2e3c73803ec3e3d58905121774ed53126087f5413a8fffed48f55670f86a1acde0d1de82b3b2401e98748
 MISC metadata.xml 830 BLAKE2B 3cca18c10e74192db49de4a9a6c7fd049c70481bafd9282cbfe8962a6f8b4e65d65b63e1acec90e32fb91d3f3a9cafbad26b7c62cd4624f61b211998e0e9bdb2 SHA512 0739b8d49cae0a93d2a2e3cf34fe90d35c1ff9f4744f0f4caab0c75e82379f4b647081bea750ab2c7c1daaa754f59f2ea47e8636ce16c1e4616a406c4b64f030
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
index f2519a9bee87..33ce2edc0308 100644
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake distutils-r1
 
 TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
index c45e15470b49..dcb498382ba8 100644
--- a/dev-python/errorhandler/Manifest
+++ b/dev-python/errorhandler/Manifest
@@ -1,3 +1,3 @@
 DIST errorhandler-2.0.1.tar.gz 8534 BLAKE2B 2a1db016acef81b5e625800614b2b5084cb6e8175d623e42726a728018871d200709ec66db16847ae0cf604551925a18fd2207c861388844f324a6eaae4bbe90 SHA512 b2fe44f400551e2af8aa589aefce042ee761893678b211a0e3ec7eb4527803001ac930d0941425f6e1487d36493d0c8f439e0bf672536ec27f041309fd69420e
-EBUILD errorhandler-2.0.1.ebuild 476 BLAKE2B d1ed2417ca3b90f224c416d023271a6b3ddefe42def69016c2928f3bc83d4bac5b1f097dfd1c537eba87e011eeb712d8d93b3485e379531deb95451336b08889 SHA512 2753bdea1bf30b81a5d5b3214b896704b7e98f25496ba994a6cd6ab1ce8f8366df8e93c9a40122720324d2dee4271dfead4ed80b252a225d5e7bec631138bad7
+EBUILD errorhandler-2.0.1.ebuild 477 BLAKE2B d7b64db104f279cbc97c3bf836a74e069c85c6c0ed50644a7a4724de3939955ded697a5675ec69c794c836fff8146e0f41d27428a377453fe3187feaf567e0ef SHA512 752ae5d5a5e1523c3b3c7f730be498b8137e3897aadde74d6531b65b1c5f9e7512c132b25bb5319027752973ed96e7727a8a9222c6144846c89e52976827f721
 MISC metadata.xml 325 BLAKE2B b9d3bdc299f206991f900f0fefbf436445eedfd32b0c005919d37417003fb115d435924e424943554333fb65d6811d82e27436f6cd40b0818e204804da74ce6f SHA512 d7a0591bd66d48cab6821c9ac4131839a8b60f026ffbb677263f1af1a0f6f9b9dea2cfe3be003c40e2da7f16914ff2078ed591de0c6833406595010ed88479ff
diff --git a/dev-python/errorhandler/errorhandler-2.0.1.ebuild b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
index 5d9dee02223d..1007e99597ec 100644
--- a/dev-python/errorhandler/errorhandler-2.0.1.ebuild
+++ b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index e60b8969c6a2..f75407b0b79c 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,5 +1,3 @@
-DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
-EBUILD et_xmlfile-1.0.1.ebuild 499 BLAKE2B 4cd82ce445482d84488d0a8efac4a39d6230cd59754198aff000e4bb97cdb4b7177ed155fbb7184db109235275691c98bb379b5e479f1fb63cd6f7641ef15562 SHA512 790ca6f337b93100eb2f38d59cb3c7713bae942b79b26364a3a908832966826866fbfae721c57e3c130a3450af659a7d4798b0d7bd675b80eea828977560fdee
-EBUILD et_xmlfile-1.1.0.ebuild 677 BLAKE2B 42ffeab1d9eae419e7e97c604c82cbe90b4f371b0ad949f7e8e3a1bab0c63d7d2e799ec92cc5bf30b9274a95a3a74a0343194e2fb8a4dcbe552457f2dd0844c3 SHA512 6dd7debd0ceb0f5480f546c16db066c3e294173fc83e6a2dc8476d87c28f89e78e544acdbec67ac46fe4fdc73f083d7a4d981dd4c0862629e4f83a52d04df94b
+EBUILD et_xmlfile-1.1.0.ebuild 675 BLAKE2B 340454cb74a8d7b068f2133695cbdb2879766b0877d39c47413b03d2dafae7759a977aac881cb6798fe2ebf5fa8f769f520bf6774000614789de16c453f53575 SHA512 adae9647a8e4ff24259ed7689cb300c7ab0135cf9a3cc949c03e223efa2e916bc1fc069b33eec7746cb62a2e91ef3b14ea9685b13999e356a06b0a75876d19dd
 MISC metadata.xml 348 BLAKE2B 888c03fe50adba6f74323c04eb0055b6399303a1d13f73f1faf432522936ab416796e94acca3ba59422bda48e277829680921875fbb663347a34aaf2ee02ff2f SHA512 59f01b675ab4d621f215e72b8e642bf4e2931f78679d9721d96851f5c0a1ea7da4ec579e61aa2757e398c7789e747324696371f1e912bac64f1b9e0cfc0aa823
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
deleted file mode 100644
index f91593728373..000000000000
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="https://pypi.org/project/et_xmlfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
index 84687c138ef7..375cb36404e5 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 68b709f3e1ad..8231b5b7607c 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -6,5 +6,5 @@ DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d
 DIST eventlet-0.31.0.tar.gz 402530 BLAKE2B d4d5983b22d04fbd6102b7e1ebe58c6e23cba04968478808445d946a3d8fc9ee0b668e83321397163d507cacf58f0cdd8547b0fb2649bad23819fbee0a6cc5ad SHA512 1721ec5d3c6c02361a5993237426d0466d87327e3d429d7b9f20d3466eebf08c60e57a2b1ab133956fe508835e5e84c52317aa51f962e8487f22a6207bbbfcf8
 EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31
 EBUILD eventlet-0.30.2-r1.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
-EBUILD eventlet-0.31.0.ebuild 1696 BLAKE2B ff7ce278853e6ebd3e6f0e5939b3c011c4368cba536620e3fd56f10c6b80a2bf82856809aa9c72440080904684bb4466ea65a18d33104de55413785f24386ec4 SHA512 be1e474154b49e7aac41598ef2656510e07c748ad8f1501cb087091620d43986fb34be8ddf885eaa27790120a9e7e9539a5d27a5f7dd7b89b0a5fb419f96781a
+EBUILD eventlet-0.31.0.ebuild 1694 BLAKE2B 4f26e852379e20cd47bd7b6d6c42db5bfe769ed710cc890245b92a95eb364fd26384e495e9e18d80513d7c2c3716b88a0c09230312782c35d78a2f13f75481ab SHA512 19fa8af01a7e0495ee5a6bb88d4ff8b4d6c0ddf4cc83dbe3e297c12d4441c6ae1d959a30c6e07cb67e7b099fd38fd1f43e91e96d0260bbb57f9e8e885da3ce59
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.31.0.ebuild b/dev-python/eventlet/eventlet-0.31.0.ebuild
index f8d57c28dd02..ecdba196ecad 100644
--- a/dev-python/eventlet/eventlet-0.31.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.31.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 0d9295cfd97e..3d85d5e5fc80 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,5 @@
+DIST fasteners-0.16.1.gh.tar.gz 28572 BLAKE2B 8434f2b47eae01bc3eb239df7adf1106299d76e577724291aef82fca2b68c7a7b5b82fa37a80d1d9ca0315615586c61b29bd4f6ac5cfce6fad798b4423eae64d SHA512 e2f94ad4d19fb425f507236ffa4611127d6254485daef4a818e4508ce935aa7a7100c2bb91343697d6005f4c220d8060fbcba19ca1e2dc257be756b0e24454df
 DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
 EBUILD fasteners-0.16-r1.ebuild 654 BLAKE2B 1ad152a2d29ab8487b70412aa57889a2f7351449d221662a423fc696e4e16884af1917bd387251642cc57d3c3a21546221dd1449be577638f74f6734cf8f87e5 SHA512 28c3dac7d4620f6a6ce1a04361ce249cac21f68b7fd75ff1f83165be28050328ac9d994c78b589f17241afe52593dfac12b74a57c1f61c4675f14a454acad05c
+EBUILD fasteners-0.16.1.ebuild 788 BLAKE2B e794f59ab754c49e56fe52c0b9a3c34c0b9ca170d16a1b7235551993be363d392569942e30ca8e205d9c33173d2e4115d8678b4825e85c01025ad6b1310e7072 SHA512 cfced417c18ac71de7619a38f701afdbe238c0be57221e38ab10543dd23a432ba86fbe7674bc991f35749364c430ddb1bb61da2cf73f3a84afaaecf4fd4d9434
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16.1.ebuild b/dev-python/fasteners/fasteners-0.16.1.ebuild
new file mode 100644
index 000000000000..519036387df1
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.16.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners/"
+SRC_URI="
+	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/diskcache[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install() {
+	# https://github.com/harlowja/fasteners/pull/70
+	rm -r "${BUILD_DIR}"/lib/tests || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 2d3bd5d71415..22b4cb05e420 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,5 +1,3 @@
-DIST python-fastjsonschema-2.15.0.tar.gz 35225 BLAKE2B 43b5dce109b0b25db4906b13223ede61b9f9eee9acb05b207d3cd11e0cc1d3740674c4e29709ce55dca8b4964643942be0959267d0228a71ff8fb535ccc5de17 SHA512 3323c085e79e1a465e807ef972ecd3f09811e232a36abc16d6b2e3e2ac5cc343edf2610e18d18b64fdd555d640c0ef1dd3417e268b5c62738f82680a404a300a
 DIST python-fastjsonschema-2.15.1.tar.gz 35384 BLAKE2B 89b9be7a9dcb8b22634dcfb54abec7b5709805b7087558af93b4cbca3c71a0b876956060aac0d0e7f4467db1bb38e6a587025c1c219613a661fb0d9e656b81e0 SHA512 7eb4d512eac03e258d670f6d448c5aeb74e20f892a08fa84a0412fd9c99cdc6412d4daa74bc09f9fe933a973a81227dae36125766e64f3c5b01106435ca5d70f
-EBUILD fastjsonschema-2.15.0.ebuild 583 BLAKE2B 00f38514522efe2e5af70de06c457ce30f70cb2e14c95481946b97bed2e672f3b7135a44201d06c5473bef7024ec21d24a69ad07884a3d1c861c4a0447ea9d86 SHA512 614430bef3cf91222b0241a26d4b0f7e08f628ec08fe5f491b1cb5e984430cd399819792fb237d5bd7ba988012602c19804f54ebcf4241741d34bcf23a0a0351
-EBUILD fastjsonschema-2.15.1.ebuild 586 BLAKE2B 268e2add7ac9c28086e6caf7acf3e4d61e7b54da3f2d4386950093dd96cf6749183631dc72a591c4084bb074a4a31605f8f2d2aab4da3c2c825f06ae633a969a SHA512 fb0587a3d5383573f3aca0140046757a60a9bb5544db39fea321ef51815b1ec716396ddfa702742eb0a91e601bb98dd77569889967358d6ee6d01f448ed7fd8d
+EBUILD fastjsonschema-2.15.1.ebuild 583 BLAKE2B 00f38514522efe2e5af70de06c457ce30f70cb2e14c95481946b97bed2e672f3b7135a44201d06c5473bef7024ec21d24a69ad07884a3d1c861c4a0447ea9d86 SHA512 614430bef3cf91222b0241a26d4b0f7e08f628ec08fe5f491b1cb5e984430cd399819792fb237d5bd7ba988012602c19804f54ebcf4241741d34bcf23a0a0351
 MISC metadata.xml 319 BLAKE2B e19c02bfc0b2d83b78d1d775d34f9556025170483be474d2b3a4803d62818de81706fb50011059260011d3e0cb11736059014c549af5c2ef913b711a87e7c953 SHA512 6efd64e7ea5b5e60d33f87d5cb75941d976c5c84cd1bec89afa5ef611b0efc620dadf2983f303f6a360a6362db003ef14ff28dd4280105c61ba43ec7b71c41de
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
deleted file mode 100644
index 375ee9426e37..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Fast JSON schema validator for Python"
-HOMEPAGE="https://github.com/horejsek/python-fastjsonschema/"
-SRC_URI="
-	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -r tests/benchmarks || die
-}
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
index a14b649f59d6..375ee9426e37 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 505b76151db3..4aa434de3634 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,3 @@
 DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
-EBUILD feedgenerator-1.9.1-r1.ebuild 501 BLAKE2B a6af0bcd32bdbcf59d9fedab7ab4725787994aa0e2f81a7cf339b7197eda21a4edd3ded75ebd69d6228476fabad7998ac4b39538000445f107e8c3cf39d8bd4d SHA512 ce330d6aa40ca4d9f8e4ec30b895d20fcc360c3a01a3bcb0b37c9582845e8841a248ae1a5524a4477f244b223abfa37ab3b9a788845a56adf5bb6c2295b3552a
+EBUILD feedgenerator-1.9.1-r1.ebuild 502 BLAKE2B 1a1683bde7c920327395023b883a1322ad9734448e6911bd26412646af9805025fe143bd3f3eff518d92ad96edd1bf54314859fcde4b81524ae6c36b20d6940c SHA512 8ed911f3af61d125e1a0377a19f72fda63257f618b01886f8c4ab8cc9b9555d0c5dc821c8d27999e6ff96f81e8d93be494f35a2325f2ebc28a4e65a8773775e5
 MISC metadata.xml 476 BLAKE2B d9847da87d942b9ca5bd8f47eb3c77221c733ef781c453b3949add8edad11fc2eda5a674c99eb2e8ddc27b7b37b74e01e047179b66e13507cb1c5b3b8ec3f84f SHA512 b75dc094154171043c4e66bc43ec170226e516a8f2ab3078728bb39c2527d255b079f2607300905c87548e294820c215963f9b8b7535f366ad941c90c502be8d
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
index 189b5e555adb..4b1f0c831b01 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index 277d4fa830ce..ce564ec6f793 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,4 +1,4 @@
 AUX fitsio-0.9.11-test-failures.patch 1560 BLAKE2B 3299a43eda8df89467474c51dec85af9edb8af52c93958e49834317439d440a0993ef6311002a4cddc4cde6aed42ed355dbafcf4f6ecbe98b81d60b9763c1c03 SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b
 DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
-EBUILD fitsio-0.9.11.ebuild 910 BLAKE2B 24876a5533b677ad919afbb503673446ea873a2649da0fcf5dd8ce90568c8feec3875590e7575e08a2658dfd3f01f38992f3090f950863420f8e42edd9046437 SHA512 07c7e1a43377ff7ddc5e693facd5a68e61a378ab4656c3daad4131986afc958cf9928e21e59733bcafd9d48c2517ccd157fb2b0d8e778f60edfddccbffb8af60
+EBUILD fitsio-0.9.11.ebuild 911 BLAKE2B c39dee4861e470d5bdc4d21d3cb699f56efe930c76b28149703cdcd55b4e59d3adb853c0d08f798bcc7aff5f19d65d1b673aba952564413450e84bfb0bdf9602 SHA512 b5dc0d05ec104fb1e6f9f22ebb75081c5bd2d97e8625044f063c1c173f0cdce64fe1e5fac1ece523c6a6c2ef774c780e494e77d1009e82eaa71ae517d1f0bee1
 MISC metadata.xml 946 BLAKE2B 5db7e27af3ff956fe32bb98c7bb54e7f4479fca568bcf0bb4c6c6bbdd97ac7a2db645bfbaed09ea3338f6512c75037b30ddb70aef4abcdeab6855cd1ee476b4b SHA512 75e62ae6ab0ae2348fbe678419e9d28d79373965b3d87af425195074544687b4fd54133b86e04a129a224a6eb84d07a3ab20b53cd38c09484d0f6532dd5db211
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
index 5bdf8f822b33..c58f52da2827 100644
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ b/dev-python/fitsio/fitsio-0.9.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index 6029047acec1..9a7e22a862bd 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-polyfill-1.0.2.tar.gz 7591 BLAKE2B 59c55e054b04098ad2e1c95d3464f3582fdfe2a83da75c8cebf556e2e7e32abeccf1bf69ec2d0b5c9790179d1c905da21b27e60e1c9810b62502c455193851fe SHA512 767a599aacbe87328b3e36bd85e0841870760ed9bd95dd3a4a9084edc6f0ae89f8203d565c2b075f16f1db21b647c17b2aa59b08e4702109d7e5f79f36d9f3fa
-EBUILD flake8-polyfill-1.0.2.ebuild 990 BLAKE2B 25fe460961a967e32883d64f5335ea3b59e7e147527cc537ae6f5494d941ee5b17ec47fd3f25ae43bbc84d78b8536dbd86db9c2075dabe25250e999738077d75 SHA512 556767770f148982f5d09f2b8f62f9b1ac5250f236013b863cb07e4182bc059f85f3d21d0240508c545d216aff250d1007716c8750e47be882fe017524d9cf81
-MISC metadata.xml 296 BLAKE2B 482debeedc50fe66cc094eaf32300f68a956fc40c3246f7a1542185b7b0ab1b9fe6aca59575c8ed8bbd9887da47b0ee6ec5d37b3205a6f8f104dc9ed23c5a714 SHA512 74a9b1446fbdcafe8d31891a7f176b501bf89c5d31e3e3221a23691280d447df21b6aef208516ef9e891b24244025c072900dfcbbfedf42253001e9eeb1afab4
+EBUILD flake8-polyfill-1.0.2.ebuild 904 BLAKE2B e3b4f141c00155080465a6355b2f01225d0ab124fa32987e0f94ab0839dfe9cbbe6a27d407392d2df6178f0685fc749e13498f2dbc8142636a09c5f8a1c36194 SHA512 f28107c9d8cdab611d2e2df3bd6bcc28e21862f91eac63aa2617f78168ad80812622dc1b512ddbf74a9bdbc38928f09b5a912709d59c25456767f0caf0dce7e7
+MISC metadata.xml 320 BLAKE2B 37c54de2aba60e6a82b6df9a981413db1aa48c6c26ea7b6cee9160bb4db53e7c8935775cec91a894a61d35ce1c730255a87096995e584df9717ac9eaceaa76e3 SHA512 e17d6ef6ffb17f0fde35c6fb5c8e78f0a97899bf0475b4f0cf4010d1bd673acc455f47e682bb65423dc4f398fb31447791fb0c6e1e4bcff6694b190574002c3c
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
index 3a432d6f9643..da199eabc872 100644
--- a/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Polyfill package for Flake8 plugins"
@@ -18,11 +18,10 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
+DEPEND="
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/flake8-polyfill/metadata.xml b/dev-python/flake8-polyfill/metadata.xml
index 2794ab4c2eff..05da64f6a419 100644
--- a/dev-python/flake8-polyfill/metadata.xml
+++ b/dev-python/flake8-polyfill/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">flake8-polyfill</remote-id>
 	</upstream>
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index edb85b4d132b..252fe2c4c5d9 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
-EBUILD flask-babel-2.0.0.ebuild 922 BLAKE2B 51f71507d99c8c74cf3e2f68a5a19333b1136fa768cbf983448c3f14bb55c8b9b58b640efd192679e4ac5ab513d06da43e8399004ea392ff9552fcdc41bae45e SHA512 496b242f1d244b13c050db2e3751ddd00f5a6bde5cfa08a9f28c259e1c7c47029d8ac9292f209a80a1a728f1ecc3504ca61c66606cdb054dd54fae31b7f78aab
+EBUILD flask-babel-2.0.0.ebuild 923 BLAKE2B 101ffc68d1900e8365d633f5bc0617727a084af2feb5a0a642575b4ab0aed1f76cf28c504d93f1f97f8983aa053754c9c7433ba507d3df62c817cba60251e9f5 SHA512 a3f2ade7c07c8e40ef0c0f45735b68a115ad69ab1ee404e28dbc5c1af33060335bbb416060554ab7f64ba62a93574cce50fa49a860ffa1293c47d37db7d2c48c
 MISC metadata.xml 474 BLAKE2B 36e79f81c6890109b98f7ab2da037e18fd85cc34f1cbf6f8ecaac683284b3385fa15848922d725feb08a063100005dc2d159066d8ff37199cfc5778474d6e442 SHA512 a1f2ada6b9ddd886fa70b3d79c6afd3c066dff22ffb7bcf8ad8b8e02353a0910b96c25c8320879e5f3c137c41bb52d7c4249cb3fe486f13336e725f98df25f2f
diff --git a/dev-python/flask-babel/flask-babel-2.0.0.ebuild b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
index 39d8176f53b7..08ffec5020f0 100644
--- a/dev-python/flask-babel/flask-babel-2.0.0.ebuild
+++ b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 3f865e24bea9..832b7854d8fb 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,3 +1,3 @@
 DIST flask-cors-3.0.10.tar.gz 31012 BLAKE2B 2e546518c8183dfca32308ef0f7d8f503c75ff62302d11ac0dc315f7c6760fa3e9064477216fd8c2cd290b0a280e6c45c35cf2cce3cfdffe141edab7beca1c8a SHA512 4471e94aea92700185a6fca37f01d61b9b966754f206eb6211813fb8c82fc0d219597e3df80e9d80b68663931ec561ca209fe23afa0142345fb75beacf3adc4e
-EBUILD flask-cors-3.0.10.ebuild 817 BLAKE2B 2e277e31015a268122b0c7f94eda77b1d49e9583a106d0fd8868a055250d42284e90c4913c41c1f2a338af51504b5ec5c09c86512f78c8657573e713051c0131 SHA512 908ef79e9ebd4c23ab6cf23a03ab09951639346d57d983e46fecedee51216c2b0c7a003e47be483545151dc05d99850dfc42eef4daaa174006ff8eb82887c8f8
+EBUILD flask-cors-3.0.10.ebuild 818 BLAKE2B 6cc6f30445b5935bb9555df2b5888ba34da0e5a228821d1e0d867cf23d3d042dec1ea4b744a75f254376df226bcc295c2e6cec459d300a745f72012ae0fb207a SHA512 c35ddb139dec464375fc6e5965f10baafce2326a5e93757758fa0a5e64adb3d771f46b001463ebdbf395e54a7ad2ad9ada99469912c81b1a6be135f2d0862f1f
 MISC metadata.xml 569 BLAKE2B 8cb54ceea61be82baacf0dd03401d12eb982116091252833ceaee249672fee76ce287356769c1890f1e497ac08b83f6206c25db9231ba5538b48ad4428383868 SHA512 abd43f9ab7c53b9c72abe72e9edb5934f0cbf5b5ca042b1cdb443155db24509314962f750bf10c0e766613c17dd2371828b6fb05bbe51fe754373bf40571777c
diff --git a/dev-python/flask-cors/flask-cors-3.0.10.ebuild b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
index b2c5f36fbecd..3848ff398930 100644
--- a/dev-python/flask-cors/flask-cors-3.0.10.ebuild
+++ b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
index 86776e2d082a..79865c66abcc 100644
--- a/dev-python/flask-debug/Manifest
+++ b/dev-python/flask-debug/Manifest
@@ -1,3 +1,3 @@
 DIST flask-debug-0.4.3.tar.gz 9148 BLAKE2B 9263a4df08f1a9518a42a025a14a89b902c62ab08b25d79b3dfffb25675a47785d0bf9075290190ee4622a30a89e190a465a87986b47ceed7d724ce0b59ad218 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816
-EBUILD flask-debug-0.4.3-r1.ebuild 775 BLAKE2B 2833c51a2146d85fdd2a3984156e6ed1aea1bf0ba823d7710c9ba98bbe3ab2e015400b4e10d5d5558868c74366e3472084dcfb9b170875ee46a46d8bef17e29d SHA512 fc5883de418df40f301d9d9eb25e346342d05827e069ffe0d62446c5c32274bfce73da8a01294aa36d6eb16de2bc4d0df0d7f55f2c728d0119cad631533acd85
+EBUILD flask-debug-0.4.3-r1.ebuild 774 BLAKE2B 30fdfec558e87de76ccf7674a72aa265f4574677b9d3c3c7d8a844b42d162fd502c098e8e31da4f813f871cb44db85c69c49a21aa7427e07ba7c743d9ba61a26 SHA512 3fe29a8056fa944e89e4aab25136a244229eda1fada3e909fc9dec711d499fe64c8d96b3c81cfe41cf80ba7ffd8b91f95b19743f04f0a1d30acf2cb8a922c2b3
 MISC metadata.xml 461 BLAKE2B 954981f786d23a25c5b66a8e69745860bc442b3730705e8b54cfb33a23d3f11ef6563ed96f952acadc31a21fb6a033a97dd1ea9d3464b4cfdaba43223d44cd22 SHA512 3174ce628a8bdece2397fe73e29cd61568936bac40a7370be818d43be6176130e6f68e7600b326546b512334cd3989ced62107009f58a9c6b4e70a23a6c55c27
diff --git a/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild b/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
index 07be1ba7c222..c4ac46372d40 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,6 +13,7 @@ HOMEPAGE="https://github.com/mbr/Flask-Debug"
 # PyPI tarballs don't include tests
 # https://github.com/mbr/Flask-Debug/pull/2
 SRC_URI="https://github.com/mbr/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,7 +25,5 @@ RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 851a5ae46491..eeef59d05fcf 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.5.0.ebuild 822 BLAKE2B 7583f10e96b48dd5bbe177d317300384e4b09cb41b0702e8a7aae030c68aeda943ed7233510d163e900aa215b42aea20714b8d74a947499744744df9bfaa4f8b SHA512 d804066b416a6691f0fee38e5aabffd5f435f61072442aff83dae729386c5dc782efc1a7b7ea9c40e92ac3a0be9cab211d6a69fb7a3aa95a1435b1b07a402ee5
+EBUILD flask-gravatar-0.5.0.ebuild 782 BLAKE2B bd2051fc519523ce7f5d050494d66e8b4527f461084bb6ab34828fb075a41b4f4764c271a2b8e95e98a5d47651e1c2bc9115ed95719e35778a4d11075e19839f SHA512 71a706a0c40401b0edaba64f8c6d0642519ef938a2189faec15edd85540f5189cfa90499e3f9cfcb82db6bbbe167ce6dd4d28357d6b9644e5e181576bd1533dc
 MISC metadata.xml 518 BLAKE2B 71d2f87edcd17a067b164ee000c52706b1ab40bab63b1224ef71a0cb170edc7d2b8535b2406095f1e7cb84f100ce0d8c586d5f2c3626949e6ab652c49371e7c6 SHA512 9487a7f0a8015e527df91da8abc4129a445a6fdf7da13fa24ab55542c3e2be5751949b93cb33c5df55bc5a9e393671645795d1a53540841c8c3cd7bae9f1748a
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index 705f58dabfa9..25ccf70909aa 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
@@ -32,5 +32,5 @@ src_prepare() {
 
 python_test() {
 	cd tests || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
+	epytest
 }
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index e8467bceea14..b63be1605488 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1,3 @@
 DIST flask-paginate-0.8.1.tar.gz 119751 BLAKE2B 954d39e13619784b1a79abc9f26fc2b3827309f9a3b77cacdd40c8f8d9dfec4c2967894e2d571e26841245da6d264dad71a412e425c87aa0c07b3520274de7c4 SHA512 ca226c79bd944a19760048c1289b554ee048f4f8d1f231f5545423843b7c0616d52ee8024cc68628e11c5f528972897d7fdb1630f87063bbd0e40c4dacf91224
-EBUILD flask-paginate-0.8.1.ebuild 560 BLAKE2B 7e9d684795a9e73c7528f685e06885dfa05b3a8ba1d42310956a34c2529f398f1d590621f2392792f2c1a55b285077f713b6cf167db60698d10bab78c0128596 SHA512 ce57a817c9e81870adb83d6798a624ba2205dfdf8febf32808c3efaf65eb028998d483e589364dee4b77d97f7598fae097f7affb1978e889a13f308b1c284ceb
+EBUILD flask-paginate-0.8.1.ebuild 520 BLAKE2B 74661a178fae8ec753a4e31875ad25e20de8a4495b81ce226c73ff3718361e715cb5a516b90066bf17c06eb07867629e6054d137e53af5f6df050fddf8415672 SHA512 9d18e2d2bd9bffd836be4d013017ca2f740f9f0fc22e4c89d081971b886ca81533471cb9dd4bc5913ba734662ca671e160b000fcb3198ba488b1fa876702d47b
 MISC metadata.xml 658 BLAKE2B d653b497bd85c508ac526d621e45f7a9135889604d68db4cb5b238ea1007d9e15db32071554662021690827396d6317ccc3f00d4f970f65093fcc4858efc3e91 SHA512 2098d78928c11db33b74b532500b60f6aefaa6536b896c8437d624786e1ac16105e7802f3380d5df2a7c9951b8b60de83b7ffff797920077c61805acea9bfbe2
diff --git a/dev-python/flask-paginate/flask-paginate-0.8.1.ebuild b/dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
index 04652ff0b78d..bff5d1a80563 100644
--- a/dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
+++ b/dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pagination support for flask"
@@ -19,5 +19,5 @@ RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
 
 python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
+	epytest tests/tests.py
 }
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index c07d862b5967..2ce6c8d64889 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.2.ebuild 542 BLAKE2B a4f70f68ebd359129a58bb7d2bb9383c728350beaa465bd742716a7b0345a08e51ff8ea28ca6411d451c1571bc31549d3d9387e8ea8ec50f79127d5a151fcdda SHA512 2baa39bc12b78a09acff099981f22c07f229af66c161e74783e2146850328c24182aa903db1fb7c7ff16d1912536774025596f40ed3b4fbaf3edc7c283c79dd8
+EBUILD flask-sphinx-themes-1.0.2.ebuild 542 BLAKE2B b82ad368f85b1feadd9cc12f4a000a4396cbd25960e5223f4584b090f5be55819f5978608990c146267f98d47acd3e05a91fe4e492b0f606e393fc70c914bf8d SHA512 99dd46edf93c550afb86040ce255ad70336ddc73c612ba95ac94240a6260506ef528ede096dc0d1ca13226fa809c6d1646b29417966fe30430f961bb4c279d1f
 MISC metadata.xml 503 BLAKE2B f9e7d350693898ab972f1dc1faaafd2d35f05bbfa23a9dd2d6fe2f21b5afa7f0d24ff0224a7f20e0a1fe45741e72a9833359faafe5aee523f9a6e6ca513cecdb SHA512 7ec82d7215991e08614a79e8ff759dd4f831319947f637775e7da89f7e545beca88d69b3c78ad02d115b7e064e81ab272b658a1c681d8afd30b3b9c8f02b59c3
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 95bed176a27e..630add4ca05b 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index ae23f1b60377..5a8cdd2d2e7e 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
 DIST Flask-WTF-0.15.1.tar.gz 45540 BLAKE2B 95ed9efaa89b487f406811926a8b206d15ad9c065f99595a35ea2ca4f98ede671673204c4085de91afe1e1b91b611ceb0f43b9c68b46fdd0e38d9025ac666f70 SHA512 9741e2c2285a500866b160e8c906c38ca579fdae2235bcba2336c7125ba614a9f75167c82bfcb96a45e553170c5925cb1a530d0164ecc57dc76cf1b560c40855
 EBUILD flask-wtf-0.14.3.ebuild 1030 BLAKE2B 6741790ee45cb60146b5d2c36a0510e5f635cf19de6c5ab90705af10daa6af512b046a418df87741f3ecea27ea292c4d1b776bd477ab2c0272fcebfe260e8cc9 SHA512 4e6bcc04e4f8174a1b81c96997a1f8a72d44b772bf41cd8a76c27efd35376ca3cad229f533fce86731794d326f6583da4df22e19bded7ce07f877951338a2ddc
-EBUILD flask-wtf-0.15.1.ebuild 1032 BLAKE2B b7a6bba5b09e9f30ebb55213d69a291636cea09d4fb842f6271179012bef0cac1fb33c4ba896a7c6e07fa2bc0910bc1a2ffd93661cfef71219bb53733ab89b97 SHA512 0eae0e1420a5e910fc9fd452a837fbe59fbabebaea8c67c00e9adb72a089d78c7ae5988d53e25077c999eef084571060dc2c0073da174c7ce3e6b640f9230478
+EBUILD flask-wtf-0.15.1.ebuild 1012 BLAKE2B a378d29d4f6a24d9993f7f348397b5484fee746d5e3ed32625386058d71754a1e2a87150f458f8b7af57f43f627f55d89aa37d26075af3b173d29aca6ce945c4 SHA512 36cb6661181ab09ebd7fe87be92d15b2ee82403376eccda00911fe5e3c425a8defc43247bae06a66442aeb247b0d132bf0bf0f041976253201d3e468ea6c75d9
 MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
index 7db390002886..af7bd3457aa5 100644
--- a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="Flask-WTF"
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
 	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 043b003d943b..bf44391c867e 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-EBUILD flexmock-0.10.4.ebuild 482 BLAKE2B fff2ba5ff38dfbc29ca1d46bcaeaf420cf281b340c55dd1bb94e4849363d27526a575d4e713cf68739153bc0001b5e033c9d35dedb07fbd7b9b2bb772e215cb6 SHA512 92c17bcf5552727f4e78fc0a249d342fde3f0edb28038ac96e767e8852fdd1d10609e1837ad664470908cadf085427786d0e27bd872a609e1d40cc68d689b075
+EBUILD flexmock-0.10.4.ebuild 482 BLAKE2B 03d6e64fc5fdc74468d12e0df9d9c1c062f72f5d05b846eae5eab09592abacc2c15aaf4d19bbbe73973abf0b0e374372be026fa86fbf20ffb7e8182e5bfdf967 SHA512 0ec3e119b67a5601b104a939d9450060ad22616b3a0c05eee95ca131c920dd5b0c5bab543093375fa9e288b46cbcac8eb3ab44edeb26ab928f613b16e516373d
 MISC metadata.xml 657 BLAKE2B 065a19cc94f756b0702f9b52010d5ac63af8d3b8f67ea307a073f0ff6046143e2d2e4f4266df5324192e42c4ce823fff646188654207cd87277d854c986d2667 SHA512 c2cfa313f94d79e0cce3213f53449582e18edfdbdb244d9771aed0f4e610e2a7ab225b0d7d51483be9c1ac9763c376f051b45fffc1f83ca44bd06017c0b29a06
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
index 22c19f0099f6..7045a6d0ba79 100644
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index ff5a5a1f6e18..9ed7b985895f 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,13 +1,5 @@
-DIST fonttools-4.22.0.tar.gz 2544600 BLAKE2B 685da467c40fc7cffe2b33b08da53e5bd148c5190efdc8d08e2c66ef06e67b5e26ec5fa090334b9ef427b1a005c6386b0f78b978d376c7daee7f4d540faa21c7 SHA512 06db054ce488d0291f876b05b5dd09a772a702f1d45b97c1ba46d02e01fe59f7c63e268fff958baa4076c1ce72f450384e473263250c1617791d78c0e311710d
-DIST fonttools-4.22.1.tar.gz 2544433 BLAKE2B 711737f696bd3a25f0c0eec2c1fb80c38dcab81d974c7f5c9d9e644aa3850dbb08502ba14111397b42615fc5287f9af8aa4d7b83e7fe9f23ae4d080f2864189d SHA512 2f38eda41ce913bdd6e62f495a215c38ed9c1fa7df87f1ecc0964b3065498e39c55e030899a5561321b16f995a705449c958244ecca2aaef492c49066db0ef93
 DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
-DIST fonttools-4.24.0.tar.gz 2551274 BLAKE2B d893d07729ee680c77ff3f2d369e1c77333e5a706ee5696e0843b19cfd419084d3278e35bf9f4cc3accc62bdc168d2e25cb0bacaf6b8adea17301e47cc185c34 SHA512 be80610e9c61a6f49b66b81d2e0ee50ed07e8ff8f932e3ccaf59869cce347088aa739883c6bc599dc47e196aecb69a648033dd485da3d18c84901c02f0aea92c
-DIST fonttools-4.24.3.tar.gz 2554695 BLAKE2B 8ef77e9c00a074a3d9ba92a976f5b22a20b24e89bb51e46e72ce88b6d09e5b9b77ac2b2d67aaa8988bbc34f81a17a52798bc2adb6b552ca68d36c29136a9ec21 SHA512 394d0c33432288670841d246167ca0c5af7c5dc843d8601ff7e681f8a81dba02023a1314053fb591256145b9063b8b6f9f0f13d5c319de926ec96f4f15dbe4ff
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
-EBUILD fonttools-4.22.0.ebuild 1308 BLAKE2B 8948cbbdd2891530e5e79f05e0ff752de0278afc6659c8cbb24bfa85a6fb35c1a4869cd84642acea99d1d612c31ac8fb2ec84626c497b8d735c4fdb7edec113d SHA512 33a7e0bf787ac86abae46dbbf93f58df730076ed0c2d7b3cd0c9645d6bbbd7a019c424064a0b6293a179f36d906cfc1f59d139e33c850e8ff43171ad5b460f52
-EBUILD fonttools-4.22.1.ebuild 1316 BLAKE2B 9d44143f4439f4f8c74ae55dc801945a7aad1c7d1e30e3826b488a14dfbe761ebb63501f4a92545a1eb2b8fb6bd37ad07cc494aeb73fb72169798bba63139060 SHA512 895e3d29de74df1a1782fcc9f7b15d3991e14e69b6066b249839ef86eff3ed4853faf48d9626c63fc3fad5c81c1c4946c2cc899ce1882dae8fbab60d1aa46687
-EBUILD fonttools-4.23.1.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
-EBUILD fonttools-4.24.0.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
-EBUILD fonttools-4.24.3.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
+EBUILD fonttools-4.23.1.ebuild 1275 BLAKE2B c141c4c40de9f3eec1679e8b574ec266962a6749c1a16fdf6fa8ebc7e8cb6cf705f7c0907a55793efa1f31d8f9bc65a9708a865ddd8897a5956c7161be354ace SHA512 4204c3df209a287f41da115fc6f04ae40938dfcc50721636c9273f69821c29e63ea9ebd33a2a7dfd0b97f067f519376f4f0707fbea10de8e87dce12527ebe5e2
 EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.22.0.ebuild b/dev-python/fonttools/fonttools-4.22.0.ebuild
deleted file mode 100644
index ad44a2f64933..000000000000
--- a/dev-python/fonttools/fonttools-4.22.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.22.1.ebuild b/dev-python/fonttools/fonttools-4.22.1.ebuild
deleted file mode 100644
index a132b8324f4c..000000000000
--- a/dev-python/fonttools/fonttools-4.22.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.23.1.ebuild b/dev-python/fonttools/fonttools-4.23.1.ebuild
index 95ced12ecf0d..04af2aab63cb 100644
--- a/dev-python/fonttools/fonttools-4.23.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.23.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fonttools/fonttools-4.24.0.ebuild b/dev-python/fonttools/fonttools-4.24.0.ebuild
deleted file mode 100644
index 95ced12ecf0d..000000000000
--- a/dev-python/fonttools/fonttools-4.24.0.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.24.3.ebuild b/dev-python/fonttools/fonttools-4.24.3.ebuild
deleted file mode 100644
index 95ced12ecf0d..000000000000
--- a/dev-python/fonttools/fonttools-4.24.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 95ba41f901f4..884e1fd83adf 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,5 +1,3 @@
-DIST fqdn-1.5.0.tar.gz 14630 BLAKE2B 021b4e53c42830a5523964961cde9857bea9eb700cd2030331b05006ec4a8b7e05a9f2330748b0d84531526e17d81ade73fb04e65db381417f2d7f618138f09a SHA512 3940955df50bcd0bbd5cae82f148e9a8ef64b6db84dc867fbfbfbdd661fcc42208a7506f931209347f9115722c00e330fc03c5bdd459cb4a98d0df59af48c492
 DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
-EBUILD fqdn-1.5.0-r1.ebuild 597 BLAKE2B 285258443c384872b88f8e21133d42a5532e3771e97fe9ca70e21c3ec8f928fdcb602ababc2b3ee939a1c025a4f2eaaa9314d9a440458616d19c41c143d0c9d2 SHA512 2414ef2577f401124db4c958296762e73f301dcf891f218f7204b7ad27a9b0f2bd8b8da77eb374dcda7e277f83ac51e6918ec3d5cf810c4dee748ea3ed8fda40
-EBUILD fqdn-1.5.1.ebuild 590 BLAKE2B d6e75b02d59a89249033ab2eebbcbd1e11af82455b6787090f8aeede8abe27ebad85a9d298b6a3ca82ef6506d2cd375c03d95d1b899c14f25505ed305b48beab SHA512 5e9238495c2210c95d0fbe0ff3de7453a00c3ac5332fb0f9257c554f9ad4ab6fb541ed3b5977ead3028aed9e73914014bb8fcd30326b0bd68587260dbf06b054
+EBUILD fqdn-1.5.1.ebuild 581 BLAKE2B 5970d7e2183402a4b4424ad83e41951878f49d29e663883b16c6d9ed82feee879a534ec976360143a8412b6f173fbba22aaf91cda0a4a5774780bd6a53145aa1 SHA512 eb275893e159c2002322c0f06768b81a01d798872c03c2853564bbe4c579d8e8d33027ea5aeb7c73ed6b778c8fdaea3589165993ec7e95cc74d30d20c188900b
 MISC metadata.xml 651 BLAKE2B 52e04a7e3de79067b3ef936ecc8bd0a2ad9db6157901992e45b4c96fd84cffe68a836fdfabd3e6b8350e53fbc88af9fc5534d0754ecaaa7f2df8e4c7af146951 SHA512 1f938747b18ee81777209bc80b6ffd66fb680f980feba5e7fd2fa13c2e96727be27be004a4e69b244629e00da851b2ad384691816ebf49cc81e73e9ca000f1bc
diff --git a/dev-python/fqdn/fqdn-1.5.0-r1.ebuild b/dev-python/fqdn/fqdn-1.5.0-r1.ebuild
deleted file mode 100644
index deeea469ea8b..000000000000
--- a/dev-python/fqdn/fqdn-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
-HOMEPAGE="https://github.com/guyhughes/fqdn"
-SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/fqdn-1.5.1.ebuild b/dev-python/fqdn/fqdn-1.5.1.ebuild
index 91ac88a37d86..9bacbadb679a 100644
--- a/dev-python/fqdn/fqdn-1.5.1.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/cached-property[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
+	' pypy3)"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/fudge/Manifest b/dev-python/fudge/Manifest
index 4a6928374204..82e54350dddc 100644
--- a/dev-python/fudge/Manifest
+++ b/dev-python/fudge/Manifest
@@ -1,3 +1,3 @@
 DIST fudge-1.1.1.tar.gz 87604 BLAKE2B 2660022089ab50139fd4a63aa212c0f53d04557571fa444cc2fd74dd556475c04d3563359c49f0252d811b93a3d4215dddca32c7db91b81682adae2a7fb7f772 SHA512 4a5043048aef1bc4c7806b7a13e138810295f882739f728115a60f2b0157716d85a7bed8a3641b76213b788c74fe586f57854f96bf7a745d6006ad6e67dca136
-EBUILD fudge-1.1.1.ebuild 832 BLAKE2B 431f2aa931e8307073b1de0583771d1519c21483827fbce614ead0e40d89d6e86e9f6e0fe286b31a8d64f354d94b90a4d29103925456fe2c89010b8ffc983346 SHA512 ce323f105d31e2da30f3dbc81413d681dec4b1427a9615ae553b3dd5624cfe88a760f39aab3c472df7ac59fe08be0088e83d6601475f7575d476b10dad01a4ca
+EBUILD fudge-1.1.1.ebuild 577 BLAKE2B 159daea2ca81ae4987229b75b99c8a5259f1a678439f4407d4a0add78827d85428f7d53e90d19189c122fd104d8ddddee5ba41855793f27de9ba33a24f73049e SHA512 9ea75970e6b81e89e8683aedeb802d7db2cd2e7f21506b0b0242c2e96dbf253982c7e3d511625b5eec2b88ccd60b5206820ebebe2fe04417f40efe007997baa2
 MISC metadata.xml 308 BLAKE2B 515b12cd0857952a40c85fdb530340408506cdc4b33f54609b1489fd9ca458f8ee25d195f7cf3b151ca2d219451766714406d7788d7fabc718d2f0f234e5e588 SHA512 b453f365fc5bb8e91cf95982d92096d7f952f4d4cdef59ec1cc41e53a6e2e4861d815db845174952791a1ff67007c8c076151b2a12a1730d3ea03471cab02c56
diff --git a/dev-python/fudge/fudge-1.1.1.ebuild b/dev-python/fudge/fudge-1.1.1.ebuild
index a68ebe7de1d2..f35325a13384 100644
--- a/dev-python/fudge/fudge-1.1.1.ebuild
+++ b/dev-python/fudge/fudge-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,23 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
-BDEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+distutils_enable_sphinx docs
+distutils_enable_tests nose
 
 python_test() {
 	nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/genson/Manifest b/dev-python/genson/Manifest
index 72d3a65a997c..cd7eed1a019f 100644
--- a/dev-python/genson/Manifest
+++ b/dev-python/genson/Manifest
@@ -1,3 +1,3 @@
 DIST genson-1.1.0.tar.gz 26662 BLAKE2B 726b0467edca9ca503d73c914d35392f0784ae8be01a8287b84da3cd5ae4b4cd6e12a46b1a7baf73db40377b915ddb3c4b53f4a135e3923fa775af5b51a5261c SHA512 54264dcc51cd5ece9bd428079fcd5cf833f32ef36afbb7987de9982d33253834c5c8c35d18b21ad4003fc2ffac4da02965a00844457b7d8ca6c6bf3d3facb8d6
-EBUILD genson-1.1.0.ebuild 605 BLAKE2B a5652193326f11bad89303b30ea9f8c7eca7503ca691c072418919b3459e1da129fded7f2348751333f73dce30b537d6df726f0fc5a1ddbc603cc4080674a06f SHA512 db48b7090320a3ce41d068840a9e5d9001a15178f762d11c488caa523e0c5a8955ac8673b08d838ad7860e0d731ec7f8c73f20de0bd144de8b925362f44184f0
+EBUILD genson-1.1.0.ebuild 532 BLAKE2B c82351d891b3523e089021e34a50fb8beb42c88b3686e70466363fbd90af6a8dcca8b4b45b527658b0dfd600097f1f2c4080ab74bd26b705217b2e6809b440bc SHA512 632440be31f9b65328301c53ccc1538a64c6040e025372e2bbaf96af6bea14bc7143da9ee0ee73077ea327c716fa115994051c49ab8a6d865dd4823622151825
 MISC metadata.xml 374 BLAKE2B 5b656de91f608ed3000284960ac44e8983150d3886c34ce891ddfa5036581a246bd2eef841002b0b8c9e25fb81b96a08e8e7f001446d0a1b8c8a7f8196b96286 SHA512 94125f62b402ca3ef2ce14df0727dc0c777a30276380d61cb3ecde3bce3930d130a65c730f2106b2aae324819e593e1fb4e62ceb20051f74fc56295c7bf9983b
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
index d52c514b42fd..23d76cdf7836 100644
--- a/dev-python/genson/genson-1.1.0.ebuild
+++ b/dev-python/genson/genson-1.1.0.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
@@ -16,8 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-python/jsonschema[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index f233a36219cb..79059c134e34 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,3 +1,3 @@
 DIST geoip-api-python-1.3.2.tar.gz 35674 BLAKE2B c6c4469164347c8c1a8a5231be25370e806768d7f155832cf759469320d8adbd5efcd002d14d1d95522e8bcb4db12668b28b437b45af669bb336024662908498 SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414
-EBUILD geoip-python-1.3.2-r1.ebuild 816 BLAKE2B 669afaba47e5af39767852e4749e60145a4b3ea543a58d59e1fa98ac8a015a7d68b8a6310e97dac738355f4ef19883fd6dbf451b956f88b983e6d2e34e84e2ff SHA512 e87984bc2df3f5a2226555ce3e3b8e5b3da26da7eaad447e7a3f60f981420c951b6c90dcca24cecc14f1f3724ac224435afaaa2f64188d7528e80e487671c2ba
+EBUILD geoip-python-1.3.2-r1.ebuild 784 BLAKE2B cabeb6c8b48a2f9031fc38d966c6e3240acaf0a4a9343b3a049f51c3fb5b40d727b499e1a1827a59e183d07922f2f837ecdbd72b6c24aa9bc74630cac236fe5a SHA512 1b8f9e5b2e2276f76b43d7cfae42d14cacf8b523cca1ffd5a6b495ad2b2d7b6157e21899750bef9f53370bf41771176b743756e052d39fd7ddc2047d416ec5de
 MISC metadata.xml 372 BLAKE2B a64a0eafc20c11334ab112844de60a58eeaec62d2bb88ceb0e72efba9fae4cfd0bb02a169f4913299534cf3243d740a6f0f96fee1448a55bb8d9bffe3ccf3597 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
index 6097ed5189aa..6741bf4bd48f 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,8 +18,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
 RDEPEND=">=dev-libs/geoip-1.4.8"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index aaa08d288f53..deb30a80f52c 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-21.1.2.tar.gz 5943652 BLAKE2B ef85e9941a8e46370437a34728c012f9d8976b5680b22bf9b13ab35d7417019ac0e85fac5cfc8632972e38a2f70028a00ba3fe9f8be11aa2ff64e364052da594 SHA512 1ee2b748a97fa40f67ad2c3b83c6b9f48dbfaae9f2b4f1c118919cfd642c1ca27de0e33a00d950f003f90131354b56a4868ce3051864dbe2ea9b7f22eeafc1eb
-EBUILD gevent-21.1.2.ebuild 2160 BLAKE2B a9e618b3c698f841c5fb4363b3b99780fb18894f5990c956c9e02240ea52da8cbe99e168a1e81ebc645626148723ddef65ada5af38846a8eab1bc9b14740a8a3 SHA512 62a1ada1329364df6b94d5d22ba7f040459bd8144360fecb4c3f3c47a4d1b9a435b58b473ccc1f1f26cd28edfea68649305a835331e76f960b11abd83df01bde
+EBUILD gevent-21.1.2.ebuild 2160 BLAKE2B a789bb1d3879cb3f17fad0e55e34a3ec7e16a9415d6b5b545ce40feeab8739250b30b0e489ed26524ccbce1a1ef97202d3ebef14ffb67bad01f86ff06feacb86 SHA512 220d4da55997a4a6944d55fa56f610a281cef3eb559892dc5bc3e66facf0edce7f7c127685f724721891b3c199ee4a217679c450274e314cdef1b81fd2b082f8
 MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
diff --git a/dev-python/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index 147f0a72c836..61c3d717cbf5 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index a1283844266d..e1c39c40c174 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,13 +1,5 @@
-DIST google-api-python-client-2.2.0.tar.gz 24631108 BLAKE2B 377b87d30a0adb2bdbf983e9821e8be5db371e70572d79cafc1c4d231206461d50373b87aed5927cf5a485c3c1b21819db2719107cf58472551a7a0f858d8090 SHA512 9e921aa4b3868f85ecc3eb572d465c13851b1dfa0e84d11706821d5d02511cd4ae4fab4b9b55c606446d5753dccb973a99de888fbfa890aa1fcb6083fde976de
-DIST google-api-python-client-2.3.0.tar.gz 24912943 BLAKE2B 60233808f0f6243c37e8915791975e9aa10fa2d82e54c183582db9712dc36920d7d99f6caa67a25a96b1806ae9f96fd4f371010472b753f7a80d5e4fab49bd3e SHA512 11b9ba2f6417c017d47c9563460c38afdbfd01658e6c0f1812b1cdd1068b04bd37bb362e2ade4214fcc9a89d758f31bc977e281b093793a48641a2b7d926715e
 DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
-DIST google-api-python-client-2.5.0.tar.gz 24996941 BLAKE2B cd29420cde87584324fedc8a0ebb91fa20e65a84418cab1eae8ac5a7adedbb09a8f5b1367e3ff7606f448b1125c6d4289cb2dcd908031707774fe7dad50c9229 SHA512 b97abbf87aab42ea14907500d5955d43e318087a73ddb08c43d8f073aefdb56ef31dce7d3ce054ac8bbe6140d5adbb6a54dc977b4c504cad00fe99937f5acb7e
-DIST google-api-python-client-2.6.0.tar.gz 25405797 BLAKE2B 4961d4940b82edb1ef839b7433c69a0c0abded1593a7a229a97e52f42583d6808a3325d76a1dab4c6ff3d9c66462190e408ac22afc66b8c0585205ff7b0974af SHA512 eaf0bb958d54a5b74916ac962e6d0b1b55679ffe6a2bf663e0574a86c799e9ba3ae49ff9a986b81ebe8ba407c8dfe4e46388325f3725afe49f2b157fca10b978
 DIST google-api-python-client-2.7.0.tar.gz 25488451 BLAKE2B a8a761944fed3970ae0cf53b2cb926a6670ac37323c39085a5f7fb4f354451292fca4bbb2c34a72d086dfa961b74a72f66319f6bbc2505ef70f5c94aff3f7a0e SHA512 531e919cc9d0cffc49b31d881a6ee3adb2d9cc166813b5884c300e9a3b63b28c9c269a0d1efe47961fa61f79ec5adb8a12e2208b644fd62ed4baa66c56d219ba
-EBUILD google-api-python-client-2.2.0.ebuild 1519 BLAKE2B bbce04ff3287c107f2deffd4614c62c71fe3e147b514fd46cc97761f3a30b8593aade945b40d7272d5b34813f897fd1bfb3ff96c89fe9208cc50960007217fd6 SHA512 7604601e0431d69f1b999fc5cad59c2118a4d5c5864ed6ab803fe3faa1be4833ab1a72df585ae278759cd1e8d73c617b60889bae6e41773c0f74dd36cf78a401
-EBUILD google-api-python-client-2.3.0.ebuild 1559 BLAKE2B e345907554560433de3888b24109ad3103348a620f9f85f0c842fa2350e5c3fcbd4cae21229787b634330a94f916b16bddcfea00cebdcfe49028f5ccd92d945f SHA512 1c0638e7cf57b6e3af304741a6c80408005877abff24e88a161bbf7233ddb28463ca7b3009f2d882758021f8ac2810235bc9986ca19a385fece84b3472e1b004
-EBUILD google-api-python-client-2.4.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
-EBUILD google-api-python-client-2.5.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
-EBUILD google-api-python-client-2.6.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
+EBUILD google-api-python-client-2.4.0.ebuild 1514 BLAKE2B 576cae9faed55f9bc0d1ff3d428525f696b509c0517b27e464a7670701a1b3e7929cc217ea4b92134dcb11771f74dbddc78ebb759e1e75be4c9b5ea28590eaa6 SHA512 8c2c8dea75772e9d6ca556bc3c4550904b139fadb02065c91eacf90a666d65c6e8ba45abeab967071a76b732ee6c639a5d076c4f1cbc67d5232742172bd999f1
 EBUILD google-api-python-client-2.7.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
deleted file mode 100644
index 390300fdfffc..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild
deleted file mode 100644
index 4a2588364e71..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
index 5ab50082b8d7..e1063f778812 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild
deleted file mode 100644
index 5ab50082b8d7..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild
deleted file mode 100644
index 5ab50082b8d7..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	local deselect=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	distutils_install_for_testing
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 0c81d278b5d5..7c79b6cc31ab 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,5 @@
-DIST google-auth-1.29.0.tar.gz 167058 BLAKE2B 0c6c9ac11330e46757bc554f7ae984d4ab94562e4524e0c579c0878fb093201240ebabc3a4f44f8d9f530a82ad5f84dd76100d57e2f874b78315c7f0d2cfb4fd SHA512 a6c8ca93ef493f16b7b16c2e1456891a09635bbc4a39053dc2c4cdca2f739692a74e4588c61c8aa5f06c1a5355ef304771770e26f1656edc0ef4c3c291df796d
 DIST google-auth-1.30.0.tar.gz 169598 BLAKE2B 4b0a0e66255abc11c697ca2c3d77ea0b7cf72cc13f6b1630307018e6ea52bda57a1f856787394455d71c61b58103d4e5e24da62f6ffd95022042b48842efcbbe SHA512 d07d6946635071e601c684a60e99ecec532ec51425aa934ece48b124419cb4c69c7651505018471431a7cf14470f4f8d894a2121999d3a482d603d41e5a8e66c
 DIST google-auth-1.30.1.tar.gz 169244 BLAKE2B e496239807ab9ca64e1b5dc39726fa22b56d55f14883c983673064b8ea33f80dee013654d4808fead0d06e8b6ddc53554d094f42aede6e06224dc3a3c04e88d1 SHA512 7e35f5be9be160ddef4b579c2e5bc966f1d64f8f0bb75220e22fd3edb9c6f6140bdcf68055fdb13dd370e3d543206900cc9403237eb328d69418a384a4d0fe26
-EBUILD google-auth-1.29.0.ebuild 1437 BLAKE2B 8ca006569936c4c27aba0c41a1101afc6cb03ee559e91c643525aa52e391edf48db40f0bc14b4f117e13cf18a85f0a3cbdf6fd5c7872878e7dde36e41c61f323 SHA512 36aae194362705122cbd36d52c431935d352b17fd0dda3221c17f900f71ab5b9e659295c2cfa3f21a67d831474ddda829435a07f997560241ea23b93755495e6
-EBUILD google-auth-1.30.0.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
+EBUILD google-auth-1.30.0.ebuild 1444 BLAKE2B 39bc2a6c2325506e7d4907520d245526d3b2210b8309c8096695ae9d79e34eaa4f2e46cfde7038eda95a853dfa54362c05d7da961755d31d45aa9710fe7c477b SHA512 6065a0445d2ee742f245809246a8f0eb5676a60d6f3a013dc5b135586cbedb8965858a596f7f6ea40f3f4d29b18315abb36f8ec4dc473e10a69d37aca163ebf3
 EBUILD google-auth-1.30.1.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.29.0.ebuild b/dev-python/google-auth/google-auth-1.29.0.ebuild
deleted file mode 100644
index 905829d2b1e3..000000000000
--- a/dev-python/google-auth/google-auth-1.29.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.30.0.ebuild b/dev-python/google-auth/google-auth-1.30.0.ebuild
index 4c3742ac5a32..a25e7b2ceef1 100644
--- a/dev-python/google-auth/google-auth-1.30.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.30.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index c7cf009cad2d..8442925793a9 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,3 +1,3 @@
 DIST graphviz-0.16.zip 193031 BLAKE2B abedbe170eaf9d3ad83f91b5ad13aa9fbda8669ac19ebbd1087aeab3f9401b0b8e6557313e04d791451ee501c75bc2843d89d1a0f789a219b0db771467b4b8bb SHA512 7896901decf712657d4cb16fad58eab8492e1476e60a32b1a7fa37ede2e9c47ed31c00b7dedcaafdee291e2cfe6b2e2affa352282665782829fd3fb2f30bdf92
-EBUILD graphviz-0.16.ebuild 742 BLAKE2B b3326cbb6b9c8c6006684e859f473e13dbd3576acfc55db5b2bd478436f071a7d7597721e9fc2d2cfd2904448d6a1dff6ffa155de8cdc576d90452cfc8d1a73b SHA512 7f54205780f9fb328b4456e6511d506a1a1d923f7f971043214c7c369ad12d7413f06f4bd914378e08dd6050b5ced8267f734e759125840ebc7a68828a445847
+EBUILD graphviz-0.16.ebuild 743 BLAKE2B 76db9057ea6113733060b80840fde1f1cf16be3037bb2d800fdc889c8d62a6d684404c3a4e8aa8a0ceaa31e7bb55b8745249f7bf7ab585372a3df372f1065b7e SHA512 e309c4982445f2f11e3df428b47d563eb2d69beaeb5e93f71cf1f4daf4e1c376d57da923fc59ffa3caf3458df0a7a9b69fbcca02555db1b1b8a9cc4ef92211de
 MISC metadata.xml 552 BLAKE2B e5a314fb4006a3081b0f54b84bb35243dc1e56e6cf19b8500dc683a02e48b687c8a086785fc1aadefb6301aa7112467820c1697b141010b96ee9504213d21a61 SHA512 d8513afc41a59f83476e98b296e6150d159096939645afc964d48a95dd36e6add4b2cda9a2ef2a5034050616c5c08d6c6222f71a0a0e0f83250f2be570c1c990
diff --git a/dev-python/graphviz/graphviz-0.16.ebuild b/dev-python/graphviz/graphviz-0.16.ebuild
index 5fb0f3c9d5df..81c5fbf1cbdf 100644
--- a/dev-python/graphviz/graphviz-0.16.ebuild
+++ b/dev-python/graphviz/graphviz-0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index c4730858b9ea..fd22f9150ccb 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,7 +1,5 @@
-DIST grpcio-testing-1.32.0.tar.gz 16814 BLAKE2B 70205dd8857256c9c4de8c7a5d115620b908deb4da35fc3cb77d9a93bd42ece34d6fcd2d32d587f8c3ede9bf49e61b9d37aac36ebc1fddbbd6e3ff2ce83809f1 SHA512 3ee10912a090287d3f039f350b11b8fc2ed656939e02a3e616911fd1af838e3f3570a7b3444c0ef54a25797a61edde87d545a9b9cabaf251a862b94100a45473
 DIST grpcio-testing-1.37.1.tar.gz 16930 BLAKE2B 17f30c1c8266ab1fdb363aaafa80a51711be61a76048ff47b09954f0d5ab570d87a1fcff9b3531245c2dc7066e8f71034662ef524aee898af81d922646d3482b SHA512 bb32067abd145dc2b45b29fe2f01ea9cd4c2a9fe76b94f4c5392c26557118aba2e3032b2566809575311e2773a0afd408a3ae656e31deb93e978fb35ad64c98a
 DIST grpcio-testing-1.38.0.tar.gz 16637 BLAKE2B e5d63653baa3ddd7c85b04a8979a748703037aacd1daa25e3e066a14efbcf6e9a36352cb4fd14422490246e72f7d3bff2e445f659eaf890db31cec0ddfdf7445 SHA512 5bcd2204475329bfe7ea194380152bddd440d82cb31a3a2510bf253cd4c165c06e02b607f19e93d5860eec18e08ef39bd6ac105c6dc016bb2d083c1dd74fbee4
-EBUILD grpcio-testing-1.32.0.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 EBUILD grpcio-testing-1.37.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 EBUILD grpcio-testing-1.38.0.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
deleted file mode 100644
index cc55c6572526..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index ede25c8f813d..950b1d77ab66 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,8 +1,5 @@
-AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
-DIST grpcio-tools-1.32.0.tar.gz 2103777 BLAKE2B f33a54140a5356afb3930dd1ed7d48852744093621d7b252ba74ab9b615c90de36c637d1004689bd2dc3fc86757c9084795586f334a54c3ed45475f2565edf98 SHA512 aad072eb6de60d162d4ed6e353ced9d1b7d72e4ffd012237294fc5839c7d411dc640ea235746057007d289ee37235aa93c8ac23108299ab150c24f99cf050a4a
 DIST grpcio-tools-1.37.1.tar.gz 2120381 BLAKE2B a0a0249166c4f2b0167ea3608f962d0cafae8d7ca7d9085649dc3ef70fb32a93240739c311dbdb59e29c5f1e3319f76f28bc97eebedd37c06b298099750d6730 SHA512 7fa77a822fd242c94547e93aaa7120648a25ddfc0af16a0c1b721e6e2df1fb02a4e29c260e0cd3b35f1b25fa74dcfd42065d0dc34e71fa489e7abbdf2e4ddb4a
 DIST grpcio-tools-1.38.0.tar.gz 2128330 BLAKE2B e2d191289dd7cb1edf85ed3d63dc2c469ed03f75145fdbf8dc0c300427c629dbf27a9c4393bf37ac29545dc5b959dff20a7ac6cef679f34aa6b395c556e9c01d SHA512 0aa5827d2f6e575874b9d1222f889a8d07e54c64d4a2e9fb76610cc5ca731789cf5e9eec2dd42462eda386d96ea519040e162e0ad8883c1fe9683289311cd8eb
-EBUILD grpcio-tools-1.32.0.ebuild 843 BLAKE2B 8605ca43be2b2d03f96214f4943aa8bbfc422a7a65ea2c5cf8a05f04c1638767effdada5a1ac120255f294cd9ab508c259707324a04df0c4e03d33ca2522fd2e SHA512 99774f11ebbd4a4c026ee0ae16d2b58b3f9e68d54597c6259d578191ffda244163444a29ce5893da5053640da4f7ea81f46f452bc9bc5ee41bcad486d6fb4198
 EBUILD grpcio-tools-1.37.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 EBUILD grpcio-tools-1.38.0.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
deleted file mode 100644
index c6729e9808b4..000000000000
--- a/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 25 Sep 2020 15:34:19 -0700
-Subject: [PATCH] setup.py: respect CC variable in latomic test
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 20a6d76..d1cd707 100644
---- a/setup.py
-+++ b/setup.py
-@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
- 
- def check_linker_need_libatomic():
-     """Test if linker on system needs libatomic."""
-+    cc = os.environ.get('CC', 'cc')
-     code_test = (b'#include <atomic>\n' +
-                  b'int main() { return std::atomic<int64_t>{}; }')
--    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
-+    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
-                                stdin=PIPE,
-                                stdout=PIPE,
-                                stderr=PIPE)
--- 
-2.28.0
-
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
deleted file mode 100644
index 38d1a3e83c5b..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.32.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 multiprocessing prefix
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	hprefixify setup.py
-}
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 6b8cb0181eca..1cacab55fec5 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,8 +1,5 @@
-AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
-DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
 DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
 DIST grpcio-1.38.0.tar.gz 21391828 BLAKE2B efbbf42ad4e67a2c39369c47f345b2a823427341f3e535737d28ff4061941bc649bca179cab84ff5457bab2ccef49146fd2cf7daeb0cae7303e47f192f250feb SHA512 7def460f1a96df65b99fae8aa149428286002aecd14242f62885622fda1568f2d44fc69c3bea28cd1568e3eaa46f03b0fbfda2a9cee23e1e5dfb44ac99ffe597
-EBUILD grpcio-1.32.0-r1.ebuild 1206 BLAKE2B 9efb8a65a9330cb803fd72fb1002c20bbb05a4c650248eff3c869f2615695deeb8a4cf698cd3cc727708c4e4b40e947ea11c2f391c10fd2b91d6823125e96646 SHA512 2b109be98186b79a61c332bd39a1134a2b3e187f222cfc08c43f69271bb0310ffeaf9deeded15cd1627f1c14d797c8daee652d9823cf7a07bacd85ca1173b44c
-EBUILD grpcio-1.37.1.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
+EBUILD grpcio-1.37.1.ebuild 1196 BLAKE2B 5fecf77f518a1ca95e1cf483c634d9fe6c25ea4b2d8db1887e93dcc56c373f3891b7e0d617ed31a6995a3df5a574c4c7bbcee2e40614d8af27989337e80274c9 SHA512 39ba92ade9f8a542da57b45580b6323ef9192df29f66d148cd05a5e50bbb5f624185b9beb31e7c8eec55740a91ce94c2e587b9fd5dd056cc4997fb7a1f5f27b1
 EBUILD grpcio-1.38.0.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
deleted file mode 100644
index c6729e9808b4..000000000000
--- a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 25 Sep 2020 15:34:19 -0700
-Subject: [PATCH] setup.py: respect CC variable in latomic test
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 20a6d76..d1cd707 100644
---- a/setup.py
-+++ b/setup.py
-@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
- 
- def check_linker_need_libatomic():
-     """Test if linker on system needs libatomic."""
-+    cc = os.environ.get('CC', 'cc')
-     code_test = (b'#include <atomic>\n' +
-                  b'int main() { return std::atomic<int64_t>{}; }')
--    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
-+    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
-                                stdin=PIPE,
-                                stdout=PIPE,
-                                stderr=PIPE)
--- 
-2.28.0
-
diff --git a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild b/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
deleted file mode 100644
index c9c963aa55e7..000000000000
--- a/dev-python/grpcio/grpcio-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 multiprocessing prefix
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	hprefixify setup.py
-}
-
-python_configure_all() {
-	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
-	export GRPC_BUILD_WITH_BORING_SSL_ASM=
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.37.1.ebuild b/dev-python/grpcio/grpcio-1.37.1.ebuild
index 9a037a3b070e..9516150c7991 100644
--- a/dev-python/grpcio/grpcio-1.37.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.37.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist]
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index cbe00e3e01bd..dbef4841a8ba 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,3 +1,3 @@
 DIST guessit-3.3.1.tar.gz 156178 BLAKE2B 190b61eb98c4945eb2e14bbc3387a2eabff4e0f2fccf42f3b957d2b081d83d96333f3931837ad77d6b09c12aaa174eb8adf993d62ab9de7b74d8f0c55282a77c SHA512 42c87525ea2d9c808e30b50db674862f5362f26b95ba5e6bc163df03a261d9b24daf4b4d525677d3e6d53e8e7f637c3d9e0ba3f25f4397e0658b618f50a3248b
-EBUILD guessit-3.3.1.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
+EBUILD guessit-3.3.1.ebuild 996 BLAKE2B 07f96a459104bc8a2cd47a7018e73dd7de777be3f37d5719ac6de375d6bb4146c7a917747847915fb019005520d3704c16855c2b9619939cf8b221f34ba52a52 SHA512 8c575648ad639a2ad97c327207919466b54f8862ceae2699f4b6b1a4cb90ed69afa412705ea802695fd08a18d22e20bda5ba1493aa6ef04c2b04dd0e881ae1b6
 MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/guessit-3.3.1.ebuild b/dev-python/guessit/guessit-3.3.1.ebuild
index b7a5ba657f3c..91238882af64 100644
--- a/dev-python/guessit/guessit-3.3.1.ebuild
+++ b/dev-python/guessit/guessit-3.3.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for guessing information from video filenames"
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index d9b11c4eeab0..6b673b883512 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,5 @@
 AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
 AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
 DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
-EBUILD hiredis-1.1.0.ebuild 711 BLAKE2B 0ebe16a1eca3c5ce220c679757161eb3240f6308ed99118093c28eec8ad7429185135345600d65a547910ed6ad80d5f7757d5bad2ba7eb2b76913a32e771289c SHA512 5edd4e6fe59825424fc338328b3fc917faad39c573f6d9e0c9b1fd208e4196ef608c00f306ae6053970f9e6fc7f5566315c4b2c269b44623691464d0a340b9b8
+EBUILD hiredis-1.1.0.ebuild 711 BLAKE2B ea29b6b1b3715ad14044459e8afe8876716748b8ebcf38f6ec9d9d16ab6d08108efd5bf4f498101618354707f5afc65957ce38a02e491296d0fde4c2b5897a24 SHA512 414f9b7b60adc607f5fcf4ed4d4898a3513fcf0dcbc99bbad842e26b473b07bfd55cae75b1d737f4227e9911035608d205cabe68a69cdd3fa47d31065ba0e047
 MISC metadata.xml 578 BLAKE2B 39cbb3058e829134e69701f8acf4c89995d6ef1553b911b956a38ce2432267b78a7db070713d230dc2895c5df0c8e8295278caa442642fe64378a5cfdf444ac4 SHA512 da2ecff30312f5eed7611b107bf678af6d1fa45d5d87f75474d70412d7a17db4a37dae578a3047c45758e22a8041c123fa349c5f23580fdc98439300335636a7
diff --git a/dev-python/hiredis/hiredis-1.1.0.ebuild b/dev-python/hiredis/hiredis-1.1.0.ebuild
index b0cf4177c163..68ec424e3aec 100644
--- a/dev-python/hiredis/hiredis-1.1.0.ebuild
+++ b/dev-python/hiredis/hiredis-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index b7c5016a8450..fac4f1ac27ba 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.9.tar.gz 274597 BLAKE2B 7744798d74db1d591490c75eabae5333e90f053a8ba1c5517f08c1b9c253042796e42618ae0a674e1b1cfa97390448ffc595e861234f5b980a1f7c0b9056cc88 SHA512 0fce4b1a18b29a9fa94e3769e2443601a502158056be1c93c1c1ddd5fe84d11d5d6dcae6338ac0a21aae7972625f28c0ba66099fc51081f504cb596626de990e
-EBUILD html5-parser-0.4.9.ebuild 877 BLAKE2B 6f2693f463fd0115592d0c8d11e6bc59c915bcc4fa2e4a6b75719606d6fd74c97a9bd452e24ec5846b0ec2443d8fadad52b823f6648d6bfda70f1955488ae50c SHA512 18a886185a132e82f21f7998302254d2a1a23ed17d0fd43edf6f86c5a6f2a9cd59e81125db15e2cc02b2d5ea01f6aa9a297c2cd09d9e79b577364667c9c40973
+EBUILD html5-parser-0.4.9.ebuild 823 BLAKE2B 86454568f2efd4bd74b952b91a287fe90636469b4eb5b7fa54b95134aef4b07bd07cd7d565386c34f446b088c5df83f65a5a7f2b5070996f39b8c1fb561cac9b SHA512 de290fc47bcd52954e9c3fa1db1541f58cc56a78d1c9a752c36276920147b36098e573d6ed6a45043e6acac9f9752af632ebe7bb7e4769cc263b6233b1ac148b
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.9.ebuild b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
index 570a72670df2..8e4ed1d92edd 100644
--- a/dev-python/html5-parser/html5-parser-0.4.9.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.9.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Fast C based HTML 5 parsing for python"
 HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -35,5 +35,5 @@ src_configure() {
 }
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index 6c22fd013e13..07e8c26a8f3c 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,3 +1,3 @@
 DIST httmock-1.4.0.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
-EBUILD httmock-1.4.0.ebuild 482 BLAKE2B 70c044c1b7a0cc01450d339c1c5fad718425bc5ff77eff3f8ec7a4f1f177d8cf7c0bffba1ee7cd1a1aca27c53e35ee4c6b05dd6dba49abc38653dc8c9d67751f SHA512 de6bc60814215ca9794b428154eee0c548af7d08f228aa5b0777474d3a6602c5da2a37b2a45bbe7affcc5b21709bb13b8a3be042c319d8d7a29f9e86a30fd572
+EBUILD httmock-1.4.0.ebuild 482 BLAKE2B 84e1658b9c4003dbb1c61b638165843cec3bfe498198f8402d171f0d89a151245cd5ec24440953c0a9497034b96cd1b05b57a01eb28d7498507e4fd42fc588a0 SHA512 04279ca3b9a30f7ba4a2897acab52604bd88acc58a0310cb5dce4b2a869a44653517efc5463509180f3cfa18772cea181137dc739d7e59d2ec4b662dcdd627ce
 MISC metadata.xml 315 BLAKE2B 72d19fbdfd4936491e318de748e0ed3951a2c4e31c3c7834039737da8e61a0cceb1fcaa682a22fefc996216931b877d1d54759cb23563c257273b3582052db43 SHA512 58c99bff32f43f1a2e1a42b0fa05bc6ee37d76e55c3061d09272ef8172f1a1efbf4f9fcf11234c49b2aebfc1a55256aa4e246ca676ecfbe49f167ce820048e15
diff --git a/dev-python/httmock/httmock-1.4.0.ebuild b/dev-python/httmock/httmock-1.4.0.ebuild
index 58f0ae3fc225..526cd9c48a3a 100644
--- a/dev-python/httmock/httmock-1.4.0.ebuild
+++ b/dev-python/httmock/httmock-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index 4a23a6cbe3d3..501fa11be40d 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,3 @@
 DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
-EBUILD http-parser-0.9.0.ebuild 882 BLAKE2B 64eea517d087449a5d8ad59d1632d95e53e10f1d13fc71ebe7e46286d2054d11fcd016044db9f7a1fcf908e25c37c3954d5b46594e056f78a1b0ba8fad23183c SHA512 85cd5a983ab0c3c28b0535c4d2f1520754129e929f2be4c1325b9a5b7f26d349e6b33528a91f9bc6a2c767334bc7cadfc065b6ebcec01717d347bd8cd195ca72
+EBUILD http-parser-0.9.0.ebuild 882 BLAKE2B 0d22312cda71a086751e2ef98caaf0139296a01c07ae01be1d09f0d65a23e4ae46ff91263976e428bb0e15fd98b6b00e4f2e1499d47c9a4eb54592a97e019877 SHA512 5607df8cbf9ade92104565db3dfa14b8f4f59f7f64b0560d9c02432f33d0c6d0236f6823963801aa7ef8258b50cff816e809b20544145aa629e6ecb983a03466
 MISC metadata.xml 385 BLAKE2B 16371b248416d43a094b0038919816277b3dbced190f2684cbc6d0ff9cff6007cb7e5e44d867eff942f46173edf5018a4b15383454344fcfe003544aa3e64fba SHA512 5b4b7b992bf4036ee076a2714bd0b91540b071fac6194ade8327e71062d7dfc5597f68934c275d72756c5ebb25e334059df4112946a1a84ab20ca0710ee16760
diff --git a/dev-python/http-parser/http-parser-0.9.0.ebuild b/dev-python/http-parser/http-parser-0.9.0.ebuild
index 578ae2661d5b..dc270dee7e5c 100644
--- a/dev-python/http-parser/http-parser-0.9.0.ebuild
+++ b/dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index dddaadf86977..b720d1efcd3e 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,9 +1,7 @@
-DIST humanize-3.4.1.tar.gz 56119 BLAKE2B 79f91e03b0c3ab1c645552ee3a0bf321e0ee620f5c0af827e44ba9995c9128638d1dc5cd80e4210de143ab55b39fb25e03abb4afaf5fa9a98973ef6c37d99b2d SHA512 d7e201717ee6b1065920faed3fa70f48c7b6acaf246a707126246d84f516fe7a14713bf4c488b18815907a0926b6cf505f106e15f17051f69756a50f50cea51b
 DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
-DIST humanize-3.6.0.tar.gz 62280 BLAKE2B 6472e332bbd4c8bd539b084889f280e56cb0b8fd3083c88b5f9fe313de734aa8876f6d9fb9b1ba3f9d6b110b5ee0d9af6881140c30fcf64c33364488f3c22033 SHA512 502ad941d9ff97677f9a6da7194ff2cddff6c4e852b84339a17eb13d71d34701b4c39c05607314a0d06c6634b5e5e12444bc97f0ae35d715611f8dac3eafe623
 DIST humanize-3.7.0.tar.gz 44002 BLAKE2B ec253c07a38c83d67038836998a7159afe7d1f3e1f0f5ea0f946f987e18bf4943d7dd48e2e156009627e1bda2140017bf99df072671008a6e1daad704b693292 SHA512 e501cdb4dcb603601624f5df9a04a256669f06ac594d8a3a0c83543d1d8503bfcf4d7198ff87827e2c60dd63897c23b722be7497179c49a9f9b05d07289de4be
-EBUILD humanize-3.4.1.ebuild 546 BLAKE2B 136da0da80d4e729636d0fb03069009795d282f7ee7aa10e699fc2bcd40df7b035248fce8452ecfeda4377b058a219530d2c7f001db1215ada2fa5ab1b83f689 SHA512 539e9fec04f88a99e85fc83b3ff223d7792b60fc02ad421a7ce485e93776bececfdad27de9fbdb5a12388a3c41097ebfa67418c702936a966efdc7a03638a6b1
-EBUILD humanize-3.5.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
-EBUILD humanize-3.6.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
+DIST humanize-3.7.1.tar.gz 61846 BLAKE2B 6ed6e35dc15ef08a88cd15211212cbd4194363889ff0dbe4e53d76adb248da948d688e4eddf5a93548497b1e1e02145431e1c157fd26288fc27f2b9b7b2c80b7 SHA512 152ee6030de83be34bdb40908427ca4f1461191ce417faef273b070a1d347a43f4a44182cd0fa79b8935c07d97679205285bbd6fa43352d2d9cada53df5f112f
+EBUILD humanize-3.5.0.ebuild 547 BLAKE2B 1e7c1ac2157ef61f0885d14b939b0a92efaa7c2d2259b5dff8709b7be500081042791ea3de8b3354a4c71e671db0825029afa5b407e92b539fff2647f6bb3a12 SHA512 c6f99389b2225d05450700755005b546bea0987bc1ac470f2700e45fc3030712d7af5c03b00f239ebaa2729255d47fe171176d7e3001ef2b10470141a5d6e35d
 EBUILD humanize-3.7.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
+EBUILD humanize-3.7.1.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.4.1.ebuild b/dev-python/humanize/humanize-3.4.1.ebuild
deleted file mode 100644
index e402dcc8a026..000000000000
--- a/dev-python/humanize/humanize-3.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.5.0.ebuild b/dev-python/humanize/humanize-3.5.0.ebuild
index c806307de9e9..7520e23c9527 100644
--- a/dev-python/humanize/humanize-3.5.0.ebuild
+++ b/dev-python/humanize/humanize-3.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/humanize-3.6.0.ebuild b/dev-python/humanize/humanize-3.7.1.ebuild
similarity index 100%
rename from dev-python/humanize/humanize-3.6.0.ebuild
rename to dev-python/humanize/humanize-3.7.1.ebuild
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index b3f755f1bf5d..bf2100cd8acb 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,6 +4,8 @@ DIST hypothesis-python-6.13.0.tar.gz 9128293 BLAKE2B be618d42639602bc6617f8b5e93
 DIST hypothesis-python-6.13.10.tar.gz 9132876 BLAKE2B fb9b48465fd6e6ce08423384753ef3149aac6e2b57230f44119ad685c530ac68fac0b1a1925f2ab98586265055151e9564fa287262b06aefe68c2a78d8b3ae4d SHA512 f166a025dee3ec31033d8f8a3909e6f9ee4b2e14420ae41777a41163384502cfe9f20632fb134e38797817ee19972a7068e4233e64417fb4cf5af51427a1963c
 DIST hypothesis-python-6.13.11.tar.gz 9133504 BLAKE2B b9cb54dc05aafd57424a2f9fff097a66e3ba5e55408f8a4587eb7aee079f1ad494e3a9cc18a7797c09fa4444715290dc49c58b98e722dc0722d8cad0d6cbbe0d SHA512 9cb8ce31a7062ab98db829300c1f68e1e24bf02a39ebf4ffbbf47554741dd0bdb96edd69aa7a360570405ca85b1fd7956eb26c5b9a6898f6f8f6f79177522bf6
 DIST hypothesis-python-6.13.12.tar.gz 9133873 BLAKE2B 161e323d9dad6d6a91641336b6e66fe0b00bcc902d844480ed0cea59b89c455eaaf8f57122636af464719d63cf96d0dfeb42dbd855d5599856636b4f4e1520bd SHA512 e58d9a676b9f6592134f4f4997d7585001c28980697e77f8f3216c5bba65256c15784e7eec5458f58684b61cc5a0d9ef2465748412a601a867a70e5b72fde91d
+DIST hypothesis-python-6.13.13.tar.gz 9133621 BLAKE2B b21d2b566aac70d30abd8dbd96aafbe0f16b9d4cfe997d88bbd36724bd90ba7c747c87275d47d977a065431c87a5b75814a774fa34c9360f973829382e94e6d2 SHA512 87564b6b1d3c917d50feb1ee3b0f3f16fb880d42f8226f50ede28b175471b65cac4286d0569d4a33c82f5924df7941c0b2b49862f9e79fc851ec4d3e556a2a2d
+DIST hypothesis-python-6.13.14.tar.gz 9134690 BLAKE2B 821fa0baa47dd896fc5ec61d0a96fec3da225dbc35306e6cf684641262c9ff0b714ca95aff69daca4bda551033a67d90b411f0cc2abff8edd41e5d749939344f SHA512 74397fd77e6e70df918e0fa605180e2bfd509fb26ef8b4a86020524611a315950073c3babd65bb2d2ff65d39e027bc52da88c0125f422cc2493076398e733853
 DIST hypothesis-python-6.13.2.tar.gz 9130008 BLAKE2B 3ca5c306ac402002a1435b8ccbc034f2a7acf1553eb6095e0394ff1ddf778f47ef6f72359cb5219db924edc18623b22732b4a94bd7c269217ec632b8d59adc1c SHA512 8c7e1a5de011ef66f5105009aa82f2b23ff36f0b0906554ae65e2e55e10c4df743c894b6264002c86bae3fc5e1dd7ded7e913f0866ed725e1afd4c9f54022b7c
 DIST hypothesis-python-6.13.4.tar.gz 9130435 BLAKE2B eeb78cc647df49ea11fb0e0f4d8412e20095e7c33bb0601dcbaad2b9e9929423729b25b1bfbf2a27b05e87ae38ced4e9aeba5bae4de76cfc81aae2d073248de0 SHA512 93db99bdbe408ddbad4baf983b00b3e7624fd28d15a0d4c1453437328a51b0733db13e3b7b04b40bc60aa05e2e8364ce5b186d81a2d33e50b49f5a406fec95d6
 DIST hypothesis-python-6.13.5.tar.gz 9131314 BLAKE2B 3de7ba681ab9c0907920ea7ad562a4434f06009a7bced47b98bf46da5d15aea35085350f4aca24fd41ba9fd14957e4de1d56092d49e757ea60a1575f59371add SHA512 06765607be1a49d92382d426105021ed9dca91c5b41674ba45f0a29ce7cb06537edf706ea7305300f9aae7d8c9b1827bcaf807e3c4aece9594a55b3c0122c622
@@ -16,6 +18,8 @@ EBUILD hypothesis-6.13.0.ebuild 1730 BLAKE2B 84d537ed7efae1e6abd955073fb36da430d
 EBUILD hypothesis-6.13.10.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
 EBUILD hypothesis-6.13.11.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
 EBUILD hypothesis-6.13.12.ebuild 1761 BLAKE2B e9d9f33a1b07ee3c900155de0a21221c93632c8e4b7b4aa1c95658c8e16116ef879eecd12882646c0f86fa0411211006ec59024cc6ba38d36597adc5645e2b0b SHA512 ddc361590c8110eac2d84150f120e244c9c44eca88c65ff6c08ae7b273bbe124fa97cbd579778c41f17bfb1b8e39b2cffc94e3d658187c35f76c33910af5bc76
+EBUILD hypothesis-6.13.13.ebuild 1761 BLAKE2B e9d9f33a1b07ee3c900155de0a21221c93632c8e4b7b4aa1c95658c8e16116ef879eecd12882646c0f86fa0411211006ec59024cc6ba38d36597adc5645e2b0b SHA512 ddc361590c8110eac2d84150f120e244c9c44eca88c65ff6c08ae7b273bbe124fa97cbd579778c41f17bfb1b8e39b2cffc94e3d658187c35f76c33910af5bc76
+EBUILD hypothesis-6.13.14.ebuild 1761 BLAKE2B e9d9f33a1b07ee3c900155de0a21221c93632c8e4b7b4aa1c95658c8e16116ef879eecd12882646c0f86fa0411211006ec59024cc6ba38d36597adc5645e2b0b SHA512 ddc361590c8110eac2d84150f120e244c9c44eca88c65ff6c08ae7b273bbe124fa97cbd579778c41f17bfb1b8e39b2cffc94e3d658187c35f76c33910af5bc76
 EBUILD hypothesis-6.13.2.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
 EBUILD hypothesis-6.13.4.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
 EBUILD hypothesis-6.13.5.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
diff --git a/dev-python/hypothesis/hypothesis-6.13.13.ebuild b/dev-python/hypothesis/hypothesis-6.13.13.ebuild
new file mode 100644
index 000000000000..004d0d143b20
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.13.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3_{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.13.14.ebuild b/dev-python/hypothesis/hypothesis-6.13.14.ebuild
new file mode 100644
index 000000000000..004d0d143b20
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3_{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 5d26a757bc4f..71704d57842a 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,3 @@
 DIST icalendar-4.0.7.tar.gz 78569 BLAKE2B b5d980335b1a9d8135ad9ec037e140f3ae49c3e8db6736b9e469748e3bd51c43f39fc5f9dc443de46d4d4c5856ec74bb548a8d1b47b7e52278fdc2e269be0cbe SHA512 97f7184ddc42ade2a447af5112f5bd18ea9a89ef25ea3983cc2213fefe2c59255102b7babcd49b3e04cbe435d75d2712dd57eebc1bf1c20c54aae7081ba24379
-EBUILD icalendar-4.0.7.ebuild 814 BLAKE2B b9d5edbcce7d51bc283c5e363d19a1e04bb5a1833e6fe3dd1193dd620ad34109789541c42b02ffe975a1d9f38799696f152cebc4659b54120c07dedb2314c501 SHA512 b79fa603b33417f476b99e6d46188e52fdbd6954bc87b150c3dcae03f5882e5bd1d4fc6a3462309cee651af03e4c8aa533ead2cfa369bd43e7d24efdfdbe66dc
+EBUILD icalendar-4.0.7.ebuild 780 BLAKE2B 4af53a4a7097671c7c183b9c8f4ce63d0d4966d2004b1ab94e5d030d4c58430f1474d0d77bd039f59e5f19be769cebac272dd6e15ae92e500e621f5f83588fe8 SHA512 8dd4217823dd431e944f72b52cd8fc5a0037be61041fef3f59c55ba34468046260f5e77403cae3faa5eb4b5a06c746fc4fa4b9cd10b16f115e6261052acc9596
 MISC metadata.xml 502 BLAKE2B f370ac279a7af56233a313f68da17d2c2f03fa6028fa05b1bef93cfd52fc3fc2808409b86df3c3597939c7e0778513067ce643c456ae74f8a6cfff5d4fb83efd SHA512 e345c6c50e5c496bf50e2d0a5c4134ad57a85a7b43867359fb152962d75a0ff2ab69beed9bd9522bab68f8e98125b37c812ac00394d55a0bc4297c21c9af90a2
diff --git a/dev-python/icalendar/icalendar-4.0.7.ebuild b/dev-python/icalendar/icalendar-4.0.7.ebuild
index ac5d230652a4..88949aa432a0 100644
--- a/dev-python/icalendar/icalendar-4.0.7.ebuild
+++ b/dev-python/icalendar/icalendar-4.0.7.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index efebb3291bf3..aaefb1524629 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -2,8 +2,10 @@ DIST identify-2.2.4.tar.gz 100967 BLAKE2B 9473a157ce2aed13ed45d6e8d83b4510c40ae9
 DIST identify-2.2.6.tar.gz 101016 BLAKE2B eac32751d54379e3ba5ca5970c3fc02b6ac9f677a26f7a2c91986ba6ce8773a8e51ed98f17b6b12ba920cabd3d66ca23cd765d2cb6c48253ff97c34ddb9cb81e SHA512 09694ea3d92265385a79464ef948effb5b074f5b67a8a25171b4872b2cd70537a17c87c2aa94b66e3079f2047b290300beb7ed74be50ecdf09cb723948bc11d9
 DIST identify-2.2.7.tar.gz 101032 BLAKE2B 988aecb3f32b1d1416984ad7cb5937f85600e222a1053d2800dda1c498fea2660f86ee42208611c71e29b9827e212992fed35697a3d24f02814cc6ea8a560615 SHA512 f3c4073a9018ba595c8535447c7ccb20ca1f8d8bb006b4662db19b3356afc33d810b2073810b86d7dec4572b151c53301feca09bf0662d4d683febbdf7735e06
 DIST identify-2.2.8.tar.gz 101040 BLAKE2B 46bf6631c6006ad2326f175257ee2cb4324ac463419cb50df0919768b2787afcc135dc1982ee1feb4a5efef6990f3224f63fb2dea19dc6795a3fe736e6b8555e SHA512 d166f37fa60cafc0fb624cac9626115adaecd8ec88f42ce71b81794b6aa8301e42f459bfbc1da3d81709ee5681184e927e9111a906a22ec8c977b24f1e9dc17f
+DIST identify-2.2.9.tar.gz 101065 BLAKE2B 399acf1a946c5fbb54dc88897c51b00cb02965c306ce87b52bd1cf4e7cc2836dd4051bca8a3b9533b6ca954a0b9eb4c12ef1d391e1334f9106fa46daadf150b6 SHA512 b26e80cde3225d9fd9f95e4b2c95d3e8ea35f5848301c1e3430be72ce9fd49755ea09ce8d933605839d5919255b25b05c1102fad5923dcc0c5066160c501ee29
 EBUILD identify-2.2.4.ebuild 526 BLAKE2B be61e9ff39f3a18ffb9e65cea4fe6823619d2def1a381b5e95d3f098b0a2c721d293c8b0e2843bfb65fa7dd78cb5dfc0fbca27302b4f5220d715e4669385577c SHA512 a0f5d34c699ad1c71fe721fde559dc76a3ec3edf142b162665d0b543710917ecd18817eb33b9f5928a153d248b72365fe55398e4d378c05492dde2b7479dc375
 EBUILD identify-2.2.6.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
 EBUILD identify-2.2.7.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
 EBUILD identify-2.2.8.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
+EBUILD identify-2.2.9.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
 MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.9.ebuild b/dev-python/identify/identify-2.2.9.ebuild
new file mode 100644
index 000000000000..f4471b5191e4
--- /dev/null
+++ b/dev-python/identify/identify-2.2.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 4ec5c52449e9..c59bc229696a 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,3 @@
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
-EBUILD immutables-0.15.ebuild 464 BLAKE2B 1a8e6dead8a726e75ae07f230af638a6e47a661f4bed07e47c34b239951d3a909c018c94d6a3d4f5eb1e9a114a4d9477c9714bbf1a3423379972958ecc018f78 SHA512 5d4b9bf0cdf0b75b190513383ee245c3407b59c9120021256c3c004ef794608e7bbf33643011f935ea8bed52e903d6fb521e572d322212a8bf1fc4eb3d7b620f
+EBUILD immutables-0.15.ebuild 465 BLAKE2B 7ab56ed2ca6dd5819485bbe0647d0f19627d93747bed71803332a43bd77050bcc317d9e4377052f5d5bfb7b14056f0e79c9e8ec87dc3413a29da0d9e010b716c SHA512 5b9494e4832a2d0bb0a9e98e2491d6e3c198bd486aa9a3af8e4630d3acdfe3ef1e72a495feb572385c00c09f75a45d7edd7afcd52a5dfdb16f0c1e81e9e1e05a
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
index 19eb7a167364..a64dedc2b19d 100644
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ b/dev-python/immutables/immutables-0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A high-performance immutable mapping type for Python"
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 78be1ffdd665..366cbcbb58a2 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -3,9 +3,11 @@ DIST importlib_metadata-4.0.0.tar.gz 41881 BLAKE2B cd0330e2a5959f651ef6ceee72276
 DIST importlib_metadata-4.3.0.tar.gz 38461 BLAKE2B 5c8387aa618b6561910adf48a701b28556574abe0a4aacc6ae8fbecb258cd0308f637a95402a07c2452ba92daca39034a5fdaac03608e5112534c379e66aa4b9 SHA512 44e3da5207ae6900059758ab26636798fafa9d186d045096e382660083909305887e28c63c2147c940f0af5870d1781f69968c9cc992e50811b5f9b055048459
 DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
 DIST importlib_metadata-4.4.0.tar.gz 39577 BLAKE2B 1c1536b72385380176febfe012b5e47bc4d1b1382e048dd6383b5097f8047404a9a726438100e6f812f397f425e4d0d92ff296530e1f81cf16d3f26a57f47e48 SHA512 d227caaa1130d5023a87e5fa32aa1cd473ff0ae09cd82969be86f4301402cacee068dfc5d744bff82a18abb86848780013b6e6b2ebfa8a568ee027c270b90efd
+DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
 EBUILD importlib_metadata-3.10.1.ebuild 1273 BLAKE2B ec33cf32a3fc2a92666c0e9aac0d3d72968b7e31d7c8e4f5f6e90462b8b07efc2754f20c011a11065f726a6197b642d08eb4c6c70240a64eff67aac23b51b3a5 SHA512 eb3e8fc070b6a7f797ed1a92fd34bd7263046ed44603a436a882daf38d0da3a4eab4c981ca6c0fd6d4c4a3a0d6ba5822698f82b7e3dce90ae8b37e0017f27cb2
 EBUILD importlib_metadata-4.0.0.ebuild 1281 BLAKE2B eaf8b2c298ee8510f9182e88d2f01bcc33461c7c4fd18f5a26f06a692c6684618aeb3747bea8f330d0a6e2926b1b86ef0eede8d7aa73022c0e6372ffbb13492c SHA512 77544555aa575bd4accb1a6bf073e916e80b094a77af906bdccfe05d11e5ccc31fdb0c6ee218470317708c2d3b1a45d71a1e9d7893acf486eff1510a9809f404
 EBUILD importlib_metadata-4.3.0.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
 EBUILD importlib_metadata-4.3.1.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
 EBUILD importlib_metadata-4.4.0.ebuild 1288 BLAKE2B f71a42f95886edacb0964fd1f2849b043547d10d99343a78ba7d783818e66d04cda5401c573eaa31449690a2d8b4bc187d0148a646d9900f370d312572b022ac SHA512 9ffb08aa8baceb5d48dfe4fb2be1b6c1f34f6e8fe3f9f4e827fd548555cabe1ba76348d00db28f1b4cf7211b64132f0f321d033f04766f8c9073a75f73508956
+EBUILD importlib_metadata-4.5.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
new file mode 100644
index 000000000000..e583ebb91129
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index be51cb9e685f..5fa8159a0a38 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -3,5 +3,5 @@ AUX iniparse-0.4-tests.patch 779 BLAKE2B ccda778ea17d34d59fe16e0b63fc140ac12c1e0
 DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
 DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
 EBUILD iniparse-0.4-r2.ebuild 626 BLAKE2B 74dadcf61f92367b3b17ffba8de16789a6e237434d03175de8dd3900271cba73a6494a961069010215a79f48f4f3518b5052d321504155d9c0182a5a13d5c411 SHA512 8d86d7c83ff0784b8111a0e992372a40fd1c6f3f0c0bb4eb95495ac8823ef9540375d3a4302041ea2cfb58a526dacd5320297eb3ca3d76defde0c8b0eb8cc9a6
-EBUILD iniparse-0.5.ebuild 549 BLAKE2B 5ee96d647dbfd7cd41b9d242158946d4d39a213df0293b04a4f3d3815493dfdfcafa5310db6f9b50e77c48202540b4a2f2b7346959a0770e682f44eeec33c45b SHA512 f3e862b85afe7bb59bbc49eb82c9be256729d9d0742ca338a15591fae8dca7c557d89b1452766cd53bf4e3a10b84309e7745cd755ceea5ac86336b6f80e28be6
+EBUILD iniparse-0.5.ebuild 499 BLAKE2B 48b83e92e7badd68a2639ab027272b15989d9c2d81227bbdce1e484b084f2962939382f4e08235fbe1d2e415acaeb610fc3fc4e01e631f6143ea052acf93219d SHA512 2b01501de54720ea0ed304b906e25fb8f91ef57c595dfeebaabd27c8f50d10916415f82657806c417898e45a4a966739169710dbc29001387f88fc80d6bc7b96
 MISC metadata.xml 335 BLAKE2B 8c6ab85fd5019293bf35f10dc2ccdaf54d5ce871361a3a074f86b3b87cc1fe38ce90f47fb3cd2eac3212118c8db21d6166343af5de2a7f144e647427a0b89807 SHA512 a97b8da0471080deb4dff6e38d0ee3648a34df6c582af17485e405fc3300fa23738e70554606f444e16c1dab8cc8c26c45f215927dc42599dde1e233e2c31327
diff --git a/dev-python/iniparse/iniparse-0.5.ebuild b/dev-python/iniparse/iniparse-0.5.ebuild
index ef6e379353a0..777720c9ea55 100644
--- a/dev-python/iniparse/iniparse-0.5.ebuild
+++ b/dev-python/iniparse/iniparse-0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Better INI parser for Python"
@@ -15,9 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
 
 python_test() {
 	"${EPYTHON}" runtests.py || die
diff --git a/dev-python/intervaltree/Manifest b/dev-python/intervaltree/Manifest
index caa3afe4b2d9..3d15ceaf1ef4 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,5 +1,3 @@
-DIST intervaltree-3.0.2.tar.gz 30663 BLAKE2B b6d5e7a029e1d1aeec60eaf28c1e40707c655f0eca7ce889a9c0d85a9003ac262c3aa49c396b4c42ebf70bb63157e098addec69050d01ae42a6ba37ea76e1ea5 SHA512 51d6aa302c95c9a573bcf594de390037ec1a6d674061e6a0b4025fa889dfd0187e37bc0331f13d6703340973e4c539aa1349431b14c742de9d2050cbb53d8255
 DIST intervaltree-3.1.0.tar.gz 32861 BLAKE2B 311b7937526495ff0d5d85b4e6a01744d585714c119e6b128ae47740a50234bfe32395728e55c1c9d0670c92b4e815901dbf26c9a83bbe8271875967e9f11f1b SHA512 adb49726912ad6e9cf6c0985b4fb94df91b4ef54aa2eb327186d7f15bc992745d81654d49f1dd2ce95f7173683ba2a072787ef1e8b389cd9b7e23b9ae743906a
-EBUILD intervaltree-3.0.2.ebuild 482 BLAKE2B 2ef3ef6974aa0db491ac11cdac9591ae2c8743f3d62cc73ccdd0c49fa6ce20bbd0b06b22f006429f95bb1a70289a65aab3ee18815faefafa36f562b766f67e95 SHA512 8f519d1b3a50dd81556a7336d13007dda631893527847cd6c6fb17fc81c2659416231191d0144b7c148e52f3466ef0ce8771b19232fa1e280c7b9fa63b377012
-EBUILD intervaltree-3.1.0.ebuild 484 BLAKE2B b1bce1cac11fd33ee39b45a93ea58ec835c5d578e5d2ed298fabc6be99f701289293320ddfe311b8bec63147a7e937d423bb421d5883003913a031038e39f6d0 SHA512 146ee0a02a586d43281889b0288f15c7abf9b2c4ea132c66000f97ef05b9cb7a2643ebdd85f353878ba54a8b576fa4d5b0c2a8735ab364463c406393813b724f
+EBUILD intervaltree-3.1.0.ebuild 482 BLAKE2B 2ef3ef6974aa0db491ac11cdac9591ae2c8743f3d62cc73ccdd0c49fa6ce20bbd0b06b22f006429f95bb1a70289a65aab3ee18815faefafa36f562b766f67e95 SHA512 8f519d1b3a50dd81556a7336d13007dda631893527847cd6c6fb17fc81c2659416231191d0144b7c148e52f3466ef0ce8771b19232fa1e280c7b9fa63b377012
 MISC metadata.xml 360 BLAKE2B b2363a7f27a1045e2be5cd5de32fa34b9a4f80c02ba38490e3cd323878c35aa4c534d130fc78909bc0b85376f7fd7474e23b9ce8acb0866724a82e8279e801f5 SHA512 e2783badf295a9358f9035c25bbe78caf0c52ea1477abe0ea0fe104a34a8aa9367ba1f2b613c7496c78e6bab819a4338a518020d1ac0ca6468a5e099a3d18186
diff --git a/dev-python/intervaltree/intervaltree-3.1.0.ebuild b/dev-python/intervaltree/intervaltree-3.1.0.ebuild
index 351ab7015af0..6e6e9bf04d0d 100644
--- a/dev-python/intervaltree/intervaltree-3.1.0.ebuild
+++ b/dev-python/intervaltree/intervaltree-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index 665be0740f50..bf16186e9f4e 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0-r1.ebuild 622 BLAKE2B 7962be75bfc9a631d1230103c004532c3b38c7f6ce7901df661db50bd6a5057d89fb5ebb1a72724510c03129d9cd8b261c8fc547817d61fe3918c2297315ab71 SHA512 0f118f9db3cb088e4784742ce672415ac325b753322e2bef58813028e06f9ae47f903a230881042b1ebe6a08367e79b869117348b4e96fbe31c4a494f6cfbb03
+EBUILD ipaddr-2.2.0-r1.ebuild 623 BLAKE2B 80633c471957188636cb2cd820fd3efb503fe5f867fa7e3619bd453eea712dd67ece822f79784bf79369f0c0871125f7ae9ba432e7fde718628b1a851ff018d3 SHA512 c06a415e6c772644da2b910da0bf0b1b0124c1bb3116d14b763bbf1501a116ef47db4f5bccaff18f2720b43980446ffd8fa98ec81d4aa121bea37af91a18f72a
 MISC metadata.xml 402 BLAKE2B 1dad72e6f84c952bbb3096790c3318a2d92b5a3c19affec50d6ced9595a24aeb2a98c1c2bc2a95076fbf53a987433034622902fc5480864835a82bcdb62f5e9e SHA512 faf8046b616b389fd6155ee7a462d4ba315506ff1c7b176178facc6ee1afa127f56fde8068fab167027f5aedcf26eb49a3dcf65615d71041e0a8b70b586daf5a
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
index 6405683e4f7b..481f1ab53644 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python IP address manipulation library"
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index 7199ce37e5c5..b095ea3202c5 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,3 +1,3 @@
 DIST IPy-1.01.tar.gz 33641 BLAKE2B 10d5ac5c3df00a562393ee762e9ad0f458ecf4745f894ab23e686b7112842adcbb3f25064c0010630745273fa72280ba5ef92a951d687d0f46f341acd6c041ad SHA512 f0983254523025a1819d543877d9651fb6a9e39dabd3b043488495f681b02e43b544a0121658a0430a418a1c39b360a59db1699af87a75a16a2bdc29fcb2b74c
-EBUILD ipy-1.01.ebuild 1104 BLAKE2B 2a916647e99083d5cf520f79b03e4e6acad18a5a43ff728e7c3951c798f20f89a85a04eef006512f4f5adbc5480081d022b758b1d88b9cb2be07a7f67e01f45e SHA512 f494e3eb0021bc9924dfe0eaf8f9ba614c26249e8e68093fbb0f0fdaadcfeda6af54e6bc06c2118cda432baae40efa62f82201c1698fcc9cfbad5232f475fcf4
+EBUILD ipy-1.01.ebuild 1104 BLAKE2B 1a872535f4fb91fa015ae947cd0d85ff39a6047b7de82aad9f85a37702d9cc38c7001f67143da6237141ee6b0b668623b691fdf325c61146d7653ac6a4a58b40 SHA512 31e364f825961e9ce0fe0d1c69df72335f952e2b81cda5484ce3cac00a6a12b81f0bcd49bcd8109395c782d6330905c308a4d2f6e4d2bdfa165483530db206f4
 MISC metadata.xml 403 BLAKE2B 20229385e1b06c38601686268fbbf06c3f797933946b58fad8becc44166dcebe0969ec658a7a5ebc8825cb46d11ffe6c141daf4202f290b891ea1bf4ed0be531 SHA512 07d57dc63949778a70b1c6e2976943d747cf425fa35c86409d6458783f517eac17ecd2443a9bac80d599059ea9487e1c6b9f60ebd283b1978844d22ca4c20486
diff --git a/dev-python/ipy/ipy-1.01.ebuild b/dev-python/ipy/ipy-1.01.ebuild
index fc72e6719760..ef39a44e48bb 100644
--- a/dev-python/ipy/ipy-1.01.ebuild
+++ b/dev-python/ipy/ipy-1.01.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index a3aabc16a64b..e032f377147a 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,5 @@
-DIST ipykernel-5.5.3.tar.gz 112656 BLAKE2B 4cad13f24baafc591558136405c8c643e12033ffd01b5608ffdef5442080c3e2003c0f2c4b1562c1f326b4c10e124afc358f5258a6c59b7c9db90b8bb23278e3 SHA512 7b7f0a0aed71f7713934ac071e7283be2028a221fa2b87cad8c2d26821909f81d21dec23a5f72c91e7c9de639b0d7430957c8cc58bbc026d95bd81bb0a005800
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
 DIST ipykernel-5.5.5.tar.gz 112909 BLAKE2B ff898dc10f767838353de13571de4c42ea59aae9b367046265808d9f1f7abfbd3934b7b4370fe024b647b5268316c573f7d52b2e62284a6c430005a901dfd6bf SHA512 580c3a3d5d10c325524287c091a885955981bedb8c7bd8eac569ee19393b258dbfbc7ea8700137071c2c55bfa94b5a7bfae1c687bc5e2d532525c6fc3e043835
-EBUILD ipykernel-5.5.3-r1.ebuild 1179 BLAKE2B 350c84768e9cc85088b38069da3e06367b1eb8213be149de7e821d65a62e90a1771262677b4cf2e451e1c019ddb7d092ac712518db987cb57d4d8afcc656687e SHA512 c02f39007b0c8845c5a83eb17065bee2e8c1b9b7b5293bec52f890c37699e4baef75090092c4f75d79a14fd9e52679ce50ec67723d61de0f81775634fa66ab0f
-EBUILD ipykernel-5.5.4-r1.ebuild 1170 BLAKE2B 90d21a2443b04efe39c015be345a6d08304929225d61c84f6a9ac1b70f6ce8d01c0ea4e0936b463eaf6b0b4e5da39e0dd0723aa98af427b40cef1aceae965def SHA512 7d392edeae27090b8b97c14609e215154bde4438e144abcc2544175bb702098b035788b3d042fb5239041045d3f6162716aa8b6983735e76971d78fb9b3954d4
+EBUILD ipykernel-5.5.4-r1.ebuild 1167 BLAKE2B b517d8d54a4ab2882657857af2e0a96fdc5775cf4291ab087f844bdff575ebe6e09f2f35c1206671386b842c5ab284c77bcb551d6aae6a4dc2d87cccd9bc3946 SHA512 5e493d830ff61535fe9ca5c8cf8094efbfdaa7fb47564ff1b500f09349d72957641f7ae67cc72dfb4a1f7606f55ca1e47a3a0472011478962014f0190cc4abf5
 EBUILD ipykernel-5.5.5.ebuild 1140 BLAKE2B a33ffe5b5e8ce99108729bd99e1074695df2a936497811f367eaee228b6e2870952bee60f48a48aea4f6194b1f813adb2ebd1b00ba2c5fa96aa7cbc7f2aa3a7f SHA512 7486b112f5189d01fb3aa9ecf058f0aeb286ce688aed329f5dfb8787a7ed28bab769193aacdd259f8856be479d30d0d5bf8c9f042602a64feeaf0276e428d8a1
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
deleted file mode 100644
index e005b16d69ec..000000000000
--- a/dev-python/ipykernel/ipykernel-5.5.3-r1.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		ipykernel/tests/test_serialize.py::test_numpy_in_seq
-		ipykernel/tests/test_serialize.py::test_numpy_in_dict
-		ipykernel/tests/test_serialize.py::test_class
-		ipykernel/tests/test_serialize.py::test_class_oldstyle
-		ipykernel/tests/test_serialize.py::test_class_inheritance
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
index cc9cc63cfdf2..51ea86e2993a 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index bd57df58c450..530fc390e412 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -4,7 +4,7 @@ DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b
 DIST ipython-7.24.0.tar.gz 5146172 BLAKE2B 9d10eea9c329c78d7698adda999d746cdb305fad71ad521bd2f856590dd1e34010adfef045633bec07f8a6705201325815bbc254c23d74f0a17d73d2c3c060fe SHA512 67f6392b5448f1526da67577e8fa84958c99b3ac71c616c78a034e5c20cd06224134da45a8c3930a3779ce98ebc983bea2f237b5be7e8ba9d6fe97fde91a0608
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
 EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c4c755bf7085d8890499eca01c776ed1ef500c20f277c1597c63c231587d2ddaf3ca68265629bf897d08f75a482cfe SHA512 bb27d30f8fa1fae515f1f92cca52846fe78bda310e35c84053cead7438898ec8b3d30475f36db3808d74e4ac02caf80f7bcabce4c570376a9f8661e6fecdb378
-EBUILD ipython-7.23.1.ebuild 3842 BLAKE2B c8e2900a436112ba50c3c5bf505da365359fe914dbbf132dfb901186456276472bfad6d2bc0e1290b1594ccac2d5368ec876e1dd786e58e12e37ac2b005ee3f5 SHA512 921a79ed0b75e69f1c390663e3a7a02263cdbb65cc2e580b5e6b1717d46b9eb742e0382f5aa03c220dd6fe95e8f17b7b27d4e0b87ef6b0915b834f4939a6a87e
+EBUILD ipython-7.23.1.ebuild 3838 BLAKE2B a48aec0e4fe0de58169bccb994bcf0c19d8973d69496e2c19a4c9f8463ba76aa79312548d59bc7a11bb5a7ec6961c5cbdd97e05094cd7aae4e53928e5637aec8 SHA512 de1faf13bded5832d60748b48e98344a9e8fefc47bc2ff0e0090fc2579ee2d760ba65546691449c1d86d95de1a27681ecd23ac7de42e34f21449060310f79ddc
 EBUILD ipython-7.24.0.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
 EBUILD ipython-7.24.1.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.23.1.ebuild b/dev-python/ipython/ipython-7.23.1.ebuild
index 8a339cf37473..f0c9377c3818 100644
--- a/dev-python/ipython/ipython-7.23.1.ebuild
+++ b/dev-python/ipython/ipython-7.23.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index 26c71fd5b4c7..b5465dbe992a 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,4 +1,4 @@
 AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0.ebuild 594 BLAKE2B f140eb9df242854659fc5b8cef33c0da91354d5646be42e7e4b7691bc1bcc9b02343a70d84ebf14cea6911f2d5c735a2ba16b278221d4f3079886a09bc080c14 SHA512 2e2c02dd4bf426679a71efde4587e86e9065976b0957c42aee92d8681096d10a2b88eab7b90ece8c41266a33d0d92cb0587cf50a88b723ff2d3637653942ff61
+EBUILD jinja2-time-0.2.0.ebuild 594 BLAKE2B 93f4bb3f5361780da583363f5c2f00e6ee4dc20d560f87a39d566c14cb4b2b7c418a6729f3d9aecc25fc8a9335d2be1fb0c270f8660a44715eed13dad3be246f SHA512 090fdb925873f5a277e4e962e81e84b6b21a4e708a145fe5a0a0ba6c32b5e36281f8d07ee0e924bc811ea3f6ca7eefecab8868aa735a2b54f00c7c484a27f633
 MISC metadata.xml 399 BLAKE2B 496b65cfa2e0b71b84ad70a75d216e2f88b5bc03d41e8165697c82eb81b20fce56286a045e31ed7bcc4d62c820c57c4116f7bbe05bfe7c000b0e73a03bb1dda1 SHA512 1ae1c7236959197b30a121c001248fe67f5057f35fd9160631ddd0e19f47b7c6f47fdd82e936380610e0903375625150d75b09fe93f8d74ed6e45eef67e05012
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
index 65faf85dccf0..e7fc5ce92ec4 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Jinja2 Extension for Dates and Times"
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index 0aa7e5f9fd0f..dc118df1665e 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
-EBUILD jinja2_pluralize-0.3.0.ebuild 547 BLAKE2B 444c28b9f62c1ed482424eeb4f6f16e2658147b26fe3de203b5ef1763f4176090fbb3c4e105feed34df9795de85efc3b6a77c57f19c857aa9e600f162fa9ac1d SHA512 4c0b11b7de1b59c4b9634aec492c519419c506e53c370f84866a62ab7a6ca1920c5a02b63f750ddea4f43a266e5024ed92d772e35654e922886ca349ab767013
+EBUILD jinja2_pluralize-0.3.0.ebuild 490 BLAKE2B b363767a4de1b861b646c83ef9fca770547012234e2e7b54b389a7d5f6d45b238237f527c0c95107fb0609ee64b76b92826d94a06fc2b32ec986bfb249387c2c SHA512 01f749b9887df207360edfa512488e96416614cb64cf07ce1057d8b93c9d4ef147c6ef348e4f68e786d6bfdb8be9a2a267f1b654de6cef72769265b8c3bfd234
 MISC metadata.xml 387 BLAKE2B bbf1f15fabc767c47fdfb69fc1dff3722cde37c075f15404667ed1a9e51ac3147bb093247af3941d9165e26118dd725eae8ad7823be1f9d7a9727ddfc2777e04 SHA512 1b5c9b39ec7a445d8cc673517d3552a9f256804ac8b4f24be6fc7a19d5c7df9613eea3f15e44009c19df3944b9a14a8dd353407bee415883322dc6e973e403eb
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
index 7de4f08a6514..00bbd09ea45e 100644
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -16,10 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/inflect[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-python/inflect[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]"
 
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index b2ad9498524e..422cac052b74 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,3 @@
 DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
-EBUILD jmespath-0.10.0.ebuild 571 BLAKE2B 88ba1701d3a773d7f5aea77d6f96b752a626d8d451cc2131f7a34b8ec89e410bfd926495bb1e86ed1af44e44171014758bf2a8220016523ef309192594d85285 SHA512 c082dce268b8c9bcfa07b014cdf6f6e48c976ca6723f7c9863f5908c02774748c9089a7b41a73f3313c00191308441024e1fa4d8b58ab7960aa7e166be75f066
+EBUILD jmespath-0.10.0.ebuild 572 BLAKE2B f705aea089881191d94dd923de2999bcd4353f73f501038e7da89bcc28f9973801fea76e480592b7a5e0f93351972d2f4cf1e79a4908573729e67f510618e3cd SHA512 06d57b98863abe0749f7f7be117aea64b48fd2f0a66cc0434bd45e15c57cb71f40c1fb51a6bc3ca98d645681bbbc012e2efb2199d762709fdb83c49f4bb60d76
 MISC metadata.xml 408 BLAKE2B 9181b68543881bbf8c74385b007f757debcdf6e6dc8c92524b8f86eb9ad893a1fc8a23f49e37f68e568ea99eb52580b2f7c40d997705d54fb526ff3235bb941b SHA512 f7f732a0e399f618d1b5fd59211c2f8fd88883ba7f94b40745d46342b7c9ac61cbf47ee8b0938151eb5d5e1191341796c4e2cb89010560fc7468fb632ecbbbaf
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index 991938bff772..2f7ca6851d90 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index f07aadb93720..25a0f3e35233 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,3 @@
 DIST josepy-1.8.0.tar.gz 57507 BLAKE2B d395f08db9c46d37555f2cc540ab7af79356e32b60763acfa2116cdc08a46e51d75f56e6d393dd28c7dfda5f2012db5f4d5b5cddecf74809a01ca3dfebeb598d SHA512 50cdedfa4cf67055ae65dfeef2328ba7bb369fb8b763b425e4ca73108555c9cd04f12a644309c2f2e1db50e1d227be3bdbd00037e509d2b2d82565c213b81e4e
-EBUILD josepy-1.8.0.ebuild 784 BLAKE2B 6f02c1e06fbb041d496e3c21e994c839a6ba82807110cdcf635818bce637b242cca6f2bcf29bdda7cf540cd76d9b9e1763fd5f165af0da4d9e7518860a04e95c SHA512 7bec7cb0c29ca25e8d3997db11485d61733deb801279f53b4c6b85f15f65e9e59ae70df25ace2d3f18c5158b41a8b3ee2eaacbed64463459ca7f8fc64bc85be2
+EBUILD josepy-1.8.0.ebuild 785 BLAKE2B f6af24b68c94abcd4895914eb09b551ca7c4547144a1b3521b6b16a241e02609a9e33afb36015f63534e2999b500128c0e5890e3a9e8fb08a9ceaf976db671da SHA512 adc17aa849287d6ff8defce9bbfaf29d7d60c642cc2a476d7a1bbbc09d645c3fceda2130ac155c439ddb9f7a422d124952a628704945f7fcead6a620ad85480b
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.8.0.ebuild b/dev-python/josepy/josepy-1.8.0.ebuild
index 2131f3b0d38a..0345e440d015 100644
--- a/dev-python/josepy/josepy-1.8.0.ebuild
+++ b/dev-python/josepy/josepy-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 57fd31c5acaf..b93adf84e819 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,3 +1,3 @@
 DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
-EBUILD jsmin-2.2.2.ebuild 465 BLAKE2B 13b12e8ac763b1ab21d2acc52975ebc167f8826c02a550bdbbbb2d51caceb3efe7adfe084d9e8b9dec73ec7a34d88d882c36399a8c79a752424d343bce7d7aa8 SHA512 614f9d24ee4f6b32fcbfb828e13689f64e801d3332fc742ecaa4c0588402c54882575351583751005eaaa0aebb6771ec915ee4ef795c13728c47f511dcbeb601
+EBUILD jsmin-2.2.2.ebuild 465 BLAKE2B 9ff8a27d8975c53020f8e5365b960ad933c0f6e6f787c79663245358c48f6529dbfbf1b7b78dd0b925d92a0356cd61c7215a198213c0341b71392845f3a827ec SHA512 8fce447422b0b2e0424d615c02c9cadc37bacbd878a5b0c71c9805761df906a86a0179f37a7300846bf029909fc86eac1615c5d5be03b7bd426a0670d25f041b
 MISC metadata.xml 372 BLAKE2B 1e01737db79c54d3851dd73e3a76c5509e56fdfab6d9e8371f269fd4038935936546df8bd452a430792e7e5ff3fdb4ba163bd0f3a553bfd685cfd2ad991641b9 SHA512 866aa28c2ceee47ddb6960d40782eb1a4fe184a3068bde3f938316aab1070a57b54f5a8df9dec06db4ef4385f49ed9760b689b840b1cc765fe0c4ce9627b7b58
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
index 716997406fe3..40f762f32efb 100644
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 472909cef4a7..261598ee4f05 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,3 +1,3 @@
 DIST json-rpc-1.13.0.tar.gz 31089 BLAKE2B f2058bf78cf1924aff7bf7882aa693cbbb5419624bf3e3508a344754265985907cb16456de611b9be23afd701bd2f664ccb05f954622e543bd9db0ab8be52101 SHA512 76cd320b29c32a79fcafbd415cea8d4ca98a349b22b29c379aa06a89a76cd2b5bcba2e0883d8cad75ee43c4a979759a6af513d3cfb30076965de08e1ee801b9e
-EBUILD json-rpc-1.13.0.ebuild 553 BLAKE2B 84e1386ab42745c508f8f257faa20198dc1ee81134d164e0a48e7aaa652157953dd1fd6a483fcb8a5be8aa561a5eb4f9eb8a4793d1ad3e7dbcde580ce0e7f53c SHA512 5319e2631b8410dce1ab4aa58c7180a4060fc49f181a211a9172bd802ac75689af9af32fd98a92f6bca8f64251d8c72affa1572b1179707d93d05389e7e3787a
+EBUILD json-rpc-1.13.0.ebuild 504 BLAKE2B 99913c39cf633b0b86829ac88d70acbcbcfa989f02bc6dfb56c73875da94fab2b3a886e0658a2a7652da147f1f09071ceeafc0954003e807d79bf6b470c8feaa SHA512 06ddc43d53aec0e3fb6eabbcb44fcbf962dcb6f5ac6d5ed7be831311314beb4c03733576cd4244ae0cd739dd4461231aac6f1d54294c7844e3e2712d1714ec03
 MISC metadata.xml 915 BLAKE2B 39fdc02385c24f58d76e7fe3f726ca0f644ca8cb44be2043ee035be385c87f0c968e9348638f3780138cedcf5f94ba834416588d460eb713fc74df1021e62dc3 SHA512 b59d57bdc0a0f9b5a38faf8fabba2a9b6e4b8b0004fb094b98aaa2f28d308f3085791fa1cfc65011baea2dfc2f869c28a9344d9ba0fd662dc6bfb6109b72002d
diff --git a/dev-python/json-rpc/json-rpc-1.13.0.ebuild b/dev-python/json-rpc/json-rpc-1.13.0.ebuild
index 2ec8cf682b46..ce9b58b6cc5b 100644
--- a/dev-python/json-rpc/json-rpc-1.13.0.ebuild
+++ b/dev-python/json-rpc/json-rpc-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,12 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? ( dev-python/flask[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index 5b2ffc172636..f7886161c9ba 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
-EBUILD jsonext-0.4.2.ebuild 573 BLAKE2B d874bc21cb2f9d48e4a57ad5f1290787c823769a0929475f53e76123fe537d09cd2f164242e588410de08da550a8363f6e37cf250fc676d6ecfb70aa91d69dae SHA512 f11ba35da82954533b98ddd61661097e351f36dc9a41ddc904877f0d34b1356d0f65540868f8d9077b1f7c85aa35d3a78f34622050f48c797aac5bce5187b1c1
-MISC metadata.xml 403 BLAKE2B d4649f94cfff182ded2bdaaa3ab292720a396fb074cba35cee2d3efe5e98959ff798b692025d80e841cca4696b4b4c2357ad8094f257e003147bc8978054695f SHA512 1c906478df150a82bfef259258e5bc3b334936b54c27950a0a334867698e9238b3904c3a3adfa2c6853bcc420926374f2206563588cc43715defd5672ee1f519
+EBUILD jsonext-0.4.2.ebuild 493 BLAKE2B 8b953a9eb6feb610d406ebf9b5cecb3f5a65d9165ba7c881e57fdc836625e3a844463c88a7dc30aa0de34d0ece594bcb08396f9abfe7787b8f2e9cfa1f3eda0a SHA512 5b5b6ca417fd1ee1e343fdf04544d92d7fb41b745eea843f839885bfdb7927de366b1f55d02df46bc3ffa713aed5dcb6999d44b6ffcb92779dc1ed19d0432489
+MISC metadata.xml 427 BLAKE2B 8f3eb96564585f36de7f6b46ef699837b09c3d230efce1f82413251299be94d243e25d3e17fef8232de9f3819d36a17bf2eec529c5b0588791fbe1c3800761ec SHA512 d47bba0c18463d9ee52f09ce48e3acd102006199babc3da9baa8961a5fd2f96c63800c05c52a79ad93384fa0455257083918a2e78a0d264f7b24fe540cc229d3
diff --git a/dev-python/jsonext/jsonext-0.4.2.ebuild b/dev-python/jsonext/jsonext-0.4.2.ebuild
index 8fc1fe898dd7..3b6e7dd7a515 100644
--- a/dev-python/jsonext/jsonext-0.4.2.ebuild
+++ b/dev-python/jsonext/jsonext-0.4.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -13,10 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/arrow[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND=""
diff --git a/dev-python/jsonext/metadata.xml b/dev-python/jsonext/metadata.xml
index 909536b074ce..11d4c2d256c3 100644
--- a/dev-python/jsonext/metadata.xml
+++ b/dev-python/jsonext/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jsonext</remote-id>
 	</upstream>
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 50b5338446c2..4890a0c3f4b8 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,5 +1,3 @@
-DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
-EBUILD jsonmerge-1.6.0.ebuild 628 BLAKE2B 775cb6cfa5dbb036461408fb3d00fee2ab5cc861352ff1dcbdc5c0038b54b19dbf7e883a8a630284c197a5fc6468a5f41d1e155108b0b90cbd2d943360fdf410 SHA512 769547cb8ee16cae1748d96f1ce3a9b4c45f1b85a4f905e128820b56b8f9746588127347e5ca62d08cbf5755ac5a31aae6b4d6ddbb41e7f127cf322b70ded1c5
-EBUILD jsonmerge-1.8.0.ebuild 482 BLAKE2B 4b2f9cac28ec1a7c3559c175d93d4efa93e2c5193343bcf6628223187cb399e9afa3b67a68008aba89bb224c8f882a057cc8fd50afb064552bd1498f8bcef2a9 SHA512 9faaeedec20e9bebea5a1c765f190b1e4d4e1f324b9ba0c4f20a02548c9058b56341b0e0c0bf73e53c9018dd38e656d1964d49347de6c81f155c0440bf2f225c
+EBUILD jsonmerge-1.8.0.ebuild 483 BLAKE2B 85a780ce7263ef37eeaac972701ee5e256acdac30ebc23047112664659ecef75b8dec70d8185ab842d93632a6173e37eb73869f30d6ab3763d4858831830e68d SHA512 8a74e746f502e13ca3de0496bdbd7500d4bc8e004bfb9be84c17032178b1fb63e079d28e2bdcabeefe89dcffbd96c05719102d838c70b132edffcbb66b8e9410
 MISC metadata.xml 473 BLAKE2B 3a28d55fd85b68e566c37040b5b0d966da02b285584cd0025b6501b07cfc5f8c340d0e14bd9cf8b1510e44dd5f4be8f6d9c01ecc4d82240c23d051cd69c4a73b SHA512 e517efb4a97e559a940691db5b1eaa182ba4816bdaf971fee350f4601998d9ce608afb6d670a36a556529860805b24b37e01757455ce251b7461119b2f8b9ad0
diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
deleted file mode 100644
index d43fe240f3fa..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_test() {
-	PYTHONPATH="${PWD}" python -m unittest \
-		$(find tests -name 'test_*.py' | LC_ALL=C sort | sed -e 's:/:.:' -e 's:.py$::') || die
-}
diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
index afaa5a495335..77669b0333dd 100644
--- a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index c19d1dbbb2bc..8b78acc899af 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,3 +1,3 @@
 DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
-EBUILD jsonref-0.1.ebuild 515 BLAKE2B fa07a37f27db5f510226a2b999c09483295897b6e41d78d96781353dde8ed15a6f20678ba86a9b69d6a2d0817810a5e117dcccfdff74ab1c2912e4c5162f621e SHA512 e3012c3d21685637c117413533414db3eb7ebc348d6237e46ecae812d01636871ec0363b367a3da57d5af750154e4f1954dd88ecf3b59fb2848907e1d1b1a143
+EBUILD jsonref-0.1.ebuild 505 BLAKE2B 2b27d83d27d4c2a1f8b0561a0634240393d18c749e1d7c64eb72c0687f5af74966d9d36e6748d26962864db1fd868fdd12c04ef999a2f979add9e4e83c51a0ce SHA512 fda5bbf44b9bd2bafeb566bd931d24d19d95fe058c15fdc2e16678390057f9c30431869628b47b0e1583c0b7b9ea02a7e7a5be9ba76480a85a6d0ea39c35c446
 MISC metadata.xml 796 BLAKE2B 562347d3389a298d73972737f5184498dd85b86c343414e874aa9f25701bcdf28c3dc9e6f91afdefcb3fa0ba1a330044a970e2a3c8b9087149bfeaea8203c0e3 SHA512 cdb03942fc8274d9479545d70dd81b78395fee6c65df33cb13091997bba9bd0aced77952351a5d1381a4e8a14cc2888fe57a2d3e92143242a92abe4def4feba6
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 55256ef28304..2e8274b1dde9 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -19,5 +19,5 @@ KEYWORDS="~amd64"
 distutils_enable_tests pytest
 
 python_test() {
-	pytest -vv tests.py || die
+	epytest tests.py
 }
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index f97001f8d156..64ff230478e2 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,4 +1,4 @@
 DIST jsonrpclib-0.4.2.tar.gz 59590 BLAKE2B 4201d62c9be469d7016943acfc84dca56606f17383ac26e86f574c34927ee6131c5c1a9bc5c3934b8324049ac35b1ff5e4e49ca7ef850251ebdf9a42a53e59a4 SHA512 8d9e5ebe8de960272a1ea0a194544d41851f96c5bc16b9eb6984ac4e48ec1aeaee8e4c3846cfe747a737612934d43a3df72bb1267f0608b1cd2d6faba2acc7b2
-EBUILD jsonrpclib-0.4.2.ebuild 646 BLAKE2B c3b7f06e1e555fef93c8d75ac4475dbf7fd91e60710d6a4c3c67e392818686b787f18b2f396a128dc9192dfe1198f361db57b46d5545051c3ac2be62ca6aaf23 SHA512 88786861fff73955699111e59f245dcbd64362c8600515b871f4b6a17d1a3b30fff03bbd6a64f8c93a90b0c83670eed89727100baecb5dec8fa2607e3ea4abcf
-EBUILD jsonrpclib-9999.ebuild 643 BLAKE2B 3350db13c17a224a9f9e47505189955362bc83596ea40344e838d89599ca83ab82c5b5b15950cc8810707e72c439d64e60ee08549f180e1a555621a60e6ecbf6 SHA512 41970d3af552d85f7777eeb11300fee9ab880dc2d0beb5300d1d642a6951270a63e8a9c6495938ca51b967b235a1b499d1f92a40e443fb2758e732cd13f983d1
+EBUILD jsonrpclib-0.4.2.ebuild 647 BLAKE2B f85e37f63b23befc98c2434e8ba08a251f936d4d8c1ae0e320d727e152890006e0d3ec1239cd0b3fab3dbdf02aa33b1972b53bf37f1521c455b206d8f364e2ca SHA512 cbb3f7f47aa10da80afd42346f03865f7b2dbab1d9874f3e5b95b29782ed50ec3ff149b6af7ae92dbde90a90c60381061e3574652422f05ad6c0a031727f00e7
+EBUILD jsonrpclib-9999.ebuild 644 BLAKE2B 0e81f1181199c604535c494930ac364f87bb1ef0fe18ad12c573f683a1006d74d2bd6c7f15a456779a5541354a1564338b8377735f1acbf9d325bc05f2a26ae0 SHA512 8c21ce7f83bbdf9521854978c5c559c8f553e08015a9d5fe3e3fbb099e27ea75851f1253b3e3a5720b18ca4a5c68d7b485237ecea102856c6ee9c726a4a9fe8d
 MISC metadata.xml 509 BLAKE2B c34a7216797604e47ce2663ec7fdcaab476541695782a6bbcf51b48cd143eb77147d78987e0a1be5ee4a91bc02b30774f08c89e7e40d8bfe6cd7cf1f309330ed SHA512 a24ed1f64378a7da8c422d830cdb910f068ddf07939441390d86d6afb5e4efa1aeb058f33f28dd160207b85042fe0539d53f2b666195e7539b33ef7765514d33
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
index 5ff5e7c94d27..8081f1f1e35e 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
index 25b82faf591b..fa19adab5852 100644
--- a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index e5c89793c2f1..ea3aa66f6de6 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,4 +1,4 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-EBUILD jsonschema-3.2.0.ebuild 1659 BLAKE2B f3e534a2d7c16050843b991f871777bf273d8a5890ea62fdad14a302b6b8f4d548931a574a121d7c394bbe9595caaf8c5a25d42b3944a569710e35ef9515193b SHA512 ef62b6e3cc4c044334e9c8c4f2b228e4a6248a207a6315acac065962d65b6ac124365e893f0ca32bdb2955e93cb476103c6019a2af56c78f4fb410fa836727f4
+EBUILD jsonschema-3.2.0.ebuild 1276 BLAKE2B 1de013d01c360d497535d6f8bbc0448ffe095dedbad6ee5a28b5bb19c94209586bdc48c28422f78a0c6fbf24a11059b14a5830d7d20572662f269ce5867dae4e SHA512 60633c46d09a761e3d0425a07ed15f95e86fd0e79440f01174e9cc6556ecfafeb8e40ee7945bb13b6c94074696a99d7044a5b8b26867936dfb82a0a773dcdfec
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 64e6301f0482..0c4030cc4684 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -14,18 +15,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
 
 BDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-		' python{2_7,3_{5,6,7}} pypy{,3})
-	$(python_gen_cond_dep \
-		'dev-python/functools32[${PYTHON_USEDEP}]' -2)
+		' pypy3)
 	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
 "
 
@@ -39,19 +36,12 @@ RDEPEND="${BDEPEND}
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 "
 
-RESTRICT="!test? ( test )"
+BDEPEND+="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-add-webcolors-1.11-compat.patch
 )
 
 distutils_enable_tests unittest
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index 75d84f1feab3..6c5cdba38d81 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,3 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
-EBUILD jsonxs-0.6.ebuild 469 BLAKE2B 35bc7f15d4384203d13b607d8cf91a015a45303570a2eb4900d80523669f65e0582249e2ef90a4c8b51cd6c6fcd7d06eab081817ffb6bd8750ba5f2bfbc6c650 SHA512 1d55e128966614a8363703c520417614d7d340da01b695939bb8a1edc8990a17313d8a81e2820896a9660b44037043a9612b465b6b694ac61cc2daecd5aef055
+EBUILD jsonxs-0.6.ebuild 469 BLAKE2B 1389a7f6d6c3076d331b5bda76d9d65eacf035a70e4aae9e17c9421db7e42735ac9f97a082cb3ecac771270e096767ba8f50d48be0e4b60e5e27b02a60931374 SHA512 fd983ed33f5a61a4fcd25502f36e6876afdfdba18335bc470f0f650fe782f9e8a99dffbd05b54acb73a689d366c5814d34a2dedcfb6d824e638b154408549172
 MISC metadata.xml 388 BLAKE2B aebc716b9ae4d2f7137863ca8088929b9f5ab0148c175eaa84bf96d7bffb6985585a847200951ed13614667482e46080040863206ebef731defeb81e7ef8b941 SHA512 4ba5f30d7718bfe05670d3b66cf7725bf1719c515dc2cc814a79f5af4a6ee64779ccd8fc5740bacbcbeac25ec196b710692988e2547c647c3da99e30186a5e7d
diff --git a/dev-python/jsonxs/jsonxs-0.6.ebuild b/dev-python/jsonxs/jsonxs-0.6.ebuild
index 9eb4fa1dc91c..df1168c837b6 100644
--- a/dev-python/jsonxs/jsonxs-0.6.ebuild
+++ b/dev-python/jsonxs/jsonxs-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 4f4ffcd61e64..5f654cc31d68 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,4 +1,4 @@
 AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85ef2928f053e49d4fa9bf9db5f086b32d74fd6d04488566ca63915cbd57b7a5b5fd0f3a9329c0b79918e40d487fcc3938f365 SHA512 e3031229d0e0ca18d3f0a9abe84aa3e0d8d62e212ea93551cecdd1be11698d2a73db5bc52c49b65a59681b0620f1718fab8c4093951edbffa6891495ec116931
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
-EBUILD kiwisolver-1.3.1.ebuild 626 BLAKE2B bcf09f5ec20cb2ee4860df96356327c3e950498c7612441c0485890134bc111f21271648b06d284e2602996d3ea8eaacc712e4102b1a2a6bfc9e3c4967953a9a SHA512 8a11ade2e6e59dc0e596856e4e5c4c7dcef3b368ab401d4ddd41613740552a21533023903227b9e781fc41718b14b1f0a1b9b0950e664d49ce6edf026ee3c842
+EBUILD kiwisolver-1.3.1.ebuild 627 BLAKE2B b44004f933f4e0dd36bc2ba21d3568ccfc1e9b92925de41e4c1d810845bddf1cad075e6b7fc4c9b7120ea22fb99ab4c04cba4f006c504eee872cb4261977dd01 SHA512 8c15a11162e99c5605096bc2579f51d08ab69634ef319c20fb8daaf57b620e9e761c0249a1c8bd5f37c155b32afcebf624357814f172bbdd1e507d3364956c23
 MISC metadata.xml 365 BLAKE2B 358ba29f93baea54b87b7af93da632cf6d9e15ddbf8171b82e0745531c5ce9c5b647531bf9346d81591c713bca19d72f136221077e61baef7bbf05f3d770a62d SHA512 2516fee7907e5d0f3b401d0f500adc914cc53fa7df56c49424e16ad8d33835c3aa138632cdcee89aebdfea9b3d497c9ad6f275f22b0509ac90bcacc1647b33f6
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
index a9550a7550f5..0bb58273599e 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
index 9d81de170084..a6a816bddb91 100644
--- a/dev-python/latexcodec/Manifest
+++ b/dev-python/latexcodec/Manifest
@@ -1,3 +1,3 @@
 DIST latexcodec-2.0.1.tar.gz 30131 BLAKE2B 8af9cf81a1e0a8b72bf4eb1be206d2f2029598372872f1c43d8abe5e69efeba957d610102f44a5da552325f5525e1668e52ba2cc6c9a2d3f4b7c59c375f040e0 SHA512 e7f23b91904e0bd4a3f052f5f201b125e84c1f94a247b869e14c8f45ee8bc2c478e8887a792efa8c9b6d2b7fefed43fc66e797206b6e40aedaedc68ce7865cab
-EBUILD latexcodec-2.0.1.ebuild 498 BLAKE2B 0a62422087d54ddf603ed2edc4bca11089db678b90138ac5c161bb30381bb25a07021c8a79dd4f350a3edf8c12145a22e40759defa631338c94e75371babb38e SHA512 dcaa15efe2f61db1b674dc6121d54362a4db69aa74ceef03e60d89a367a8ed028411bbadedfa884ba2dc821b15aad988f3e829423d72fadc9c465ecbef38b67e
+EBUILD latexcodec-2.0.1.ebuild 499 BLAKE2B 42aa6d37556f3b5128c228bbfdc36a0c3f5a7ebd9f27c0091d21234745b1809d759d8468af5a25a6139b75c332b0ca725f8320a90d279c1e39854b6b28e84fcf SHA512 ea7cd16be8932e3a54639443e2a8c3c36e40c058053bdeaeeb5b5166926070397aeba549106877472851a060199f32f8c1f5aa66cca60a84df249ec2e015b10d
 MISC metadata.xml 1160 BLAKE2B d2986a4a033cf7f44aabf97de75849955ee2dc92305eb93d0b400a612f3798c734a1a425870130c5458b0931b66b7e2d62c2d1e6c84834061194f4389c0edd82 SHA512 cd8d441a57c36583ed04fa0f22e86e0f4134e85b4ddf0e6400c368eaf48d948acf0e91a0713b1c53e1c8eba51919a51bb1c3a024944d78973c614fd57c6d6d03
diff --git a/dev-python/latexcodec/latexcodec-2.0.1.ebuild b/dev-python/latexcodec/latexcodec-2.0.1.ebuild
index d0b505b9f685..3fac1b0162d1 100644
--- a/dev-python/latexcodec/latexcodec-2.0.1.ebuild
+++ b/dev-python/latexcodec/latexcodec-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
index cc18f248fa19..0addaf40af8f 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1,3 +1,5 @@
 DIST lazr-config-2.2.2.tar.gz 31957 BLAKE2B 5bfee9ae556e6b4109fa43ca36cc2676fb805dc6b9d9f788224ccd29e7836313affa55dd031496c2a252c5e64b150fd8f21c2934da3699ba95e0968ee8022879 SHA512 3427d2be4b4763238bd8378ec5936d38d0b944074d56f6ada55d0e3f232fe0846630a0ef3900c169b58092d029297d7c937ea4ad349aaa2745ed25b71df9c7a0
-EBUILD lazr-config-2.2.2.ebuild 687 BLAKE2B 04dcb2cff59b464c55ebab1ec35d191ce32307a1f7cebbead2f9004ef43c19f781da4d3b5307ff62949e474d9965c205e5bae5ef3a7c145ac08d5144f94f0f88 SHA512 05aafc76eb448447be70d1c50b0c917453ad0a522689a490c2fb1c7e7fcd840995e79fc40a373f8e3562a47b13100fdeec70b207ef7a9c8b014a2805de398e53
+DIST lazr-config-2.2.3.tar.gz 34213 BLAKE2B 029bdec3ac4f937f439f833f51e44a58f4604f337979c9f06695e7a243b2cde0af39a46139af5e88052e8585d2729c1b328df89979c9ff100338ec557e841b71 SHA512 cd8edc29a811b658045f314b2de4317bd750a701c2596d89912948fe0e58bdc39ad3d22cdf34bb7e46658af7ac6d32249e454c35bdcf72bc5053094343cd37bb
+EBUILD lazr-config-2.2.2.ebuild 624 BLAKE2B a604612d0df4c4e12a9a4e0ba94f094218d3ab1b0f5e09b54a61a69aed52abc856fa6dc8924f703797b7e55ff33da558bc2adcc150266fbc516823e4d734ca83 SHA512 5cd676e8fd5e1ea01396f36b439486245283fc36673c7ad1fa143eed5bc738edce5552d399152a4faa458f3501801c4f8b9c89408dcb4940feecf90e5f43f26e
+EBUILD lazr-config-2.2.3.ebuild 624 BLAKE2B a604612d0df4c4e12a9a4e0ba94f094218d3ab1b0f5e09b54a61a69aed52abc856fa6dc8924f703797b7e55ff33da558bc2adcc150266fbc516823e4d734ca83 SHA512 5cd676e8fd5e1ea01396f36b439486245283fc36673c7ad1fa143eed5bc738edce5552d399152a4faa458f3501801c4f8b9c89408dcb4940feecf90e5f43f26e
 MISC metadata.xml 407 BLAKE2B 309f8de2c8180787ddfbf2c96df9df76ab324465e03d82fb4a3538bb1ce61c57374f688ed44700a95cc968090b917070466088495179255bc6adf0ff7e0093a2 SHA512 b41c8f97ae6ff851d406c414d5e528e63d43660facd3e9a7591a635395512ecefb3e58da8d8d745f799bfdc8089a8c9eb223822010611da096168e940def7bc5
diff --git a/dev-python/lazr-config/lazr-config-2.2.2.ebuild b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
index b0cf9788335f..51ec50017b8e 100644
--- a/dev-python/lazr-config/lazr-config-2.2.2.ebuild
+++ b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -17,9 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	dev-python/lazr-delegates[${PYTHON_USEDEP}]"
diff --git a/dev-python/lazr-config/lazr-config-2.2.3.ebuild b/dev-python/lazr-config/lazr-config-2.2.3.ebuild
new file mode 100644
index 000000000000..51ec50017b8e
--- /dev/null
+++ b/dev-python/lazr-config/lazr-config-2.2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Create configuration schemas, and process and validate configurations."
+HOMEPAGE="https://code.launchpad.net/lazr.config"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/lazr-delegates[${PYTHON_USEDEP}]"
diff --git a/dev-python/lazr-delegates/Manifest b/dev-python/lazr-delegates/Manifest
index 4216b76e8177..5fee7e2922a7 100644
--- a/dev-python/lazr-delegates/Manifest
+++ b/dev-python/lazr-delegates/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-delegates-2.0.4.tar.gz 14168 BLAKE2B b9388a869e7f83e0bc30dc5a0cfb184a935db2b6272c2a9a93bb12d3db375114453a224703ef05b3f34232860a16fc087b7d398e94d164fbf77af61ba8abf102 SHA512 0c0b32a4fa4c132646d601870be0f0c1f1856aceb91bf979faa9a675fcbf94f76c7c6f548978a402842633cf4e53275c052cff7dfd776a4246691c067eabe501
-EBUILD lazr-delegates-2.0.4.ebuild 596 BLAKE2B 107810296e7a7d4ef55321b1380493e256472a07c16144482cba9adfab2e8d51b0ebe63a61d989d1d1b73733c6627a4b8413db87ebba40d24469578632f16410 SHA512 2d84bf2be26c0ef6b96565c1387f274293d4f28502b24f370f6e91363736310ba13316f62463ab19a0e4e79c65120a7d56fd2e7bc1422a686ec34c4ddefff262
+EBUILD lazr-delegates-2.0.4.ebuild 622 BLAKE2B 43ea6d6ae5590bf130df796d20289dabc604e233056095209b1150dc3e92e1ddc8294cbf90ee53a31f39ff7413d20d2960faa64c6de38da81d879f9cbefd265a SHA512 1c14184f14ebe5b1bb729fea3505cf4a2ccfd1982c7f3b1bcc42f01ad0dca3b493a05af59c5fa171e6604aca90adeedef0912f8d9461cbc8dab1c7cff47dd7c3
 MISC metadata.xml 410 BLAKE2B 299b41c39c31df7aaca8748d6adccbb348061e4fcfcfcd9ec9c9b14679c40ac530fa31eb7133b008d3fe2e979d7ec0a3f20867ca6d41c7288c4ec6a40a216148 SHA512 97b0932ff2b5e2b3f6e32a9af52d12c37fc737ef48b0ab453e858b7722d4c495807eb83a7acdcecbf129d2c9bf054504fb588fc661c2b625693be2759de24afb
diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
index da4bd430308f..c85bce4ae891 100644
--- a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
+++ b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -17,9 +18,10 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index c0861e89baa0..8224a88bf6f8 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,3 +1,3 @@
 DIST liblarch-3.0.1.tar.gz 55564 BLAKE2B bb3b3b67f9a64403e1a57e9b47217aa1a9b066708d70e1387a8b864a81dbdc4202b6b75012365f9c93179bbfcc4304116a33ebd3bd892f24334e0c200ae94b56 SHA512 591854eae54f5e644882f8ba486434f85196115a3c06f249cf7b343bb0e029b78a818610881d9d656f6342748c956cf5a213a22843e95b2ed05246a8013ff8ca
-EBUILD liblarch-3.0.1.ebuild 642 BLAKE2B 8908503b530aaa8217d3dc0d158b02d2957e3d57ae381ae089f361ad6ded0e5427d3078afa8d7e2d308920ee3e393abf7e431d4e59033c0dda76c316adf3d7a3 SHA512 372a14e5fe5be3856e73de9aa1b52ba2e309fc78bbb89c184f6c17f9561058fb96c16bfc3344c67593b72e346677c96346b24f1fd0cc57148fa3f738ff9fc57d
+EBUILD liblarch-3.0.1.ebuild 644 BLAKE2B 83a33654e1cab8279bf48206d05717de95e6c2d53e4b74c9a7583d30e1e4b0cfbd8cd8fde8c9c23dc0d52498b2d66b0566c887577f21f4b18e167a8fd0901704 SHA512 3a0547bc2eb9fe13bc3c3e1ebeb4460f95b07159f7f0489d9a6a3d69685eb9c82bbaa852344a8c173dfff02ad328ca790ddd0bfda6fa1732b51af8999d2ea298
 MISC metadata.xml 816 BLAKE2B f8e5369478e15d5db78b5298cf7102130d5598da60d897c31391a58733bacf3ec9965b85f72c1efbe61f2c5d5adab50e861602d3251c3587dd4a6559f83fd612 SHA512 8a18df9c51da63c8f04131dc16e1d554d2df244ae45cc738289fc3760462a7f3eab8f9b66d3d032dd1550f7716a2e673647173c531ef099829c2bc9ada7c42b0
diff --git a/dev-python/liblarch/liblarch-3.0.1.ebuild b/dev-python/liblarch/liblarch-3.0.1.ebuild
index 7122e078145e..52d9404fa7b3 100644
--- a/dev-python/liblarch/liblarch-3.0.1.ebuild
+++ b/dev-python/liblarch/liblarch-3.0.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 06b1ae8f84d6..3fa92874c4c4 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,4 +1,4 @@
 AUX libnacl-1.7.2-32bit.patch 890 BLAKE2B 40afbe3e71b550da59b9c26c2834ea72b151d847605572bec3b149edf714125698014a8e30c2e8d9c49cca489564ccf5fbdf0f7033caea528ee588716e222a2b SHA512 8ee93b8dcb23228b3f294a947a54f49afd9fc4dc9207fe999ca7349868cfc05741ea8cab004087c3f0544436fb445ea3f513b574076f6350b2390415a3be7426
 DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
-EBUILD libnacl-1.7.2-r1.ebuild 623 BLAKE2B c7ab8a5404811eed2fbdb005dd0a8938df59e50e3bcc379e7777b9ab203ef34892b84cb03730e06a401dc86bf3937e94ff0a9e820a6c1b19443b66c62da160ce SHA512 ab975756df19a8038476c16b81113c51c8d064bc6023f3bc27f878d74d36b42daa1a7d0c7e2e50904ee377ad870a6c488830f3c9121dc993647fb938c58bb824
+EBUILD libnacl-1.7.2-r1.ebuild 624 BLAKE2B 559734aafb12fa0bb12e65a8127eadceb720cb24ccd55522c3af276966fba962caf4e243c7877ad0c68cfbf23c9f171077d635f56dd2317159e830addd3dae0f SHA512 b42efbfb6dd6c0418d91e93e8c2342b2885b4cfdc829f17060b90d6cefb08475f49fe0d87233cd370c7c0d1b8e42b0449bfc1bbc576e83871a64042bdb2b3a50
 MISC metadata.xml 495 BLAKE2B e77a0ee4b63cdc8594ff6dff8416db824eaf4a3fa50f143bcaf2c71b5e216078cd41ece0aad491240392896a06bf4dfb7f73dbd1e7e504999e1c32b642910537 SHA512 dd1c019a0685be6b3e1b6f124feeb0dd6ea0678e1f243504565bf467c62c3bbf4901990692b559c1e869d08bc4ee6338b8d7ae41410bc6a2d904d53283fd49b2
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
index 22fb3719796a..004612b55001 100644
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{8..10})
 inherit distutils-r1
 
 DESCRIPTION="Python ctypes wrapper for libsodium"
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index a913d526ecdb..2a974d4a729a 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-python-0.21.0.gh.tar.gz 55774 BLAKE2B 3c584ff3b6c09bc768554a3a4f7ef28ecea0726f59206da8540f9c1b4db74ab1235695074dd6b95db74f174066bb856c9854026525da82e7763f341920f0bd53 SHA512 d5b7a1bf0dc736a6a38e2e609f0a213306de31d5ad84cfdcd96f9ff72a1c38f15bad3cf25a1cec6dca5a9f3b00a8509afff2b4ea5e4db80e218e3ae603d55856
-EBUILD libsass-0.21.0.ebuild 1403 BLAKE2B 303f467fc492eab305cb7f231ebd35758b0fd94cfc3e18a261c02a2ecc97e395fccab50bfb206a892950774da8eb7612c8e1aba767875d56b67028395b244194 SHA512 41efc0c0c3db94c2c23356bb4ec9eb8fe6349292c51edd092ea24adb8187e633328bf595416e451daa39608f5fdcd805524c1e5fbe7c353340433a3ecc01d437
+EBUILD libsass-0.21.0.ebuild 1527 BLAKE2B 1524db6af9b9d8f38626da41ae7f0362bb91d8514f368d920c4bb3dc1467f0771fb27cc704ed8c2167f90e020ff58f72d78ada6a7468824f52f5c7f56771c372 SHA512 4162ec08c68a798d489ea436e4ddf317d7d6ba8e75f89aa7fdc672cc5a097b6e688392de3a7b633d60556f7f28e2f6f8ef6db95c951c3233ad65c416b70da8fd
 MISC metadata.xml 328 BLAKE2B c75e306610c41d64a7d68392c44c72827ecaae50a26ea524d8826d48c418e7fc34a2345d682dd9f6ccd5db887f032de1b6c6051801037a67dbe5e1700b9e1d77 SHA512 fb6418e4e357c35fda2e78378db2b7646a49401989a695b0ae615d11f132267819fe896335259482b6b91c20cfc832417e4fe2ce0a93768b3de8f85b0db93806
diff --git a/dev-python/libsass/libsass-0.21.0.ebuild b/dev-python/libsass/libsass-0.21.0.ebuild
index 88f4ed3e19dc..42335f36cb91 100644
--- a/dev-python/libsass/libsass-0.21.0.ebuild
+++ b/dev-python/libsass/libsass-0.21.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 MY_P="libsass-python-${PV}"
 DESCRIPTION="A straightforward binding of libsass for Python"
@@ -37,6 +37,10 @@ src_prepare() {
 	echo "${PV}" > .libsass-upstream-version || die
 	distutils-r1_src_prepare
 	export SYSTEM_SASS=1
+	# https://bugs.gentoo.org/730244
+	if tc-is-clang; then
+		sed -i -e 's/-std=gnu++0x//g' setup.py || die
+	fi
 }
 
 python_test() {
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 1bc66c913655..560361310146 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -3,8 +3,10 @@ DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cf
 DIST line_profiler-3.2.1.gh.tar.gz 54639 BLAKE2B 8840ac41397aa5d5c0cb94dec5f673a021a9bad18a7d67d73a2d90bf59745c5e35f205d67d28edd3ceade075320c6fe00426d5cf536b9b2953fbbf90539a5e9a SHA512 6e4e0fcb44df6a4eeafa66e8254e511ef0a0c616e9c2bb4bac6bc29df5efa1849f9e75e998770ec6fbe62916a22b17465cdc6eeee6c61ffa52658a9bdb773490
 DIST line_profiler-3.2.2.gh.tar.gz 50780 BLAKE2B 79c5f7f73adaf940e34f96ef799faf08e7a6218cd9346dc3aa86211d04f0cdfe309de23d11f43292aaca121e78df27d0d07ec3efd129e1cc6778b6f8ae83cbbf SHA512 a7279db406adfdae08d375fa18869fdc2276fe360ffb791aa65b13a028470504cd45acfbaa7ccb1c44fb1a5622d9400c5a889f13230514b9d392f09b439af0fd
 DIST line_profiler-3.2.5.gh.tar.gz 50934 BLAKE2B 2124fcb5cba9b0eebe81da6f966eb12e17f1a44db8beddab6903dc7ec79441cfe1d207786083f96100e2394cc2f0274460353d7aa6ce75a6f301500332acbb47 SHA512 ee72df835b55a26c0cd150356da19f8051013e5ffc1a18a31899c9da06f40e97175368204dc23ed21722a237612c1089cb18628715151ab07ba5827e460befeb
+DIST line_profiler-3.3.0.gh.tar.gz 52791 BLAKE2B e3499f5274045d158620fa890df6e725a99c3df019bb4515434213d2c60d52d400d7a7dfce64b153422722ea388f73318818485c9747e6eace2d81c457f93a7f SHA512 37680c55a551c73aed7a3ee2333c523f0617e01cda6db98060f15fe36990c8c8bc08bd5848e569f269bf11590776290ee0980046cce745df8e54268d7991559b
 EBUILD line_profiler-3.0.2.ebuild 1200 BLAKE2B 1949ae0c2051ece27545485b1a4386c21e60e777bc857f7ca6bfa7a222b5a39759ccfc0e3d73bf7cdc8b2d14800e3cea7317f321902814913371e68f46eedb11 SHA512 86e3c9df28b8715539d3a6e2de1c79657fbc754a5831f25bcba5280f302092c799c82ec1114d82460b636a74983d7d85d18f57a937a4c7b0ff9e06c3a030eeea
 EBUILD line_profiler-3.2.1.ebuild 1104 BLAKE2B 1fa42fc95ce52fddf76ba7a15f63803d2ce9eb714579427b3ed60dcdfb2be4feff5f7f85a2ec8b4fe486a410a5acad59033bf6324dfbe14823afc0e887d46dd2 SHA512 8e0d41543752019d7191132cb720ec2d0cf5a230a44946da26143bb4b7131b8070f6409170f154196784e8cbe6bc0913dbf604438bdeae28d099ce2983b57489
 EBUILD line_profiler-3.2.2.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
 EBUILD line_profiler-3.2.5.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
+EBUILD line_profiler-3.3.0.ebuild 1071 BLAKE2B 37b705e375479e658f55df58fae3365a0c437e5495e6ee10e07ece2270fcd76f5dee4469f4044076bc988eabf7f3a51f1aad6782b93f0546d7ed69c11bf04485 SHA512 f8bb3618a1d157f3e6cfb19c53c0a4c2e97a36c9d1b00a48ddae937b36724d2d2cb49c1abef03434ad66fb5fd2c3c401dd0538fa9bee290444c3a57a1cd1734e
 MISC metadata.xml 774 BLAKE2B b6b3a12e779bb827902f69c9ffad89290888d7b446489dc54f22bfe8d21547e730b694ec552b9a9004c764db543b39a8daca8cc0a28f84a5800c8555f4809033 SHA512 c63fbfbf0e20463e78bb8ae15cb9241b1122a80d7a909ed3fefaba1063325a564139f2556a09b0d394cb8fdc32ce34c5020b807c22ad38e5cd8008525fe38a5b
diff --git a/dev-python/line_profiler/line_profiler-3.3.0.ebuild b/dev-python/line_profiler/line_profiler-3.3.0.ebuild
new file mode 100644
index 000000000000..1f06702ad61f
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+# force it to match scikit-build
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+inherit cmake distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/pyutils/line_profiler/"
+SRC_URI="
+	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+# technically, the package claims to support non-scikit-build build
+# but it's clearly unmaintained and broken at the moment
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ubelt[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd tests || die
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1b7727157eac..49c5d3664422 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,8 +4,8 @@ DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
-EBUILD lit-12.0.0.ebuild 911 BLAKE2B aaf5dda5550e4bdd5354fc4ab00f1b6d1540791e21944b394f75e0c42966cff49999a16047560b0286e6ed29753949aa92efd55a8bd945a91e9a4f70ca1cfb99 SHA512 5a91da5a8c8d58dabc445f6a55e3febaa3404f8fa89d5bc7fd8f6031eeeab45cad8c05fd68a5adf6b73595fe9836d18c6416f9ef7a186aa47c13c9ef4b591da8
-EBUILD lit-12.0.1.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
-EBUILD lit-12.0.1_rc1.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
-EBUILD lit-13.0.0.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
+EBUILD lit-12.0.0.ebuild 879 BLAKE2B e1ae6897065f200b1fdbaf5534505138068fde33376ca9414b0929e4dfb0a659b2bcf32e51441dac01752f0036ed8c8276f270ae08274bed9a9e0fa477193342 SHA512 1f0e3b356004ce9b0bf151b6c01e0724e4100cf5c905aa8ba463388dbb308ccda8316190292dfd9db4d601cd144decd7b06154565716d4fba66f6f6a540e0e23
+EBUILD lit-12.0.1.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-12.0.1_rc1.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-12.0.0.ebuild b/dev-python/lit/lit-12.0.0.ebuild
index b54ce89ae254..0502b9a74a19 100644
--- a/dev-python/lit/lit-12.0.0.ebuild
+++ b/dev-python/lit/lit-12.0.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-12.0.1.9999.ebuild b/dev-python/lit/lit-12.0.1.9999.ebuild
index 2076120cc165..37168fbde9bd 100644
--- a/dev-python/lit/lit-12.0.1.9999.ebuild
+++ b/dev-python/lit/lit-12.0.1.9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-12.0.1_rc1.ebuild b/dev-python/lit/lit-12.0.1_rc1.ebuild
index 2076120cc165..37168fbde9bd 100644
--- a/dev-python/lit/lit-12.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-12.0.1_rc1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lit/lit-13.0.0.9999.ebuild b/dev-python/lit/lit-13.0.0.9999.ebuild
index 2076120cc165..37168fbde9bd 100644
--- a/dev-python/lit/lit-13.0.0.9999.ebuild
+++ b/dev-python/lit/lit-13.0.0.9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 llvm.org
 
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 1e1c0d02db55..8777cee36013 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,5 +1,5 @@
 DIST lmdb-1.2.0.tar.gz 881437 BLAKE2B bcb045868c100bcb82daed99bdbd73699dcb5a0e982679f1d9f49747f468e2ab2cbc412ba020b9deca7263fece501c25d984397ee2969187c8118da920c691aa SHA512 75c7aeb3e98ffddb9e40b4eb7404afd3c6ade93753488eac2cb5facfab3ec9b660d925b8bd1c40ca5f8180cb6ca33483020bb4c5ddc074b841693ba278883529
 DIST lmdb-1.2.1.tar.gz 881515 BLAKE2B 76d56e046b5a481411c9a180989da0d1c4b7371058e38abe6d8a6b76f7e2bc62678459241d319850cf739b7b067f3e89d309e5f9a538a187c52c1044fe8b768d SHA512 fa763e24c8f278e0b9c379f39329b7b80051e10d5d8edfdd631486490cfbe5c7bc641d885ffb9f298c0c07f7e6901cc826023c472f98b430a4ec9c0bc71139d5
 EBUILD lmdb-1.2.0-r1.ebuild 849 BLAKE2B 3e7786603e70262d6de6dba3cb68430ce934825105ea188e1397317c7df9bbd90a23fe649ced7ddfe7e7faa53ab12f1ef40bbfd91498d8d3740ce7e72138d3eb SHA512 0b8004fb92370c30448bdf67cdedb0d13133f74489f66ce5981471cb6ea7e079ade4c5fe2a2b5f944bc4a5b85b2ba3108a41628a8d7db5c020b5d5bd3c864f00
-EBUILD lmdb-1.2.1.ebuild 804 BLAKE2B 61e2883315ca10151c43169da9013b45cfe2444185b6b6d5d967ab75773918da333238f1a372a38d7e912a8d8844128d42791046cbd35ed451ec47c1b649b818 SHA512 d6f37db07a8f8f00dd17112e45574ed7f7271ae80a5e8b4adc64c8c00b32da25aedb956b89d45b820102ffe77013d2aba59738081fb27b0af6d4245d9ad3f42d
+EBUILD lmdb-1.2.1.ebuild 805 BLAKE2B 97d600d2cec6d8b3ceefa9cc7b32249115010320231de9e9302abee71d0726fc829a6d53827c5c0b7378f19cc72fe73059c196f7064ed8b59bd37d4b99301b50 SHA512 bd10a9eb7bccf558567269f3ef18a75cfbb7702cedfb84831643f0e1eae249dce531bf0622bcd2312d634a04ccf68edb74b9f3b40986785991621f980ba353eb
 MISC metadata.xml 419 BLAKE2B 7bb3bd08439249e8bcb7f64d91a707245dd2c32eefed576a4389019217c304173754628f1fdd82f147e6f7a077e2abcb6062dcbaf76d0547c8d710c8d16d0a64 SHA512 700345b4a50d602e35c983fadf73eee5da01b7d9dc4a647966277aeb7fe1fb26f583c681acf1718060dff14b195df7fa4689bad2451c475d1883b66e223ad29d
diff --git a/dev-python/lmdb/lmdb-1.2.1.ebuild b/dev-python/lmdb/lmdb-1.2.1.ebuild
index 2d0edc21594f..064803a9c171 100644
--- a/dev-python/lmdb/lmdb-1.2.1.ebuild
+++ b/dev-python/lmdb/lmdb-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 644b619a89bd..80ae26795868 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,3 +1,3 @@
 DIST locket.py-0.2.1.gh.tar.gz 5988 BLAKE2B e50ef1794a49494434c730580510a4283685e924f6f3efb95067db7d566fa4808409fc339f3c8e3276ddf09f622cb165e9dde90094f764f662558ea32f85516e SHA512 517c580a3420283f945d28607fc765c571edb2c0fab52d5c76f24226d2ec85727d1ffe0c03c5f87f6ce6204e7db4d3c8f6e408d767a389bd93d34cc0de3e8bf7
-EBUILD locket-0.2.1.ebuild 568 BLAKE2B 603d44978a7bd9638ef93f483393d9cf5c1bc6741fd8f0f02ff6c9b4e88dbee764b174a3a3358d7d251ef7adaff8a41229c37d689c37095dbf0cdf7707ed949e SHA512 664bbbd999304b02184ff56043ddd8568945aec03292efe95c0e1d38f31933a9043c793cb39f19668b79b8a1286316f8477ab108ee6ed416d62913e9518dbd36
+EBUILD locket-0.2.1.ebuild 569 BLAKE2B 23c74e109561189040713dbb0c9037761af209dc4869ff8180024eefba4fb32a3f0983db971e0235bef31d57df6bdb605db046201671c208353e4c2aae508f04 SHA512 dcdacbfa769b349aa23ddf215bc7f251f7be5b52a52b91553041f228abf97f77f8197ede77d9fa18583abaa7a27ec4cb437de5a974128f630d7cea0ad9324082
 MISC metadata.xml 407 BLAKE2B 7eca13df87202f2d7451be08d5bcc293e3f37cd6d663ae204c38b25e57060e635ba436d8740af2f1cbcc4ac71eb41f77fba5638ba11db6dd7ffaffaf7bd32250 SHA512 9390efb7c0ee77d79cef09ca8e8a73cc8c934b82f28b8c4facad95babb14cddb2141e220997ce53b302f31b7c4394892c42af956d95c79951497a06afe701484
diff --git a/dev-python/locket/locket-0.2.1.ebuild b/dev-python/locket/locket-0.2.1.ebuild
index 3cb38276b156..d1b288c3eaf6 100644
--- a/dev-python/locket/locket-0.2.1.ebuild
+++ b/dev-python/locket/locket-0.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 27717d44a8de..53d43df2cf16 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,3 +1,3 @@
 DIST logutils-0.3.5.tar.gz 27703 BLAKE2B ceeabbc64603da949e771531fd1a7cff6bc760ffa98fcb952eddc5da39d019e202949dc596398ea68397c573cb9c2bace77f8e5462030e68d2f5768444a23b45 SHA512 0194bf4f01e7a29d4211495dc5fead9d4bd5bc1b791d25ff38ad28960a229a9bcdbaa7e6d3b5a4105eef6c9aa159459d6529c2615df113e7ec1ae93aac5cce6c
-EBUILD logutils-0.3.5.ebuild 479 BLAKE2B d5d715abf26755abdd8859c8a2801fd33264967801cb22f6c119a2b1de8fdaa57ea8f17c33cedcc6a9ebe29578a255ae702072c6904f98f4881f4d3e9dd4be40 SHA512 dca83ff69b066ac5b11e9ff0e716401dfa552554c0614252d2b6fcbd16347e06bc3a1fc2c954e0e116881c9a599295e1cbedf18695572a409fc8cff0171c7ab0
+EBUILD logutils-0.3.5.ebuild 481 BLAKE2B b967b207981270262732d13992f3afe55267cae7408363591bcf67e0f61b7991a6df1d6ac70ff6038bf457befa97fb3ba745376a5531d881d78dcbafdc18ff9b SHA512 707cfdfee9916555bf1a4f3da86b1ac5f19529254bcf8a566a9a8f618d6930087e05a0b489fe5ddebe5c94bf660e0fb8d08a20a2dc337423528be222a6fa8492
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.5.ebuild b/dev-python/logutils/logutils-0.3.5.ebuild
index d64fc314ed74..d31df6d8eb34 100644
--- a/dev-python/logutils/logutils-0.3.5.ebuild
+++ b/dev-python/logutils/logutils-0.3.5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index fd611c482c66..fea1e029f8fe 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,5 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
 EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
-EBUILD markdown-3.3.4.ebuild 1082 BLAKE2B 93bad1a568d23cb28dac7e0058588836f4d55611413b37bb81cc0baeba2be53fdea952d47f1d4acaae87725322478dfac9800816ea2354903465a8d10b10b1a4 SHA512 95e0558dbbfe2e1e3d6fd3d95a750f7158403951470e1c1d713757c1f6c6d46448734d8dd667762264cf77e97f0fdd3eb5b3add679a6447c1a0cd3c7597220c3
+EBUILD markdown-3.3.4.ebuild 1049 BLAKE2B 5f10947ebe4acfb905781760aeedac3260a5cc0d9ad9dfa14ca99f4aae342bb05ea8af1caf061917bf04a2a28bd02746be43d83b5b1c5d8980b7543a905ee7c6 SHA512 a17b96ac96eec530a8ecb969e03212c32043c19bf6046ca16cfc0e84ca10b7dc1cd6d82f922d9d219d23bd9fc3350c58c3312e2c5fd4437ef3bd24d22b0768e2
 MISC metadata.xml 399 BLAKE2B 675bf8fa68dad4dc02b4572a74a7e4cd8c7876a78d7a9769b118551ae2f4217028a67f1d206537a08d2b0e26763ef0d396b007d0ca86b498397b6aec5d516435 SHA512 713fe9c2390fc8726140a5981c63bfd901e9288fac25b3b9aa5b7d6a1d5502334df09d4b9f57a1d0f4766ce6e2c36695161ddb796c1263bc090940f99bc1d689
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
index 4cb7a066f436..16284fb9fa25 100644
--- a/dev-python/markdown/markdown-3.3.4.ebuild
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the markdown markup language"
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 0b737ada0b8b..16cf152458a3 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,3 +1,3 @@
 DIST markdown2-2.4.0.tar.gz 96596 BLAKE2B 23fa2b05e7f26bd76b38b2c7f4fb5b3b36694b0e30ab3f168b64754f62d7d2742c5e0bfbed774a198527ad226bfe411e0ba11ddf6d0b2002670e5937750070a2 SHA512 ed523116e01121e471ee1a8ea9e8dde42a04c4c7c5170c56eed852268881f18b7b5062c43f1548fad3a84e2fbddc19c26fbf88084f6affdd11fd4d493a480cdf
-EBUILD markdown2-2.4.0.ebuild 657 BLAKE2B 52068a74b03ffb0713d95d5c5a9393cb14316ba13104cf9d5a6d05d4eb553115588de5c63d8929ee748a1da59532b5ccc6f3d73b64830c961f9d0424a8023c7a SHA512 7323899f1cb4d2b504abfa129ee9dfbaddf2281db9e855da06e248b3b6351b956be9d3cd9ae6161e9fb3038f27dc19ab580adec6ab5eeb77aa5c4bccbe6db6ef
+EBUILD markdown2-2.4.0.ebuild 658 BLAKE2B 66837205579c0987d60aceb745913eebed988d8c3cf9d1874a3728bfdce41d4c4728f60b3f8124ac488f2b2b4dab63a043068567f0937926e0ac3225adc6dc6d SHA512 d6ec4fd4db6ee7a961ef8a7dc5992fbcc28312d06555b2b60396f48200f63f6482f1f49a3f8ce2840641fdffac43a50c6c5ccb8aa6c75b48ab3073560c140e6e
 MISC metadata.xml 550 BLAKE2B 4b9f6c2fd2039c8a71519652f337a8d8fcfce2129a0cc0411c763bbb204038ffbc6bc3b86a92f9c2e3db5bd8f99ed127075753a95a0c035c99bbc46a166ced0d SHA512 8a46a2d4eef951bed1bb62d2c65eaab50032839dbf9bf15bea6c23523da27780ea1412bb504153cfa6972db1fc566d2c498864e44134674d555aba46b828d4bf
diff --git a/dev-python/markdown2/markdown2-2.4.0.ebuild b/dev-python/markdown2/markdown2-2.4.0.ebuild
index e2d7545ba5f9..bed62d568244 100644
--- a/dev-python/markdown2/markdown2-2.4.0.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index 8c51431986f2..5a2334997a13 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1,3 +1,3 @@
 DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
-EBUILD matplotlib-inline-0.1.2.ebuild 534 BLAKE2B b1d2d5d87df00e3545234dcb34c048c152a183607552a3fd4d92ffd14d172def4489a4ce32336decd582b6cba2432fcb7f7451ad76d4b184fd6311fb7d3d5a35 SHA512 2dc95716a3f76bf0aa0af42038f40952c0b83f61e261fb7052cadc10ac60235fc8bfab09d7a59e352f956764e35a41ba0c613500e95bd4908c847238892d6218
+EBUILD matplotlib-inline-0.1.2.ebuild 530 BLAKE2B 384ced724fd7dc6d4615d907098a4bfb048fa42a9171a548904d7dbef0416bc4761468ddc9d4e8a33598436dce98377beb7d365bcb13cdc14602917588215699 SHA512 ef6ec4a8df21d7619f8aa5159bf1af5d4d8ad30d62d8268e11354dbeea606380112708330b64f6908b1c36eb03f48465e157965b20c3055f4a20b8e4a4de1703
 MISC metadata.xml 363 BLAKE2B 3cca406a8e51346ecb5b3dbb3de8a0e3bb82a09243afd82f976d4ebe19207d11487000752cb20601a3e190ed2673dfaf8ccd37bfdb4b53a1b344fb8be2c8dfcf SHA512 eb9935d48f30a722f73335aff5bb53a539002d3018249ca57006db40621b6f3ed9af0d02596c5938c97bf8b28aa7bc3bdb2c0c14cbfa60a08400b95fd33b67de
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
index 9a9110d9d3d1..cdf8ef3b88d2 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index e11613877f5d..a58ca7d696d3 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,3 +1,3 @@
 DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
-EBUILD mdx_gh_links-0.2.ebuild 472 BLAKE2B ca2208f239d50fc920920bb96496b7ac8759cc3c32f28d89bbbca6ae327d9d5a491fdb8cd4ce1c535a0f73716976cbaad2d8a863833a05606863c814ae14d97f SHA512 6a2b4ba6b87084d6c4da50b91a647965101e593f9046d697eb44240c17a61df1f6ab1c7b99fa0e8d1f051c3650c5b1afae14f95e0a7d78e4ae38914ebbbcbc61
+EBUILD mdx_gh_links-0.2.ebuild 472 BLAKE2B 024547e85d16d14f274e7bf7cf00bfa3dcaf26b78d972e21dfcc6dc4e8d13c9557b3bc4a5024919a7d8a9597d454b03b963480b1ed8e52d3257927c516f1c64c SHA512 08f014a6cdb52faaed46616082d004ea9338d039d8a1122fd9f62a96e407d1c5634f8287aa64a1c716172ab1ccfc11a1bc9cffb329873b3009399d17bebec084
 MISC metadata.xml 357 BLAKE2B bdbfeb29d0f7e37568adedc0b0442a60a1b4aad7dd421d242ab29b4bf2ca6fadbb16a0a511c474991359fa428596f308f4f7892838fb7c81dd4b3158aff5d6b5 SHA512 2913aa9edd1f0692735f2afc7fb39eeabdc2dd8088a025345a433df0df847207125ec467d8fee95f5ef060e9bbf6bc858584421b9500daf635f5de19ee6479c7
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
index 4e5c514c419d..fc43311fea3c 100644
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 548209113d1a..b968cc9ec068 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,3 +1,3 @@
 DIST memory_profiler-0.57.tar.gz 84096 BLAKE2B d2c5fe810b9ac2f1e52fb8630056ee825d3d56799c15a377bff914be3a04e11c872e557847ef2a107421d082515eb59906f931ad1873ae7fec58fef16caabb4c SHA512 c6e2f755656dc820dfc2cf7a659dc319b3d1aa0df144ac6a08db35f4b38a90a9b994cf9c8320b8370f51c97e0d0bf2f9c4a3ab070b4934879f8e579b732e426a
-EBUILD memory_profiler-0.57.ebuild 1761 BLAKE2B 16a31bc241221d2460e2735082561186eede3fcf4c355c365f16e160f4041e21c48906813e83aa94b266770b8625564a1cce5ba3f72b23436da6ee6171224426 SHA512 61bcd5979509c4f1a84cafce1a5606be640fa6f09ac932f181774536fadaaa05b3ece3c4292f4d41e9f31e7715ccb357ee63624309f88758b893c20818f992a6
+EBUILD memory_profiler-0.57.ebuild 1761 BLAKE2B 11620de24512de621dec0c7724653fa1e875781355abc083ea3c932be8c86b31391d6d60744a8f4351b4485b9402234895730de118ca47d60649dfe2495687ec SHA512 91df54c1f7ee42ce9c743f38683810337d32385e4f1ee944f0947d5c7573c01b9ba84a0ff59630020127231865d26d9f515a791170162d9231d3a3e7694a43ef
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.57.ebuild b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
index 7b0e5797b3f4..4571a26aa141 100644
--- a/dev-python/memory_profiler/memory_profiler-0.57.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 0770f42d04d6..757c13badf2a 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1,3 @@
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
-EBUILD mergedict-1.0.0.ebuild 402 BLAKE2B e2401a6041ec26bc76cee23e01437613b7ac4455a5f17086fec32ccb388447e2700ea9496cb143983363f76366d6fc82c48049db0a9440fe2b818079d0c5dbed SHA512 34aae3018a4f9c31c7b077e16ae8d335046a3ba04e1a13bd2c99954755a0d604a9ffc0ff67395d0992b29eb88cbf0799d597903261ac7e4556b4beb55c38c1bb
+EBUILD mergedict-1.0.0.ebuild 403 BLAKE2B 78ec3ff49b7a67415315f78e7d52c0a48bf0b870316058a960cfb4c8af60f725a4c861be0a255709b59fd0e1bc420a2d79aedf1c97ded04b289c71d0a3e4ac6a SHA512 e88a21ba794547ca720b15912972979d677ae2865a5479d48e584b9570528003cc5f759c010fc9103a3b0c8f25d2b25a8ea7ddb4c715b1874facd8a9187fdcee
 MISC metadata.xml 375 BLAKE2B 4a8004375ba9a901afcdd9573fe5e76b481f1831c9556f888792d1e993b2450e4ac6353d2dbd03dc129f46ca55bbaa1563ac3c7de033d23ad7dfc833bee26de7 SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
index 1067a4a908e5..e3ca27fe737f 100644
--- a/dev-python/mergedict/mergedict-1.0.0.ebuild
+++ b/dev-python/mergedict/mergedict-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index 51755b7892e7..be238c017213 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,3 +1,3 @@
 DIST micawber-0.5.3.tar.gz 34550 BLAKE2B 045eebd018d8b1f52cca9f043cfbc8de528a409e42ad9f785cfa00bbe223546c98d2d182ed2dca0047b3e73428b318e8db712466813a781154a8a6654d8cb9a4 SHA512 7b5c7e3bb5d92a50a3488229c59c5ae95355410cc0aacd49be2d96372a2d6ab9169aa6ab066d49c72e6a8b80358b3937b358c4bb8027779c5132f0929747dde8
-EBUILD micawber-0.5.3.ebuild 669 BLAKE2B b8a200878dbf7ecdac3a148dc18cc430c62d78d2e9e7f25a055b3144610d126a57ce82fc40a37a9c2b79b63fe457e759a5c7cd710eda8a78a0709020e6f104cb SHA512 751333465fe83cb3c55339bf04f4f176cb3d45069feb983a6abc1b0faddf5e1a59ca0ef941a808c2a348a9f223becd95b5878217bbb810f70106599bebc1ab26
+EBUILD micawber-0.5.3.ebuild 670 BLAKE2B 2dd787f7ac0e6835e177affda8b3c8ea23fdcb784b86946f8c019bbcb01a0961cb7c5d3433c0294903703344a11cc09ed67f5089529652e9c2db51210db50a78 SHA512 c0ea1c2826099c4bfe62a7f36a84679e017f3f78aedc0385a9d48904f898000aa596fe283621840c56c7d6f182a3bd61c53ca05767c9b5c6484513b86b25438d
 MISC metadata.xml 392 BLAKE2B e64309d757450287e941aade812040543a73b56dbeb26960bd1fade3bd0e8b45a3bb04be4f4f0c9720c6ea36967d9e9715f793cfd57435c64c7dece1986761ca SHA512 210939afb78c7bab48debb24886a5b482215ba5fbaac0e7d7faacbf6781e6d1766ff97e61d94070048ea13d351996b5bd2e8a56e9395e8fb47e1f63e730f30e1
diff --git a/dev-python/micawber/micawber-0.5.3.ebuild b/dev-python/micawber/micawber-0.5.3.ebuild
index 0cbc9decaf63..82f4d563dd9e 100644
--- a/dev-python/micawber/micawber-0.5.3.ebuild
+++ b/dev-python/micawber/micawber-0.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A small library for extracting rich content from urls"
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index 92a4a54f4d15..f00d9954758e 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,3 +1,3 @@
 DIST mimerender-0.6.0.gh.tar.gz 16677 BLAKE2B 55db5bf97cd65de89271af8713d9dbdebab6254fa2dc62cfcd78394f4333093fdc508ad6e93f104eee2f3d8a1ceb9197353b4ca085e3b4887b4560c2c65c45f6 SHA512 68c584ba8ae608097b739078dd729bd8b5493087901ba281959abdb81d4e6052ff045c487fde4f67744b413bab36d7f938c68b162049ebe33bff642571b8fd98
-EBUILD mimerender-0.6.0.ebuild 686 BLAKE2B 017d2751561c724f1a7da06d2a44e488537a892154b87b26e84b7d7bbf6ffabdb4abe9534ba967fdd809e4bf810b19f1d746270f68b1dfbd2de275a586c85329 SHA512 841d2b646c2881436075c072261b388598e58f0cc5e65b256084e2b39a8e3eacaa79bf3a1bb78820502abb4322ed3b2f7b49719ca84212870ea93f43ae0e66ca
+EBUILD mimerender-0.6.0.ebuild 687 BLAKE2B 2d456cef3b2d10dbf55d7088aaf5f1fbd806644a271524d6dd571e9135e1de201d0e2633892def7a59f0bcda9719a1f235022960f88d468cba20c777cbaf4199 SHA512 6cf3b50633225fe57b44423f11964b71af1f76a8b9f9c25ca01066907d3e818ffb3f50e44dce584b4f003d501e4d25521cbf7108aa50be8081d9f0f4e65b5942
 MISC metadata.xml 375 BLAKE2B 61ad72d6f5d98a750b8ec2538dacaebb68522ca8045bb0d45f085f01aa9b3d9b30fff2eb2aab8b2b052ee4dc522e65e50b1312ceacf8200ae55ec13950fa00a7 SHA512 36ddbd51b0fe68f36b4ad55d683517d5cef7d7057afb403748fc89e59efacd6d073ce65232aedddbf87afe68dd1f2ab31881cf7d79ab09190b3a3e080a71af6e
diff --git a/dev-python/mimerender/mimerender-0.6.0.ebuild b/dev-python/mimerender/mimerender-0.6.0.ebuild
index 2e6b87d28f00..625e2dad26e1 100644
--- a/dev-python/mimerender/mimerender-0.6.0.ebuild
+++ b/dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 0c8f11937fa2..d109a98df74c 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,3 +1,5 @@
 DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
+DIST minidb-2.0.5.tar.gz 11957 BLAKE2B 31b500e420f256988ddaff7271b143f628aea5ebf0abe77125d9ce5143dca3d3d3fb1061c39d325d5df564514b786d751dec90d82fc3310c0f76daf1b4683d02 SHA512 889e678a99c7a5dff5ae7ae2c3540e978f09616384450934f2f16797a3a06c9d863b57eced4b2cde0a4bdfa4923b754e473bde0905c86d948d3bdb81a8e6dbad
 EBUILD minidb-2.0.4.ebuild 442 BLAKE2B 6b5092dacc1675cc8b3a21bdb02e905e61afa543d727fd2df24d175a97a26edd7761d4a82a19c406e491717f351c2adbc167d8153b07822b2de1c10f3124d005 SHA512 c1b9dd78e7aa88a9ec4889c229255c839019e76c9985cd8f7ee04aaad5ec4419e20b350a77d9368ebfe7b85334b967f501a0810c4ab59545359636260528f3f3
+EBUILD minidb-2.0.5.ebuild 445 BLAKE2B 31e66d4c48eb5b1c2c0bd935726e9f8b542f980ea3c87ed89dbfbdc5a5a0cd5287c5598f70e8f626f3ca7da0f0d70c4dfcd7657c1af594cff7c4f781288f7af9 SHA512 ef239c76a74f9fae588be2391565deb5a53f82cf3719f07b73c949bf6bdd0838338ca5fcb95169dd344e6007223a8a02c4f73974d457f16a5c5090541f25406c
 MISC metadata.xml 446 BLAKE2B 46a86136a6790fb2e9923525fec5e8b52420ab0342ca4089f2ca7ce55afe41d96bf39f55fd33af8e006f65e15f59eed09e0ec473ab72041e6bccee8bb06c51a1 SHA512 b29032fafb54b53261e748273f5cee899a91a87e2480057eac9aea9f170e2bda001fbdf1519349cc8e3d411cd64a1185f954920f461c52bb8652d87286207d92
diff --git a/dev-python/cachetools/cachetools-4.2.1.ebuild b/dev-python/minidb/minidb-2.0.5.ebuild
similarity index 51%
rename from dev-python/cachetools/cachetools-4.2.1.ebuild
rename to dev-python/minidb/minidb-2.0.5.ebuild
index d0370c0aebce..7fcf72270def 100644
--- a/dev-python/cachetools/cachetools-4.2.1.ebuild
+++ b/dev-python/minidb/minidb-2.0.5.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
+DESCRIPTION="Simple SQLite-based object store"
+HOMEPAGE="https://thp.io/2010/minidb/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index d8a1195b3f51..a38f310943fb 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
-EBUILD mkautodoc-0.1.0.ebuild 643 BLAKE2B 403486972ff04cd7d737cce8fc8f4c007858df17c41cbb1e4ccbede2006bcd8cfd9c9060669de6bbc4740a73ebc23b37dfbff6e4f2c9ba61218ab0c6d9576d03 SHA512 b69f6a6c62fd3ff393ebe00a1d6ec905718c7f948aa849a99a6ffc1fd2ec28ad99b48a34b95a1e8563e6ca0e11c8255a773b7685b9d2d20d674ed3f643fbe1ad
+EBUILD mkautodoc-0.1.0.ebuild 605 BLAKE2B cfc9f5ab3c8c01e45fecadd39b05adeb8868d61a42ce83068bc771800b0be17a7583be42f41e0238f2484cb6a329dca587b19bb7f569966b76b5abf8223b84a0 SHA512 6a44b800e8718310d30c0330b722aed3a3e82f1ecaaf07dda0a7d1b7231560c6939945d80d8f25bad2031927fa5f9017f3ca6b36febd84c3dcd7da4bbfb66854
 MISC metadata.xml 516 BLAKE2B 72dc56a7a6573ee2870a8dc08522f0f4dbe6f07db4ff8d27e5de5ba8ebcd572cb95a8d8b85b399f57c6d7533223d590c5fb7d68e2b9c76a7883a829edf7cc81a SHA512 6b44f28ab4c93519733ad434c56b5e7b1638e2823e4b4e239143a8d934a07ac44eb82aad02c0f929e941198c63da57c42a7e7a500fbbede0e0e302de16d6c62e
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
index 578aa7762319..228c3dfefd11 100644
--- a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
+++ b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -24,5 +24,5 @@ distutils_enable_tests pytest
 
 python_test() {
 	PYTHONPATH="${WORKDIR}/${P}/tests/mocklib:${WORKDIR}/${P}"
-	pytest -vv || die "tests fail with ${EPYTHON}"
+	epytest
 }
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 1e258e9643d5..31f0d3978dd5 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,5 +1,3 @@
-DIST mongoengine-0.23.0.tar.gz 322731 BLAKE2B 5aa01b59193fa118d9b9c2110d6ec401090bff768b5b2e5d9c5fea4bcb5ae6714c62d4ff664c3ab24c600d912f90287a8ac77313bc8c50e13c6d191baef69e49 SHA512 9dbc45ebf3d367a829947f404a3979236be7ef0fc39611046e2815b6ab83bdb2ada3db8b6d1f4bec6301677f5b727cc2570bb732050e2ff865da49a5ba63d0aa
 DIST mongoengine-0.23.1.tar.gz 324881 BLAKE2B f6856d432f34c19f9d32aa7fe340c5a09db6976802f5ce320e9722b942f80a1c38a725eab882780104fa379abe212319802f9dd4b405da41454bda84a5d57eb4 SHA512 fcd2ff1df3e2b28bc4cba67cad71a1856e9f94d4d2ecb731a5cce2f1c5e9abc163be37b7db518dfaa54a0ef7f664ac49b621a0554961aa7e13686ff608ef132a
-EBUILD mongoengine-0.23.0.ebuild 2098 BLAKE2B 7364b9ad290bd83dbb1fd2f528679cd2b594aaa4dc158c1856177176341393e7ca2fa624547ab029a27f374033f5751e954672c40db3a2368030a6ea9865f3c2 SHA512 bb828275d6d21750e7637fd4cf4666579602982d2e7ba989f365128085a7ec691ec4340ca9eea10aa3dff1e043169f1bdac5adfb24efbdd677fd2f678be1130a
-EBUILD mongoengine-0.23.1.ebuild 2099 BLAKE2B 228a306fd1c42d40417617687294db4371b7a9f2ee300a165a582b5e4c6be89026b76c1df1c878637722caf3e0ff6382f4208be9be8ab4a78a20f33c99da869d SHA512 c7d369c4005da4c8a1a49343cb36cbc4785cf407b501925aae473da98290fa81f73b0d9e5ec9c70a991e1834a813649ac05297ec26c71c9cbbec8dee8c7ddd35
+EBUILD mongoengine-0.23.1.ebuild 2098 BLAKE2B 7364b9ad290bd83dbb1fd2f528679cd2b594aaa4dc158c1856177176341393e7ca2fa624547ab029a27f374033f5751e954672c40db3a2368030a6ea9865f3c2 SHA512 bb828275d6d21750e7637fd4cf4666579602982d2e7ba989f365128085a7ec691ec4340ca9eea10aa3dff1e043169f1bdac5adfb24efbdd677fd2f678be1130a
 MISC metadata.xml 401 BLAKE2B 85d14e37ee9648d1067f85cd133ffc31023c94057b3bba418c3c047ac7ed7234193ab54f1784908ffbbc23b087675d295ad55e59689dc9be312bc3ac966213fe SHA512 8eec6c724d7d943777ffd842f5963fbb72247aa0e9a66a9de006e56421e3b51e262df3aeb04112f2b91c9251ff3e3abfcd1c018a5bf0621a5a7b1f0ba17fcd1a
diff --git a/dev-python/mongoengine/mongoengine-0.23.0.ebuild b/dev-python/mongoengine/mongoengine-0.23.0.ebuild
deleted file mode 100644
index 8bc583611f98..000000000000
--- a/dev-python/mongoengine/mongoengine-0.23.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
-HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
-SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/mongodb
-		dev-python/mongomock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: investigate
-	sed -e 's:test_covered_index:_&:' \
-		-i tests/document/test_indexes.py || die
-	# no $eval
-	sed -e 's:test_exec_js_field_sub:_&:' \
-		-e 's:test_exec_js_query:_&:' \
-		-e 's:test_item_frequencies_normalize:_&:' \
-		-e 's:test_item_frequencies_with_0_values:_&:' \
-		-e 's:test_item_frequencies_with_False_values:_&:' \
-		-e 's:test_item_frequencies_with_null_embedded:_&:' \
-		-i tests/queryset/test_queryset.py || die
-	# TODO: investigate (wrong order? bad comparison?)
-	sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
-		-i tests/queryset/test_queryset.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-
-	mkdir -p "${dbpath}" || die
-	ebegin "Trying to start mongod on port ${DB_PORT}"
-
-	LC_ALL=C \
-	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port 27017 \
-		--unixSocketPrefix "${TMPDIR}" \
-		--logpath "${logpath}" --fork || die
-	sleep 2
-
-	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-27017.sock ]]; then
-		# yay!
-		eend 0
-	else
-		eend 1
-		eerror "Unable to start mongod for tests. See the server log:"
-		eerror "	${logpath}"
-		die "Unable to start mongod for tests."
-	fi
-
-	local failed
-	nonfatal epytest || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
diff --git a/dev-python/mongoengine/mongoengine-0.23.1.ebuild b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
index f4d6a34f196a..8bc583611f98 100644
--- a/dev-python/mongoengine/mongoengine-0.23.1.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index d8eab05afed8..3837a33d0ac6 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,5 @@
 DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
+DIST mongomock-3.23.0.tar.gz 123705 BLAKE2B d58f867628c8c80e1289c1a86fa910585431b5eca41818201dccd54d5adccb55c35aea41566ab2d483c7040cfcaa4c2afdbaad39fdd901497a0e1db4effd1c11 SHA512 35442f29907bb58693059a33f5941ca557965fe2b0b9b68ab3e4b31f5e2326bb41db8716a089dd18a1a1fdd5523a729b48a85e0caa0daca1bad2790c2ac017a9
 EBUILD mongomock-3.22.1.ebuild 852 BLAKE2B e64e7194e6900d55673d33e161d3aaf2a4bf9b7ce11078201c9c8df0befc617cc844c4d3634a0edbd8144c24aaba51e2f6aa24728179ebbab323ad28d9c462c1 SHA512 41919b31354f337d332efb5788e32c1f29b27d0694cdefa1869ee18147521ee8189defe867d80f732c872e38e0d081b257fb1389fe16249704b476e9ffd46023
+EBUILD mongomock-3.23.0.ebuild 854 BLAKE2B 5c3ea50a873f09f0514458c84103b23a044678f2a7d61280e592a3a5caeda6e3452d2af268ba295ecac6a28d6fab56885f543320cd61bae576190787b34a2d0a SHA512 4c3058fcc1100bb47f944c0c5a82b580b8a3dd5919f9ab788761e29efcfb0ffda0b57a0f6a3ec38acd213f8f629cbed888879a517dcd708795a4806b0ff028f6
 MISC metadata.xml 395 BLAKE2B 348ffbb9c7274a10413f5805e9af06ebf7dd5ccc3b4493d7f876cbf370cec2d42a16280648097e2c1c273cddfbb55417f0b33f206acba49a91685bef1cf6be75 SHA512 dc60cc89f839255497b4cd2f9fd020cf0e300ffc2944ae681ced5368d6e4dbe307e10a6752aa1594a2730392928016e6a7dade21fda3f4ab715d09c332ed5d9c
diff --git a/dev-python/mongomock/mongomock-3.23.0.ebuild b/dev-python/mongomock/mongomock-3.23.0.ebuild
new file mode 100644
index 000000000000..c7b70822284d
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.23.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 20f099851a17..8820fd19d72a 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,3 @@
 DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
-EBUILD mss-6.1.0.ebuild 763 BLAKE2B 81f824c319d1d42ac0de9855bade1cfe92923d38cac3bb24f2be774a64bc5f7df4d8b46c5be8c4c8fe27126b7f26b38bb3150e55e349a60f8a9358a83720bbad SHA512 3cff7e7a92418b11cf0d3f793d692b1b7f4a91962b4da3fb7dc789817255efce69a3772763eed9ecf7afd0c8c74ba9ffac73d434fd9efe64d17834d0b5bcf0ba
+EBUILD mss-6.1.0.ebuild 763 BLAKE2B 00096e39116c11a02a126e8f9941ae6dcf101883a35ab81fdf514a437de71ccdfdd723c714597c1865dfeda1b060c8bf773708bc52219af9dede00f58fd97e7e SHA512 587b7dd40ee3fa341e3a8b125bc4f039f7f1d40ab5de20c987b8f4116ad24b7e99b238b02e61bbac237ab224187518127b6b5ff8762cabf71f15c2494ed95791
 MISC metadata.xml 348 BLAKE2B 74049da1523c38ef4f46b73d9f1d6b1a9bc383a1ae1c7aa43fdc30b85a931b8964cc1f0444d86ff6c3f6e0cdb1b1d8b2ccb11cc4c5ee84244ec3321c023b92ba SHA512 6a72dbcc89de5381e894a1f4b959fe860eb0f936c8443a4b8c27fb2c384ded7e05e5f263d4d62d4c6ba9016d7497d48248e2fb0bfe21864bc55edf234b829e99
diff --git a/dev-python/mss/mss-6.1.0.ebuild b/dev-python/mss/mss-6.1.0.ebuild
index 72eee16892bf..28e1238e4f9b 100644
--- a/dev-python/mss/mss-6.1.0.ebuild
+++ b/dev-python/mss/mss-6.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index f1eb070e1cb0..ab599db3b4c1 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,4 +1,4 @@
 AUX ndg-httpsclient-0.5.1-expiration-test-fix.patch 17191 BLAKE2B 6dd375fe61ac3b55c5660f7fa70fed69d026f148da439d1acb417cb5107f1834be3e5dd089c3daf4e658fba107e3484baef5d0d5161d803b31bb549dd8f77469 SHA512 cd78bd9c39f7b5ea12fe55cdf08351804db98c9871e2f9de9f593c1cbe167ce988c556752392d4112ba4cfe978b5f41a5dc3e8917f9247508c1f514827ffb648
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
-EBUILD ndg-httpsclient-0.5.1.ebuild 1179 BLAKE2B ccb41f5d30683d95f832f530dc49b82b9ceeb2e4ef7e73688eaa2ef0d9f12d4085912a4b002c1b0226c3cde80899d85630c88e69b93ec957a2b7fef5e5f9ddc0 SHA512 d595205fe8a40f4978647acb5c86c6d4a446f5b5cfcf32915a1d781d92a7d3c52a708d547e958041a44058c4d0551f4ef7b0fd6ba02649b64a4c333144fe63cb
+EBUILD ndg-httpsclient-0.5.1.ebuild 1136 BLAKE2B dc81f671c414596ab8ec01221976a843d3c86beb012561c11a8079dcbc8963387fe3fbc2e64ceed10753d509d055b333e4113e6415214e6812830350194ed4c9 SHA512 15d9a3b57389ad7aab3c299770a98de838965bcbfe99f54f1c8ffed3e973bd908785e15d41ab75d98e476da9220acd53cffd8c6990079ca569a0c0c1bdafc1b8
 MISC metadata.xml 418 BLAKE2B d8bbb595e8483ff5072ad8bb4dd0558aa87e0bcc9b01dc59b5816c42d9e465ab1bbfcb5073479a06b58a2bab3d637e4ed23abeaf899c5c5be6edda057afd123b SHA512 82ae35467b503a3fc7e5382efc7f023917bcbf67b7bd9ed2a01628c76865154e46ffd9e2f7f7eefe6a161c745d0da92585082a27b88b5e957839690803e99de5
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index cf5a74bab0ca..99202b1c9470 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
@@ -24,7 +22,7 @@ RDEPEND="
 	dev-python/pyopenssl[${PYTHON_USEDEP}]"
 # we need to block the previous versions since incorrect namespace
 # install breaks tests
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		!!<dev-python/ndg-httpsclient-0.4.2-r1
 		dev-libs/openssl:0
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index fcc1afbf9e3c..e29a963f1c2a 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,5 +1,3 @@
-DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
-EBUILD nodeenv-1.3.5.ebuild 470 BLAKE2B bc0370672aa4d3cb89a2707a981cc03265486933556fb82ae619b911574124cb9ee34763d122bbf2698a90bf04f60631d085f4d0e523a955d3349b4fcea5b48e SHA512 b459a4b36bdaacfaa5c33524076117e7d0bebfb66dc562432604bf5edb17ae0d16905a173d160b8c8b77ad6fa64e2bbbfd84ffe4c17b7081c51cf629bb7da2fb
-EBUILD nodeenv-1.6.0.ebuild 472 BLAKE2B fa62d5ae0c566cde8d4f6e7a5bc231ff443db533c0a8309b5290351d9444e3fba8ca11cac0dbf80a564808325e4a8e079a6032bd81bd62684896814658a536fb SHA512 27f881dd8f4daef26b1fe74856e1f67c8ca0b8935b56ba016cf882b8a6f1fee5318ce6309db859df9067b16006c387acadc54f99010f22081bb34846698266d0
+EBUILD nodeenv-1.6.0.ebuild 471 BLAKE2B 4a2a928c08a7bc3a2540bdbdb6efc43ed443e424255e847877919ff9b4312c129638e765aee6295d2145a58a563861990723a020a8f44d6d525cd27902dc6b34 SHA512 09333fe623d267c998dc2e71da561364c42ecd571b3b72a3720e7cd364fbdd2ef0f4daf8c5fd13f40bc1b22ccc3f3d674f0717365f6f45b804fcce218957458f
 MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/nodeenv-1.3.5.ebuild b/dev-python/nodeenv/nodeenv-1.3.5.ebuild
deleted file mode 100644
index a56521f096b1..000000000000
--- a/dev-python/nodeenv/nodeenv-1.3.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Node.js virtual environment builder"
-HOMEPAGE="https://github.com/ekalinin/nodeenv"
-SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-# requires network access
-RESTRICT="test"
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
index f79748c9e382..14dad2644bf0 100644
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 5a35ca7f8387..b59c5019a719 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,6 +2,5 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r7.ebuild 2304 BLAKE2B 97be9d38b82206abc2e04d470f00ac21a6889c632b307e7b6c767c832742843c38cf2f949b5165369a69f222ded243e728ce93cbc044a42a2fcc3026ae01705c SHA512 4382b2a894c356eb311d253d2a49d697d94f623b2695242dfd6d1d07c38a204105de03518cbb461b08ef53d233552a015e17eedbb9ca9b16e14ca3cd110548c5
-EBUILD nose-1.3.7-r8.ebuild 2251 BLAKE2B 8efe621b30a90319cac473346b4776e99b8152e6b86ee7d4cc4aeb410225b7cfff3deaf7f8095966cc3bef97b100604c8ea8f295c6e805ab301a889ae21d29d7 SHA512 a559bea7bbfe88dfd7f3eed8a48bda5f2fbd198a59c0592c9168f34b078cd4462ea7139f2b22eff71fe0ffc7a9903f8d0492f8e548e8b77bfd2368f1ad0746f4
-MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
+EBUILD nose-1.3.7-r8.ebuild 2243 BLAKE2B 9e6efa83d458d958f81a4623d3b09c4fd1d85463e865b1ce10009fb6332f9a83816aa48b0cb2506772aaa96a908f3181055c9840249935937515b3273063ec39 SHA512 abc31a83c574dcfdd2108a19cde5e1f8db32a85081f93ddf7533fc4cd6862d7c0a80af4b884a08fc5759200aefd6c1068b1abad9e8b427b45cc02925121a9ca0
+MISC metadata.xml 398 BLAKE2B a569ad5eb48558ae14aa483c32016a955fb2af9870f7ecd26a2abc8b8aa16c88fef2022ab23c8da7499a7286acc0c2d88bfb203cf2b46c520f78259b801050f5 SHA512 87cde48861c5e2ff2d78831829b4b5bb44821559b31ed995f5e73d60a9ea9d5ebe62f7c568382f91244241adffc458e32c44eb5a8f97d88b684e202e009e2cfc
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index e00e1107d375..1807b936f961 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -10,8 +10,4 @@
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
   </upstream>
-  <use>
-    <flag name="coverage">Pull in <pkg>dev-python/coverage</pkg> needed
-      for nose-xcover plugin.</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-python/nose/nose-1.3.7-r7.ebuild b/dev-python/nose/nose-1.3.7-r7.ebuild
deleted file mode 100644
index e1eeb12eb28e..000000000000
--- a/dev-python/nose/nose-1.3.7-r7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="coverage examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	coverage? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	test? (
-		!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-
-	"${FILESDIR}"/${P}-python-3.6-test.patch
-)
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# fix manpage install path
-	sed -i -e 's:man/:share/&:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile "${add_targets[@]}"
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7-r8.ebuild b/dev-python/nose/nose-1.3.7-r8.ebuild
index 9ff8d8ae5d04..fd55e99ba0e6 100644
--- a/dev-python/nose/nose-1.3.7-r8.ebuild
+++ b/dev-python/nose/nose-1.3.7-r8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 59ac6ca4e6b2..af1b77c4ee5a 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,7 +1,9 @@
 DIST Nuitka-0.6.11.tar.gz 2582563 BLAKE2B e65c3a01f3283b24aadefc47a17a41ebae116265946c24f2225fa7f3f6f824a0a822c76aa2fa1ff33b5a00d4d3762bbac7cd0d090d2627274155b13a48d8f0ba SHA512 c1ead8430f0af3a20d7a14ae3cb34b9a4675c18f0c775e8833b5722cb0acdd8213b28639e52067b3e6758b8b6cc516b05151cfd85560630c92b872dae05a88b4
 DIST Nuitka-0.6.15.1.tar.gz 2712603 BLAKE2B 8e639b19975410143d1b91b4fb4f71c65bd1d9382c07d2f1f431c16b687954cec62c2e4dbe9bb1c6f6981dda1948a87040b2e300919dbe72c7d6bfd0772b73c2 SHA512 70bdb55ff4b57f06f67e3026c6a1fbeaa729e85f0a7e698ba0ab40c4acaebd31925327dd0f5fbf8187779421968bf29f9b0fbc2995193468411b40a1d30889e2
+DIST Nuitka-0.6.15.3.tar.gz 2713332 BLAKE2B e8d61221839bb961cda14575aa1de5979510113a09b7e8df47aefbf8985b09f554b32210db9b91ca5f02593a11d7537adcdf0fd67d397b022623534bb25368c3 SHA512 960f2ef33aa2c4dcb6a86ed15b8d8fc8ca1c5f26a0dc98a925e8c0669599912f25d10e20f547d51d57c0a63a18e2f07fa45141666b740b3d8804014db5b89bb6
 DIST Nuitka-0.6.15.tar.gz 2712097 BLAKE2B 78c43be4a2ef5678d7a0d6164d7cba2b3a67a738215915b001cdb3774e209fcecc167c52db4c3b22d87dde9169e48077875d09f8601df7c8b079e3d57b21aea6 SHA512 9a41e9b8fb3f51ec16dccd5415b3b7d7d201230fea6aff902931be1764ba65e1d5e4885cd772b4c1cb9f36b1b14a02a73351bc5c1b8e7f7bbb87e5d74aad16b4
 EBUILD nuitka-0.6.11.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
 EBUILD nuitka-0.6.15.1.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
+EBUILD nuitka-0.6.15.3.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 EBUILD nuitka-0.6.15.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
 MISC metadata.xml 942 BLAKE2B ec5857515914046bc074009149a2e830fd94da026e6563984f914d72183595617e1437e1d3dcff9caeeca20fe0f2be0cf33d45489a36bfde05b35815a9a34df2 SHA512 c2bcbedbfaf567f0813291fc890fccf9d59fa52808317cde9bbdfdda79337f15a1e6551587557bc0bf8ea27f5cc646674d3857c1c960f72469730fa23a43eac2
diff --git a/dev-python/nuitka/nuitka-0.6.15.3.ebuild b/dev-python/nuitka/nuitka-0.6.15.3.ebuild
new file mode 100644
index 000000000000..8810e82b4d14
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.15.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 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/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-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/numexpr/Manifest b/dev-python/numexpr/Manifest
index d4e9772728f5..a28cdbdbce4b 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,5 @@
 DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
-EBUILD numexpr-2.7.2_p1.ebuild 1253 BLAKE2B 985dad5546fb1b9e598cf2e5f26258cd159a84fe1293e1f32d3fbb7e82c9abef534067728f86acefdd60b793fe67fb27c449fa2b535d3ce3f9610d3346aaf501 SHA512 3d0e8b86171ccbd0f31df179f74735ea2a83262a5c201b74c165a9ca04262f11ad9adf95fe7407078773fcf5df2dc14c0871ddc4d4c70da57723ca9b7f5bf053
+DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
+EBUILD numexpr-2.7.2_p1.ebuild 1254 BLAKE2B 899bd020ae001477eec6359a8ed1fe41d3d6f82009517e90bc177ebf4a8e6c2b661e61d4acd01ef4ae79d16f57c3c0eb856dc527cfaa40fb1d249b4e4b3e847c SHA512 c2f408169d0c9d30c074f7da8dc174e8225f35ffb28ab6b84f07261b43faba5f58f7082bde99e5b397120eea10e3f2ab6e2e93fbe3cb2f9caa28b4733c73d139
+EBUILD numexpr-2.7.3.ebuild 1217 BLAKE2B 1b2521fb96c8a93eb6f7a16859db9cdaeb783e4039830ffa88a67cc38ff14a2325fc44cd70f48bb147057b3fc66759bec4fdedc4cf0fd95e0fb3cdf09f160487 SHA512 7faf0405436d4c0a8122729761be87cb3c70bed5d1caca54ac727bbac49b1b6bdc099c2ff59e780ea2d70d15dabd54a31e7c89320fa2e55c518b6a8f827a20fa
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
index b680a186a9ee..679730c0dcac 100644
--- a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
new file mode 100644
index 000000000000..78f0a10f5478
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )
+"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys,numexpr; sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 9c57cb65e227..f16f8748ca1c 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,4 +1,4 @@
 AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bcb58275d90f59fca9dcc8bebdd52f5d6ed69455f9135647b27ed64d3251cb7d7b5f3da4e7b394bf45a45791b73c73 SHA512 8d8a43bcb75141a5fa278871d7e4e3b2ba1dcb833967a347f334675d6fa1a510d7f9abbcae82419617fc593ca02e1708ff69d9b4babe1d23e08d24814f9b564b
 DIST objgraph-3.5.0.tar.gz 638591 BLAKE2B 7a0ee6c9ee1d8417f7b322f19a397ea2452ed592ebbc07afc1378e86b5bad3895ed2e4a20d92a5f4b0215f68fc7440f85852303585a3161497a85d41d4c4e550 SHA512 da29202871bad06f2caa9cc297e7bf9a15af4c89e23baf9c271764e0ce93ff9557cd5c21d0bf39b425713460dbe2dbc8468d70c6bfcc1c3ff8b1b4d4a7923858
-EBUILD objgraph-3.5.0.ebuild 681 BLAKE2B 3e4cc1ea2d6f4c07ba5a7ed9f1ab88b4f75a64b47a5b86af6b333b741ee9523c55b36139ebc766e8f4b92890b9ddabdcbd847c1ac5d5e03f8c5280e010e02b26 SHA512 4a1313ff063157cbd5d924a132844b5146204da89621d219370205b8debe4509827e13193d43610363a9564d54fb72293bf7102d6431673085d824df949b2c16
+EBUILD objgraph-3.5.0.ebuild 682 BLAKE2B 68a4308524b19068e0afc48741f772ec0241705c544f7ea1e1745670b0c710a52e649b3be7effebfaa74987e01e3a6002dafe79331091841667cd767529de62f SHA512 58cae7cee8580868919f919ec24265abb38beab129be2c83de973f7a1944319d9502ff2abd41acfdd8ff8c266f6359adb2d64fe3a77512cd816c09b2b8ae76d0
 MISC metadata.xml 348 BLAKE2B a578b3a8235c67ea155b276adec023e2a06302972a97c12427da81756c07e05fadeb25fdefe787ef34cd0206fe50b4c6c67605a2a48efdae788030a1b1b99675 SHA512 461de70466cc82758d91be3e79ffa57bd079e5f9044331ec93737a89798836a9f6a3e01a695cc3cfdcc3d55037f4ea4524283df14ad22d3c2109e0af4830deb7
diff --git a/dev-python/objgraph/objgraph-3.5.0.ebuild b/dev-python/objgraph/objgraph-3.5.0.ebuild
index 30177c675943..b01ff5139bae 100644
--- a/dev-python/objgraph/objgraph-3.5.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index 6ef93e909578..c8041a89c1a4 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,3 +1,3 @@
 DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
-EBUILD odfpy-1.3.6.ebuild 602 BLAKE2B cdec84dcabcea9f01d6ce4bbb0376aafd8b24edf567ba5dcc9d2f76bce3a14d0b9f61c7d23c277b4da971c6476c5703b18689b616bf9d0d174c5f549dbd5696e SHA512 f004b0e30f78010f968e20a183c0fc66c45805026997fcb2c06ef9156201eb671d9da4c340b63eb04465ddba89a40d32aa69e37aefb4285258984afb856acb53
+EBUILD odfpy-1.3.6.ebuild 603 BLAKE2B 1104355f943672acf9243cc37714592897f9bbb6d727254906b621f251cfd8e2a5cadc5a5f4af8229a769e535a5ad1966cf8852434efde229447dede88f62be4 SHA512 c3fbd2133cd7f58606c45a91adf8bfdf0b39b45be0e97753737791bd6390012eb673e44213d733905999b1ec8211825569011bc9dfe4c2977b3541d42f167d6f
 MISC metadata.xml 357 BLAKE2B 96888cda20bf2f6b6419b542fcf92ddc59eb9107f910a48e1b9c7bfc60f52eda47d4551596fda7bea9cdaf1ae5e7ee66497169c1ce2d32248210200556bee646 SHA512 2c33929495b2fc2260fd181c5c6fb1554a15790b1c1cdffbb7844973763c8c36240720fb23d79702849111eacb15b22b275281e379a7cc0583a107cc0cb08b90
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index 3beb4c44f82e..ed8c62fc4648 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 34ce7c49be17..c3cc1fabb012 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,3 +1,5 @@
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
+DIST ovs-2.13.3.tar.gz 102736 BLAKE2B ee6f10a41bf46534d3963360a63a0a39a7ffbed6de468894c566c7dd2ee0c645cf6f8f211bfbcda70f03b4204e396fc0b081f457df9d27f93fc40d158bb641b8 SHA512 9f73dc383f7b717000d6d1f8f2f9114ee2be2457c9b352de68c01c1f9075c39ab4a9ef14fe67083bf1da1872240204eb2642fbf7b5a871a5ad044191e0774d88
 EBUILD ovs-2.13.0.ebuild 484 BLAKE2B d3c32e970e0218d6f90d2854e908ed1917e8c8051dbde803e97a6298fb48e7f2b5af90b3b38cef3714d28a56f50a911234c0bebfe9ed7c3c87cf04780b23bff0 SHA512 38574730e3aba44d029952023fde8a845c4efa7a57ff3c7e15669bb9525a2c4f702d5750d5d6890eb9d3a6b510aa133af237b75e88ae8342f85bd45a95589d18
+EBUILD ovs-2.13.3.ebuild 484 BLAKE2B d1f5ce6fb8164bd0fd05cc5cc04de52557f022f5c6749fae89593808ff401b9626ad024b3fc5086e29150818bb3bba2010d278a58df96498644c5e9eb098b6ff SHA512 9236ecc5580427abc6ddfc94c4f9c09ec65ba459b38848706795737a93c0467979255e2df8ff1bcfadae635327fdf4cf7beb682830634ba8f74d9692da9ba5ea
 MISC metadata.xml 375 BLAKE2B 82239250acaea0ebb9108d9797e33ce0a22a8a8d99da19a54066426014e684c52edc3ae9e0099078142de0c0fd2006d1a892defabaf873341dd2876bd262706d SHA512 bcb2340395b1f5525b4a82824f531c7054182c42ff7dad23740a36d93d480f733230bbc7a32da6c9f23952ebc9792917f31d5ad8775eb67e25f22dbf7c915e39
diff --git a/dev-python/intervaltree/intervaltree-3.0.2.ebuild b/dev-python/ovs/ovs-2.13.3.ebuild
similarity index 56%
rename from dev-python/intervaltree/intervaltree-3.0.2.ebuild
rename to dev-python/ovs/ovs-2.13.3.ebuild
index 6e6e9bf04d0d..2d024aad4550 100644
--- a/dev-python/intervaltree/intervaltree-3.0.2.ebuild
+++ b/dev-python/ovs/ovs-2.13.3.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
-DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
-HOMEPAGE="https://pypi.org/project/intervaltree/"
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index ea9f97375a17..c3af5baba41a 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,3 @@
 DIST pandocfilters-1.4.3.tar.gz 16586 BLAKE2B 975000f96475e8338a54d8a96793a8bcfbf62c5251897a01c185a6708ff7c47f2a1bee617e4e25d3854e7de1d078769bbd887527beb20ebb7e06f0c4da59126c SHA512 9c7ae1329c103ff2baae3488edfcbfaba183bc94146b29e413e7e83ba2ff2dee69823138bf213f5c81a8b0097c2d9329bd05620b10c646662a9617aae7a528a9
-EBUILD pandocfilters-1.4.3.ebuild 434 BLAKE2B dc930b15247d2e301f0fdca16e5ad2f349ddea6c665f77afb6e30bbec97e1328605177594235988a5c152e9bc88ce97471a57c616576ac61a685db644be1073f SHA512 4eb40b3d0e8afcafaa033e0127cfbad1b35729c462499fc28f4ea7b3b82e2415145491354b2560b145c4d9363b3df19bb26ca137c8605fdae34107211dcdac9e
+EBUILD pandocfilters-1.4.3.ebuild 435 BLAKE2B 341b9f934443f14b450173e144870af8cfc1017f98095b4654ece467740213c40661ab00a10c2ba2584b668b5d878d75500c30690142c0219c9e2e1aafa92b5f SHA512 850c058be21cf1a56ed5bf9d54c777ec986e386ccf2ed627f5e757ac9db8270eb6bcc7c078551c26ab82e9009f3574ac82c2d925b418e984294b8f750e7d741d
 MISC metadata.xml 530 BLAKE2B a4d60e832cd40f14269e822f158fcaf555c7ac84a3bc1aa4ae04b588233ad158b2b2e684e1d8ac46a6316790e1392669351274938f4d77595ffd6e3dee72bcf1 SHA512 bbafe21e07701977a4936514a82cb8fa7b8c72be7fc10c1d288c953971702aa06a84d12f175649ad7c108bf97686775a4f0827dd7023fb13ebf75d71e7536a87
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
index 4ffb42caad66..c9f5a18b60b9 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index e80a71628768..35351e5a3371 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
 DIST paramiko-2.7.2.tar.gz 331678 BLAKE2B ff96dfd7b114255c15282f4f73e1f9425ccf77106426ccf3ad3f833b56bd5abfde867cf2d322448dc7b3777af6ab080b4e37ff8871ce17f0db17634b7f101747 SHA512 c9bc569428a0a61814cb73941356de5bae7fea7891ba4fd3f5c00ff1ee5083454bfde7e969fb4aaf5254b909f7f0132f590d67803eda8a67503e5c02ec2bf01a
-EBUILD paramiko-2.7.2.ebuild 1319 BLAKE2B f6704572b5876e62e7061571f0542917673afd9948a6cb4e3ddb312ef99ab4dc7274cd65e9fe033a1638ddc883c9186bada5adf9defd2570313811caa5ac8a4e SHA512 1daf0b675709278e9e09089febc7aa73a12a70a0b9ad1fe5c495d13c455233705b654f138d9393dbef960494a4fd3cadf0f36c61a50645cb241ce133c18aada3
+EBUILD paramiko-2.7.2.ebuild 1320 BLAKE2B a72d6fbb594d185cbd3e730c136c93e38904d581a82a37b5ae5fdd038ebe895a0e3c300ee241a54927950edd7e6087329cf69fc78fb3589bcf3c0717006214d9 SHA512 80ed2cc380ec28c19fe4f8a13f1b403d77ec153224925e8cd8e5a6b86ea4fbd2247e1ae88cf2f5eff7f7784d0e28a7b831e43ea82a1db968174bc81f2dd6d0bc
 MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/paramiko-2.7.2.ebuild b/dev-python/paramiko/paramiko-2.7.2.ebuild
index 00503d47555d..6b405a0e1c1d 100644
--- a/dev-python/paramiko/paramiko-2.7.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index f72379988005..61b99aedd2a2 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1,3 +1,3 @@
 DIST parsedatetime-2.6.tar.gz 70732 BLAKE2B 099b2d4d434fabf3e3d587923a037608a982eee7986f5843f7a463acc52a736a0661261da557a16cfb310414778ef49b1d2bcde62bbf53807132004b526aa175 SHA512 ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543
-EBUILD parsedatetime-2.6.ebuild 546 BLAKE2B bacf3fae993490f5553aad2c2b5cccd5ebdc903f3eea699ccca4254c6a889f75fd0a7376cfc40d1b9f611f90b9d698a0d0ec3dcd3b3631d41e60ec7743f6a56e SHA512 6e6f27720c2c6ee90fb13831a47961ed11644846d9dd708df0d38af336134dbfd4dfef6e100de028867fd5497178e8c2c52de52b6c57ad1d2ecdd4b2c446e44e
+EBUILD parsedatetime-2.6.ebuild 547 BLAKE2B 4dd08a584d4bb839d9b42d507e92d0569f44d90d4fcb9534a35809100856dc0d907a99e6a70624b097ed7c826e096b1c712e013e9450c90931b8bd7dff42e1b6 SHA512 87c87ba136b168b1c82e3f431b632dafad0d1578f3c229f83fcd8427ac181a962699919f57db4bf9825321b82934945f702d4794d2b7502f257c54f487e51e3a
 MISC metadata.xml 464 BLAKE2B 03386ae154776c05e33d341711b1f967398718caa0b7761b96811364aec85d2437fcea06d01edc9da811961491e4cc763c8a3482723d06b04000a8d833684de3 SHA512 f247daeb09b51b355dc28ada03c21abb2c796fd1a98e1e452eef88d6afc802d17cbf526b2914c6faefac5bb68ac1bf9ce3131978ae38b238026dda02282301ab
diff --git a/dev-python/parsedatetime/parsedatetime-2.6.ebuild b/dev-python/parsedatetime/parsedatetime-2.6.ebuild
index ec0d952ca327..56311cece76b 100644
--- a/dev-python/parsedatetime/parsedatetime-2.6.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index 38c85c723a79..84e67d8b5067 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,3 +1,3 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r1.ebuild 513 BLAKE2B 731eef082d531bcd6049376fa9ed7f8ab1d5d3ef18e28a7271ebdeb9250010727925c6512d3b80f1179f90e1dfaec7f0d731bf79472bb20ab72a9e21e15a1e75 SHA512 b534b53657f6fa67a15f037899c277a711ff48ae839bd7efae5455ba2af8b8552be8459f55d1e6e8c65c77ba0e9243e058cfb0d61eda0f2deea62acfaa512d7f
+EBUILD pbkdf2-1.3-r1.ebuild 514 BLAKE2B e901975d5462192c4227b06c87af80a8338d5919504b4adaa22efefce02fd94ffa87f82979fa8f76373abda0162c900f64be03b7cb2f04df2f09277088d72f8a SHA512 084a8b14fb8bf9961e98a5613736a7a97c65ff82cccd7b6d2480fd15bc919b2ea9dc378800e1ee76d75d7e3e8a56159a0e9be36c17bb5ecd1e4f827fe6c44ced
 MISC metadata.xml 514 BLAKE2B 49289e7be4afcd682c52ae899c20801d69d148281fd543108ff17c3218d7d2d6cf70c5a8b438e5e54d45aa5df8faf74055cb5a92901e77d9ae946d6dc7689f9d SHA512 ed2fa0998f4f19ac8059c959e0eb350e589a9f816c4da6b1f40dd388f7a4483e1b4e33ba4d8532065fbcb3c19f5613a814c45982ae3c125940e0abce6fe23f74
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
index dcb1709cf14f..f6baaea9d4b8 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 548e5690fec2..8f4e80de2fe5 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,5 +1,3 @@
-DIST pbr-5.5.1.tar.gz 117488 BLAKE2B 52deecc6107d739daec0b2d3c397285c87c63bb3d2a2abc8266feec78d43eff84f4093b9739e2bbdf47b604a1621e4ed809a689b2167e6ea673418bd27f29018 SHA512 c72c2bb8bedd7f0606880f003dffa0ed585521b698e3e986ed2913cd74303e281fbb2374cc1a00b76777c677eb2677507eed9ccaafefceee0a689cb6fa61bab6
 DIST pbr-5.6.0.tar.gz 125220 BLAKE2B fc26737857195b0dbe16ecbcbc6e389b53a61105b3bc66e714bb4fcb4907e4329ee7c76b5748fa7d892bf231522e6ff9d414328ae0d97e6262b608c44c737764 SHA512 1dca9020a84e3b9be71fa07e2feb37bbdb2bb69d0b4f69fdcee0fc3c7fe4d84ac2e2079d6bd7560192833f069ca6f5dc27d03a3ef87c168eed18eee8579647fc
-EBUILD pbr-5.5.1.ebuild 2120 BLAKE2B 247f52c2fe42b84d69fcc99a7e3739bb524f9595541912a7927396d6c1745e5f3eb4178be89d048563bc3d0d28aa3a47f66716668f5abf5e01a504dac8416b43 SHA512 ff668c7413939f6ae59b471c315f728eafa5d9dc31f0a4194db0588fcaf4767b2a7d513c55f7eaec31e2fa77e912b2af57b8fd4c779b52145af51dfe34738d1c
-EBUILD pbr-5.6.0.ebuild 2307 BLAKE2B 51769fef99c54da79c80e55131a71516539f3bf77b8ec25ea880d2f5870e0f8291f4753c924623380a99de5a04bc8ed4fb66bde1b655568051688b8c220b97da SHA512 a8ec64dcacc9b54d74d65f5691bc04160767a9d8b60835800db86a738448c46bb9d2304f3b56c027906a0bbff85cb301438b56b858ce7698daebe816ac04cacc
+EBUILD pbr-5.6.0.ebuild 2300 BLAKE2B 073cf980c49f7476b4a1f2a79c31f5888690dbab5cea77c1abffff940949214519663dba49f58becd519b8def6a415d6c365fcb89009cd5f6e335d78a9d81a30 SHA512 bdcb1a4f0061597396915a6dc2151054597de824440afd95e0ee786ad9ff8c8ab21770b6a23bf873ab130aaf19f28fce1b20ebddd445d4852833ef4a0d27be5d
 MISC metadata.xml 814 BLAKE2B ca519dee02f08350185d53773b1c90724c92c7c814025417b295cf0ad961064d26323830ee19f78416bd6fc67b43517736d51bf485c4d314c9313ca4c420a6dd SHA512 0c0b2f916a99a568c224cce64636f513bc7d8bb2c7ddf690f55eb46d5b98afd0060a5db74a8515277e84dc5c08d8d5754a37eae73b1fdb3460cf1d45b5797e88
diff --git a/dev-python/pbr/pbr-5.5.1.ebuild b/dev-python/pbr/pbr-5.5.1.ebuild
deleted file mode 100644
index 0192a5da39a3..000000000000
--- a/dev-python/pbr/pbr-5.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-BDEPEND="
-	test? (
-		>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.1.0
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# TODO: investigate
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-i pbr/tests/test_core.py || die
-	# broken on pypy3
-	# https://bugs.launchpad.net/pbr/+bug/1881479
-	sed -e 's:test_generates_c_extensions:_&:' \
-		-i pbr/tests/test_packaging.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-5.6.0.ebuild b/dev-python/pbr/pbr-5.6.0.ebuild
index 60fecc79e508..a59c1d35b29b 100644
--- a/dev-python/pbr/pbr-5.6.0.ebuild
+++ b/dev-python/pbr/pbr-5.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index fb7a300806b4..d334fbdbc7a4 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,3 +1,3 @@
 DIST Pebble-4.6.1.tar.gz 24800 BLAKE2B 5030b1206eb263ac4584b4dc5a6b2d13c39af827245c5f1574b30138a80ac4eb501374e22109bf20c4bafc21105cea7030d30f68fb9f48e77400b028f30c37be SHA512 0d6c04a45af66f8d849225e87158f33e8ec218943008dc385c5b13187f816d7e7a2fb485ab1a230b8d5e2ab23fc9fd18efc57ef3f15dc5caefad9b75cd149de1
-EBUILD pebble-4.6.1.ebuild 510 BLAKE2B cb9c2017f85d06beb9df63c901351ee73bad131dc63dab9853d173e8b9c5a9128040b5c5a2cb84367a9ebbeec24541360e251fad269d754b79b1e92d3dcfb7f4 SHA512 199f6e506ce12107db7d0ceeccd9aaba661437c7ba208f693afd4304e3159ae3bc5985a45bf5da491e458aca1befaf40599ec63c89a387dc58e7bb1b7b02f12c
+EBUILD pebble-4.6.1.ebuild 511 BLAKE2B 5ea016d6c346a90b603ada48ba272277ca488aed974930d59a75af2714a33136c70483b125a725c66bd62bf82b98d03b57c1199ce408bb03d803540ca0f76ed5 SHA512 14c51028e7ad6e723444227fbd6c78cbf8256c28e4c57b8a9bc831b2a33604a51a2475fac9ed7a12bf31a7c59f9a2827918e4f0e74d043beb98c9dea42fb8d8f
 MISC metadata.xml 366 BLAKE2B 65d8f6a8f317f3d4dc671ecaf51954d904265d61c261e5e52dbb09f2fe963875a325bca94ae6028690ace79fbf03e9277353511e736a8fcf05e446f9736ce0bf SHA512 bc3e0a767e97e35202912e6d52a4104daaaa9ecedc8f42b35651f94d76bb3b187ed0d2a74c9c024f84904b0d12384d6772550d7d206ce4788775fb1497319e88
diff --git a/dev-python/pebble/pebble-4.6.1.ebuild b/dev-python/pebble/pebble-4.6.1.ebuild
index 79f0c9548119..5ef0f7a539aa 100644
--- a/dev-python/pebble/pebble-4.6.1.ebuild
+++ b/dev-python/pebble/pebble-4.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=${P^}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index d9ca4e77fcb3..a46f9b94106c 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,3 @@
 DIST peewee-3.14.4.tar.gz 882123 BLAKE2B e20848eaa7cd93ea5fcea152ffbfdbab694d9fea7ee8b945c029fee8d6c4a263317fbb0506df31d490611a2b2ac0718b0fdbea875f0013eb1f3f71941f12a26b SHA512 261856f4b691b8f5610d041a049148f213c22348a7e50514f7792932c1f4e8735b4dddb8a29c42e583c38e89551df2f05951d81bda0c47a80dc1eeeb0345f30f
-EBUILD peewee-3.14.4.ebuild 758 BLAKE2B 69b8e9c0e0fc8481ce6a78ea78bfc2036b5dff2e69e64259bd670619dc37f5ccb25f18567941d646c88d003ecd71ff8ce905b6846f4075efd7302929d04953fd SHA512 1027f2c8d7d53fc47be3c39d25169e0527357f65b49a33e44505b820fded2bad7d1eb6845efd2bae8f6d65cdebfc4ceae0ad95a75fc045703dbcaefedaf5dedd
+EBUILD peewee-3.14.4.ebuild 759 BLAKE2B 9c7a878229fb4b6c3890ae02cd7f4b093b5b922388e06655f8e456cef3f3e49d76f8cfee4d69f16d2101bb27c6c74b52f37f17b5e00b8c97768793cd438e12f0 SHA512 5fce1402b6f205f9361e164f202b0ffe2324b6c4dacea969e90641ef2f855d1dcdda22a6e4b4d60ccbf3c3395886dd55886ef326af23b06c50de3fe81b42ccc3
 MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/peewee-3.14.4.ebuild b/dev-python/peewee/peewee-3.14.4.ebuild
index 8d21553d1411..10d743299d6b 100644
--- a/dev-python/peewee/peewee-3.14.4.ebuild
+++ b/dev-python/peewee/peewee-3.14.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index 3da43dfd97c8..d54ccbbf190d 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,4 +1,4 @@
 AUX piexif-1.1.3-tests-pillow-7.2.0.patch 1382 BLAKE2B c7ea03ffe0708b975d64602910bf9c228f0093d9cb717a1b1b9f3e7b6358b94f3bcbd6da8f9bac12fe2ee0745d17defccd196bdd8ec018fea50b7d131e148616 SHA512 be1ee541e3bb6c219d6fd9ab68e9143c2131f695a2001d36a0d63b0566d71a542a09d58dc0bcbdb8c1353297156ea7853d483b9a44407cb31c30acc4252310bf
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.1.3-r1.ebuild 819 BLAKE2B 29fe55f8b8a5b593bd2f7ae8b51ef8fd5f360c728b8c3f796cc8f856521ab69b6551231e8ff3684d95c9e27700cbfb8257ff1d2c7d7c4f26962512795c17add9 SHA512 f4cee0a02ff1f40fc0c9283e5519b1302e673f6e1220e414b6f23f0d347a76091649fd89dea62c34b3eb946de4d1ed328835ed11d9d5a6ea3507a1a3a2dc3204
+EBUILD piexif-1.1.3-r1.ebuild 820 BLAKE2B e07d5f0dffa67a1d3d44b23a9b5389c7bb5218a92205661bac6c6e8ff589f717360070e72f83b7180ae4516cc9e6ed14afe20adad47155209a52c46e0e018425 SHA512 973fdf18c0d4628ce07efeec4b48987627d22599215b80963f0e00c69f09b8f6de903ff93cdcbe0ea75c85eced3400ab0f31577b7eb35a8d5fa3fdfc19dcf77f
 MISC metadata.xml 363 BLAKE2B 0d1dbdcb12e7a0d709950fedd9f1da080dfb469886b8af985d47d5ac851e93964866fe9c5a845d86bb83aa94d02fb247eadfee27b3a2af7524a9706c2f1abea5 SHA512 a34daf002488ca39148a7e50c10a56373858a52e9a1bfb782f1a52109b920e4423053db616f0884ecf9bb210d6b28e770310c94aa5c522c3a252736f1b26fc1f
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
index 1173922463d4..70599e5bd248 100644
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit edos2unix distutils-r1
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 59473f60c571..352e2d36e098 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,9 @@
 DIST pikepdf-2.11.4.tar.gz 2298520 BLAKE2B 4c657e50259cc126a4537f699c30723eb5d06303b2fabaa53c4ed2862236bcc253ab793d20905f7f2e298649a3ba8c5c8b66deeb4b859b66e18ab50cd512b843 SHA512 292fa0cfdd0a3d43bfc533dd339acc35b93958cdab476a7963274f0e98f2d8ad0c121d7605b53fe9e1a318cab59b24a46343ccf9f25e6de32e6e39d6dfc02ff1
 DIST pikepdf-2.12.0.tar.gz 2300821 BLAKE2B 17f2a316d7139471f1bc1106b52895246ecf4503a0c52cb7ed0b8fd408c9bdc8f4e4539f7381b184be50747edc12ee4ab1d58587c9db1fd4c3384d83a56a3ea0 SHA512 7484da6b6aeb8dc93c7b9eacbf5f5096bf738c2b75e4d3d63b189494acddba3da8c707fe25526ef2fa0be15be03729b347ef971f1ae61e38fe6c55ee72272359
 DIST pikepdf-2.12.1.tar.gz 2301208 BLAKE2B b3fa60c97a58dc312e00c0e129d1f55fd390d83b221dfd90acad5f5954e0c564492fe39718248f87980e42ecd590dfd98bfb21133c8ab0664666391e8e030902 SHA512 13bb7132282c024fa5118970deb6347c954a94545602fa21efe99ea2f837693b810dc6706d1681c28588d5ef41a867c70f75c7ab85b01267fbcf55ba89d39b94
+DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2d509ebb8824a5b2fde709db341366ee2b8f8160e65d876c2fff0aa7da54eddb1fe2b9fd524b0c25adf79779e21c SHA512 6bde2a538cdaf55460083c54a6d55ddab3ec4ba127dfc77d3f79da8492ff50ffb76281312395973f8448c360ae53b0c9a0d090258f43bfdfdf420336c99fb423
 EBUILD pikepdf-2.11.4.ebuild 1538 BLAKE2B b56471c516e7c203ca3b712d9ebffcee5c322bce8ca2eb6a31baa5238f7999bd4445dfe0149dabb6e6b259878b2afdbecf46e0bd60c95da63be2f8d5a251e8a6 SHA512 f1e661917c48506ccf19eb50c3ff7ff9c2ebfc2ab6e731a8ac9c81dc22b92c253bafc037d69d8a8e9372712699a3004734278a0fd78c709502ff2066bebddbd0
 EBUILD pikepdf-2.12.0.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
-EBUILD pikepdf-2.12.1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.12.1.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
+EBUILD pikepdf-2.12.2.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.12.1.ebuild b/dev-python/pikepdf/pikepdf-2.12.1.ebuild
index 2a76869d388e..e8d4a2650905 100644
--- a/dev-python/pikepdf/pikepdf-2.12.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=${P/_p/.post}
diff --git a/dev-python/pikepdf/pikepdf-2.12.2.ebuild b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
new file mode 100644
index 000000000000..e8d4a2650905
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pilkit/Manifest b/dev-python/pilkit/Manifest
index f4b00700afa0..2f423a4b46cc 100644
--- a/dev-python/pilkit/Manifest
+++ b/dev-python/pilkit/Manifest
@@ -1,3 +1,3 @@
 DIST pilkit-2.0.tar.gz 160077 BLAKE2B def84c3444c5ffe7e1b9c016c2fe15de222d6765e7ce4652ef2f6864af59fdc89b9bde5c7a63097838ab3fc054c81529dcb4a13cd3fb3ee8a0f141f6b0030c10 SHA512 7732c67bc00db53c6849c907233381cca7f9055d55d479958a7b97db277524ac280753fd40c0023fe2b34f98b7261134f993585e658275ccd4c67f357c13de51
-EBUILD pilkit-2.0.ebuild 656 BLAKE2B 12a5a0759e15a2530e62469e068c80e4e0c277f872316294f58294beb6276d0e8d578799987f27196183e1e4b099b28267ffd4844e7e144f370c1835c46fa289 SHA512 6f76e7628acaa7bd18acccd48f62ee42a347f23cfbdd2f5ca3d49c431f5f6c77750506de24dc89b45ac85c91b286c27efd6ecebf5f21b08e6841bbbad77f82c5
+EBUILD pilkit-2.0.ebuild 658 BLAKE2B 76bf35985f9b5dac7a9530938f080c89f69452549b0995fc47ed65d120f80e99c6e873e8315a88945d1fb5804d746c22ea554c819e551f3c3a1c238e04a5fecc SHA512 03ae16621916f10737d5be392a65e8c738f0a62f2704e9f0366cebe04ca6063268bf2d580838ef451a0937cd43e79617a1359ab3dca8bbb876dae1d1b71de527
 MISC metadata.xml 607 BLAKE2B 561716a82c52f375cb1795838a40ba9ddcb014eb988039d7d3c83b49dc81ab2560e2027358faab70b0d450a88f80691702110ea0f96bca40bb612ccb7c381e58 SHA512 daad1d0ca1099be6b2e8b245d5b620c2538964dde91446b7f79e4f6546cdd7ae081068d9e4d63db8de8c3c2dd529d4688cc4c2e66165124b988fa3a61dd57df2
diff --git a/dev-python/pilkit/pilkit-2.0.ebuild b/dev-python/pilkit/pilkit-2.0.ebuild
index 85b00ae5a81f..bb39f045ca7b 100644
--- a/dev-python/pilkit/pilkit-2.0.ebuild
+++ b/dev-python/pilkit/pilkit-2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index e9ec858e92e3..28c0b34c03ef 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,5 +1,5 @@
 DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
 DIST plotly-4.14.3.tar.gz 6374650 BLAKE2B 91d950b6365876b03b2b0393c642275c37fc352fda90ce010310f5dae046c3cdd835de438036c5d92fd35d3afcd2c7b8548a87b1354d4a33cd2cfe10838ae94d SHA512 7d8db7a0f6c1abeda1b222f9bd25e4395dd8d14d246ad986960868a8083e4f1d1f600d84f44416eb1d089640d190192e931b5a5f6ae24e01cf8146c4cf8e80eb
 EBUILD plotly-4.14.1.ebuild 613 BLAKE2B 5f45698653121c6f20f3f933c236fccb8a4f152806795e24686425afc75e57dc1337736a63e60c982587d4b30e315c21fce0cdab78075e5cfbab1539a03be3f0 SHA512 18a4ed69b6b3983ce8b6cb1ced62bd11502569b0a8f381ba479ff69fb926c8892798ffbc7315872ee0ab24f071806f95a785712bf22eb83d8365bed4288faa21
-EBUILD plotly-4.14.3.ebuild 613 BLAKE2B c8262ca7e127883fa49b223df7b3cc0875bcab0d835995d08a1eae9a9dc8ecb8b2d88dde33bbfc67d8dc5386d72acd259439be5ec2c80a183f234558c43792fa SHA512 e6d3178b59fd81874e7f3ec607fa65e8767095eb0f4ba96e1f81b035a69fb169f01c6d3b4453fc6496b1c2d7cd91d8585d004cd2c15a1df9d4791abd96f1b28a
+EBUILD plotly-4.14.3.ebuild 614 BLAKE2B bbc53aaad602a5e0f0609f06e1372fb1c36b5a778e27af9d19c1a5624702d31ab9a8b8e368ce79abc0638f3553bfa8178918bc303710132564c8d3a9ba4b4eda SHA512 b2b432fff00ea557662fd43f91eb37c45ad37940f1a6cffc39bf025d087e6413da139a5edbea569bdf1c8db4ffd62ff0ca70131616414b2894590a9de2f521ed
 MISC metadata.xml 724 BLAKE2B 1508771febfbd6ed56f55b9db32cd255b84139e53b63341ad90e4f95d71e9c4f2f74d88a55ec4d1b66f1b21004017816e6cc74d62eb8f8e0850823502d23598f SHA512 2de0e70fdefd14ba91b72046f31af45a5f68be8d8955f746e6a35ee71c639217caf2cd2d8d3f44687146fa39076eeec15c5186e113599000528c429631e0b5af
diff --git a/dev-python/plotly/plotly-4.14.3.ebuild b/dev-python/plotly/plotly-4.14.3.ebuild
index 999dc245a8bf..a042ff17b547 100644
--- a/dev-python/plotly/plotly-4.14.3.ebuild
+++ b/dev-python/plotly/plotly-4.14.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index a230d7286471..d9b49dcc42b0 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,5 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 DIST prettytable-2.1.0.tar.gz 43306 BLAKE2B e2085003f2720d573e19fb2b03c8aa98262ec9e7a3f7d0a20474cad2fab374a91664bb513d8158cd612e58a47917c3ebe8b43798272f38c182f6cc2472918f55 SHA512 8eaad22c66299ca3f66cc167e1a94aa41e3b2699da4ff48a0e81927ee8cc623d3147ae29a0bef92370d07d6a7fb6b1eac535fca7090562419aed219b9483edd5
 EBUILD prettytable-0.7.2-r1.ebuild 599 BLAKE2B 81279c0a0b31c8d20b3320531e78a9503d493c7432b758873826823c35e9db0e8e1069d1cc551c06ef5a223732a74bc4585247ba4a1973c03a5738e7cb6ebe3e SHA512 c05622c9ff27784044c47dd092a34545e464daf0ab17fc0b0e6e2eaa957a49e1b0612dd4fb87b907a4ccea023a8b0c383f65a8c1f98fc466cb55deefe66c4700
-EBUILD prettytable-2.1.0.ebuild 717 BLAKE2B d3dcd66ca8cd0c8dda6ab0b8c97b59f7dcbd4c67667d305346d1d4ebad28e23b845045ac9c497178f0ab53d37bc1bf60a0f9d8cc7faba9683fafa8cf27610c71 SHA512 b2ce04e181640af1f8f3d1a9c76b180faacb2995c6cb4f6e8755b14cbb6209f403cbf919ab707f3c3a312ac670167920b55003e0fce63c8e76aadf8c2d3b6391
+EBUILD prettytable-2.1.0.ebuild 718 BLAKE2B 7609f8e3ab0c836631cba6942243a8058428eb8b78c1e05d3c2ccb97439b61e74d0621d61a4471131b466b334f3be750eb2b52227531cedbc25237afb025da2e SHA512 a9538a82e439b8372eb0ec32f28b1bca1030f74dd3e8d80dcb50517fd90978300bad2fbc04937ff58ee94b40cc01c3dffdadab72e7bc84ddf46701fc1a3c5463
 MISC metadata.xml 582 BLAKE2B 2abcef37a8ef89f66a30fa5c96406bc7ae799f16cbeba3ab5105d5412da65ecdc691d410b0d4147d089290ef49a0fd8c4af42c1676c7161d82b12b31f7a2d5a1 SHA512 e4665346eda726a3041e5eceff3e7925bea95dc2a2df761c7f807d9da0f333d5a46a68ffb1413e6118e40c459fd08af9e9d73e6a45e9c84d41628d80e86fca60
diff --git a/dev-python/prettytable/prettytable-2.1.0.ebuild b/dev-python/prettytable/prettytable-2.1.0.ebuild
index baf03d2ccfa5..23c045b88890 100644
--- a/dev-python/prettytable/prettytable-2.1.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 2becc537acf2..198c11c2f543 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,3 @@
-DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
 DIST process-tests-2.1.2.tar.gz 11554 BLAKE2B bf4716f32b8d5e6cd8d5f8eef1156c09545fe22e48134fa0f98c47172141f0365f1995c2dad94c4e3a6f5a151883f92048bcd943fa07faeb7eff9c60f18555df SHA512 56a76d8467312de34413994e663eb63378ff179720b883037735eae9d8f23a5cc0ea32d4a9a2f9041af417b5ada07b7948fd481e3d5b2cb43db3c19183f6b263
-EBUILD process-tests-2.1.1.ebuild 648 BLAKE2B 87ccddd5e816726f6577aadbf6cf52b4673c2dfad8955a989a47f4d4cc411f2739bf03ad76ad541991dac3eb2f69c46d77056218884044770f25d095eac2dfa5 SHA512 1bd58417013f1d5a881a3045a0d17055d2ba8702209653ed3647550118193177b6436883fbf587c6fbcb5bc84d713e3847f01935c7ab020c29a62eaf2abf6a82
-EBUILD process-tests-2.1.2.ebuild 655 BLAKE2B 068466ab9c5c7a3bd40c62e781261019062de56b82cf78cf6c8a0e6074db3228c1597a89bcc9b70227509d4de0de12ef87a1a13196779f9c895d15125944ef84 SHA512 ea1e1f6e00bea85c071d9e2eb3c90adec5c07187fe42ff4185e5bb3741c181dd7c47cea0148f74ffe6fb9c0d13f43f07d9ffcd1aacb5890dca79fa6aace103ed
+EBUILD process-tests-2.1.2.ebuild 648 BLAKE2B 87ccddd5e816726f6577aadbf6cf52b4673c2dfad8955a989a47f4d4cc411f2739bf03ad76ad541991dac3eb2f69c46d77056218884044770f25d095eac2dfa5 SHA512 1bd58417013f1d5a881a3045a0d17055d2ba8702209653ed3647550118193177b6436883fbf587c6fbcb5bc84d713e3847f01935c7ab020c29a62eaf2abf6a82
 MISC metadata.xml 408 BLAKE2B 9b3db07555d5a2939176e7a6628c57510dd02652862027662b225d36c1315d53d3fdcaee98e35cb3b2ea57b759d71a5a63856aab57edd20f9a1cc698c56d9350 SHA512 94e3ab549a93bd8fbb5383300110603d4618da0024bd4b227370e4ffa3af791c632d8fd143ca5599c40fec8c46fe92d85c54968070260f59894ec04afcd776b9
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
deleted file mode 100644
index 4e4cc28e2b28..000000000000
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for testing processes"
-HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# There are no tests at all, under TODO
-# see https://pypi.org/project/process-tests/2.0.2/
-RESTRICT="test"
-
-DOCS=( README.rst )
diff --git a/dev-python/process-tests/process-tests-2.1.2.ebuild b/dev-python/process-tests/process-tests-2.1.2.ebuild
index 9b6ad71f5f40..4e4cc28e2b28 100644
--- a/dev-python/process-tests/process-tests-2.1.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index a827a8af709f..922c3871fd07 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,27 +1,13 @@
 AUX protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 888 BLAKE2B 25d486e8ccd60753f372fb708bb66ef2dd6358cf088f84ea58d4fe6889bc31276930bb5d8fb5538b5a25d621959cf197ce9cd9d27299df05109432197c32c2ff SHA512 4ed96d0608146e268d717709d7d00272b306ce78dc91d715d35d0901a545dd58873ff40f903b42d46362deeef6bdeb0c2a34225f7c3fb4798d352e54fdf8c344
-DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-DIST protobuf-3.15.0.tar.gz 5284848 BLAKE2B 6c1135499dd73b6d1764f47ded6415f8073841bccf5d5626e751fc159b67a6103d71a84096f563053c34c9e4235504238fcdc86ebb757d38b2f4bc1674d08674 SHA512 f52dfbfabdff3306d26ec05cbba7cd47bf3db8b08f4fb27e2cbd5a594de57f0a7ab2212dcea2055a9adfddc94ae4df2d0b1caea311ead75bb850ef8458b1b74a
-DIST protobuf-3.15.1.tar.gz 5284851 BLAKE2B 5e3f487ba1c3f6a3d2d87f2421f9b07aa4618df0853b05364d7f29e93d8e7dc4c3ece08ba3b7cd0bf69d0faaa32ccc952218a8df7575b74aa6216977f2b2219b SHA512 24efeec969ee72833c377e6287e3b06a431d54d9b3be50635685f6903534f15c2957d78cdbf4bcc6482732ecdbc735dc894c0b9095486419b8d11d6df6169180
-DIST protobuf-3.15.2.tar.gz 5284455 BLAKE2B 433ac18774395174798d110e4eaae95c44bc8be89cfae85648497f8531cf19513f4c7745a6afc27d6d49a07e7e1fb4faeff73530fa082665727095e837f11940 SHA512 34e82ece83f47249fd5398a955e4f0a32d0722abcaa4e90c741bdc5106a0bd92088babe3d10d818dd89e2e9254cecbb68ae0c182ea408d4f1e2d70318e7baf37
-DIST protobuf-3.15.3.tar.gz 5283923 BLAKE2B f7b7b22200a4fffe6bb89e6d15fdcdb7e53ad91d4b8dc4c0b9ec7e64de39f0e3854c649edfd5a6eca040f35ccbb2bea6a3b86c7e22a9ba011db2dc11117646f6 SHA512 ca403cc2ed28b67c4219021273be59d36a3f4382a8111aeb6152fc0ded30dfc203d96c3c60977d19ff00a1d1524b8ed4c183e8badb56c942e599f78aaf6745f6
-DIST protobuf-3.15.4.tar.gz 5283753 BLAKE2B 256eb365b26a864755b43925bd4336fc76f1fb122aacdb01243b24ecc163541fd7d2105ba66f7fa0c14ced0166cf4bc8f480ac5d9f2cea13e4cc925dab6e1810 SHA512 d98d1ed408a6f3d15fb3a60d11df896632dfdffa06759c761bc227a8c8053ec9db6c62c21b115dc109c7d9139df239b19e29aff5783b585101bcab3f4d687547
-DIST protobuf-3.15.5.tar.gz 5283712 BLAKE2B 0da6255302014c885aee47d48344a75ee4808cb91fa6cdebef15150e0b8ce7f7835d21bdc8f42fd1ba5f5c5401e6fc60b9410ff1ea8bd0d0f698d3cf7d10dd2b SHA512 b9d3b261047c354f0f8735638041562e05d93691cdfdc295622fd30aa04c859a9e3d4200981807ea0d4926d0e4a31a918b4851ebc25bfb9709494a3699002531
-DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f64b76ee3318b99f3530d9dd0c49cc8c386ef15c7394475c2bf0fa33fb631e481fa3fb927c2ab8a88af31234bd0b1 SHA512 673d61b492ce0e85f5c63f3fd7a0174737cc65f7871f79d24380bffa59ea1b312065137ecc63b0f4d4ffa3eb168a09e9c1129c21b0e6c5c3a8c2fabb2cecabb5
-DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5
-EBUILD protobuf-python-3.13.0-r1.ebuild 1821 BLAKE2B 1ad689be6b15a3d334ba98a71187059fc77137c9be4357200919185887a9a111d1d8e2772afc0a552c52f4f3f5b3d01e6de0dc8606b33bf41379eaf54a618529 SHA512 ae7027d8366dd82b52e17ccc7f7ec5b5286ab143f2ce172792bcb32ec3f2792f49d62f91fe8b3b271207d891872d35518c08632eca26e18d4c50fc37e69690d9
-EBUILD protobuf-python-3.14.0.ebuild 1618 BLAKE2B c1e05c2fc9abaf0b1b65716cc5f9e5f6f6c4295094dd3564147f32a56c01927611c3c4e8a1ec07e234950a41aa92f9dd570dd18e89ed03245584e7f11a3276a7 SHA512 2c103938eab1f3c56df13f0b52056c029b88d310e41fe2a48b1857e8a6029261dd269af628bc6ae137bfb9550768e4ac84e47fe87a436efc67c1b0f9f46e64a6
-EBUILD protobuf-python-3.15.0.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.1.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.2.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.3.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.4.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.5.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.6.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.7.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
-EBUILD protobuf-python-3.15.8.ebuild 1619 BLAKE2B d14b9f5409d0ef8cc3ee6d3f70f33776c173e0568c22c5a145472b29cef9d8e400fa2c8347de0f1d74b88e48d8942cc6177518ca5bf2fc771af6661d4cc142bd SHA512 f5b538588baec4e97eb5b6295af9328266eb71e326e73958e7ef30a8473d5f624581e7d65e096e74023adbf7a7734dc01a3aedfee295c5bddd1fd2eed91b1e0f
-EBUILD protobuf-python-3.16.0.ebuild 1624 BLAKE2B ecdbe906767002fd17f4b269dfcdb6570a670ec8a68b669fc57b6c7f8852ec5f47739aa3884be9ee5766c1b1c28a16b062166faa9deecf30d5deb07715b35bdd SHA512 3379b2b0491c0f4d1706789f0b52a3d4b4433c8b1cc842c060f9bb911abf1b11ac37ec37420f481a51f4d8a55d74da2d903e81e094797ac7413d8afe8a439c8f
-EBUILD protobuf-python-9999.ebuild 1522 BLAKE2B 9e75102f9ae98ed4ea85b768bcb6df009813d1feee5356ce539f97c22fdbcd3c25f382c0a8c5b603811a55d51e7d67a1a27db6c1b1e537390c6ba912159c4863 SHA512 54ea25f717efbc641baa25175bde24f465b8f8da3ff0cc6732f89b203b2d00373b84de6c99107b4bbf39dce354fb902850499f1d1005b3e598b42d1bbad18d5f
+DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
+DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
+DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
+EBUILD protobuf-python-3.15.8.ebuild 1585 BLAKE2B f0f489358adf04d9a88c291cc04bfa5d4eef567ec8be619f97054863ea37da42878a661501d15c8027b20c5d81e9da046f30af56c8b4622453c7b16eee327046 SHA512 7c8fa9c1ad6d4656ffc5abc0633e6142562bc13365a186c2f4398fd63578b81e63a75bb656328513bcf47981314cba5fa56f724b183837c4ee44ee8586b43cac
+EBUILD protobuf-python-3.16.0.ebuild 1590 BLAKE2B 09843dba7ac5025af39e727967bd7b5bf8948a90184bdec6ef0387673cc1d87c3bd7c6f61e031dd6e31bb918b12de815d308b61dc9fd9fe8ece607897cf850f6 SHA512 2210f36588a1c9e560ac4a14312827307aed0f2a93c649a39a9b7bf237c9e21c7372ed4bc807201df51d115324f0a63e59580c59ff32b7021a13d7a524fb2a9e
+EBUILD protobuf-python-3.17.0.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
+EBUILD protobuf-python-3.17.1.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
+EBUILD protobuf-python-3.17.2.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
+EBUILD protobuf-python-9999.ebuild 1488 BLAKE2B e2fd094fc844aa663c5601f9c3a4d16889a7ce4c378b06568d9ae6147bd21348b954e75e228cacd7359dc8d4d2ddeb4da8f248f6e41d9c640d598b3493ba4938 SHA512 a8d40bfeef805a8afeb01d51198692fbbfe264315aeb8f9c56baec81686c80b2c4862f49be5c05b638bf1c75efb9395a014c6cddf4c3c8d4c27555eab6131cb2
 MISC metadata.xml 553 BLAKE2B 21140c27d2faef17e40528a3a90790083195432bc84b8af3c7f34c836fdacee20acb517cbb1ba15e7c699faae125fd9bc2f40ec5398eff8f01a882a5a02bac3d SHA512 6dcaac2b38128ac9f13de5f4c38e8e10b3e85f73b7777fc12ac15229bb2c94aae6df4e135540d01ae33658df524bf3a6519270c59f1d4f06355f3d786607a13d
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
deleted file mode 100644
index 98ace3034663..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/24"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-
-	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
deleted file mode 100644
index b2ac1bf9e133..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.1.ebuild
deleted file mode 100644
index c3065bbdad23..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.15.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.4.ebuild
deleted file mode 100644
index c3065bbdad23..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.15.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.5.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.5.ebuild
deleted file mode 100644
index c3065bbdad23..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.15.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.6.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.6.ebuild
deleted file mode 100644
index c3065bbdad23..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.15.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.7.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.7.ebuild
deleted file mode 100644
index c3065bbdad23..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.15.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2008-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
-	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
-	eapply_user
-	popd > /dev/null || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${ED}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
index dde5fd1a7370..a58110ae3a52 100644
--- a/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
@@ -33,8 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
+RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
index 2469f4638533..115530da3f0f 100644
--- a/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
@@ -33,8 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
+RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
similarity index 93%
rename from dev-python/protobuf-python/protobuf-python-3.15.2.ebuild
rename to dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
index c3065bbdad23..94a49219ee7a 100644
--- a/dev-python/protobuf-python/protobuf-python-3.15.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
@@ -33,8 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
+RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
similarity index 93%
rename from dev-python/protobuf-python/protobuf-python-3.15.3.ebuild
rename to dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
index c3065bbdad23..94a49219ee7a 100644
--- a/dev-python/protobuf-python/protobuf-python-3.15.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
@@ -33,8 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
+RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
similarity index 93%
rename from dev-python/protobuf-python/protobuf-python-3.15.0.ebuild
rename to dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
index c3065bbdad23..94a49219ee7a 100644
--- a/dev-python/protobuf-python/protobuf-python-3.15.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/26"
+SLOT="0/28"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
@@ -33,8 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
+RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index c48a1ffff073..f4642d31c14e 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -33,8 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
+RDEPEND="${BDEPEND}"
 
 S="${WORKDIR}/protobuf-${PV}/python"
 
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index e6f8f6a42e27..09735b558346 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,5 +1,5 @@
-DIST pulsectl-21.5.14.tar.gz 41357 BLAKE2B e88953b07b49de2e33762bb85e4bcb2a4e5555970127e6395e3374094dc1c87627f2bd4779ac9fb79c5ccc531c23ea76ead4dca7317313881ed495aeae9b17ee SHA512 b9a9ffa33c31281c6d0dc3084cbdc342b2d45cac713a1d928e106162fa412d80718c8f6443369b67b6c6af9d6b2dc6dbfb85d137ae693ab916ac08e19f048ba1
 DIST pulsectl-21.5.17.tar.gz 41487 BLAKE2B d4e547a140a9843107bac70a0a98ab230018b6457875b395528c3c1c1e7f20df4c4e6db569334c98f62be549930ab8e8f07927a54396554f1aaabc9a6eb46d7a SHA512 fdfceea8833955880326c04c536e6b2d63a260a851b98d7a76bb3637f30f414c2b2f4bd50c493f86edde76983e0a0f83c39839fa39646d8f1f2a4e93229d42fe
-EBUILD pulsectl-21.5.14.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
+DIST pulsectl-21.5.18.tar.gz 41636 BLAKE2B 1949f14c12a9d39f2ef6db798c7e8c8ca6dfb4fd3a3825af9f165e03fe1a3b2650bf369a4dc031528974db594740c0d990ebbb20d54aaa5c79a8859b9bcb605c SHA512 33dd4ca0daac4be1af510f6b4ac102f5b4b555bf2c72a446b2b498a80f972e4a970953812fd06ecf1e780bcfb61037e5a1245a8a047a592d73a7f4bd14790033
 EBUILD pulsectl-21.5.17.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
+EBUILD pulsectl-21.5.18.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
 MISC metadata.xml 557 BLAKE2B caeac803705c90d7fed8f0bf8274b97ca08089af065d9b797f0041489c80d0f0f54e5ffd6b47d868cae6e25c2f5d68030cb06e8ab5ac7678687f3adeedffb20b SHA512 24ffaf4e6034d38f7acc00834fe040358b6460be27e91a07e70f918d01b2e3880238a92cf0c31a3af69ef81d27667ab1c89751a91d4e6bf5adfe05dec6527d04
diff --git a/dev-python/pulsectl/pulsectl-21.5.14.ebuild b/dev-python/pulsectl/pulsectl-21.5.18.ebuild
similarity index 100%
rename from dev-python/pulsectl/pulsectl-21.5.14.ebuild
rename to dev-python/pulsectl/pulsectl-21.5.18.ebuild
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index e3a77f509fc5..9d81cf2ff426 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -3,5 +3,5 @@ DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998ef
 DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
 EBUILD py-cpuinfo-6.0.0.ebuild 528 BLAKE2B d600632563dda508e9de69ef4120651646b82a9c919051261faa6b2e303f6a1ace445a431e7540eb8f3fd9c76eb0588bd1840bce67a626527e96c22a1f1b79fc SHA512 d3a4fa095d1460c345b1b3046c3ab08bce7059d3b6a7256dc52ef5cd321fa93fdeefaa77afc475ee3d4a49fd5a5b979629552add27fe5defe84d31e4df58eb86
 EBUILD py-cpuinfo-7.0.0.ebuild 502 BLAKE2B 8da0ce27db88039ea6c7e12f015433a466e440006b6e24a0d14c8a047b8abaade732757e3a276419b24844b156b4052abf67a3e4f5fc56355ea0eee63a9182a7 SHA512 884577429bf5fb17eec88d51836945657cc6ddb14fb4d693d9a5d40b181ca98e47c20a98d1a9dfcc9fa057a49e7639c8e0c59560fed396c5e51234482d812a00
-EBUILD py-cpuinfo-8.0.0.ebuild 505 BLAKE2B 95fbf04ce9fb7463a5b2dfa469e06bff60d990a51cb920c9ed71deed0ee10b5c40758f8f30ecd0a56eb2fe6544f531dd2239edd16ad93a630f5af6a94cb32d79 SHA512 5b8b995f4887690a5e702cfbc0213f6638b4e18265beb399abeb70d4a609efce9989f7eb7148ac0591f43a43a633aa07ae5603e40b4c8a6c516106d99208e0ab
+EBUILD py-cpuinfo-8.0.0.ebuild 472 BLAKE2B 746a00ba70302348cea2d27a1da56957afac8ab18352cce15c67e060773af44584317089d171fef08494e813fd6810f9e1cd61077186c67bd876d780ae6ce80a SHA512 1358d618a32065cde3d86609bee08ec59def01c8d31c1d09b2ba626b53749c598936fbcff069ce7ff5cefbbd822eabb1edc13c4866f1cfeb542926b73e130104
 MISC metadata.xml 531 BLAKE2B bc7a99b8d7291478da528dfaddf83ef3297f97ed7b1516a81291f36fe7387c7611b4ad84cad47a16eed622a1976e6e418dbc7a2d9e4a853ecd60bc991c1ee438 SHA512 e951485f6fdcbfb48512aafab5fa3bace39dc72a327888de2e38dc209490a5d7e897974b45e3fcff3fac965cc1e283a8a2bf15ceee131c5a48dfb593044928d7
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
index 944389530103..6fa77056b701 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Get CPU info with pure Python 2 & 3"
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 6f67b24b3667..85d2c39db678 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,3 +1,3 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.1-r2.ebuild 775 BLAKE2B d69382a17d3733189b40521037d33bf904fa32d0125869000cd72129da22a98516b18ab956b7f1488296ff2d90129bdd38b195c18b84a6f95193b1c6ca840fe3 SHA512 8aea6c233a233a02829b2ab8f5f1340a93b96029b3c4cc2d932c4208fea034aba83ab4cad0099e7d393cabaf086ca65872431edd13585bf10095e0a0fc7ddc13
+EBUILD pyaes-1.6.1-r2.ebuild 776 BLAKE2B 4ddcfde90687ee8f5bf061b3b4146f36a19a716337a0cb3120c6a97bb1bbe767f79a11d04bd02d41d900ad016d690d41e07943df71a490f2f78e692935860861 SHA512 e78714107e17c15ffc7b4edf5a20073de9786bc89897cf283af979af69868f88d54796ecfcc1763d4548459bf35c0900fb24d65e513e4d3311381ce8fdcfef3d
 MISC metadata.xml 438 BLAKE2B a9ef6e6bcd23ddb73d9a005c520caefb142d8351905f31875100ccc005a77738038aba97a4ca5eec19ca2986a9c52820e40be958053952bbfff174e01f57d846 SHA512 0d1bf03984e248499483ef6248f11baae42b253f231eeaca17077129fe9ca38af69e2d53c7b438c63217d9f5f1ca1f58a18fb1b15c7d161ebc94917fc90e8a5d
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index 4cb20ac8ed76..2cba9a7fdc7b 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 6316faf846d2..4fef69dbd996 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD pyalsa-1.1.6-r1.ebuild 641 BLAKE2B 2f6d9f3e05528bb831d4975e8b3ef080cd079b25678d1ff9c97dd37f83a9d8541d6638124f0a8a20f3ca8dd894a4bc49023399f2aecf6b1b18b90d2e3ed27f0f SHA512 627846024b4c01e81f7a9ff8f0dbe3d5a670de439d33c98abb399bed2da2cf449c82b48b8eb73a0facc8560f07702dceb0cf3dcc094b233eeee552ffbe44d0e8
+EBUILD pyalsa-1.1.6-r1.ebuild 655 BLAKE2B 5e4b2945515394fde82822ab96e5426c4acc779ba84be5d38a7f635a8e07a6c1a7eef2f56460331eea30ec5cb6d3bebb61daffbd0e146ba297ab23be79c74497 SHA512 74f8e716244b73daf4eba83e774324c2921ce0678538499383bef4645c7fdeccdf4dc57fce3fd2a47dc44be1bc962dce3e1520e1d43ca771c16aa207cf17f18f
 MISC metadata.xml 426 BLAKE2B a331832c36e0a9a857e46b921f5278ac43e16cc33113a1f913feed1935faedcfde22cd53210d7b197693b585c444b97f9fb3f16a4eef9df26e39f72333e1c215 SHA512 9cd209e26fc20a5edba5636cb915b7d6278f4f4a48485b8643efde6ab67bbffb5320328f54c6a39ce6fe625b07d4af2f2a409c2bf763f25237e98fb52a94a481
diff --git a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
index b00a9bb3b7b7..e66962bd42b7 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python bindings for ALSA library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index c9ff9825f584..2499b38417d3 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,5 +1,3 @@
-DIST pybtex-docutils-0.2.2.tar.gz 12556 BLAKE2B fac2d669d7e71fdfae75dceae847693f5af00180b9b18a4afa4724578c1bbf66bcf9e89d29f2923d457602602508008ad10f2620ae405322ddce23dfbbd3e275 SHA512 5659d148a71cd1adb7243d06a09872f2a610dfbc3d3bf00b2b433cab0afdf5615646c195a68ee74815b5770654f584b7a994f89d5c0482f4355fbfd925de6a27
 DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
-EBUILD pybtex-docutils-0.2.2.ebuild 550 BLAKE2B c2e4f7f9c86187f3b7cef9958b42520f581069ecebf66fb8eea66eb91862bd74db981e123be82c9d4212a42c26b2a48587e5e6fd4caf64b195084d8c6fd2c5e0 SHA512 b82b33269520d226dac81bd17693dedb4fc407cd67bca1d238209262e1e454031f880a18e4d68c94f0d014761379a1f91439063300ee3cd1dce3d9febe7c1e16
-EBUILD pybtex-docutils-1.0.0.ebuild 519 BLAKE2B cbbae5e244ac1fa35e72793e417ea929844bc1871e8e8070c1e38f38188d329f953de8e62e24269811d2fcf20ca54eeefd5588dc8e2ce941516406dad5eaf604 SHA512 cf105c7c72a509e9adea923063775492e3371c59a640cacb8ba557befe4bcb541b64682b219981083ccb0c87085164aa16119f320d80479743ef2b9cedd4e5ab
+EBUILD pybtex-docutils-1.0.0.ebuild 520 BLAKE2B 35d03debc750b593faeef4fe364db5d62c7904d07047e0ea276419b20916a327227fb6c2cfa4ae1c01a0f6e003f981cd6e451704b52137fee4f4c775f53ad04d SHA512 1cf47850d12c4f4804b5f884650162219305ca68d49833791955c4353e8c2938c9c75216390642bd5b8701cae1ffb5ac89a149fb60ed6ea7588b10aa8c672eb3
 MISC metadata.xml 427 BLAKE2B 4240ad89f3274e6c809181cf1cc798e2aa0eda209aef78f99f15a25de02277d33b430e1566dc849ba8a1e2eb65101ee8e908171c2f96f3c6a34fc72ee3bdc5ae SHA512 b7d4797d2e06dfe73609a4925c9796ced3f9efecb4c8faac4a0e2bcd7449f3e82804a8bd6debe1e898a869d7119a5d7b0de2e56b46ab1fc5672f4b4af76909f8
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild
deleted file mode 100644
index ccb4a22f8af3..000000000000
--- a/dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A docutils backend for pybtex"
-HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-
-"
-
-distutils_enable_tests nose
-distutils_enable_sphinx doc
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
index 450da88eb67c..180da6ee766f 100644
--- a/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index 42beddab6a63..ea62ee18196d 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -2,5 +2,5 @@ AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a9
 DIST pybtex-0.23.0.tar.gz 400649 BLAKE2B ae841eb98588fea55dea59a90be4ea5489b115b5594aa2ba7da140d529371c9275d28896d2b3b1d7fdbfe6a4bc7f1a99a8a73505f5d141f7affc0f22e5b08ceb SHA512 11b4c8141f237a25c320726b18fb254df077f4b644ac26fa2bf9f3d85c4301ab839f3544a3c1849243e75bbcbf194b25642b0ef11d354e3711578a4e19565bde
 DIST pybtex-0.24.0.tar.gz 402879 BLAKE2B 0cbb74360ebb4e9598543b17a46f21fab037d83a50ee46eae50dd385b981789d72c8cfb0b6c9983a3721565cdefb0df7ca15c120683e33204c591863be79d23e SHA512 caa3480b82012d1db5e44ca7fb5a4082e9aa27e892364de22bd05b0b589da3b1bd41eacd3cda8f86ce567b32ab9a22765d2d8d89c21936d4149d4511349c556e
 EBUILD pybtex-0.23.0.ebuild 763 BLAKE2B cbe7bcc848e40e2b55b9dc8e63ed0dba479accca9538676cb0fc23a40fa35d03c02be31796acda8ac2f8528af18ec74256989e48f9dde98c65a342238302a8eb SHA512 5bb9b9d14091f6aae1f246eac11460b33b9e4061ff159b52fef7ed7a5ec05aceaaa96fe8d2f7b79611725c2b216b8e0ff990b81c9b918394017c920114f42540
-EBUILD pybtex-0.24.0.ebuild 704 BLAKE2B 1a4350bfd74869b673c6f6e1087729be4f682938aefa28bb6b24c91426306078aee8b9b87d0289dd520ad895ca904e85b241cf194e7dc991d46fcce5eedfacb6 SHA512 98144f8fcd3738d2d5ede84c8c3e834a8d1200cd691107a78719765f46d6721211de9d7de32c1aecf6113bca0c44524a2c6b2af2260ac727997d3292b0881cd9
+EBUILD pybtex-0.24.0.ebuild 671 BLAKE2B 0c6a53ab7569a53da34e19922ee2d2034d6a0d52ebd19ad878fe58f70f8e7f8ffbab5b7d49575a797aab531409318cf5dbbe210ab905a7133d28554c9f4fb559 SHA512 746490efbc2a75014c16496d6ffbc1810910f47b21c6627864212e8de8d545007e33fb2652a99b667c82d82939d6afe82c0c50e2eb4d5755c7e7b55581a3dc7b
 MISC metadata.xml 552 BLAKE2B d2ad25afab203d540cb43364d63b5cf816b76e2c5f83aeba6a70fc8fbb38ca8c83ac43bb231ac138dc5df874b7f4777c24aad4dac4c30e8c58fbc502e4b29aed SHA512 73bae3b0aee3e77ab33785af0edb0c7ced7478aa8f8a55c54eb0de10f98dc6291913fa24d92e70243226ab479162ac3095db5aa5d6f65fe9d3316d2f39f5f198
diff --git a/dev-python/pybtex/pybtex-0.24.0.ebuild b/dev-python/pybtex/pybtex-0.24.0.ebuild
index 903359c1e9db..3c21d5769d29 100644
--- a/dev-python/pybtex/pybtex-0.24.0.ebuild
+++ b/dev-python/pybtex/pybtex-0.24.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="BibTeX-compatible bibliography processor"
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 74125c93a058..7a60f2b1dee3 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
 DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
 EBUILD pycodestyle-2.6.0.ebuild 897 BLAKE2B aaafde99a58df5a41fde3241fe3427af4b2798cb6862ccb8d15bd0da07035cf23a9e04ed6c48e600e7156d34b98596536ffc3d59dc838e987359baa7a02cdf6f SHA512 6907d9dcfb2611f2c07b56a994c0b75cdf0f4e7694060685071f1f8b1a82195d96b445c1675d235966bf39d02e1c74c9133d44f4b2d95607e58df6b7a2923b86
-EBUILD pycodestyle-2.7.0.ebuild 865 BLAKE2B 0b6e3060b185ab19ca089539b59ee664da59a3183c8f7c173a6bd2d686f3e059daa0a9fddb2e5b30abff67a83ba1fff5518406104be74ead5dd36466af668f53 SHA512 f8a9df27bc42559d9bd8bc049c1ccc0adc7a339376fabfa85c27be4225eac649d4b767f252acd66d76e26eb5afea3b6fb2cd666a01d74f281fb99044a8e13d6e
+EBUILD pycodestyle-2.7.0.ebuild 831 BLAKE2B f948d50648e7aa211aa58f22e882914d7a9e2fcab276acfbb315274c89101c4c2ce09ece1b3494236c8f66ffc61c3eb18e3775087c87fcfdea15c4d7e6d80932 SHA512 2e7dde07ddb3e6ba103631265255cd0d1753acf48cc24d89d1b3bdb627fcc9e88a7634526f37725cfbaef243b091b016c7e3b6aed9813d39fc05e9d868f1e239
 MISC metadata.xml 360 BLAKE2B 87e79216747cc8ad94f6862c47bc9dc89f7f2060f8386f4d7c8cc4ba27ac7da428bd90cb4ba063883e5ed158b82d50276579ea7201ce84bb165fd70018747225 SHA512 45f5de422ab2b65a88d3baa6c87411d4f5bb5adfd7c7d45fe1c28bfd45d8c3ab0b391eca1e5117c1301b32ca62ba023b04199ed5efe13b84d176004ef6ebe3ff
diff --git a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
index 716ff1b79602..98e490db8c49 100644
--- a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python style guide checker (fka pep8)"
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index b6d00c6bfd31..d5df57123b2b 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,5 +1,3 @@
-DIST pydata-sphinx-theme-0.5.2.tar.gz 2556695 BLAKE2B bcf54d1353fb8a46e19b738e26127f0109f1d837f4aa76e532ffa03d9cbc3a8183839575c2846f32621ff9e6a61331d62481af23e7d5e10cb5b3de060a419f18 SHA512 949e3e6effda7c2fc01c27d346a388c897a7bf035c83a204404279b6047a60382217e5520c3680faec1d0b91379c147585307461120fec630a5a11b9df451b19
 DIST pydata-sphinx-theme-0.6.3.tar.gz 2617286 BLAKE2B caac09add734ab3127461f3b54069cf9bbb22b00b54e6d0ed999ff6d7783f68d2d97bf31d19ce99bdefa0e1d754e6194e5ead8347d89c5d704dc38e148fff619 SHA512 0106accc2f7b64899d09d1da5b39fccd074732c07db78a924aceb403923b3d67cdc0592834211ab1fcc2788ef55616da63e9eb058a7909b2486006061b6d367b
-EBUILD pydata-sphinx-theme-0.5.2.ebuild 975 BLAKE2B 696f5fcfdd00d3d2db2b6fd38105c4685a0dee20d8b8ef94ab1e5bb899487dd7c022d0af911279a5f758b3657470c86728d5f50f243e6b3d118632dd902616e8 SHA512 f86de04c41b98ce98281bc4374a0884437a50da14fb337fb9ffe96394504cbec170b15c7615571f7eba10f50f2c21dcb1459c4d9f4a267d1ba1bd181d3703a0b
-EBUILD pydata-sphinx-theme-0.6.3.ebuild 969 BLAKE2B e14b29d67ee6ab7a1fe25ba9f4697fa951e9fbdfb282394d0f256331004dbc8fff9688e838fd64c55004ef11d91396ce28a83454161b8e00feb25c52cbbaf963 SHA512 9f52b4520aaf31118ff00b8761ec39e8a8468973664514baebd252b51a04149536eee4d51cdaa66f232dcad98453e05850215198342e37ecf3660e6b348fc3ba
+EBUILD pydata-sphinx-theme-0.6.3.ebuild 967 BLAKE2B b2c91676ff1b2f0294c8c13f79fed8ed95d5181b1ac8765df8cbe4cb45ca6da0cf88d4076b15e5e808b216d9a96aaaabfc894cc19d1fc106e9c4bd1547f46c2a SHA512 e60aeca079035b002659eca7cfecfc2e17fb87b239bc2c648bd78769025e8b74f8459fe6dd9be9316175a87c3e696ed614ea21bc4455009f391ec88825750469
 MISC metadata.xml 531 BLAKE2B 29ac12ff8537f67bd180905341f96eb0d1ef88b15fb194ae08c37894b7a784f66f97001e3a5fd8c522020322644d06b200029eeb22a9f4a35bdcf7297eb5c450 SHA512 9174d12f80cd62c94dba8aa34003291b074f3c859c98e223a131949d6b6ef061add5782d2503d1e0af99b923f95f18844652282a6787601a06524816760c9e29
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.2.ebuild
deleted file mode 100644
index 71f618f17e17..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
-SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)"
-
-# https://github.com/pydata/pydata-sphinx-theme/issues/367
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.17[${PYTHON_USEDEP}]
-"
-
-# TODO: fix this: Sandbox violation to /usr/local/share
-#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly dev-python/xarray
-distutils_enable_tests pytest
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
index f1ee3caeb805..b88251f345a5 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz ->
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index c4770bfd4746..244b22253480 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,3 +1,3 @@
 DIST pydot-1.4.2.tar.gz 272678 BLAKE2B 966f2c4ef3e26a63cc50ab89b5b6b5b413aabdfeddf994f2d5ba9dedaa1ed3152dd8060186e7380c3e768b783f7bfe1971cd600c18d1b73f7ac63db08ee3ace9 SHA512 caa8051561710129b5164fd1392da941829fd977092a6ec8b00efe7a199d2d60bc7ef13cb0e51615f384550f0fb80190d0f56b83d8d80d1fe372efb5dbbd3632
-EBUILD pydot-1.4.2.ebuild 864 BLAKE2B b5f7baacef1ee780c2659dd2df9437a837458ae8c2eacf404fa8dc7dc1dd391b67c4fb80d03628b47e46b1d5e2f729a27e9315aa44083dc9e380847a0e002089 SHA512 a401cef3578978ac2244208f117ff74f4b82d54b0dc7740748a7dbc6105f8d5918cfc1afd53a2964ab10d7a71b8499faa79175ab0ae544c1b2f05f1eb78ab42f
+EBUILD pydot-1.4.2.ebuild 865 BLAKE2B ca4166cd10c0742d6b9dcddda9efe3a815edcb08d2882a657197a4e7e1845b04d65bc9684b16da0e514e793a574a8a45f7983eaee90dec982b6923047b148577 SHA512 ae173bf0a0139ee258e1bf740165ca12a8f05fe853e7bca016dc974ac3747def350af437b1d1e45c05c7f25374a0ad0859a9e914d6c79db745ca8251955e0bc5
 MISC metadata.xml 371 BLAKE2B 2593c34d4b9be527091b66e955309dbf0212067a131283eb68fdde7d9b46e124eccf9d0b492a777ebae61d65b2ae72ed79f2729b51a2512af05a6b6e42f94588 SHA512 00e92e9c7ecbaf0e53463ba97ea63973786cd9948cdfce8fc3f4fdf5cfa3973b6a6433d5369c1d956085b44675a5abd994b193b66a07c09ec1a5eb2f78aadb1a
diff --git a/dev-python/pydot/pydot-1.4.2.ebuild b/dev-python/pydot/pydot-1.4.2.ebuild
index f50489b49e96..74974f560a28 100644
--- a/dev-python/pydot/pydot-1.4.2.ebuild
+++ b/dev-python/pydot/pydot-1.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index 562e66d14e25..6228c618aef4 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,4 +1,4 @@
 AUX pydotplus-2.0.2-tests.patch 907 BLAKE2B 387823545ea3b1372b6584a4b2daca756eb21d81487e3749309c155e37b21171e8e624d54caecc0b356a1456446a4e3b8340b5fc233301bc270fb3056571a601 SHA512 21dd557a0a94d6ad0e4932e01a97a450d76c0f7bcceab870b0ba60a2b96c711ab139fc682ca2a20da4c68b49fe37577763639bb77b9fbe28c7fa1281f2e5bb4b
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
-EBUILD pydotplus-2.0.2.ebuild 585 BLAKE2B 3d41c9d3aee7de0082e00bb1282505b4f9596893d1f06bc284e677c0e28aeaba72ee4acd5d0e4a3c13d62fd56a2b2a224dad1ac80e712b9f0ad6bfa74e9bdcaf SHA512 b3f1f3da9e5dd8db7fa7f0d76c1474fe86ff5cd04336338ffa890d932df6835384db1789bf52d39b4e2b2cb10c026dfb8d1860b4f167ea5157e5d7afe45dc40d
+EBUILD pydotplus-2.0.2.ebuild 586 BLAKE2B 3062f42c4fb51ae8c5f4c1e9c5693e518e89a322af632cc11bbca2ff012ea0c0d854aecd510a7ab7924888ae5b92ab3166b87f35b8cf82f9b573fa28884e7d8e SHA512 1360a195c6cf9725e1c93aa21d1a3c54352e41391288b7dce54195050d543e99a39d439acd6219a077b4566c579560782780b178afe5e0d142034670a270b3da
 MISC metadata.xml 641 BLAKE2B 9e863ac2660bc1c85b171ca98b3f6703528096e62a145c87c0d6433b849b69202ad92e82e6ca0ff5570ceb592ecb6e3f0158f395c164440a582f619845ac38a1 SHA512 7535da1f220bc8d12f565f7e5207e334670233b44f33aa8e8635c85a32d3ad4ef4ab8e7b588afe6628a77b7a4da526cb53b5364088f22c96da2749506fdc12c0
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index 20e6d1471c69..93ac855e6227 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 8066845e0c44..fd8db21b73fb 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,3 @@
 DIST pyelftools-0.27.tar.gz 3328795 BLAKE2B 74e6e17c68b197d0ecdddedba81a96601003c41a9c095bc72dff7630511705d36d1bc2732005a87ad1420c99497d729c5b771eca7bf5409c0da77d7b348d9c1b SHA512 bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a
-EBUILD pyelftools-0.27.ebuild 936 BLAKE2B f7b61a783849ac564906c68be47ebdea9a696255a0e0740a068638523a8a0836bb7cf821b7c38e6c797664268708ca14deb0f8c615d443c184e808fbda959d46 SHA512 2e27860ee40383236f52e6f7420e31ef9366fcca5817a9fe077ebe9b011e26fc64f5aa35fbf1326d012be85ff097370b4462c15a48d64a94fe840713d1658474
+EBUILD pyelftools-0.27.ebuild 936 BLAKE2B f2573605ceaa00c527d701581fbaec5315c60dabaf1e37ade2ddd757e420f1c316406db469591e94202ff007e1b7e639dee2f476683370b3aa5ebc0db62bc134 SHA512 4c01baa9d317f90549888a7ffc8035cf3e4e294ca041632973b0f7c6731d07b589f9eec02314937e1d884f86466dca5703b41021efc588e39254831fb8ef81fd
 MISC metadata.xml 394 BLAKE2B c89bcd4af21dcb7e2136ac81fdd480baa7749aee4ec4760a95192daed4b1db944e30ad84338a147cfbf56e36b7b8bcb3d7130c3261b7a34a24c6b1ef7539a9cd SHA512 7a09765be5f629bffc63e9a0ce39b84d3671a10d6a5223bc0f4d96ec3305579e7f872c708e744bc90e5d6a43d9c6a948fc4f66da3398b1c160325829ff714e6b
diff --git a/dev-python/pyelftools/pyelftools-0.27.ebuild b/dev-python/pyelftools/pyelftools-0.27.ebuild
index 7d4d5c852b50..030fad22caff 100644
--- a/dev-python/pyelftools/pyelftools-0.27.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index a7443f745eb3..d9bb2b54e95d 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,3 @@
 DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
-EBUILD pyenchant-3.2.0.ebuild 631 BLAKE2B 64a2b3bd9eb87a2cbd9b8278fabb0af061a70b0f4b0d8f8e839f84126ef43d1ae1d46a5bd2982ccde462cd11c55983a2d2f7c2239cabc689850699a15125c771 SHA512 68ffb3d0807952ba387ce3ce061a2536b2e8299378fdfe1d65911bd73d1df56076fceb18d96726349f553ff12f25e395f0d740baa33b81ca2636b327e25f90f2
+EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 87b17e54a5a4993a3607c153b015b64b081eb4d512f12d0fae660a8b806188c3ca372762f42c71fbcb9d2379e0c84ec67f5aa9f55e1db54e25f1e0d2169d5093 SHA512 8c7a4d1c799f2b7af00cb65e9edf831fd8a4b4a202746113e6325d03a0e76a1f65c9764511d825888846e5807e0478fc581aa885a129e9b77cebe98d474d1d50
 MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
index bd1dadd567af..2f74ed742337 100644
--- a/dev-python/pyenchant/pyenchant-3.2.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 430e24ddabbe..de79ce1060ad 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,4 +1,6 @@
 AUX pyfakefs-4.4.0-py310.patch 10794 BLAKE2B 88da28df915be0fc9416972238dba6bd109eb8cf91207db609a0c5cf7a7377d0c11ac5da8a262306713d941657183a4780d8b919b796bc555faaa549dc229938 SHA512 a3a84c09c55feb27e375f04d8950b6dfbbe48e57f41beea3c799f278f82a9cfe9c1ed6af1a4f2a1bb3cad8b421a6492895d6f29712be81ebf69e1c1330ecc36b
 DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
+DIST pyfakefs-4.5.0.tar.gz 198107 BLAKE2B ee055ba5e5b53fc91cfb83a29b6fe77f6ea89576c1f3f13e46cd71ddcfe81630f3639000de1ca14bd9a56bcf4a09046fce313f65722327b63098142e5c0030cf SHA512 24a4555b197d089c2a039354f693748415035a587d0194d7d6494b83b507db2dd7e34f748fccb18f151b2673f06ce290fab02f6eb56d2691d5ab72ac12b2b233
 EBUILD pyfakefs-4.4.0.ebuild 753 BLAKE2B 5e24605cbbc6f544344db431610089413798bbaba684b9b21932a6042332c103f8a28eb4bc80c9cff440ec434c9c55f532c20e046f901d64311432dea63987d6 SHA512 1a70326d1c5c6b456536e5987060ba581f4b4a5d0a9b147ef8e3e4d3a8f16879d91b3c06b2403f633fceac948da06609696833d390b2ab48e681501eea67e4d8
+EBUILD pyfakefs-4.5.0.ebuild 716 BLAKE2B abf1044d03473c964214f5f7e36cf36ea3390b486d54c6b078a9963b740e6454f0cd5cb94b50049c27046c3227725194ae7efd46af2e0800f26f3b4271d2ad0a SHA512 0d5a6dc807f05881c63147de4478cbdfdb5e7616e10ee1beb39c3590913acb3cc1d9be50968d592d917018403b1835b2759b9ddf8c3d37e7c29d7c5c65d5cfad
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
new file mode 100644
index 000000000000..ba7f47bcc382
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 4918a80fb572..e9b7470c01da 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,5 @@
 DIST pygit2-1.5.0.tar.gz 255958 BLAKE2B 696a4c39920e7f66962b69d2a838c55bfb6f96e7e5ee56a39aaa732926accc3bb6331042382fd22f377959cbc129be0320d94765d13db95fdb7c7f87a14f7608 SHA512 3f915c855ad08641391565906023d231550a38d4e7f8938fad4634a30e2ee1c81e2a0d3289052426e21d2c14814300a0f789eaaa9f3e62c3ece73cf53803bb80
 DIST pygit2-1.6.0.tar.gz 265798 BLAKE2B 8244cbcecdd9b9edcb8fb0cfbc2024f1d36a01c8a3e519e05770ca80d7a482393892bcbd4a61402e7622b84f02909a2a36b9767273d6322a94a15eb974fdb8fa SHA512 c051ce09d227b6ec0c7d3068b5b0220f5c150936d788462dfb3236c97954f9b76f6a1fd61cd42e604810582e3d1a5bc8784fc51c9fedac66ad1b42af580af494
 EBUILD pygit2-1.5.0.ebuild 922 BLAKE2B 1194e0c9d03c3fa228c6a42d7bc17ec367d412648ae81b6d25e018d159905ffe90e52ef8f517aba36a71d22291e3b346a92e6867eabb9ef4aa4345277dae2a9c SHA512 03cdfa2c18acfe175da8ed168bbc3202a20141fb3d2094261296b2ce172ac72bd94016f209ff9e4f72f9fba662339e35128c04e8389695269204f294bb616b5b
-EBUILD pygit2-1.6.0.ebuild 924 BLAKE2B 93a09110d9fa216f73f72be397c0503e9eedcfbe45f8acfb98176ef764b4fea25678be7b0f4022ca342d4f7df2ffea061124f820df3ccec2965bb0df84b0e2d5 SHA512 08228b42c0826d69d686f4ed19a77cd581ed248e68ca073d5cf2bf22bcd2bda06d419c12ac17e5f15d83b1d9627cf54af31cd88b49ede8fb43d7a3379a443836
+EBUILD pygit2-1.6.0.ebuild 925 BLAKE2B 3661015b79daa9bc00d7c5378eb1c540b1652562faddf85ee99ab2c3ec67d15eee66f00deb6ce0ee72e1166ace5dfc4992d478aaebd012f531d78f1eef403d26 SHA512 c1274ce98f9abecd8010e7bbd2a38f7b7ff94c12a9d1cc1a37c59761ef78693d359eef7e26558ea43cbca8725ce468cf2d8455ab06de18fc8ba2f906965a0abe
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.6.0.ebuild b/dev-python/pygit2/pygit2-1.6.0.ebuild
index 15da3c0f8d4c..b69f1d68cbe5 100644
--- a/dev-python/pygit2/pygit2-1.6.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 9403b3a1d8c8..089f01e1df84 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,3 @@
-DIST Pygments-2.8.1.tar.gz 4000119 BLAKE2B d88a3a3b4626a33c375b85ec076120e3561d1719ce45f9f85595bf87f7e813416be934f7ea0022fbfbf1a8ba3f2be1c76f693ab9ece5325fe527a4922cf46318 SHA512 223835c78615207ad590d364ba9a0f4bc9b5815baa080e60b9b71ce7b8e1ebfcc7a292d2a2b1cd358c08d820fc89e02c4060876d37ee17fd9e2759c9a0dcc80c
 DIST Pygments-2.9.0.tar.gz 4048049 BLAKE2B 3531aa35d875296694dcfea267c3922c94d73959de82a34329b7582b35c8b76310cfd364bf22066be5251ee61bff996e44d8c8ca82e9e34af879f3f2ba734120 SHA512 60a8b38e9ea941e4f10d1c4a547be81b8545202d11e2162c6aec0f95014a5c2f718adab8780017be7f49e1f220f731d57ec26dadbd543bfd6a8a7d016c01d772
-EBUILD pygments-2.8.1.ebuild 1240 BLAKE2B 15771faf474f253fc1c2911e5043b4a06f2a2c745c055b54af65f066c1324f9688e33c47aa3213d1c5209e9ab41e2982afedafa03d8ad0a3f297870db15eeae2 SHA512 55373c38baa2e28278b03fac78902e6684be3dd02beb049701de992e09c12f33c91c5d64bfde5e1aa84a3a3026c870e4806a725c75b310ccd92485fe1eb3034a
-EBUILD pygments-2.9.0.ebuild 919 BLAKE2B dac318b5c38525ef1bfc29d604fe343747723877f38bd61013c6e63385ae9d38698185848162fdb0b72c2eb82a1d63ddb2ca13decb39cdc067f3e14fbb5ec5ad SHA512 8834dd2e98f46809462a30fa93c75099efcd8b8b57cd6d0c90d62186870fa8a2fc64b39fe7f3a253b9cf9e8bd3f9c6971ada696f2400d60bb404d440e868b7ad
+EBUILD pygments-2.9.0.ebuild 911 BLAKE2B 8694c191296321ade3f7865aa83d44c7a8361f925784192e980b4fc00ae4f12e490c7566ab036135ec55dedaaaa140269422aa3f45f97de4689c8baa7b167113 SHA512 9dfe28589c5de1375b8e9eb1c3465dd0a04f6984af95372f1b361d66cbc76618362c1e86b0bc97fafa29b6c4f76c2d6b64e32872c73867c4889058c31771c1d0
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.8.1.ebuild b/dev-python/pygments/pygments-2.8.1.ebuild
deleted file mode 100644
index 353c3d255988..000000000000
--- a/dev-python/pygments/pygments-2.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-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"
-
-BDEPEND="
-	test? (
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	# there is a known bug in regex engine of pypy3.7
-	[[ ${EPYTHON} == pypy3 && $(pypy3 --version) == "Python 3.7"* ]] &&
-		deselect+=( tests/snippets/crystal/test_macro.txt:: )
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.9.0.ebuild b/dev-python/pygments/pygments-2.9.0.ebuild
index d5a51607e153..c173f9797cb6 100644
--- a/dev-python/pygments/pygments-2.9.0.ebuild
+++ b/dev-python/pygments/pygments-2.9.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index 926d26ba5f0a..02379baf0f16 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -1,3 +1,3 @@
 DIST pyh2o-1.tar.gz 7327 BLAKE2B 9d6b308d17dd799e2c83a191c346a3d78fc0a097de2a2fd5cb6277a1525992aa18f6c6b61b2c2503ae4a9e7ddd3575e092aef77a0e84223a5a2c702c0a808f1d SHA512 529fa4d8e9c477346fcbd23d7172d41de96789797f0e1ad0557f4c0bdaea8a519a8e8735845d0080cf171182874ce0819e76357ca7c7db1d62a9544f907095db
-EBUILD pyh2o-1.ebuild 502 BLAKE2B 101aa6bdbabc4d30478337d30e793c492df3b732843a68516bd07a86edb49019b3e628212819e77601ab9e6936b96b4bb4d7f66ed9732c280d5ff1d3da840a97 SHA512 497a23b55b1f71f7e7379c176815e9e067567f9b892b9687a336869320a2f85bdec20740237992ab705bc1f98bd0e38162bfd7a3c8635de9859a3d1f68bdb7cb
+EBUILD pyh2o-1.ebuild 503 BLAKE2B a5e471435ca681b6cacf7a4cf9f52e0454095e1fc26f48c5aa5d47248e068a7c2c881a1b4f831b42a0653ea17a67960cb793f6377caba3e26f969a74e017fa85 SHA512 17148936251dfe5c7ea2e8855f4fff6070b454ce8f3bbf43ab4d92a2683158ff1b33060b0f7d1cc80b03b6c7adbf41255029a6f72a9d291aa71c3397ac1b4626
 MISC metadata.xml 542 BLAKE2B a3847920d4b1526410ae3ee9a17350a12514cc7e0d0a41e6f8cc73167d54323782e545a8e6d0390602a9d76591f0d8dd7ef86b849c57e6ce62b79d9ef3e99611 SHA512 248321593c67549be80ce214c093cf5a9d07557d4dd4d763b405ec2198dc159aeacb27804b5f29e58cfb264c55fd5ded032b65b254a4e87c5c6fa63a399a516e
diff --git a/dev-python/pyh2o/pyh2o-1.ebuild b/dev-python/pyh2o/pyh2o-1.ebuild
index 181360fc9800..987ad144960e 100644
--- a/dev-python/pyh2o/pyh2o-1.ebuild
+++ b/dev-python/pyh2o/pyh2o-1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 98b91079332b..af450aea7184 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,8 +1,6 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-DIST PyJWT-2.0.1.tar.gz 57496 BLAKE2B 1258734d2cd5ca6a4012691bef0ae2a7d6539083241cde7ef27da155cff0808211eddd56b9455e812bae4c739f83fed1c6fd84abcc85208203d86e5834d5952b SHA512 a59b975fb465b44e4d84e3ef0380ed5107438e202e073238700bd700e8871098b9c59a849d157ade7888eef32609078571e2b8af09dca0752d7a18c370c2a0a5
 DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
 EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
-EBUILD pyjwt-2.0.1.ebuild 709 BLAKE2B 7dadb2bc6162ab45568e6b9abb55cf6a6225e30a4d8a99245913f2dce734eb347d62b1d6c66a58d9f39a547c4e253af8c070bf72ad78be6a152f531b0c72f903 SHA512 dc1315f8242059ff7c4ab32a785c26e907f824af0717b86d46985eddcb773294cd8cffc4646f39035e60d63dcabb4207e58f6c347fdb3b584cc036be31257d87
-EBUILD pyjwt-2.1.0.ebuild 738 BLAKE2B aa3a91f493e99df758e02b33343002dfdc58202d45ce544ab5e6e6ec2cf5bf0d4d86e929269c32938d702c87cd4439eed41021008d9e4cec5629129304c83f53 SHA512 0116569b0bb36b973b3ea64e4922e1b0439885d217f1a36413ccb6e7e891bf1d8a60571d5750bb80c1c9b68f4b2131be9e1d0b46218c3dc98d4858025a545605
+EBUILD pyjwt-2.1.0.ebuild 733 BLAKE2B 01c7e9f41e452673011a49f3215285f61f88df78f28433f0747613f7d1fac48e1b4beb87c9c676df086fc7b51e45403f72178511a6d02fa056c5e739ece53665 SHA512 5a62f26691bc7b0c70b5fd0bb20493630a7bb685484d96690300e7b5c54e9643f44afec54fcfb08f5d6519348d8920f3e19d6ec66a4e3a146de92ba5bb218c0d
 MISC metadata.xml 449 BLAKE2B 72bc65496c7061fe2e9033a92e89fd44efc69ad8055559891279f8ed2fc60fbfa5cfc06c536a6904408f8da6db3537d70337590fc9af3543d35bf9f6d0f482d7 SHA512 1712608360e4eef320fccc8408374c966d9ca611f9170cfbf7043c3782eae002f2d85e56787474c4e7f119b694019495faba3d4e004db18865337db87d290b55
diff --git a/dev-python/pyjwt/pyjwt-2.0.1.ebuild b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
deleted file mode 100644
index 7d5376775c47..000000000000
--- a/dev-python/pyjwt/pyjwt-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-MY_PN="PyJWT"
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
-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 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "cryptography" dev-python/cryptography
-}
diff --git a/dev-python/pyjwt/pyjwt-2.1.0.ebuild b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
index fe4664475ef1..9d131c5f8480 100644
--- a/dev-python/pyjwt/pyjwt-2.1.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!dev-python/python-jwt"
 BDEPEND="
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index ed0cdcffe49a..0a955e0782e7 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -3,5 +3,5 @@ DIST Pykka-2.0.3.tar.gz 55749 BLAKE2B 5da98dcc786c2bb7728485e16090b8dad7a96858aa
 DIST pykka-3.0.1.gh.tar.gz 59252 BLAKE2B fd0ca0742f3c372a5983d01929b34587390929fae28b70e0ee939f651f7655bb924ae08fac039225a8040c9bf523177af7bf3fa7c1db6ea1f04ec460cc3a1c6a SHA512 c96503019a190663cd4054c2488668143ff5d0d92b0c2d1ab3df577ab9fc9f0f2f575677a9f955a7b940e725d588c0caa6097515f1236df9a453fb3b0a2cb8c8
 EBUILD pykka-2.0.2.ebuild 615 BLAKE2B fc167ffc58b0f34729e86b20a9018229f0bc15b966931dbc8391a80584c5ddc32dfde4b77046d9fef4986207ab85b118b8c19d78236b848aea0ff6309baf7f58 SHA512 1cb8b7d4082a9b66f785d4b82d0aee100ca7ae7a4c6176bf8b9b7cf59d6cc430728607e035f62f9987dbc547fe0333f7b69d88f5a8228358c57320ff090e59ab
 EBUILD pykka-2.0.3.ebuild 648 BLAKE2B 295853a8ab55210e57732149f4dacf8073cfd9a20e56a97f39ff123255e295c1bac7fec93cfd676f50aaf360a25a80947c1e9dfbf00fa88ee61de78b6766fa8a SHA512 45c948675e006893b27369c8f308b537a6c287482de3608cc2882535b844b46ce2a3b149d520f69a2e159bea82d02761705d55c5a44a088537cfdf43d784925b
-EBUILD pykka-3.0.1.ebuild 677 BLAKE2B 92f7c30eda8e5c9880208d4f6c1b8259eae80aca6bf80361a02a4c34629aeb8648c6b3a7d25f2bc9f386f0161720e18e7b6a95f979a60901656b2ae9b7646faf SHA512 3e2b3fcb106658339169a7b78f27594a77a4cc9e2f2534b9d0e84ff0f177e49a09de4ca2be4da56eff3b58f0b6ff3450bea903775fc2d0138324650396470450
+EBUILD pykka-3.0.1.ebuild 678 BLAKE2B 1c0f1d8f6edf2e12dba53a00976bca7000a755e5ca16f1e727acf4808a35cb44dbacf5f1eb7923df0a4b506e1b245fcc7e2a72ad6e4e7d65cd8a7ebe2dd04d4e SHA512 b461bce6d611983e1323db1013ec44370c8a34c9fdef285f88788a87d0a4cca166a48b4883c83a901fcf8ea9ea74ce335b480bb6a22419cb4d84c980461aed39
 MISC metadata.xml 359 BLAKE2B e2f0a68605f91ad6a1239f96c9f7e9fe16a4bc822b2c9996989a3924e0e075d40ef9cf82ec0e6fc1957207e1a6a780b2f885f494357da4bed58a80cf80422fc5 SHA512 ee8b1752f919c781167279d93af37133f06610833603c9c837e84c4f24cf6fa4be66af29097eb738d827a38416d9dd373bc248c6669ef2e5d042162bce0d8f89
diff --git a/dev-python/pykka/pykka-3.0.1.ebuild b/dev-python/pykka/pykka-3.0.1.ebuild
index 1d0432f40a8c..36646a3910c6 100644
--- a/dev-python/pykka/pykka-3.0.1.ebuild
+++ b/dev-python/pykka/pykka-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index af2a321d8102..eda3de380400 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,3 @@
-DIST pylast-4.2.0.tar.gz 39761 BLAKE2B 35ab18928b2761255a25e2b8549fe852f28f04057c9fb1075fa223333d079c07340ea17d425695d17c0ec99d67e6e31ed93f6fe60df1121ae7c298cca99b1b03 SHA512 9c8c0eea0d3f54514ba06ad7da0868844f8dc53715717decb3b56772093e637673deb22ee4277e508d7e659b48c79733514c67c9af0283e8aa0032caeae3d44f
 DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
-EBUILD pylast-4.2.0.ebuild 711 BLAKE2B 835b3737bac47d829edc7d4582da4ce529e27270ab85611c530c90e149dcc872846dd23e2dd680c30d10afdb69eeba460bb53c9b435ef8993c2dfa0bb52d533a SHA512 1cc178693cf73d8ec07b9ec4100c2362e284f0376049ff8c8a0f9682410a3998a6e66b28717db4d3f107d18e821c54da3c1858b54ce3666f754aede9e4a7e113
-EBUILD pylast-4.2.1.ebuild 696 BLAKE2B 834c103714e715de0cd91214dba85baa5a7ae7889663827ed4e7d5d5190cb7ca840bf78b5c063d78f4eb81e41991e57c463c9f2710f6c23100c625611fcaf36a SHA512 7bbf4304265a6a5e8e3f794765412e614a96d3f30c6cd8b855cb5dce7da7d67b62be708df1f07aa0f1abd0d649f7160b421f566b31d95fa04ebeade234c15af2
+EBUILD pylast-4.2.1.ebuild 690 BLAKE2B 5067cdd191cab67f2c4a98e48ab623b6fc31cfb01b0acab07aaef8aef55a3e4dd929fc61bcb461d7f9bd476eaa0b615d798e6ab6b94c67cf7459fa3272ba686e SHA512 88c600e041f468c19050c3e423c9c179979ec9f67e934b46bfd4d68e986220c185f5f4c426a72f996f6a106377a2e242b24f0fc7149424d7a726109488845f43
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.2.0.ebuild b/dev-python/pylast/pylast-4.2.0.ebuild
deleted file mode 100644
index 86245446032e..000000000000
--- a/dev-python/pylast/pylast-4.2.0.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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/pylast/pylast-4.2.1.ebuild b/dev-python/pylast/pylast-4.2.1.ebuild
index 224d71ffca3f..fed80ca96744 100644
--- a/dev-python/pylast/pylast-4.2.1.ebuild
+++ b/dev-python/pylast/pylast-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index fbd1fc3e8a4d..00635c6c0ec6 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,4 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.6.1-r1.ebuild 1530 BLAKE2B 7b5f7cce5951e290ecf61f492ed4347f4d7d67245dddded3c736d0a9445b8b5af521db7038d846fc3277ccefadccf6fcf9fafcf795bbf4c62c91720e455fc602 SHA512 c3be2a47e5a1cd542023c3464268acad04bc2519ecb78b05293003b772ca211b8ff82dd9d9fd738835458a098d69724325fc2075363d377de5862d89c3d37f25
+EBUILD pylibmc-1.6.1-r1.ebuild 1392 BLAKE2B c4619b1f58bbec6e80f67ec508af2f3ffb3a8b27e740a3fb7d152c24d999ca2d0c8fee0373073dcc587943237564284e0d22f95330896954f431788a35530b6a SHA512 4ff24bd71eefb150ea7e36b2b0c30d8e33146538ab232e21487afee1e52434d2af1ed824d7d16c7e62df176c8e1ea36be2e1277c7f70ea161d2af47bbb6ae167
 MISC metadata.xml 366 BLAKE2B 6e4905dda317b44d4e8128caa80add619aafecef48be108207fb9e4a79f025971bcedb8c9617fac9771a703e14bc41b4014d2c105854b62b3efbbae9180d8169 SHA512 170d8b2b6e6ee2f667efb92a89302b52378efe79754ffc211958f256b9c316672a9fb7b57cdd139662232467dc6fb366b3130a2b9bce6f30e5c46c49d696608a
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index fbb1740f7bb3..a5ad94bb915e 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -20,8 +20,6 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/libmemcached-0.32"
 # Older sphinx versions fail to compile the doc
@@ -30,7 +28,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
 		net-misc/memcached
-		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 
 PATCHES=(
@@ -38,6 +35,7 @@ PATCHES=(
 )
 
 distutils_enable_sphinx docs
+distutils_enable_tests --install nose
 
 python_prepare_all() {
 	sed -e "/with-info=1/d" -i setup.cfg || die
@@ -57,8 +55,3 @@ src_test() {
 	distutils-r1_src_test
 	kill "$(<"${T}/m.pid")" || die
 }
-
-python_test() {
-	distutils_install_for_testing
-	nosetests -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 4d9db05cfef4..1760cb3b0f19 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,6 +1,4 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
-DIST pylint-2.7.4.tar.gz 715507 BLAKE2B 141506c067195422d0b052924baf87c363c89e28b3279f5173d989ac9247163184840251bd05dfb7dbb765f7b2e921a851fde0323b6c4cc231bc58911c77f692 SHA512 2b7ec9ab3325209021cb0282a6dacabf7ddd1f5e4049157610015ac8c11413471defc9e0528f81e1a60c2b259260f1bde1d04286776b3f32f771968b9866d734
 DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701
-EBUILD pylint-2.7.4.ebuild 1644 BLAKE2B acde8741c9ef9f8cf60111e492d3a8739bcade817ed76fe3b833996c3e0e53426f98dd01fbe68b20f912e547703d2e1a76917f682bed6d6d404ded96167dc6eb SHA512 9e337849034d6d683c13c3e0adee369af4de087f035449d3450f551b23a15bd0fccde719684f08e30c2976bcc5eb1a31b2b02d738a28d1d76587ab8d02e34aaa
-EBUILD pylint-2.8.2.ebuild 1747 BLAKE2B 243626aba4e5df24bb776fdf03fe04b9f9341f91d4767eb3da71678f9e704f019e8bf68dba584f07fa47faa62c32359e67c580645a958e61c1de5a399c3991bd SHA512 50ef3c0a64a1596ed2761a54b6bdafecc64eb7802307db6ee4a3c942b8fddee9d3e376c5bcb892f7fba6ceb9efe5563d6d1fd1d59f5ecd4579df2b66415047eb
+EBUILD pylint-2.8.2.ebuild 1740 BLAKE2B c1199f66ba7c0f97bd8a91b50d754564b953b23098f590c4d170c15ca0e8642dca414d973971986e9e2e6153dec9af6a5db0c67e551b9cc981c5a7bced2cd239 SHA512 8cb67e64d73deb35206ae787116a8f295c050ee6c9c1b496beace4f08b026e2b50ef6ce3c4c9579bd97b781b402cfb14467f92e73c679110d4aaf7a189b21ec7
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.7.4.ebuild b/dev-python/pylint/pylint-2.7.4.ebuild
deleted file mode 100644
index 950aa6531269..000000000000
--- a/dev-python/pylint/pylint-2.7.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-# Mirror requirements from pylint/__pkginfo__.py
-RDEPEND="
-	<dev-python/astroid-2.6[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-		tests/test_import_graph.py::test_missing_graphviz
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.8.2.ebuild b/dev-python/pylint/pylint-2.8.2.ebuild
index e47c80f8b64a..0b5c78e0158d 100644
--- a/dev-python/pylint/pylint-2.8.2.ebuild
+++ b/dev-python/pylint/pylint-2.8.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
index 0c4d0e2a6bc2..249fca122a7a 100644
--- a/dev-python/pyls-black/Manifest
+++ b/dev-python/pyls-black/Manifest
@@ -1,3 +1,5 @@
 DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
+DIST pyls-black-0.4.7.gh.tar.gz 5166 BLAKE2B 46ed7dc96b9f3b70edd1923133b39169b37f0d2d909bed41742690920dd7ea9b935dfa17b8d8f8ab43d9e3b3e18a99811c015ae5506e950e8775df8a34c79a83 SHA512 a68861a8283ab9118fa0a5bad6a751d5ece422813de12c98eba624d97742cf3f4e0b02d3afa43fb129bac00c54b9b2702bafd590d2d1489bd4af773ee68db7b3
 EBUILD pyls-black-0.4.6-r1.ebuild 588 BLAKE2B 5be9ec47d5b4874b489969aaeec5af60eace5bb2c3ed1388f6b3ef7ae4b7f606a38a16254ed2f46c1a996bdcb73a147affca934080eb3e35be02c6557eb28b8c SHA512 3f020431e190add9ee08c322634b8903fd702e693f0b4c234385142be66e22b3990e9308ba69c7f5861214c3d784f79fa182ccdc0cc1353b77e9d7d18b6747dc
+EBUILD pyls-black-0.4.7.ebuild 590 BLAKE2B 19ef9d5650f496c581c28c9364eaaefdeaa56b8bc510a165d60d67faa527c22ff13b1033897fee48bb6e183667f3e7365f2ea8f35303939794b16cd302df54ee SHA512 02c2e64ed715be64b3609798293349dc22bf4f60203d4edcc6f785e6264c5eba09364de8e8bea4a2cc9c4d3174040ffe2e514090570caae63c9c3a2afd0d3028
 MISC metadata.xml 412 BLAKE2B 7222f35dacb0ee8c88e71efc1f9c11c4f029f479102dc2410dbc0d61e7cbf129fbc76bfc7dc62f0ee784a02ff92b8c90f74230e6f00988d455e8f0266e39ec51 SHA512 6059d5f251b81ef9a2b29d379b3d19859e4f8f1aa8588044f1a36a69aaed932840cc9c200efcedfa7ec8f918d8cf1d9ce45b89d73323cb2b872a2e14cb782e18
diff --git a/dev-python/pyls-black/pyls-black-0.4.7.ebuild b/dev-python/pyls-black/pyls-black-0.4.7.ebuild
new file mode 100644
index 000000000000..825e437521bf
--- /dev/null
+++ b/dev-python/pyls-black/pyls-black-0.4.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Black plugin for the Python Language Server"
+HOMEPAGE="https://github.com/rupert/pyls-black
+	https://pypi.org/project/pyls-black/"
+SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-language-server[${PYTHON_USEDEP}]
+	>=dev-python/black-21[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index 0cd7860bd7f2..127a068fa36e 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,5 +1,3 @@
-DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
 DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
-EBUILD pymdown-lexers-0_pre20180905.ebuild 558 BLAKE2B 9f9f3c1a239fbdf3abf143926d83a8066b7b500c52b0410b31ecc49245b0b82b5d47b51a7faabf476b1f3476ee2063ee2d943685f8553aa0b8c11290356d5d1c SHA512 8eb46df0690ef63d4913bc06cc938b39bf01ad5862d51992112bcbce0d8258dcb87f23649b87fae1ccb8f97e2822303f359c06147833be6fa3baef0ed3651bf1
 EBUILD pymdown-lexers-0_pre20210308.ebuild 558 BLAKE2B d98ba583587cee81e8345731e11aff62a000d14c01f843fb09cf942551107fc2b026ee4cd31a2edab9796d0a6009dbd30523e21367fa2f6b3b0773de32a55a7e SHA512 9915aee7074fb0ca123f36edde001054d64ada8151a1127c2e6d801f624f6d02f55629ddb853cf29f8fcb4bbdb2c01ee75b839518350adf0db9d7bf5f5cecbf1
 MISC metadata.xml 641 BLAKE2B 0dae0d22b6178cbfc32aa39edae5fad524fca8a26fc1b2b38bb1b07ee3c7296a8161dab003b114b2df0532bfead33beef86aa113dde8f74a374d0cd45ffef91b SHA512 9cc74eebcb0b409b11ff6135a4940c3534d7309bf9845d0948686939e7769dd86dc963209343f6950d5c1273c0c6f04ed3fe44c6d4ae1ffabfe2e98af8cfd7b5
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
deleted file mode 100644
index ab51a2552894..000000000000
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-COMMIT="fa422cb95b794157760259c5c20a1235e4a459be"
-
-DESCRIPTION="Additional lexers for use in Pygments"
-HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index bd326e99e44d..69b4e25ee063 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -7,5 +7,5 @@ EBUILD pymongo-3.11.0-r1.ebuild 2642 BLAKE2B 3ab0a0f617a4aa61880829f1f507673a2d4
 EBUILD pymongo-3.11.1.ebuild 2743 BLAKE2B 9a4e53be028428053e1b8d7478c4e3e336488e52c75b667fe3f17176e82a9c8275cb9d278ed921bb54b3ef6ca66d7a3a9beaaa3b4a87805d5f2d7e42ff103691 SHA512 937fd738051a0cceb969ac14f26cc27867c874b0aeaabad7cd9cdececcb2bc960d0592a97ada6f55a50bb92a2ec4cfcefb43583ee46b445b63adf66af151df2a
 EBUILD pymongo-3.11.2.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
 EBUILD pymongo-3.11.3.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
-EBUILD pymongo-3.11.4.ebuild 2705 BLAKE2B 4707842fb826540fa9db06e305044f0252ddfd128d0acdf1bfaebc5d0855afb54c736d29dfbdba932557c8998b71a904d0d442960d6c8e029f1f3e1b70c00ae0 SHA512 7f7fd13895083fdd8386bd5493be9fcd456338b890ec745f138ceb46b1f6d0b948ec902994ac5d8328634634fafd868ce75362b4c1d8374c40b5e9eb0590c70d
+EBUILD pymongo-3.11.4.ebuild 2703 BLAKE2B 984e13ac067fb62a61d5fee095be170a528c14940e8c92e3da51c0d78cab3a236a61d3c0525767ee9fd62a12a1ae2e030eb7ffc653b08acf2ad5732aea21649a SHA512 b5af6cf77fbf13528331ac0ac398da829efc2c25eac94eae4efee77c3eb75b6d0a41e0ca586bc2d97c791eeea31bdc3b01ec80c69dd62d4d146f60a5c49dec94
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.4.ebuild b/dev-python/pymongo/pymongo-3.11.4.ebuild
index 8e7623f0e0df..e4049abe9d41 100644
--- a/dev-python/pymongo/pymongo-3.11.4.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.4.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="doc kerberos"
 
 RDEPEND="
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 851bf94191eb..65ff1e99c27b 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-1.0.2.ebuild 4159 BLAKE2B 751d7afc39728fceac6021f3d5e5e4d4e5d08ef77dc949e4b9159e67d1233aa8a21abe07a9b1a0db772b9d5db0a027028599b658d8bcfc57b07a8ff56ac4ecd5 SHA512 d94e7c93f6a5368f07858f201235f680f1ff65c679ec4f6120b2963d63dd8ba475913a63a1649230b244bbc77e0c0b89c283259a9595591b6300236303f84973
+EBUILD pymysql-1.0.2.ebuild 4160 BLAKE2B 3c7812f5774df3a45f5acc10cbeaa1cdf9207c2755d50767bdc1b1b92ee7d66ebd9602df586238be5d13989d807f80859acc7562d270ae7f244a2dd6d3f7a37e SHA512 9ce8fd728b4daf8e2501506bd025bedb119dea7559493157ddc66e4e4faaf4e7c69284f69968263a7c145ce1c21a9a857cde4465a904ea11aaa3d6237a73ac7b
 MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index c2dda33e27a7..edfdfad33fb7 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index c973f19ffa49..2d1b2b4afc98 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,3 +1,3 @@
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
-EBUILD pynacl-1.4.0.ebuild 956 BLAKE2B 70a3a0d3c903175271f0a377cdcaa754d93e23985a4dcab6da321f2474838ce9bc0b3a9abea3b7177ca6e2f4ae6c70108d66bf9eb676a065d412c52888a8c3bb SHA512 5e0194677104aaf68f97ae5eed4f6eadc2ca70216adcd64271d9680992c109109cdf05edbee50a43487c490ac7ef370d4787b780e13435cdee8252be6585f210
+EBUILD pynacl-1.4.0.ebuild 958 BLAKE2B 3fbdd55e12406300d859b15e6d2b9c0a07a0dbcb121fd529937f56993624cd0431a218495292f3771ec6299ae9da952f09868eeb31f4431d46c5cc5d471ecc0f SHA512 d5e3c98e1cf416240d82164730335df25b1ce3c7fb88e13a17814a6936d674f761943b1c02950ef428555ca1aad1f46c78e334bb8636eedb1614a9b981686ed6
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index 3783b2151cab..c99d963aa406 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9})
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index e830b0a1f62f..4d8a1a106cc2 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
 DIST pyopencl-2021.2.2.tar.gz 450053 BLAKE2B 577e328aa5999b499aaec759256b60c1ef5e41ad8d9e19ffafa9b1e7562e5f74f15f2c8ee344f4f2bd80c27375d6a303a813f80241932d22988f6afefa61d6c0 SHA512 ec148d5b05f8df62d35ddf85d156e75ef2effab6dfab12a998e8a79cb559313c5a7fc1b680790eeec12f4f31fb5af80e46c6a18e8b641b6485659a5c89758735
-EBUILD pyopencl-2021.1.3.ebuild 1458 BLAKE2B cc0a0ee17bb7c072098dded2973d6e13142797c6b867da34bdc9d1a7d6ba00f0dded0fc9b9a0ca48037dd2a0fd394338fa3a729153b7c09a653e1ea70f453b56 SHA512 42e47d1baf85acf94087fc0f23cb8660bdd36adfa8054560f10d5db45254fd05c72b5c523e75740b2e49e13613d6af3f0ae691b3d8f434e8e39b7b9e0960aaa3
-EBUILD pyopencl-2021.2.2.ebuild 1460 BLAKE2B 1102a8a5aed69bdb9ac19f8eb775731a5cd0aff8150abc6c6fda164c85f9997cb0632d4a190aac9d474814472bccdd0ac09320423454b1ecbfe1c0ba2eca039d SHA512 8152742974fc8e34b2cd5737a43edf9993bf5bff46c34000ace1b8b30ed49da5f9c842ba1f90f3c78e2a6f3f58ec8925d7d3c10ffc83746a793b971c9720d432
+EBUILD pyopencl-2021.1.3.ebuild 1491 BLAKE2B 627fcf87c2a199260cb4697729d7fffe01dd0da7e0146fe6c981a7e2673c97496bfb1d90fd5c7354b64bb7a7f871d46b692855db6111f9cb4f559595de0f90f0 SHA512 820bbe51273f64d1f5aa2e781e68baebbc6ebe014b281b3c477876442e9a218d3cdad26b693aaacf48fba07df450d4c754b7356c140c553de9e6908b6af6447e
+EBUILD pyopencl-2021.2.2.ebuild 1493 BLAKE2B 7d112cc13cbbc739e3381905e67af5fa82e7f837a2213d414bf1be2fe33a63182783e47a5aa0f781846e338646e24b95c6c4cdd429f0bf37e09f07fe53328f43 SHA512 3ff3ec895dc210d35a32f41e72e8e4dbe2a0f7a601e61f8f6428aae41a6543ae652e85e805d9d781aec3968160ef32142638bf1d0a04da6ff35e630cc0ae1123
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
index a08b0c4fd9b4..103b128915c0 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
@@ -26,7 +26,8 @@ RDEPEND="${COMMON}
 	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
-	dev-python/pybind11[${PYTHON_USEDEP}]"
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	opengl? ( media-libs/libglvnd )"
 
 # The test suite fails if there are no OpenCL platforms available, and
 # even if there is one (which requires the presence of both an OpenCL
diff --git a/dev-python/pyopencl/pyopencl-2021.2.2.ebuild b/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
index 863ef6a22457..a1278e628527 100644
--- a/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
@@ -26,7 +26,8 @@ RDEPEND="${COMMON}
 	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
-	dev-python/pybind11[${PYTHON_USEDEP}]"
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	opengl? ( media-libs/libglvnd )"
 
 # The test suite fails if there are no OpenCL platforms available, and
 # even if there is one (which requires the presence of both an OpenCL
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index b7f9e8e7208c..2bd1a2ab86d3 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,3 +1,3 @@
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
-EBUILD pyperclip-1.8.2.ebuild 1232 BLAKE2B 018f8c7b49a20b9a7c1069a207eb1d3671bba0435fa00ea52acbca963a963e436f2663b4120bbc8882804eef6bdb78f74f1a3c61f7a0285241abd9f1acb508e9 SHA512 8f9eb6d36e5e4e99e837ab9b51faedddaea7df81c8409400ab6fe3e8b8e48e6087bc1a84ce5c4db698f83b254bf9cf2024807095c670d8794e6ddd1784575443
+EBUILD pyperclip-1.8.2.ebuild 1233 BLAKE2B 29591d712524ed1a3d00d1718736f658dd2b2656036441e745ac39e7e86ea66b3a2a5d6392117e951810218666e7b3a8981b79784b2b2a84550e378a38ef145e SHA512 67c05024c71b7d066086ea47df4ea7c82b857b15c095e45db6d153196a66b9f775e77819918510181ce1ffc975d8712005bcdc08d3dd99c235c54d4a3534cf47
 MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
index 0a037995ee10..9211d0fca98c 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="A cross-platform clipboard module for Python."
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 96b0192ee33d..b7205ea38434 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
-DIST pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
-EBUILD pyphen-0.10.0.ebuild 675 BLAKE2B 20a3feab69e5de5c89552aec94a38f752f505a8ec1fd219f7a0bb63541f4245152be76a5d7e8f69fe56e4005de9802030c47b2db42e031cee453f9bc3b4c8553 SHA512 69f6b7d251e5ad1f5506baa54f3e8e65bc43489fde18a22190c0f4a838773874f87f98e407b217573bcc72af87e0a483bb40962c8bd13776baf220d26f71969f
+DIST Pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
+EBUILD pyphen-0.10.0.ebuild 515 BLAKE2B 0a1542e49d1116483571bbc7f6fd921f86646f1dbdf9741a5b5224a46796678d4442b9166818ac50ae8d6664d66962da3515539ee34d1b0fbdb96e567e9de494 SHA512 e68b9996049d39c91d52842b2180017f2a066808b75f24c59ed1fe46abb81b6acff6cc72878272fc64290cddd29d5d4bf4e458546555adf289649a079c5c21c5
 MISC metadata.xml 409 BLAKE2B 3ec65099621f94904aea69465bdc2163554677e4312d51f925df9d792deb790aa1511b0c9e8fa86a4416f083b1f8b0072a71b88480c46e46ebe30165f560a63f SHA512 4462817e8689c52a47fc71cf2f73204c8a0963bffed85fd803993236aa2d36924c92a232d0bee5b3153a6dbad85c5808c2cf42df5ab8b6bd585d5045650802a8
diff --git a/dev-python/pyphen/pyphen-0.10.0.ebuild b/dev-python/pyphen/pyphen-0.10.0.ebuild
index 99764ca32724..37507a56effb 100644
--- a/dev-python/pyphen/pyphen-0.10.0.ebuild
+++ b/dev-python/pyphen/pyphen-0.10.0.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-MY_PN="Pyphen"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/Kozea/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/Kozea/Pyphen"
+SRC_URI="https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz -> ${P^}.tar.gz"
+S=${WORKDIR}/${P^}
 
 LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
 
 distutils_enable_tests pytest
 
 python_test() {
-	pytest -v test.py || die
+	epytest test.py
 }
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index 51f1f3b763c1..639876ab9d0d 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,3 +1,3 @@
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
-EBUILD pyrfc3339-1.1.ebuild 532 BLAKE2B f3f6fb34f9594538a4f1914d2d19b36cc29f3378891949e608dec05e840d89d210c49ca77f516bc78a9f2b3ab0ab1daea74df63039ee71d4d6979ea6979c5317 SHA512 4c455ac27dea47f8f5f181f529e5564b1ec98796f8977f2d734d1c549a9cfab7f6f9fdabf467d6d040731625787bd6529d43247bde93c37ee6df9dd981ea29b0
+EBUILD pyrfc3339-1.1.ebuild 533 BLAKE2B 8b1bfc1848d4bf41b8f8db879c0815617c2de447d45e4076647a19747c0d197adf1f76864998bed1e093b68ee14f74640323e1e93a067bd71b75e8d9863da7a5 SHA512 457af5d53cbf7ff06ad7baef9b33bd8d32de85181d7ad33710aacec07871df7698bb2d5271a6344a790fd5d7ccc6aca2fdf0f9ec7ee516826d5fd95adae52848
 MISC metadata.xml 373 BLAKE2B c047241275de0ee6411fa663ffe331d1fa4cbccb622680120d5c1b96b4fe07ffdde9b36a67bd2708dfc086e893c14f071b51b3f1b292e63c9a7a054ea841a6b4 SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
index 3162856532f7..0c9ca2a10c78 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 MY_PN=pyRFC3339
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index b30a512c26f7..20ce43ea9fea 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-mock-3.5.1.tar.gz 29135 BLAKE2B f9eb37bff0965772919c359ad56a0cdd0cac24fa763685c42ffaa2dfaea183a9c0be480269cbfc80990baaf406021c541b6dccc09602e98c8f731bbd530e928a SHA512 28ab2f239d3dfee134dd4e4fd467109cf3c76cb60aeb537dbc0c21b9a7619d068d54737e33d98c585e9341588fdafba4737ea5f428af37796f55e61ec30373a7
-DIST pytest-mock-3.6.0.tar.gz 29795 BLAKE2B ac0a9ebf47ceacaa6f1e109571a15509780ca25b67f46a74710fb81e3af4cb90f4bf95e077abd9c5be803fed1a4dfe691f57f4b0d89fbc91cb91ed85fd326f9b SHA512 158614ad655545a95134335b6ca5ab81bfae57a045a6e394c4195d267e2b5cce277302036ad7e23e3c771eaae71575b901ac3e02a734714d63ecb50c11b9df94
 DIST pytest-mock-3.6.1.tar.gz 29933 BLAKE2B 6c22d23f3a8e9b5ef26f990325f5a2c2897b60f61f84472716a1f984e72a8c38f6992e439ef581d7772e25a5fe9e76d190697d9c7bc8b5dcbf6375bead4b3dc3 SHA512 50a8ffbac1b20b1962558789b24d50c1e7d8d2e2706ee15a576eb5fd1b40d4523482dce7a1078d532b686ff8d38b6d769d356b04241528a0196e14acae0b6199
-EBUILD pytest-mock-3.5.1.ebuild 953 BLAKE2B af318c499a1dbbdc22f44d9349b63869558eb92d035dca81c9599bfca4d5a43365242f63e57e0b81a21496982fd125e44d09d0e0cc4d80ab4cae48b4022a6dc4 SHA512 197716c13d3b10d3ba5db4b432a5a522649adfdf2badbe93f916afd9bd14d3b31427a94a8f213aaf22f96da49e69668598553b46bc28fe01ddfdf22dabed01df
-EBUILD pytest-mock-3.6.0.ebuild 844 BLAKE2B d026a1babf2abd7445c5cf8a3251f9fe41ef41a139f31f3ab3b294847ac2051253fb863ef3438176231c76f6b80533ad3e095e36d1b418325b99f5fba0c206b9 SHA512 5074a2587a5c90763476d364c011e5226d688b9811209bb89019445013280ba6a98ec104b2cdb7de1d809a28be1956150f440a6d655795f0c82407f1131e01cf
-EBUILD pytest-mock-3.6.1.ebuild 850 BLAKE2B 55b01509db49382aa9fc6845171a18cc711535d41f0434f388a38f5d6bf6e3bb8154220573524072221999e217ee81c565c7afa382f981ac66ec7ca3b9ab12d6 SHA512 278909c77d66617bcc1e32797a80abb386b100cf5e89b85423ae4599e4de6f7501d6f1452c91ca629126a8f73ec928e601d2920f85df7e015abce9248c46c7cf
+EBUILD pytest-mock-3.6.1.ebuild 842 BLAKE2B 1227954d87c158685aa53fc55c9653f7392d837d54eb439660a184bdbf365e6183e83f1faafcc8d120def8a6d61d21b61ecbc604a845d3969ee91be5785fb3b0 SHA512 54d63c8f1ee99db28af396d885e3da8296ce9e89e3b824e9332af8353d2637779f0d7a934ba1fb521121f1b807bd480e499b0ccaad23563eb91e5476579682f1
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
deleted file mode 100644
index 17ca5abbe94f..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.5.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
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-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 sparc x86 ~x64-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if has_version dev-python/mock; then
-		# test fails when standalone mock is installed
-		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild
deleted file mode 100644
index 074f1d7ea000..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
-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 ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	if has_version dev-python/mock; then
-		deselect+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	distutils_install_for_testing
-	epytest --assert=plain ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
index c5b380101e58..8f048a9f8998 100644
--- a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index e4421b0c17ee..887d55968977 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,5 +1,7 @@
 AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0e0886eeee5eb4bf447544a0f712e8906edc5ea62f60555917b97c143a4804fe76e5244090907abf51bf69f98c2893552115af64fd2 SHA512 ab68967a2f30acc2aaed1c8eadeee84283b469b3465c5e79d9c37ee14236ea0e2fe827ba83efa92d5d33c369298e548cea72f80109949426aa38121ba7edb45f
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
-EBUILD pytest-qt-3.3.0.ebuild 1186 BLAKE2B 170bbde7f87dd7e77d6a07120176087550577fab22b81749db2003b889ea33edfd0947493f2c3e092b955973dea63e3ed7ad43da47ab5a97da8175536ae50d2b SHA512 f2c01fb7fd902e11f20937d0abc947f44d2da84087cd7db5ade934e0bd20168e4d94512d3156c85d9bccf2bd8df8e64d713bcf1f0128c427d238364aca8a344a
+DIST pytest-qt-4.0.0.tar.gz 113333 BLAKE2B 69c2c8c823b55c44150c7beb0754e90866c7659912dbc0d99ee29904b0a20eadf26939709a5d120d0b95e23bcb99310415932e87934ae84571c55e3ffd07c284 SHA512 cfdde2e82b42979313d96f9a14bdafea0d4d5d5b64b4785ac73b74e36bfb892ab7b5ec6eb1c4e540ec00ccec6739e8bd9a3ffb610f204f6cfe97061f57a3971a
+EBUILD pytest-qt-3.3.0.ebuild 1661 BLAKE2B 8af76902d54c81283ed1627278746fd874a0bf91eede889ec3de5a0be397e8b9cc5633abd67466e6bc9508bd56c84da0b5c069d3dc9bf339dc11b7cecb51ee37 SHA512 f39627d2dd504df4601390d1a310302d3e132db8d27a8e1d801560c921a87754691798bdbe60cc7b9337417cef993229f2c7673f9c91da8f9ffd4eac8aa9540f
+EBUILD pytest-qt-4.0.0.ebuild 1615 BLAKE2B c30a0cfbed765d18c8b840a4776c8a328896bcb7266048cb8c4967f34c6085d12a0a0e5272e34e15fc4d7a7d98d7961054001125689f424ed95251bdb071b5a4 SHA512 b9e282f1e0645fca53f8346787d6e5775b8cf624eb7aab896631084b78af6bd5c303f12211841859d9ebf5ba646ec1b49563d076de65dcd68b6ff5a4bbdee22d
 MISC metadata.xml 414 BLAKE2B 841b7a751e41917fe4f3c672a196d41ce020832ce8794c2b5bc52f24061a3742a605550e7429791e940f4d44fbb035e026a1d665bca323a7c84e5b9c2d1615f7 SHA512 50fe7cca60f607561b5f5b9436d75365ffba1704745c761f6043db274f07e1a0065e6a7c107f3d4fcaf7b51837a872525a0f509bd9f55b96852ad9c2da41072f
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
index 9d310725f1e6..8e4e3f6611c2 100644
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 virtualx
 
-DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
+DESCRIPTION="pytest plugin for PyQt5 and PySide2 applications"
 HOMEPAGE="
 	https://pypi.org/project/pytest-qt/
 	https://github.com/pytest-dev/pytest-qt/"
@@ -17,7 +17,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]"
+RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+			' python3_{7..9} )
+	)
+"
 
 # Patch 1 skips a test that does not work inside the emerge environment:
 # pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
@@ -30,14 +38,26 @@ PATCHES=(
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 
+python_prepare_all() {
+	# This is not going to work since we want to test both implementations
+	# and therefore pull in both and explicitly set PYTEST_QT_API
+	sed -i -e 's:test_qt_api_ini_config_with_envvar:_&:' \
+		-e 's:test_qt_api_ini_config:_&:' \
+		tests/test_basics.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
 python_test() {
-	pytest_qt_test() {
-		# pytest-qt test fail to test in ${BUILDIR}/lib
-		# if and only if pytest-qt is not already installed
-		# test do work if executed directly in the extracted tarball
-		local PYTHONPATH="${WORKDIR}/${P}"
-		pytest -vv
-	}
-
-	virtx pytest_qt_test
+	distutils_install_for_testing
+	PYTEST_QT_API="pyqt5" epytest
+	if [[ "${EPYTHON}" == "python3.10" ]]; then
+		return
+	else
+		PYTEST_QT_API="pyside2" epytest
+	fi
 }
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.0.ebuild
new file mode 100644
index 000000000000..a86288ff3b73
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-4.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="pytest plugin for PyQt5 and PySide2 applications"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+			' python3_{7..9} )
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# This show window test does not work inside the emerge env, as we cannot show windows.
+	# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
+	sed -i -e 's:test_wait_window:_&:' tests/test_basics.py || die
+
+	# This is not going to work since we want to test both implementations
+	# and therefore pull in both and explicitly set PYTEST_QT_API
+	sed -i -e 's:test_qt_api_ini_config_with_envvar:_&:' \
+		-e 's:test_qt_api_ini_config:_&:' \
+		tests/test_basics.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTEST_QT_API="pyqt5" epytest
+	if [[ "${EPYTHON}" == "python3.10" ]]; then
+		return
+	else
+		PYTEST_QT_API="pyside2" epytest
+	fi
+}
diff --git a/dev-python/pytest-testmon/Manifest b/dev-python/pytest-testmon/Manifest
deleted file mode 100644
index fc3c3d00e51d..000000000000
--- a/dev-python/pytest-testmon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-testmon-1.0.3.tar.gz 44160 BLAKE2B a5b623afca30b8c03902a37c8ea56680691cf6a66979e3e3ecb00977f467e5b497ec58f2ddffa8d6993aa69d5c8614a342c7b52929193f0e7694b87671a94fd3 SHA512 1107836272517a390a3cc30d550ac3ebd2cf589430059d03b5c85a1db86276ce73044663c3bfc000e7d5805fc26d716bb26e17081ac2a46b799117fdc14a4df9
-EBUILD pytest-testmon-1.0.3.ebuild 669 BLAKE2B 55b90e77e19b75b58e49a32f3abb9af1834bd04fb7a65dc4d4948214daefb3aebe897442fb14a43aa574a1f9b62694d408360a990f3d6552612cc4397319034d SHA512 032c697b93e2f64efdc7b6aa32ba78eca695c74c470b41b0bd8570c7b8992fc7b1f297a562f71cc8b640e68e0097ae8c25ea60dd06d1e29cb85a92458b6d24b2
-MISC metadata.xml 349 BLAKE2B 9d17c57b35c19c2c8bd85b26c80d1e286c27a3670ec5a5451d634b529f12b65e32b2d1b556957be131a736918aac87674c768900008ca853dc3956808c62bc43 SHA512 f3117adc85ae38488b2e28d7916996210efb3f97d1a7fdf9623b2710ad9ec3f713c2a1f07ae6e2b136434ffed054534327bc5dde1a08b269711ed678de9314ab
diff --git a/dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild b/dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild
deleted file mode 100644
index 18df13a7d277..000000000000
--- a/dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Take TDD to a new level with py.test and testmon"
-HOMEPAGE="https://github.com/tarpas/pytest-testmon"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Tests are broken for version 1.0.3
-# https://github.com/tarpas/pytest-testmon/issues/158
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/unittest-mixins[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 1896bef0ad87..60c7725d82ce 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,4 +1,4 @@
 AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
 DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
-EBUILD python-efl-1.25.0.ebuild 1801 BLAKE2B 7bbbf964aacf5ef60e9e41aa324596ddc1890bbacbf9ddce43a7bbbfa72f45ca3be4575eb1be2be5a52eca43fdd5a843824eb0ae5fb5609de232d1859458bc01 SHA512 11890deba2b982840955d1bf43ae6d2a3e953314deb5b6ef2e86001844b25d5558b11d18aba77c955169465f4fabed8c606d368e3761ac871c49d7f84b77d756
+EBUILD python-efl-1.25.0.ebuild 1802 BLAKE2B baed68f8455bb510b5c330e5c74ecf3146d87736cba66eb1fc756d986f16c6b9c27cc89c2697232fbc0fb38059f54f411bd72af960ac927886c9a7d2adbeef54 SHA512 e9711ba46c3c6bc22f862b75a5008dc5cff3584d67044459bf8455689f97434bd267731ecc4d044fa4d08f925a14e9c693218a2946c9a52e484481586dbd7c98
 MISC metadata.xml 643 BLAKE2B 75acbf33cb36cfad418051c1ef0c4afc2906cbcad599ad13e82a38defbfdf50458582229ec3f04fd98bf834b23d20be8fd248b5a2e9853b9509e1e2065af021d SHA512 83cff66b4f08aebd492d61f953847098372c8b4a118fb8e20cb746b4fe0c6113baae569a462362dc7203c9d6fae04cead12ad6970547a951b75a8a10fd53f7d8
diff --git a/dev-python/python-efl/python-efl-1.25.0.ebuild b/dev-python/python-efl/python-efl-1.25.0.ebuild
index c185d4799631..a9b38a6c4925 100644
--- a/dev-python/python-efl/python-efl-1.25.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.25.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 1d1119b678ae..562bc66d8a65 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
-EBUILD python-email-validator-1.1.2.ebuild 819 BLAKE2B 02a620ac8f752d7f62728444f9274e6d527f0d495096607e3d6d18343ae3a3d455ff576ab31a8ca156029505ac33e20ebae096eb6b9e64d68b9794c17e040e6c SHA512 841904d5aac2ebb6aec8d40004c31b1d78a90c7a89f61fda50b88c19a10f174320ebe6ffe80f56216f9cd90ce410b55d46d68443782c3a0d063ba6e9ba3daa5f
+EBUILD python-email-validator-1.1.2.ebuild 759 BLAKE2B be5e83ca690f13620fed9d24409cfe6681da56d92f25e7a322259a52e76dec0faef382880e369eadb3be80ca54403cda50b1ac4585ec97b536f441f2ad4daa87 SHA512 ca282ca64be28ef0dda6e09330be562cb2bb650db7278df6cf760c4884ff871c564831293f726dbae8e76687a1e98b7955c85d2a21290a1bda1473d697444bd7
 MISC metadata.xml 791 BLAKE2B 90989a47ce58b16cbf5b74e25486f412928d166b122baa95584f0b211ad19e8799c914cfde81f531915c190aa3d29ed23d38c948395ab224a64a6cd13231cbe8 SHA512 afa5676ca2931aafc9e97fec3da47cb25b6b5dc5698910f0ab428ea713cd9bdefde826d8726fad67a26875ae317f330252bf838faa2c2d0dae9acf172911e84a
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
index cf39f0974502..a3419bc335ac 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
@@ -3,15 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A robust email syntax and deliverability validation library"
 HOMEPAGE="https://github.com/JoshData/python-email-validator"
 SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="CC0-1.0"
 KEYWORDS="amd64 x86"
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index a1ec665c2a9f..9c905995d877 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,3 +1,5 @@
 DIST python-jose-3.2.0.tar.gz 102183 BLAKE2B edc0b0e651ec63333345eb29e0c08649823d8c59e88e2f39127081a04c2afedee0ae1c83709dc45bd81f4143cc0e1e76d22117ea11160ab6418372c69f1b216a SHA512 f81e0284ef2df05a5b2dfc5448f3cce0c8988c4ba5d40f935666ee1693a964db3db62609a38192e317bab6b3945fc5c3122b59f373dbc308363d123ea9752efa
+DIST python-jose-3.3.0.tar.gz 126578 BLAKE2B d1279d2a0788b4d395e760ee3a1b2ce8c9340ad12ebe103cb1ba98aea33566cf0134d5af75be9727fff96adab4fc88f1b471ba9ea7d36c16de10587a9efd1304 SHA512 de7147cc6e12406d6e459c32829acae46395acba727c53e65bc05f4794ee3050eecd355e3ae2e87f4ebdbd871f53822eea08a10f25d7ca6088fc6128dc7d9637
 EBUILD python-jose-3.2.0-r1.ebuild 1252 BLAKE2B d2a90b8cb648ee500eb53e177793101d5b6bb3ff3b899327fed9cc34ff27e4f7028bbb0d3a23d14373279aae07642fff089e3a2dcfa593492ca7a30fff2236f6 SHA512 fb8e25206927f2df6513e022fd2633cee0eaf709d55410eac69555a906161d5a41df96e7d8f4072d880631b5fedf22ea76b6dc8211cb59271d4ab93932792dd4
+EBUILD python-jose-3.3.0.ebuild 1045 BLAKE2B 05a04f299dc5c336d2ce2df7658453fc9137d13823af2cadde8b9ebbd001c9739109c38043f6bebb4bf64acc5554cea44fff7014a0347bce2d8998f0da4a1039 SHA512 97978a1ca6885f3521486411d5286c25ce21957a3ff81684316e3fde1f53fa3b5c9b4655eb086b6839dfc7c7ce8907c31995267393e441b2fc3937d707f779ae
 MISC metadata.xml 569 BLAKE2B ded16eceef718c98d5b51e15f3342262f07a57626e4f83cc851d0505112938351c0cb01e74bd9ac2bd190b2ee3f1ef4c5b748e37c7128e9b1861a48d2fa6e3e5 SHA512 9d2dee6efdf0bf24fdfac3b55a213331ec0696e58f8f101758efca0d56477c666ebd0184a573ce53c93cd00047b06d33f9bc4de33a43f96562f77a8c21a65747
diff --git a/dev-python/python-jose/python-jose-3.3.0.ebuild b/dev-python/python-jose/python-jose-3.3.0.ebuild
new file mode 100644
index 000000000000..5623443b5629
--- /dev/null
+++ b/dev-python/python-jose/python-jose-3.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
+HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
+# pypi tarball lacks unit tests
+SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+# TODO: require only one crypto backend?
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.3.1[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	sed -e '/pytest-runner/d' \
+		-i setup.py || die
+	sed -e '/addopts/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 6a9a8a4c6de2..2c6374804614 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,4 +1,4 @@
 AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
 DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
-EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
+EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B f9c096ed5ed2c0c762c301431193ed80133ab21c09b8c26187618f0b70a83dcfc1f4d665e452bc9ba694dcd10568db79786b7d0968d2c9955aea11c01e3ae147 SHA512 1a78d051d72373ecf324abbb6bd1e1c0bb8120c5c3f32208e2062cefc781b936802defabac414699518efc3220359630d61da6d4674cedeb5dbf0954461cb662
 MISC metadata.xml 366 BLAKE2B e8d4fa851e8430fc170e86701301b78af07fe2619a749aa5ddb21bca3faba59407bfce4e727b2dde95c52b9951725b2367c560eb3479de48ab5052f6c30ec222 SHA512 1b6b62d650e143cc4c0de9047b541489f9db4da3fd654e27bf8d8622e428a8a3e587ecc8bbaea8248e964b2d25c28d6ceb77be57f06704bf90a2f6baa18c4f4e
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
index 5c641f31ecab..f19ac1fc6571 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-lsp-jsonrpc/Manifest b/dev-python/python-lsp-jsonrpc/Manifest
index 54d1c1b4bb19..8736b946e4c7 100644
--- a/dev-python/python-lsp-jsonrpc/Manifest
+++ b/dev-python/python-lsp-jsonrpc/Manifest
@@ -1,4 +1,4 @@
 AUX python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch 342 BLAKE2B aafe30896b88531102ff79900d845a24a506ff8d0649699311e77f9ba6742f591500e2cb83a2e5aff3118a1174819b2745a8f9ca6919af8b84d379422c7e06b7 SHA512 baaa0105df9906d451a9870c7f0ca5980c6b667b7d8c4fb4f57a0fb3bfbd3f2b7502cfeea7f2abb041c2dcb344f6f5ef69822d82daed3de1ebe4564c812c7430
 DIST python-lsp-jsonrpc-1.0.0.tar.gz 10011 BLAKE2B 671490d439f10eebf2d05f221adad25be6f881f4a0f4fa975d4574937a951d4d0bc51264a9ec67d3ef5d112b6e025b551685d3e3c2b959c4a6bcef92d46c5ff3 SHA512 447835fc6c3810f486d80f85295089c021b792843bdf88d461c021b8b04407d8f7e6a99c07351a23658a5dff46eb475bc64e51bdec029787cd33330b54d4dfec
-EBUILD python-lsp-jsonrpc-1.0.0.ebuild 762 BLAKE2B 620309985c6db4abe4e06f7bce84700ca497bda184d7c7045166b69dded1e847ecab5c3e13803966c8a2adcad186af2502e4f547291425bc1cba825279cd0db7 SHA512 4b834e2273e7fa7b62b07042503779343b14f94c02d1fff98a6f04e7675767b1b425146d88dd501e3a209a2af5cf2e577e2cb138ce0ab5c3708e895d21f868e8
+EBUILD python-lsp-jsonrpc-1.0.0.ebuild 763 BLAKE2B 7881f6fbb215e7897844e0c718a192a0cd402deabace44054c83d602a9c4d0cec54bc17870926d2058d00b93a8497e341313c794e5931692a40a45e12dce4268 SHA512 3a2a08b68ac7615c8144d686b99f1fea2dff61e7814dc62d0927abd20c441da129b3ea7ffb040f6d8b1045e246e01ab6422d8b845bc67469649805c8e4a734f4
 MISC metadata.xml 464 BLAKE2B 604db448396e6558c6a65f823b25d5d1866b7558e72c96d4356488f002c3c27dd50c6a3a08457920a3f46805b01102e74ce6246c3c3686d686c722418e13ce14 SHA512 046b237e0b4b4cc0d19d58ebe225ded113b60704c190d5de5dc4a47cde24b7a539fe106dfc08b71fb3c96592aaffc10bc842d5f506726d65f1d024020ea14a25
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
index 3e5baaabbc49..221dadbfb973 100644
--- a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 49e201030953..65bbbccac0b3 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,3 +1,3 @@
 DIST python-memcached-1.59-gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
-EBUILD python-memcached-1.59-r1.ebuild 1178 BLAKE2B 74ac3562ddc0e7e0cd4e0a93b9e8dce3edf36102b19ed851e87d93682783a52b1a3f25ee3ae32fd9a1fe206d2c763bdebb54b9708b644ed38397bd93b4ac18b8 SHA512 42a2329209eb08ce7c70e7c340721ff2b9eb856fe0f8dc0b9b83f6b8270119f49501fd2ecd2738f599f32abbbaae44d2dba0c39f843b9a72724dc04c41d97a89
+EBUILD python-memcached-1.59-r1.ebuild 1179 BLAKE2B 7828ad5790de4e108da2ef8ea258ba43565aca3ded5013d7ed081f4f7d238bacd351bb46e92b4208a8bd56f60ff4b41eed819df19d011cf18c22333174a334c7 SHA512 3036c6d9239416658a36a59f92d3b50031dc7b1c843422e1785689378dac74855bca47f5132f69a02c0339cad803ae6ae1302e3c67a9c4a58cde965ff19916dd
 MISC metadata.xml 782 BLAKE2B 6506e418ce0a8dd57b5dd28079c11835eca101dfddc45ed56bfb285a34629870b1c38656a970097e5daea4ece3818697ffcd6b6df25542b3574992c3a7a83874 SHA512 500520b008a5e8a135fdf8ba4d646bdb489cfb9df82b18e983926fc05becea4d69cfe2e6c8665543aa81c2ab9a576ed9d8b693b83af3e86399126530fcc47e38
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
index fc8e95581f5c..cebb6fa891e1 100644
--- a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index bc934e982d96..cff996c1e660 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,3 +1,3 @@
 DIST python-mpd2-3.0.4.tar.gz 66173 BLAKE2B f92a97512f19ac5f71846d3997240e5a37a4fd9bc353e131c582547ddc6e9520d2d09a02b4de62168707ba4a2cbfc28a019cba7e0a113242ecc38ecdc86c19a9 SHA512 7adf0daf64c6132dcd4d347f0772e9cbef903f9f5fba5315b745708dd2179090f53c5303b7ce905c685076861d21f7a14951e598c88eb65be423dea627dbb26a
-EBUILD python-mpd-3.0.4.ebuild 960 BLAKE2B 211e523be26b5918452ee80ceb7dff9b8fab3acead23d7d788f5445eb5cb34a90e9a73f787bc140b4056e3af23855e9ccd4eb4f46943d30923f3f34319c8594e SHA512 9cc43f289f6f88df17dd8b987af1cef59d293790e1022fff515d14fa8663f71c4894db0d5d419161ff083d76df54f5c46c84ea0a051ded8e0ea2b3e009ba4114
+EBUILD python-mpd-3.0.4.ebuild 961 BLAKE2B 8a1eae8e84e32597a14f92240182b5cc23db227da7870620f4b1a2aec001a47ea84c928d5775d12cc7e248f0ae0007eb59d51e58eb33baaa6a32cb3ef821e3a4 SHA512 44cb7a26e97d7b9e3c5738b1785456fff21d7b3e091f6b0e9a03254479a8505ec874d1590285dff006091916f02a6534707eac16ab838f2654510d23e20d18ed
 MISC metadata.xml 463 BLAKE2B 9f711c66d5ac55f12770a73ec22e9f444ce861532624a17efd2ad8e31bbb77eee4d4608a8bac331eef5e9da009a840cb03c4723a5ee52c547089c6c61a248a94 SHA512 98ffedc8e05168b8a2a0e193655c20d41e40d69e652ca0d443c932f8c35630434e93aa76c2a03029c96f2c96f54c432c384ece12c6645f8cada73f8a76263710
diff --git a/dev-python/python-mpd/python-mpd-3.0.4.ebuild b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
index 6c748ccf6b0c..9136025300c8 100644
--- a/dev-python/python-mpd/python-mpd-3.0.4.ebuild
+++ b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 1751de9563ec..c2d4fae1aa12 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,9 +1,7 @@
-DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 DIST python-slugify-5.0.0.tar.gz 11730 BLAKE2B 0ec93c230523bcd4ba5f917bc9d2676ae92fc164eccc84198777a59c36ff427fdb7a242bd89f9bc3d24e86b5a1d106f0118cf118349de648f5779c384445abab SHA512 b29c542ec3cb3d05d88be0fb53909b160022fe97dbc89efc0eef5f4e2414031026f570dd6eec1e7bbe2930d801c2fd8d152e49cd2639cddb23392c9b11e7266b
 DIST python-slugify-5.0.1.tar.gz 11706 BLAKE2B 1fdffd6fb9eaec13a1ece65433c53dbcb35c5ccbe2ebfb07055acac4d9a7be1e0832535aa6f335ae7eda5b07b823a3b4d63ef1f95f220b5fbf26c28dfbe62ac2 SHA512 6c52d6242fb6b2379e28b074987b474111527ac336dfa673828e5283347cfc52e056d9485251cde90493ea2389210701f566ce01916ae250d76549aafbea75a8
-EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 55ace80e2b6c0f3b22ef75356bdd0d0d885edfa30fbb2022fb0839fe42ec968cd4331a08d081fb81ca39c10b4a506c052893addda6963ba576e3e99eae6092f9 SHA512 0b6479877191bfb5513a86fe807fcd119970f88528a138c5cb0574008cc59e0f9265df5c873061023b1b8ecd1000b95aa338c3a13dbbe6ecbdcf34dfd2119933
 EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
-EBUILD python-slugify-5.0.0.ebuild 553 BLAKE2B 90c149312eef71c8db52891850c199418ae2f3097ae0b8d3853ad09765677add2301952dd6b477ae2d930a5e91ef8a481771fbaff729bc5d370675b1ebc0d1fb SHA512 525dccb2f2e90eca20a16194bcf801cea3ad83886fda41a90afca16916826618ffec8faab3da3b944d7f5424324bfe76eac42dba4eb9227247a4c61b31b99546
+EBUILD python-slugify-5.0.0.ebuild 551 BLAKE2B ce836a2d2efe83962fbefa12a753263f51e2af6813e280f1474d75d262ea4744329d11735d4e33be1e09dd2e7290f41c2bb0c195abde9b34c9083663857e3fb4 SHA512 032ace168d060e3ac2758f83e759dae44d5da1d8edbb53e26e04310e09265b187a15665044e1b59aff95c588dd11b169eccd31ab8f805ef1f1ae759910bcd057
 EBUILD python-slugify-5.0.1.ebuild 535 BLAKE2B 547b6ecce9f1fb3da3cce0349dc5ab5ff4a578cbd89b0eed32176e15650ba364ca29f4ba650b60feb4f63c22e7a14f71642f30f73995b5de1bdafad6e53c8de5 SHA512 98c181fd8dddbff8501c5bad35cd50631908136f87634c04eb2f50f0d4aed2eaa9fa6ae7380b7d5c1e54381bbeb10448443ef044cf67098b1180059928026ebe
 MISC metadata.xml 636 BLAKE2B 67238b65f26d08870b390e38a5366992fd40770f843201ebc930689a3e0819d2446e4dcb9b7b128873ff05ad964edc58b478a4134a563669c718fc890337b054 SHA512 144bb0c8a9249471ef29f015d18349c0a142426b28fbcedf21f83fc9b66b5634e3f1a2e7aa53544d57a2045ca3cf4eb3b76f07f8296253517c14f9d6f8906d46
diff --git a/dev-python/python-slugify/python-slugify-1.2.6.ebuild b/dev-python/python-slugify/python-slugify-1.2.6.ebuild
deleted file mode 100644
index fbc929a54150..000000000000
--- a/dev-python/python-slugify/python-slugify-1.2.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/unidecode[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-5.0.0.ebuild b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
index 165d16f9ab9f..45b50603863e 100644
--- a/dev-python/python-slugify/python-slugify-5.0.0.ebuild
+++ b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index 46e8c99c71da..1289ea54b151 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
 DIST python-sshpubkeys-3.3.1.tar.gz 57896 BLAKE2B 3212ea0c38377255258a831cc942f71c0b0efb040ba8ca3283200b638dcae7a31ad5763ae0de4f51a7ae0c3f0a1b83ca6db96f00384ecd1e1e3a369028e4ed41 SHA512 8a59e73eddd795a71b64fc7433292ca03a9f447a13c8ef40d68fc599776c37f5e4a1fdbbf2f2ab00b0091a513e2412f213f6a21474ae0784af2df9a7107a2ed6
-EBUILD python-sshpubkeys-3.3.1.ebuild 576 BLAKE2B dc0a882dad0e9d646c7b242996360ba00aca2917dc2dfa8487669ea4283e81712c74d9941c3ff6d693a8a45a70564bd57468580bf07bea1b170e89e358c0b3ab SHA512 1e1caf7f070901f3a89cddcb4a5ff83297e404f8d22dc580684df6fb33280cf5be8d6cc8d60b96169fa9e8ba40389c68cb5f868250d1d47d2d170bb7026b06a1
+EBUILD python-sshpubkeys-3.3.1.ebuild 577 BLAKE2B d6569530895baa4c11b7a4880b1247d557fdcb9680bbd37219791b88df9e1805286435a0e533afe93403dd9004ff94aa3996bf53aaa8c22e7c9fa57da79e5fcc SHA512 b0e4a09bf19f9c98c407a0589a1e29095402d66b666b07851eafa3c35ab47cc5ad6476346a7855a508c6084ec043422c64dcc0a80921e21faf0a439b745e4128
 MISC metadata.xml 511 BLAKE2B 1c456477ba1082685b12f78dec6f05e32b217923e608d2c62e0bdceb3ec1f695852e6d584657888d53c313f6a2ca444bf25709fe28a246acf28f076972a8e6fd SHA512 4180c2dd2bdd77c3df2ac08863e75b5e459738e71fe8c98f0dd44d267ea255a391796a95b52e9d53a0c0ec792927fa31bbfcb225577471da44805c117766c5c9
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
index 0d5b72ec5ae1..01188691d4ca 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="OpenSSH public key parser for Python"
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index a7a4fe2c37f0..77a63fb29e46 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,3 +1,3 @@
 DIST python-utils-2.5.6.tar.gz 14057 BLAKE2B 2f66ab26cd6cda25f73c9f40081048404cde819e3e3c2fd11d134244ab2b80a05ab2b943e56a45bd8656bf3ba231853e3bfa9efbab9cb70515daaec70f6e0715 SHA512 35299880afdecd4a44144b95e6b2073e51680dfd2b00f31fb333d578cfa2c2f8bf5f58128cab88a7b81e658e6d5dca303f1c9f5be3870160679e1defbf94859e
-EBUILD python-utils-2.5.6.ebuild 573 BLAKE2B 42513b12949c4bd811d2cffe09d75af35c2878616dbcc12f012d6bf54e5212af95be0563fbaa722b58cd8ecc85e8ffc38fd91dfba875d376d60f388184d695d6 SHA512 c545c6985f162c307ea9f80ff44ad3a2305a483362cf4dabb42832ba313da2b2f88c2852e595578ff6b72410426bda1b31bdd79bb72035cd443f85129622a2f3
+EBUILD python-utils-2.5.6.ebuild 574 BLAKE2B 49716b98a6d7a997149be3fb8b0daf5386c5ab180b9eb7c022fff18c73101314807f498f332db2a6b555bdbe67be68bddcf48ac28860727baa10f2c54cd1ea6a SHA512 6a91b1a761fe2f60d6810d6cd3b676dfb87a34982be3284a7d74fda7794874f358fcd4e97b89189e0db4839d6b0f126889abca8c0b6b926fc0db33c3849d3201
 MISC metadata.xml 445 BLAKE2B a847943e498e81c625bd90908ea97d42ce4054cbb4f9a2bf525a214b261cd6baea9795b04ca88443c906c937647b50db5d3731f2a6b6740f3301de6f6e45d8cd SHA512 bd6c83e0495c326af8e74d6cece2faa6914508f6fc0edce4003ca116880e9730f9414028918a389300b494d77ef6e01a3652e7e2620221e1606d39da3901df18
diff --git a/dev-python/python-utils/python-utils-2.5.6.ebuild b/dev-python/python-utils/python-utils-2.5.6.ebuild
index 5d9f9f144eb8..d2324bc13666 100644
--- a/dev-python/python-utils/python-utils-2.5.6.ebuild
+++ b/dev-python/python-utils/python-utils-2.5.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3)
+PYTHON_COMPAT=( python3_{8..10} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index 0f3a3be4c2aa..e6e108a12903 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
-EBUILD python-xmp-toolkit-2.0.1-r1.ebuild 1088 BLAKE2B 3ec25c195dd264c4a9c0a05ad005261165978b5d40eb936216c2d05590f392f43cabdec1d958060b803d724c1fcb4b6dbb815e2336b699e85173b416811786f4 SHA512 1e3a31e62319f067c1846b3409fd2958010e636b4bfb24475a896e679556962066bce307c70a481fa12f88d004e718e0817735e24af0d51e11c6e514ec8f7785
+EBUILD python-xmp-toolkit-2.0.1-r1.ebuild 1012 BLAKE2B 303795178f2d142e10479c62be2b4f998181d0c67d2927a7a804ea2bcaa0e9d501733088a26970151f9173e59cb925607c49a9a96bb9fff166735ccef1ecda5b SHA512 6e7151238e7532857ffc2162ac79194656dd762470867e39f12bdb13443fc3533eebae3cbe56d03db08769c4553cab613bc4156aefd73c41610570fb8ec1fbc0
 MISC metadata.xml 416 BLAKE2B 5ef9300ed19a8ed256dd6c6958c2350526d5946893c3346cc17550d15754030315cdae84355872f64e09e890a4dd2da5742f8ded5945e3d4fec2f569cad075ac SHA512 64943f03cf1585d994471560ab50e7f2cfb7c7b2f234fa38b6dcbae004987741f4f2faaa728c2570fdc7b776140d68c0437960118ffb3067b03a67de90656935
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
index 622f3e3eca82..5bca8d059a5b 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -23,9 +23,7 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		media-libs/exempi )"
+	test? ( media-libs/exempi )"
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}"/${P}-test.patch )
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
index 02cee354ba4f..09b8c268d80d 100644
--- a/dev-python/python-zipstream/Manifest
+++ b/dev-python/python-zipstream/Manifest
@@ -1,3 +1,3 @@
 DIST python-zipstream-1.1.4.tar.gz 21376 BLAKE2B 84b022f93dedfb46da911c3ed800c3a6eb3685bf9c6180b9aac5d4d085748216f53759f83a085fa57f245033281aa4be1578b4051e8a855bcd2300aed7820460 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32
-EBUILD python-zipstream-1.1.4.ebuild 423 BLAKE2B 783beda9a8aec5c0e55d84a7a43eda8f252e26acafdca44b5e7593993c05745e4b3a7fe119a323e5b62bd6272c5fef06251de4135f1bd1e1668a635eaecf3a26 SHA512 87308aea66288981ccc6ea954653788fe1b5ec078073e484ba42116f246ac6a3400b059b02bbc3f4c7c37abd18b96b1c7462f3a5ad93c8d31d3d840a94bb7fdd
+EBUILD python-zipstream-1.1.4.ebuild 424 BLAKE2B 0ecb9dbe289f8bd5dc6534ea14381dd882282945c976aac05d835d1cab42060373ee214432db52b3395436537fb5f6a7d6eaa0f0dda38d521bd2f04ef9f274c5 SHA512 c635dfdeeb10499505a427406301342c6c5a856cee8cb67ec1d8b309096fd10f3ab4c021b5c17b24333b6b007382bc776566e4d5ff73d88f86d5adc80e3b870a
 MISC metadata.xml 428 BLAKE2B 2f55a4cc8d046b8a99402dfc12d03a232973beb41f2072dd2b61982b18d46881ff07368b51255f5eaa595cdd416f6fc56aac0e8a85e05b6e29555694af5c0101 SHA512 fff2ea4c04479882b9d1378d5fb85750a39bda4a66ebc04d0e735818f5490a2115516dfd4d8b2057f380c59c94cf6c51dfbf7a4c35a1840fa583628d3730a9c1
diff --git a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
index d990f98a778a..35e9f69a2154 100644
--- a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
+++ b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 9a1a459c8166..137151d837d3 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2-r1.ebuild 585 BLAKE2B d38a3ce23b5e9638d82172ec5ef43f5aa26b42d319f21e170a07047d25a71c9a5a97dcba5ff0b7eba578e4102ff4672394ad9e351559ad2e2dbb7c26e748450d SHA512 05a0ec2734a2cdf55f5d670eb958a3afa38f344cea444e925354f3604808eeadf0e55c0cf71ab3e047390bd91a4d99799ab1eeae8c984a676255037f6e1928c8
+EBUILD pytidylib-0.3.2-r1.ebuild 585 BLAKE2B e395912c1a49082b6fb1137d4577ec9a9af053461a8fbe1d64a069e879fb16754ac9e289abe679c0562b3b3b46f678b74e795128629aadf39e89f77b6d6d5c37 SHA512 4efe9b1cb28f2102f182e4289ee554cf3a769998ea9b52b4e6c30ff613ae250aead8840650d38c56fa0d81c1e51a15cc9b4c9878144a715e49aedb21bd760d1d
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
index a80bcaad16f9..2b905c8da95e 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 8f4e81e35241..c72700ca296e 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,3 +1,3 @@
 DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
-EBUILD pyxdg-0.27.ebuild 608 BLAKE2B f1566c39644ae8d085f1f25065a237c9b873e2d892d43ae5f7bad48f03212d63b949d08a8eb8278e04f6acbdbf467c0d9def1da9e93d9e6e68c3b051f732a96a SHA512 286524dc41c956b9717bd3e807dbf3dbd81a46443c50b580ba2746a531f6a5f3324ad8c5d6651a81d84e5ed677cf85d6cc2ab1f860276ecaeb61a39bb84648f9
+EBUILD pyxdg-0.27.ebuild 608 BLAKE2B b4034adaac03c8c863cdc804419ea70191b1d22abdd2334807197f5a9cdc65f81c19836d1b2e53096d574e2d6551f10bb188042b819f4ee867e3075fec547f6b SHA512 56668c034883bd16594f77140481547abb479ea1dce12746e7a19c1f96a6311b0e389fb6ee320b7388d8249df6be6dfd6ba21005c41bbf2e05b2b737254c8fee
 MISC metadata.xml 512 BLAKE2B 134a7a97dc07dfa10dfc1f9684a0d9ef1cf059966ca3a569762dd277145d19dabf02987553ef6ec60083cf7ea5dd754ff64a735ac4cff8045415657c0a5b1f33 SHA512 c1f7bdaca58f1e63fa5906edd0d626413174742e68da597ab28350fc1f917d9c9c77d0fe7ec0aadd008525cdfc1fa71ff3558bb738f60d129be198844549a39f
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
index 7ed5bb244fe3..410396213b73 100644
--- a/dev-python/pyxdg/pyxdg-0.27.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_P="${PN}-rel-${PV}"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index 9c1bcee06424..abe169f2c49d 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1,3 +1,3 @@
 DIST pyzbar-0.1.8.tar.gz 41562 BLAKE2B 3aafe745025ba542c3943956f635ba2737f78683447402d3c166217d1c18ba6d9debb170e04aacd611b53401cabc62dd0533ec72cef82ddcd454a1d6c026c3c1 SHA512 e186c7a2f29ec107f66b87a2901e128291747ef7a2159675f3170aef2a3a4b1f4cb4319da830d577c986e20abb3f2935e005361cc98857b0e1b880fb4cf40233
-EBUILD pyzbar-0.1.8.ebuild 631 BLAKE2B cf035f24c9c5fa45de33eac7cd46c8b1dfb13edc4daf51f33f61ac907b492d711bb02cdc4f233cd7f6be443241e1d65e98ec78da313edd6f67e05707d4a5f8bc SHA512 0b6fd5a2bbc1508a8826f1da28a2bb4a97dd5fe441e583ee150de081cc5e0eeee74362d620ccae7c6573d5ed28481368b9b61d3a017b85e331143150c953f894
+EBUILD pyzbar-0.1.8.ebuild 598 BLAKE2B 0c771d3869b2d897d110dccbe926818671b16fa6d41795a651dd3d1a5710858bafb0439a486ecfad4c41b01b4072c5cd78026cc23855853facc4e1d3b2575c89 SHA512 f53354f5f1f938bac7126e3c6e73f784e5c9f49f1c9c3b6eb30b7af1c0cc5857d345e6489700d7ccad9fd2da5d5dd0718052ea80eaa394c800978127a9a8897d
 MISC metadata.xml 309 BLAKE2B d6040e4f03401a028b988ce6117fb578f307eb335588e376748a4ba3cb9bd93fe018dcac7314b645d5416d05d8accd45908d3593ff6e16dcbea83c187529fe81 SHA512 c6613abc07f4767839557d20d84d58800a83c516499e9fb59fc34905bac1c9cf3d62339c14ba1880d12b567483644b8214b0841f98ede74fad42aa7dfa6cbd58
diff --git a/dev-python/pyzbar/pyzbar-0.1.8.ebuild b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
index 0b2b2c444085..48f0bc8d05fe 100644
--- a/dev-python/pyzbar/pyzbar-0.1.8.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..8} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 5b28ec371dc9..f2a66a829739 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,3 +1,3 @@
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
-EBUILD qrcode-6.1.ebuild 683 BLAKE2B fc78767be9812d9bc2387acb2794f663cb8dd96c2713a2ef1ea4ff6759efdc3ac0dcdcb1d8724b24653bddf8f43a174790b38dd1847237c1efd9fa2ed83c5c63 SHA512 bc801c9012f15199c66487134a8047c93a54962d31f1986cda1b3067668315ba85285501e53fb0f348ebd7439b4c4232e65ea70b25e635ede59a4c5a955595d6
+EBUILD qrcode-6.1.ebuild 650 BLAKE2B 6bb326e7847e7706bfdf3392f78c8d1e882c82625822316d9325e60cf187dfb3a7d4b704d4ed60d56b60519a4690b66d88a9a0bb4b60e724b51c28f3cd61601e SHA512 8dd6811383a8c27cfff84c1436928dd94887d1f37d403c2a2659bb998c12bc30ad556a10cb36b65e986c4568a94beae94c85ed4c029c78663c4fbe919b20a185
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index 51474bdbb8d7..10ba0fbeafa5 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="QR Code generator on top of PIL"
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index ad76c3037b61..46527cf63c9e 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,3 @@
 DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
-EBUILD qtawesome-1.0.2.ebuild 775 BLAKE2B 3b79ad78a8b90f48784cc2f12c736bc6ec56cb9700a2e135c7253d756acbd50758ba2bd197aef7e46dd4a7c43436126fa5c28caff1c56a85ac4c6277646fcb64 SHA512 4f006e817a9aeaddabcd6fad05309a6797f34d9f7aa912cc8b90e97fe64063fd8d8e8e5e04ed01b55052f6d7822de0efa3476afd90cf10f24a3ac0c95172a7d1
+EBUILD qtawesome-1.0.2.ebuild 950 BLAKE2B ec5b9d25ccbcc59e6f7d330db40436fb1cb7dec2954d14bf53f5474f366b669c41779e3a01ca85ffe6662ca847891b1a0c5b03580eb890cc9c1dba2bf3b946c4 SHA512 926942a9d8e9f847ef25316e301c7b10ef3ad9ee4a7ddf40ad724e5da06879d3cd522b098641649dcf3d4c904e2e335f740fb2c815c694b48bd8c93c28ac98e7
 MISC metadata.xml 809 BLAKE2B a2466e110ef2e6cb3a9c668bc9d41cc1a37396ec49e8f90c75e5bb22b87c09e27f393941ac0c6d72dc73e7cfb793032815f16fc84228e7107d1a626a2f629608 SHA512 26439f8cd592cf1764e62d146f467942d1b1d4cc35b096f2a2cef43099c8d1dd41d22713ad476f34c9945444a7ac5449e1391aad815da753f9ca8f46ff340889
diff --git a/dev-python/qtawesome/qtawesome-1.0.2.ebuild b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
index 135fd3162ca5..b2805bcbc5fa 100644
--- a/dev-python/qtawesome/qtawesome-1.0.2.ebuild
+++ b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx
@@ -21,16 +21,22 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-fonts/fontawesome
-	dev-python/QtPy[${PYTHON_USEDEP},gui]
+	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
 "
 
-DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+DEPEND="test? ( <dev-python/pytest-qt-4[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source
 
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
 python_test() {
-	virtx pytest -vv
+	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
+	# the tests with pyqt5
+	PYTEST_QT_API="pyqt5" epytest
 }
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index a6d8bc0c6d1c..33c001827e43 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,3 @@
-DIST qtconsole-5.0.3.tar.gz 428599 BLAKE2B 3110d597fe8692d46ac64c8f058f96356be62b95e74ebba8476eae148a9aa51193da0fe67fecf8a2de90d280121367802866bf17f68c7ad5b52ce3f84914af82 SHA512 efe88c66a508eac4ed14efb698b99d80b1a292e4b90fb04f76be829e95cf12b36e3afd968a6c7203bdd077a8bedbf7207c3a717809aaa3a514dfd99f7d4d5dcb
 DIST qtconsole-5.1.0.tar.gz 428856 BLAKE2B 4176c8add4fb949a82ce33fe9df598d2141c42dfa9ce57ae09ea201398df6ea54e00b890ad2b548b51e95f4dc0c7b2793640ced9b39b7adea910e3d2b90ec900 SHA512 50d2f1466d1fd5ebd33da1778f8271c5a328a61551f665e488c5c45326fabb4b431090d89b39c130a064b3c117cd24dc92e160c68c1eecf6647f2b662b01b2db
-EBUILD qtconsole-5.0.3.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
-EBUILD qtconsole-5.1.0.ebuild 1273 BLAKE2B a3e2959edcfa6efaa7774a8c9099efff7a9a28ec9c581a65bbaab87427906922a5f14fe89a9f2bb16f13954e93924a9d3eae5528f865cd8879bc31365bed6df4 SHA512 9b5da629c938ba2c67a0c7399bc8c4d31504c17eff0dc6704137c4ff0685144569731230e63e5509dcb33b5554bbdad794481a76f4ca0eb7feee82ad712060c5
+EBUILD qtconsole-5.1.0.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-5.0.3.ebuild b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
deleted file mode 100644
index 97125f3772aa..000000000000
--- a/dev-python/qtconsole/qtconsole-5.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.1.0.ebuild b/dev-python/qtconsole/qtconsole-5.1.0.ebuild
index 9fea2d480c04..97125f3772aa 100644
--- a/dev-python/qtconsole/qtconsole-5.1.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 0c23e50d9a7b..656f8e8a5390 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,3 +1,3 @@
 DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
-EBUILD quantities-0.12.4.ebuild 813 BLAKE2B 9a1ef0ea6fe3046a53e3b171ecfdff6801807f8936e02544a4b5665bf3c4da95f0c7877c0e9338b4cfe3a280769960f3034484ce359a8a7a8dd062926bcc16cc SHA512 aab5589780bccf696e77ccd4a9360c76a6ef5d1adf20938ed878b13b7ef78483fd163468be840a5f02a041cb29719b15151b7da950cbcb4b14fb65f489374813
+EBUILD quantities-0.12.4.ebuild 818 BLAKE2B 139945a3e343468e1e4a24cf6483645a5c819ac3d860e552923764325d040eca4b4d4fe3a1505e2831664ddcd4b4a4f06a62fc4f7bdff36acb742e608fce75f7 SHA512 9d8c51fe991fcb60b14fdae709007785de7c5670f8201e30970f7e49d11099bbbe22e940ba5df4c6d9624c3494e4118b947d90b720d94230c7f49a3aa1bd96ca
 MISC metadata.xml 544 BLAKE2B dab969c411e379d68269b491b7a0d132c3512d7bd7510e1ca58b2c1be128515df401a2b61533ab4e188edbb1385ff6108dd0387cfcbc5cb351eb9dedb56e5ac7 SHA512 21475f5b2b97ff228bb0e8cc6b86ffcbf422fc8e20c267eb40af57bc735a3ece6e9ecc4ccb9ed4a8533c2a18d21b300197382bf9be297584daa4f81329f64d5c
diff --git a/dev-python/quantities/quantities-0.12.4.ebuild b/dev-python/quantities/quantities-0.12.4.ebuild
index 337fd8fdd1ba..6a7c1364b3f6 100644
--- a/dev-python/quantities/quantities-0.12.4.ebuild
+++ b/dev-python/quantities/quantities-0.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ MY_PN="python-quantities"
 MY_PV="$(ver_cut 1-3)"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -15,6 +15,7 @@ inherit distutils-r1
 DESCRIPTION="Support for physical quantities with units, based on numpy"
 HOMEPAGE="https://github.com/python-quantities/python-quantities"
 SRC_URI="https://github.com/python-quantities/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,9 +24,8 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	dev-python/numpy[$PYTHON_USEDEP]
 "
-distutils_enable_tests unittest
 
-S="${WORKDIR}/${MY_P}"
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	# Unexpected success
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index 75203b2cd588..c5f33c68e30b 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,7 +1,3 @@
-DIST radon-4.1.0.tar.gz 3672016 BLAKE2B 3da02d62a2be0ab709bbb573372b86971f2eafd98724ea984236710c7f3e3517215bf496d621d42e9e93b747e3b8742f9cf156d3477c5c1cc4ac6098f0008b8f SHA512 c594fb2822a5311f1daf18304c601b4363477bee808f32a0eada6dd28560668a93cfa614196a614240eca436dea48945a29915bd4d347946aa28def0780bc93c
-DIST radon-4.5.1.tar.gz 1873194 BLAKE2B 3bbbfd1fcddb8c89c39240d7de082342b667c53a663e766dea16032ae5a7a1eca2a3a55664f39d0a60551db8c27e0f1102439409ee50520f8ffeb7ea20e5319b SHA512 8f27af1b9fed27806415f7af12f7480f638c71c741b3e7e150a0137964f48d43e615d410a84a8e093aaed28c92ad57f22e36e1d1a9819c335635ec175c4e8314
 DIST radon-4.5.2.tar.gz 1873164 BLAKE2B 64a6def2be3505e247625b11deaaf75520781f98748cd8fec07c0d525905605deaf7f17c0103c6d41361ac0c6f62f489aeb418b5bd592dbd5b12755ec73e0116 SHA512 247fcd715ed3dfb889a73889fb5be8dc159673beb3abe1e1ba5170b8caadb85ad405ebd05f6a9080a6097f1c731b83b9dbe8b7f564f2a39b1b7cb0239f445813
-EBUILD radon-4.1.0.ebuild 1086 BLAKE2B 2c6cafea3fcad0e2fd60e47c5e0ab4e3ab009bb253163a7d8fd57595ce9a4411bd405f019dcec2be74f5f8cdb20d8378c8b79e90437d960e0b6f678d89b46648 SHA512 a6513c41d90634a0bf099a3bd8e853fa858752b4bc273d49ad199576e95a129ec01a73ae94ed4dc3e807700fd121d442de07b1e5250e04e4182e8f9a73effd1e
-EBUILD radon-4.5.1.ebuild 616 BLAKE2B 6a26706fa09350fe971e7fcb729a4eb32ccc4433f57cddcb462e908f3c6a9aa75cd63a5e67ebfccbf31409306623b1b21b43c87b555e88990274b4b2ad3c5d43 SHA512 95b0d943815aa07657fec3e0c655238fcfc9c07a497eb69b5f790a24ed09b62219bf6054ca642d253ab32507ac7cb7be7322abb9815951f97bbda86e22b82e30
-EBUILD radon-4.5.2.ebuild 616 BLAKE2B 6a26706fa09350fe971e7fcb729a4eb32ccc4433f57cddcb462e908f3c6a9aa75cd63a5e67ebfccbf31409306623b1b21b43c87b555e88990274b4b2ad3c5d43 SHA512 95b0d943815aa07657fec3e0c655238fcfc9c07a497eb69b5f790a24ed09b62219bf6054ca642d253ab32507ac7cb7be7322abb9815951f97bbda86e22b82e30
-MISC metadata.xml 359 BLAKE2B e55f145a3e3092509c27ecb46a07b7b4d0bfbbd2397f2f6a619355619ee786ba9bb285d2f9920e00b60667d27afe83a5a92ec8850f5bb69f8530718715fdf152 SHA512 5ad938fcd2332303e1b13c3f683b9a9c9cfcd461bc0b199724361d28d743af71d4a2f1a823610b24b5516bc478352d5ff00b41ce8d5e01215deff580c50a2573
+EBUILD radon-4.5.2.ebuild 619 BLAKE2B 073a57adc35f4a4227023046d113067323dfbcd4a4e69b0499df60ce0dd554e2a88a7e7f971a8c81f92d421f03412051614b6d0d224dacda470d8c1518f9148e SHA512 6d552f0ba4649b0bba3768a5d0113d70ce0f2026d3773f858e366f0aabc25dcc5d12e5a52781ee68c0d90f0619ab2c853df55e5b71f3deb236ceff5bb2bb209a
+MISC metadata.xml 383 BLAKE2B 79486f11489a60f42c89ece892c244e31e12f9dc1321c49980546b4a36034ae6635437263a71790dd8391ea23ee4f7405b91412f23ee7f472ce18d3c08242a60 SHA512 09743c63c7b363b8735b79c039670da1abaca43fff31f9ee6d286794ec03e160de4322c6f05f4f4b80cf155bda9624e6858b9dfa0195f24d80c9bf2112f1198a
diff --git a/dev-python/radon/metadata.xml b/dev-python/radon/metadata.xml
index a8b773fc1ee5..4f83f7ad18fe 100644
--- a/dev-python/radon/metadata.xml
+++ b/dev-python/radon/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">radon</remote-id>
 		<remote-id type="github">rubik/radon</remote-id>
diff --git a/dev-python/radon/radon-4.1.0.ebuild b/dev-python/radon/radon-4.1.0.ebuild
deleted file mode 100644
index a562a5b5d0fc..000000000000
--- a/dev-python/radon/radon-4.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RCDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	${CDEPEND}
-	test? (
-		${RCDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${RCDEPEND}
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" radon/tests/run.py || die "tests failed to run under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/radon/radon-4.5.1.ebuild b/dev-python/radon/radon-4.5.1.ebuild
deleted file mode 100644
index fe5b81488746..000000000000
--- a/dev-python/radon/radon-4.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/radon/radon-4.5.2.ebuild b/dev-python/radon/radon-4.5.2.ebuild
index fe5b81488746..8d67d979920e 100644
--- a/dev-python/radon/radon-4.5.2.ebuild
+++ b/dev-python/radon/radon-4.5.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index abd26f46cddb..9116c08233be 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,3 +1,3 @@
 DIST rarfile-3.1.tar.gz 121579 BLAKE2B 3419eb0433866e060cc55fb94806a1ef0591c811e3b88eac97b05519e8e72cdb7da1e7f19fec1d5cadf60fa4caba4717cafe3fb1133556ef2d6f327da52c8c34 SHA512 eb910b0adfd1f28497163aa7994ab268d7780707e09931cb01014ffa51d985410b0bc17e5fb9ca133992b28115a0b5f443d01215624145d280f29e7065abb9d9
-EBUILD rarfile-3.1.ebuild 486 BLAKE2B b7871b6b14b118339296a45f5fe6853c059785ab4311942b1df6c842a11bf0763ffa229b8b3a1b56003a596f651f3992b854adac0101bf63ee938794864a6d85 SHA512 d4a079c57601454aeb5569a726bc570b4422ceae4e9b96cf245bbeb069f2bed9365120b962af5f3b727cd74bc463a5505bc86c2c89e27fa3b2db5d6ae7904ca6
+EBUILD rarfile-3.1.ebuild 487 BLAKE2B 06f912bce26e798371f40e466996652717aed95dfa5c90233674475732a73b45002e815274322acdb7c6d13abba57186af9b2ccb3c1e83e7579118a359d0fbda SHA512 0b95b61f3683ac4819fe8855af0a275402d1032cfdcd84d65c7ac045ba87dfaa5cfc86fb3a0507333fc7456ca81dc78d324943303d2ceb0dd2074e675871f433
 MISC metadata.xml 530 BLAKE2B b0f4d62ebbfab89b9f927c24dca9b138d6a3b9c2754a9d62684e634e0868e5a6007ffb1f4c52a6568bdeaa8bc9095d2789f6fa994e7c6e1adb71566bac54b9f5 SHA512 714dab1f6654a89d13b5443b91a3713a360b8c73187513021cc97c1be1ec09628c78b01c86f84d886931614c83caea3496a11202f64c195d5ace4015a699a861
diff --git a/dev-python/rarfile/rarfile-3.1.ebuild b/dev-python/rarfile/rarfile-3.1.ebuild
index b5c41ceba8bb..f1167a027ede 100644
--- a/dev-python/rarfile/rarfile-3.1.ebuild
+++ b/dev-python/rarfile/rarfile-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Module for RAR archive reading"
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 6fecf5e59548..d03df5fc7647 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,3 @@
 DIST readthedocs-sphinx-ext-2.1.4.tar.gz 11218 BLAKE2B 9851da181b9d181715436dfb350bcaa2f8f6c5dbf56941d2f26457976cd5f5f1e32752b0fa39c65a7ca4f4f304e0e83bb9cd34dcc25a039e6f970d7ca6410a38 SHA512 dc3e70f55634e6769a0cd8778644389838884da7f175464e56c7766a1cef257bf6d4bd317a4dd4442fb46fc21714f5697991d1b2a764e40857eefae340b15278
-EBUILD readthedocs-sphinx-ext-2.1.4.ebuild 759 BLAKE2B 42f961030ed3c1f4fcae1b95d7cc190a943bffd62af5b4b89a27ec11f3b8a375c0a9e752325763221d6955b24e99ed12b463fecd3e5859ce20945a26d21d96b9 SHA512 c24b914c987ec5ccd8d021200afa66d4d45e5a464f4f69a83076b9a0a57942d6fcb82a210e4d413aff0fe1dd0f9ba00b4a9d95dbadbcfe5f9fdd4e8153bdeaa9
+EBUILD readthedocs-sphinx-ext-2.1.4.ebuild 760 BLAKE2B 6e2bf67035cbcdb18401a56ef2eded7b3b1f62f03d065766091f7947b925706bdc9fc11cfcb503fc32fc167b1c349ef82f099127c54bde5af0e8e44bd22d4628 SHA512 c7fac79857010a9f397d8127c1c633bee08e3d70c69fd6000327b0eb2ee9da606810860f58dcec675ffc5d25dc8a74c27f09bb13ac65a0f5be389e4fa3be3cd8
 MISC metadata.xml 349 BLAKE2B d74b06bcf26cb258eb33f7b445a1486eb04880987c3227e891fe3fdbd39c2108dbe4a89b37e76a57c3d204d0388081306cbefcaa5a904de2c718b33f3832f0dc SHA512 ad5563a21425a463bb85e37b2f0d4ce12703999d89ba943f8bc879526b83b58462c8dfb1c5224862216b0f959ee0e44fbf99e940eea6159674a27071a669c99e
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
index 153d97190265..240addef9ffd 100644
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Code specific for Read the Docs and Sphinx"
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 73407166977d..f71947c70e6c 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,3 +1,3 @@
 DIST rebulk-3.0.1.gh.tar.gz 252585 BLAKE2B ff10847d9743972c65a6a5ae3efe77acf0364770c2998401ac08d22a829bc25caf1e0c2a7decd0c2546d2bceb05b094cbd9d9cfcc7127d433b8c30fd6084c5bb SHA512 21d022bb564a416885139aa673b3fc8b762817df12d8868a2a0e8d99cc813b781d04bad4372e5ac0dbbe6239d879c506639dd87c89f92faf078ff306239d6b6d
-EBUILD rebulk-3.0.1.ebuild 754 BLAKE2B 5bd6c02eda5cafd27f514a330972dcff5c35c546e5907ecd2c501808e14c1a0c2f30cbe4f0778451563097c9724497138950c7df1d7894f1c5a4beff6d30673f SHA512 40bbdecc4119d471ecbc13a7b1e84c60e8b2856f5ddf3f20e66aa37cd16985e59e0a503fdfb73668c782f89e779f7558d96a02a5547815113fd324ba27f6e902
+EBUILD rebulk-3.0.1.ebuild 754 BLAKE2B b0a6526badc004b0533387a685df8df4e0d1698e52efd1e0e8c13b29220907a2a1e2ddf797d45dd22c789a366cf40e77bdd5808663af1366651dcc64b747b164 SHA512 35a6000d243f748fcba14ef267aabacb6db55a6118ff1c9a5a8e66be01194b3292ef97aad3ca50fbba67dbda5bfec308e14ee548208fa16bfa3e9b5efc9f047d
 MISC metadata.xml 386 BLAKE2B 5b6b41af4bf557a88768e8e34a371a52dd7df94a7b31eb627bffe04965664a7b7ab41d3c9ee646b178a1dc447d2364e1ec223164a84b6a04c8cef910d19ab9dd SHA512 b5f8a25a3dc3e6fa49203f824372b951bb551b792df25b580ee531a61bc1c6dbab6291c1ccd9ab0faf70a2f557814273d580834dd93fa9066493ddf6d11cc2db
diff --git a/dev-python/rebulk/rebulk-3.0.1.ebuild b/dev-python/rebulk/rebulk-3.0.1.ebuild
index 98ee604172ff..40d18384be6f 100644
--- a/dev-python/rebulk/rebulk-3.0.1.ebuild
+++ b/dev-python/rebulk/rebulk-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index f386022bfa17..2e117fbc86c9 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,5 +1,5 @@
 AUX recommonmark-0.6.0-sphinx3-1.patch 3684 BLAKE2B 23692ee5c248f2ba72194dec9908c56df252aea2482e242b3541deca0e19d705d82949bab3b82a451d3926792bee3d4dd1a37da71850e1799e9f36035ce82564 SHA512 f774f143b23e51556551a75f13eb8da3e6f22bc223406bced4158e366accef637591e8b299ba0fe2565208ecb71ce44677c0cc29bd914721f1fd3d229b1cfc46
 AUX recommonmark-0.6.0-sphinx3-2.patch 2547 BLAKE2B 9bf1c55cfedef690a0377cb7ee59941e6d42bf464d073e578576b8e57dc9209e97811e0715089d8c8cf1fec27d32c63a180bc2c76eb1881530c6d84971392f43 SHA512 78ee5758d1fe3a805f3e40bb8e49d76155b56ff4f87910b084c9f18e0dd06559fcf91c55abea547537c02dead8ab029f77bf080c9c07e239b2dd0193aa1c619c
 DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
-EBUILD recommonmark-0.7.1.ebuild 788 BLAKE2B 7eecb95b3802d0afbb47fc612fd6b7e7f5bedd5c4da7dd0b6ddccdb9d3f2ddebdbfa7228c9970205e103a4acec0035344f3007b34a056e4055bad7ba8dfddc85 SHA512 478d1740184172f09b6b3bc6d0e5985f9e2a4476a6dc80c455f9781390aef5b537bf588c04f725a4e807a9a90dab16d822a922dd57a94b82f236a64746d408ee
+EBUILD recommonmark-0.7.1.ebuild 754 BLAKE2B 146950dd30d3042eba9e619316078da06cb6fda51d40a1d65b85341659582b64000b6f63d9ce519b31f24e7694492040a5af7e9d11fee95cc58ab529d62ea5ad SHA512 a34d5d957c36214388936db9dc938a6a1916eec7131942dfafa9ecf5505cc60274343784b3a227354a38c52bb5ff010eedb01994955897b7a32987e02bbdda49
 MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
index 87668d90b2ec..51f5b68eeb64 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 3a4626a57af9..702c16cb20fd 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,5 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
-EBUILD reportlab-3.5.67.ebuild 1491 BLAKE2B d5d75b1a3ac8cd7bffb187b8c7bfb4e4c93308979110b2c4041e034e797ee7e5e1bc9005a37ec94c4e3a02e6ee61463d392008619d17bf7732b2134c5859b723 SHA512 4df916fa2db46dd58f4fc447378298fe719829dc68715b78e1bceba8378742c69bad70d5df04ed890f7eb9e53cc0e0c968ee5aa4dfab215fad84e86a9985e638
+EBUILD reportlab-3.5.67.ebuild 1492 BLAKE2B d9b54242e7d90d7ab8df30cdffe52fb2ac3ecfc8b4727f7c631fee7d000f7e231a097dbdc67ea0999bac6360da963c43c05231cf61c20cd8c66e113e1b3e30fb SHA512 5401c2173c88acb054c37ac0acbf894d2c741e391300cf38e042b90115de07418639ce65275ca0edfc11a7139b43371487f58ebb9356f32b53a7edb3013b7dfd
 MISC metadata.xml 1972 BLAKE2B 92f398fa2c71a354bf25e35578038cfe62fc7687dd9f378574d7221d9982fb96f668f63fe8811b8e189eecd9f02edfe44d53cd17471e226cae8e5ee742ad0872 SHA512 363607498faad8268e3e9aea57f52240d8f5e7f0f9fa48436d7383b16138ee6e2eba87bfd54077dd475a37201324dc83f05a0c53d9c8eb5941be4026f3454fbb
diff --git a/dev-python/reportlab/reportlab-3.5.67.ebuild b/dev-python/reportlab/reportlab-3.5.67.ebuild
index af6ca2578080..f2a2463b0503 100644
--- a/dev-python/reportlab/reportlab-3.5.67.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.67.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Tools for generating printable PDF documents from any data source"
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index fa0cdafbc0bd..626a48c4572b 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -4,9 +4,11 @@ DIST requests-cache-0.6.0.tar.gz 52342 BLAKE2B 12af89721fcf1ae2e4ab14d7ac377f119
 DIST requests-cache-0.6.1.gh.tar.gz 47919 BLAKE2B 022fd94a332feae043cf646cefc368fdb6ca1833dcd58621a07425bfb0d7bcb5ff9913c8b53f2bc0769fd23e8f364c437ee10f16fd37d1d340e8c46bcba9d53e SHA512 f8bea03b05b2f1e55fe6c975b5f5caacff55250d81f41cf953052c77101fc726ff39f9d95e1fd2829ddb59215226026bdddfd93918feb478395375ac0e0a4439
 DIST requests-cache-0.6.2.gh.tar.gz 47962 BLAKE2B f0597f3c5f4a678b94f3b15023e3aba5247de3d79043e7e1cbd4ab0f2d4457e2f5feab130665129ae87baba56576312b1420ae16c2a34b44dc780bf05351615c SHA512 c97119127b1e80e6eec02938b2e0e8de785875f46d348215e05ee2d668feb77ed40f0dad4ed4a3ae53fb8e6708c8d7b13788e54694a38cef3ce22e83f13f97e2
 DIST requests-cache-0.6.3.gh.tar.gz 50303 BLAKE2B e8507a19f3883c050e1d819bf9ce8ebf720a5c6517e4004ecf745f5a197a8feac9cbca18ffa99001be0baffbad41d2ebfba5b63d90b55eda1d754d279242bbc6 SHA512 1fa801f60623dce0a5cd834272a74acf80b6ae52a602ae81fbd7e3653467800d9a58fb8220e30d53ef1b896aa01f2017f93dcbc2dacfd685ee9ae286f47077f5
+DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 EBUILD requests-cache-0.5.2.ebuild 2832 BLAKE2B 1bae66755831dbdf4cacd154a8e40f74106f16f7ee6fe3561dc61449ac05e2a82b484d4b17c7926eec61e5b98c6c83ee466001a1cda6ed48526fee10eedda1f8 SHA512 a37ea9debd607221555025b1c5903aea17087479fa96f864b2aefd8bcaf22cade7c7fbb9b0492f37012b2b37299fa0759da780b6b6f0e30cf2addeb43c8efefb
 EBUILD requests-cache-0.6.0.ebuild 1547 BLAKE2B d4882712310d235f1e36e36927fd604fec9d0b27da8be825886f8419163c90fb804c31a511b894a86fae8cf42a4dcf127e99ee8d524c57acdc3c1710ba66122e SHA512 001b0302241e7fd38c37fce08724a6b7a98ee2fdc17fbfce76d6bbe4cc42c732a5a44ec56b60fcde69a0e294a0665e61e8b5e89ea4180d7f277ce52d836b6f24
 EBUILD requests-cache-0.6.1.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
 EBUILD requests-cache-0.6.2.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
-EBUILD requests-cache-0.6.3.ebuild 1143 BLAKE2B f4a54616e1bb9a27e0958170d01e00d97afd01a2f9bd2015d02bb4ea725a67ff90ed3821bc46b1a388c205e7088b5e541a5b965596301f34c471d097c9260928 SHA512 15c6f3ec0a0c97a35236d6f3cbd428f2084d98eecf77cf246d5ea935069ff2fbce944cc5119802aa1e97c5042f671ffa7db2a88f4737943333ed297923606242
+EBUILD requests-cache-0.6.3.ebuild 1142 BLAKE2B b0a0b9112e31ca95cdf10ef6a0c3e0aa02671681bb5d712f1c50c4463218c0237ae103d94d753a625bade1572dc75159067c6d9cb706da5dd91aff33138316c9 SHA512 ca3ae4f2193658ac5ffbad8c886824faa3d43ef3607acb685327eec3a7ed153bba208c0e3ee11417e3b8b1179877885cc24b6ce80166dad5ddc66dae5d421dc2
+EBUILD requests-cache-0.6.4.ebuild 1143 BLAKE2B e58329455d2f3b0d2ab391b55f50a6029f36288bebbc2e8b00b4b8ee97f6b0db034a74973bc4b69555cefe07d4e653bd4ece7fac1c0dad536509bc5881c1104c SHA512 75325063b3460c8ce23cc7b3fd628cd5dc9f37cfadbddef37fea164dc8e412867a3bf3b27f14b261d79beac0134ecd4c60c94022bb3411a648ec895e558a76cb
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.6.3.ebuild b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
index c51bb467921c..cb79c8348c95 100644
--- a/dev-python/requests-cache/requests-cache-0.6.3.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-cache/requests-cache-0.6.4.ebuild b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
new file mode 100644
index 000000000000..bf347f9dcc78
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 6d7808f3fbdd..7f4628793971 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,11 +1,5 @@
-DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
-DIST requests-mock-1.9.0.tar.gz 66243 BLAKE2B 33602e85376d7812b8f4b35bf657c905ddc7db4d85e3de1f70d38871c90c42fc886e99bce3dc45079b6c8ac8e3e6b0b5291d4acda31d26045396d4ed505c3faf SHA512 1382077357a13dbec65cc4226b628ff6b55348422d9f0e9e2311c85affbc40437d22c2f95fa305303a86decc765a6228366f27eea76e254da194789b1d8fb610
-DIST requests-mock-1.9.1.tar.gz 66782 BLAKE2B 5457d359bf93f3f1e335481e44c1e9a391ee88c648b3c385806274e2c39ae3a69268d792dfc2e4609f2ccebd47dc2a3bb488f11b1b479c010a4194fe5cdc3be6 SHA512 96a8a787daa7d42796baf2807543ca18c27f595e101fd230cd392eb2417b3b0925b977a6fc49d70e21362e5b647cac201cb9f3968301ce2702772ddd85cf7094
 DIST requests-mock-1.9.2.tar.gz 67383 BLAKE2B 70a0772b415f437c38897862d663983d9ac65a5fc37d70b4f8734f8c249457dab6c4b1c04db79f7865a9b31a49aaa9cbbee98453ea5bcda35aad2e7cd9ca3f4a SHA512 b8da389f6642a4dfaac77b2613d12e3028555a5d4154aa7252e50fef527a49fb78d85dbd911ad2fd7d5ebc0efa49a2c0fd8d3b10114596839f0ddb53d917773c
 DIST requests-mock-1.9.3.tar.gz 67988 BLAKE2B 8ab651adbde9e18370641655589f5d209d2a9ae07d82108c64e4269757217cf01588066ebc3005852cf48527f911d3fb76cedce3e88bc74123db81725b4b5865 SHA512 bcded541d78670a1b1fc87f97d35286ab4bafd6946beb9d9b44886454c26a4d8c05834add18914f3f72b1d3c0534311efd1cc80e711b5085eb63053ae24cbb6f
-EBUILD requests-mock-1.8.0.ebuild 1314 BLAKE2B 2905ad624ce6ec7329fb59e02f6309aa0e2781237f3ed98eabd6c89c2e3f8f12fcff366c1974f8ca788124e93e9d907e19845146aed4997faaeb4462cba3661d SHA512 e260ac73f27d04f9017088b557ebf8463f888e1f4b0921856c028399c402281f178372415dfff7207bac342eeb04fd2aa00118dbdc07983c2cc5a83cb8ab227e
-EBUILD requests-mock-1.9.0.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
-EBUILD requests-mock-1.9.1.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
-EBUILD requests-mock-1.9.2.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
+EBUILD requests-mock-1.9.2.ebuild 1280 BLAKE2B 7390ce03d66e4e6dfabee8dc5a4409694d017aa83d58d4745b622389259c337df8231fc12f1302f421ee4fc98e67170d769fa43b178f162053aef3ed37f9bbfd SHA512 4c16c132ecff2ec652a61c84840315ef10c53b514c2d557af311c8193bcdbc6da7eb425ca44f01293d4d9735942fa1eb20d1b577b961936eb428002af8d7eeab
 EBUILD requests-mock-1.9.3.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
 MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
deleted file mode 100644
index 148512ff7544..000000000000
--- a/dev-python/requests-mock/requests-mock-1.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	# Disable a test which requires purl (not in the tree)
-	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
-		tests/test_adapter.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/requests-mock/requests-mock-1.9.0.ebuild b/dev-python/requests-mock/requests-mock-1.9.0.ebuild
deleted file mode 100644
index 930d9082097b..000000000000
--- a/dev-python/requests-mock/requests-mock-1.9.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	# Disable a test which requires purl (not in the tree)
-	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
-		tests/test_adapter.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/requests-mock/requests-mock-1.9.1.ebuild b/dev-python/requests-mock/requests-mock-1.9.1.ebuild
deleted file mode 100644
index 930d9082097b..000000000000
--- a/dev-python/requests-mock/requests-mock-1.9.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	# Disable a test which requires purl (not in the tree)
-	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
-		tests/test_adapter.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/requests-mock/requests-mock-1.9.2.ebuild b/dev-python/requests-mock/requests-mock-1.9.2.ebuild
index 930d9082097b..db7c8a5091b8 100644
--- a/dev-python/requests-mock/requests-mock-1.9.2.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index e76f05ce6aae..6bcf56dfdb29 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 920 BLAKE2B bc7527d4a9e2d5cd1835d952ce40552364915873154fa097663ae9c8a6fb70b97a4a9a71ba2395f97a0c8297bd6f5a2ea136bbffe0e465125e049f8e5206d3ba SHA512 7de889a8bd4876c366ee3ff84882d855154cb6a7759037a4523e8510605deebe6c27f410c279f112e64565068171856977a9ac8ea9025b8823eed54e545e3711
+EBUILD rfc3986-validator-0.1.1.ebuild 918 BLAKE2B 874bd0b7b5068cb6afe4b4f4eb4511fb1cf03187aed33eef97bd33616a640a76e86286c7bf38174c853176b859531e59d1af94a2f38f1e5bdb2bf4a004ddf2c4 SHA512 a405c5fb2c10b4d3827fd435b5ede72f4c888d2c224afa7977b2c349410286a163f3981ddcb79465a59fcf6e9d62ce5d1de93e7bcdf90f21b55f19bb639377bc
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 7e4e0d71a72f..e3f747530485 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,6 +14,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Pure python RFC3986 validator"
 HOMEPAGE="https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -22,8 +23,6 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 064cd895b932..a84c4a89f2b7 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,5 @@
 DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
 DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
 EBUILD rfc3986-1.4.0.ebuild 676 BLAKE2B daf4a3ec5f79890d8aca2a3d51771516ce3d1140b17b5c39106374dc0ddcb1c876b4380078e9d12bcd9c12f821db6dd1bc10aa1ca25b33ac962b101bbc9e3ea1 SHA512 53d5ab9961f21fe91cd5091353d1a0f1969c79d8538a5bf917fd08d1bdcda5e0605dc707878419921cdbd80da3fad927466dcd20a3333f425c05f5754cd5498a
-EBUILD rfc3986-1.5.0.ebuild 683 BLAKE2B 973d77a0b6e68718dc4fe5cb62ef7378d05d15378b8f375ad4def5df862a9b3092f45b930eed9ae386a1921e0d145192392c688586bc463b6ecdd16ade58e223 SHA512 f3de983ef343c133525c1299d45304ca396f38444dc20c140d19c7b5c63223deea6b29ae58a196d84c95b83ef333530aeff7ad1d94b51a67fc3a62542a8c487f
+EBUILD rfc3986-1.5.0.ebuild 685 BLAKE2B 37979b8caa609651053475d790f715eeb36a30242a7e72c086f106d4c6ef781ea9261ba4864fa9497e6957b14a0cc5737e121cbaddedeff4bf89c6daa52fe87e SHA512 08b1f069eec4aa56d60120163dd59ffb671a4d57abb7cdef165f6a0d0b1d77de8d0c0b6e82aa1ea2d1ec9e3e353df30b587e7514044db02f0c9b04c500da99f0
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
index 0ce7eca0ae96..3136ab2a64cd 100644
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3)
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 69da207a2c0d..49d990e2cb0d 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 653 BLAKE2B d94f2ffd23a87e8c31dad5b211709487f8ac65632cb1acfd2e4ab37cc068ee5a8dd500eb8b3f95c164872c41ba3737d5f9d2d9dc5f024cfbe37c00630ea548e5 SHA512 704f23d4141bdb22afece78c156061e9165ce1776fe619732859cd54c48beee3e8de246a8f1624fe6c6cd31b659c9b11abc9de34efca70afb09510820e14d0cd
+EBUILD rfc3987-1.3.8-r1.ebuild 654 BLAKE2B 77e1f8001bb3c1a58341f0155488ca06dc479d580bc0b92ea3ab84dd75af23d7257a7fe2f66529bf8aafffa2fe056bc2fd15b50d04828b0a8c3181429f0e601d SHA512 751271d27f378a4dca4a3434c0c217475d11ab4c6a1048e94c9ae57ff97e188192e8d0ded8b57eb5eb3fa94e079c1f569236c446dbd3549d1f8f78b7ac0a2f67
 MISC metadata.xml 596 BLAKE2B 4411d89d5052a1827d821c16c9e5ce0f2f78276cadbeab36b5ed49e65c9c0eb8f3b212c673af8cffcf986e348730a62815295cd8ca167be4ebbafaaa8dc4037d SHA512 bf3a9d195591b70271b33d3b102454fe486e8029e9fdce90e21e349d6cbcc5218e8440eacec042352c2c8231bfc1c6d64f4b542fbc0c5ffa806bcfb52495d142
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 8138b43386f7..7e77182871c9 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index bda275dc8fd9..d2c2ee11f99a 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1,3 @@
 DIST s3transfer-0.4.2.tar.gz 129664 BLAKE2B fb3658efd7a6aa6ba42ca55a1f9efc19671806fa22db7f6f5a30aaf19615863e027cabd472345637fd41f2c0436ad8f6b034f6bdf75187a71d2c6eacdbdee914 SHA512 8dabdc0d233f6edcf35d9fe1a06b6fd5bb5f589f455d6d53ad989c7eb368cefab4fee90e707bb8fa09f2caac6a27e67ee7aa3ada5709be43f2b649302e412efc
-EBUILD s3transfer-0.4.2.ebuild 612 BLAKE2B 5ebcee7751809810de963198968fe109148f82d21b23720b7ab3f86ef8526e472954d59d1a3bdef527f7341190a93c8ae0b45c90d9a3bc3adfa2ad591376de22 SHA512 d3823e0f6a842fca71c1e8b69bad5b7ae3ce679babfba8553eaee4fb018ab581a003000223e6e8f05cc589ea6762257ab0dd6d95e5b668050cceb245932c5b78
+EBUILD s3transfer-0.4.2.ebuild 613 BLAKE2B 5be8f29dd92acd933b4205960e5d7a1a13ad72ee3eb6d33e8dad820454a4980d0059d189d26e38bcbd81de1d86e1131ce1f3038039768ef6d2efbb559d3e770f SHA512 fea84e43e95e97051f409c97e952731dc72d1a7a3c9fec8bb881f9fff19f4d3ace02fa6e9b7917074a32b145a2c2e80d94429c4ba2c421a8d0c6b11b3b122879
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/s3transfer-0.4.2.ebuild b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
index 667e731d3da4..b2bb5b6dd9cb 100644
--- a/dev-python/s3transfer/s3transfer-0.4.2.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index e0c202ee4128..aecd17162c19 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,3 +1,3 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-EBUILD scandir-1.10.0-r2.ebuild 583 BLAKE2B 7ab5854eb6ea9b6771112368b528d09dfea6c6431d8e0ddcee726fa0f92ee3a5c58fc42b6f80edf44d244afafc49b053b45247d0540b7103a914285149e603f3 SHA512 d5dd61ce7d7b0e5be94bd0487d8940023036d6428b8fbeecd7d684e801669110c81541ff88a53e340452d784cef8e8069fe68fed3521a7e4b58a69e6888a736e
+EBUILD scandir-1.10.0-r2.ebuild 584 BLAKE2B 72eda9a3d5eb828b5a00a765283c729a5245c6d2c213067a7a9a58248be39b272e56a12c2dc72064ef5e305ac7c5f6e9dd5ef4e5f730b8f042a7ca41a72613eb SHA512 2696963e0cbc0d63e2caf139a7deed1ed7ba418174ff6217cbc6edf693826a3f7fc89a7d6bc2438eb2769b1eaf7d135d7f5f01bf8675e659b96b1ce84e23f6be
 MISC metadata.xml 495 BLAKE2B 00d10b6da8a863dcdf900e71725b6ca73dae721ad8f703a21b7a1555a496b11dedf38bbc13902a76cc28fee79ce305c0033d46bdaa8c1c5fc7be71b291686c9f SHA512 016e2747d2cc92f4eb80d1e15f2e33096415d743af5115b4b947f1f01648b35e07ae8b779d0faeb726d224d28a5ea49218b825d4170fb2a3321b638c6ba4c9a3
diff --git a/dev-python/scandir/scandir-1.10.0-r2.ebuild b/dev-python/scandir/scandir-1.10.0-r2.ebuild
index e7b5cb0def6e..a1eb3af2ae21 100644
--- a/dev-python/scandir/scandir-1.10.0-r2.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index f94775633cf9..a655875ffc9c 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe0
 DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B 5ff8d9071dcea9ab487dc253717939110d1e79a41492b0172a504ba14c1da81126aafdfb16312d88ad54e8f26f73f4e4ad289bf455b3c56d3186bab926f721a0 SHA512 d020e73bd5bf44f2a0aadb1a34e61d93dcaab2d1a68e50cfcc101f88b61ebcd10404efa7e2570d839143f9683b5b8e9bfc9a3645d01c710250d1ef1d1bdd0be0
-EBUILD scipy-1.6.3.ebuild 4148 BLAKE2B e13e948ef779ed3adade409b18e1b7c663742261d6a0674eae9c6750a3efaa277a746b1623ed401b33e865720e4b8cf1e932c7a97b32f2de3b238a774138084e SHA512 4fa6d7b98ed01f6105afe28a32ace5025f67f5f3da1d64dffbe874de856876380beb17e3444efc52c14254f7ffcc6518eef7f4c388753e6142ed8cecf0aada5a
+EBUILD scipy-1.6.3.ebuild 4147 BLAKE2B 505c1aec8d607be822a6b8b7576aaf3b84e5cf1a6422f45117496e344233a27788e363a09f5ea01c2d69b803b0eef4b3085c4a9247047e20672f26e4e3654fe9 SHA512 c1320410db3b84c115cc218fbbe24e01875e37cb081beb041922e6b6c46533da0c55f3e8b2f0aca05cea6259c5d379803e37816b1b15c7659ca1dd6ef020a158
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index 43a412c578c1..05fbc9229edc 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index d2d90fd4f3b6..60636a938949 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,3 +1,3 @@
 DIST semver-2.13.0.tar.gz 43674 BLAKE2B 35d0ca0b61836d0e6deb97f067a0c1cbba310dde6eb83d78f02f85c3f7485114ad549559d572d4494aa7c4444c7d6feabcb36394561a238489d56bfd04ed8590 SHA512 ca0d408d8bb7305e90802ea04d935cd7b76b8f166a9ec97ed3427dbc2cf60eeca0b2d27ad0cb2f15f32f5b2589d6717a63717c463183374c5335bf79e1eec222
-EBUILD semver-2.13.0.ebuild 647 BLAKE2B c6356189192efed815ae2909af9e6abd87d35ddaca1d05d9be1573509310d829b9178e0f508e430b6348dbdc2b48992056480a6c9ec38c0b55536cd3a3f88f7e SHA512 5698907df23a6fc1428f929e455a350ac73c98d2a5938f6c9b9cefc8ddfa406087a23720291dc2c7072d7ea36f3983318b3a77c829193dd8f3c0da1ffbadb7a3
+EBUILD semver-2.13.0.ebuild 612 BLAKE2B 5e5f075e67f8d86bab88d7d581a8a73bd50494c3b15e13878ca36290bf314b930df3e166bb36f654f2d9a10f55923e894dcba0b722dece2c16fd95edf737e91e SHA512 1bfe7ef08b29937cc3424501841a19ccd61bb8c11d2c4936f0f4cd47a1da917218e068b7b84d7491c9d52d4fea35c50adb048f8045583de7222d1868883344e9
 MISC metadata.xml 387 BLAKE2B 93c31eb7f9fbdf45e6666658b243ceafb76094bfa748b90d19c93c9e2513c462b1a406e40f7c1aaa828cd2358edcea7ff7c0a63c33949b4cf35c0295aac718bf SHA512 842e7528ea24deeb18e87f030827ab91ab49e82f3623c111ae53dd2d530210c1123afc25dfbd771d48ba3369229045df577e2b953ffe058c6290072e2929cebf
diff --git a/dev-python/semver/semver-2.13.0.ebuild b/dev-python/semver/semver-2.13.0.ebuild
index 66898ed4e62d..d9a264e61cff 100644
--- a/dev-python/semver/semver-2.13.0.ebuild
+++ b/dev-python/semver/semver-2.13.0.ebuild
@@ -1,23 +1,20 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python module for semantic versioning"
 HOMEPAGE="https://github.com/python-semver/python-semver"
 SRC_URI="https://github.com/python-${PN}/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-${P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-S="${WORKDIR}/python-${P}"
-
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
index 89182c40bc10..caad20ee37b7 100644
--- a/dev-python/sentinels/Manifest
+++ b/dev-python/sentinels/Manifest
@@ -1,3 +1,3 @@
 DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
-EBUILD sentinels-1.0.0.ebuild 419 BLAKE2B 01d42e26044bac3ec65072517ff5bcf2522053705519ecd0f04d3b8821e0b341baf94928afd6d0a65aeb1bf17e47cdd7c7917c4b7da4f685a61f30cfd58781b5 SHA512 30393a5d19b3d25d64c2c15c2e69a14c8a11ecac04c1c52cdad208b0556250042228f20f7788ba8867b69376cb0ff9712a0592c432c4d661cbe5ce397d562073
+EBUILD sentinels-1.0.0.ebuild 420 BLAKE2B 16773bffd74523f7494dc35e4d29305a1a342e125a1101fc8fa4d92aab9fdd3ffcec64f95210b4b140a99d766ca500744095e44637ad11f348148f361c7dba9a SHA512 86ed8ad558a72ee8db76c56fad5f0ee0d7bc94af2f504112db57b7b0845452d5f8afb771db4abc4c3ae4ac0c662ef26e15d2cb82a4d9f3a604ff0fa3ba41e04d
 MISC metadata.xml 531 BLAKE2B 7f6749f362395ac7fb6b7d81f768ee63d4cd9a87c15419d370b3c18ac2fd221618f3f052249a23e462aeb6a0b0d55358f0b813d04ebd0c4f2c3b18b733f735ff SHA512 c2c581c87cb0ba73e55b272a39a1e0754d99003547737a01f8e0d0ae9c62b1e90e888fbcc1ce6c0fc69302a8490ce6966fc691880ad65b14a716db72bb2c7c07
diff --git a/dev-python/sentinels/sentinels-1.0.0.ebuild b/dev-python/sentinels/sentinels-1.0.0.ebuild
index e5f6bb660535..fde5dea76850 100644
--- a/dev-python/sentinels/sentinels-1.0.0.ebuild
+++ b/dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
index a4d9cf046447..6cf859856b85 100644
--- a/dev-python/serverfiles/Manifest
+++ b/dev-python/serverfiles/Manifest
@@ -1,5 +1,5 @@
 DIST serverfiles-0.2.1.tar.gz 10506 BLAKE2B b653248261f05b20fa65a566e29065e97679383e44d3e8c05d10d1601376de2c39e1690a7ec1b1b3c680f407086294ea0769e030702fd01bff8833cc32889b8e SHA512 80512dfd8381f12aa143a88fb656bc7dca99fbc3c07a0b6cd9c7be8477de984a5121ffdb2f4cfe0f2150b83100b68ee478cfa7f26ea2f29e4a6fb7fe4eb0c18e
 DIST serverfiles-0.3.1.tar.gz 11726 BLAKE2B 5e075a816d510301af38642175530bed7fb785da4ada682b1249f993a5e8974a89f301e63ed307b4882df867641fa123065ae249dc6e48b1210665fac283d3c5 SHA512 424b99e3f0bcf97120aaab5ffcb6e08284d9a5f5caf614f4dbc41871b6aa637e39bcb5696ea593a09387c41621617079da939b6ebb183e64f878656b4d8071a9
 EBUILD serverfiles-0.2.1.ebuild 613 BLAKE2B f597d2eab4fc4c1184d916740a70926d593c480ea664c3cfb214d9100e8f9e092716f87248945b01dbcaccfa4cb12d90c5152a137f33b4b501cfcf86d8f1de72 SHA512 47dd8d4271ae3d65ad687ddf2e094a2b8db1b18697163b94f49bfc799642a90a608eae5462c52b6134338160cd0798b68ad43f4bc3bcbaae05e66358d0742c9b
-EBUILD serverfiles-0.3.1.ebuild 545 BLAKE2B adbbb30768e18c0c593c84c6cc573314b477f9df2f3ae32ae4533e5d6d6f7f407423bf5fc6fee45c68efac7e4f5a88404cd0ab51e6af9457393edfaebbdd2e78 SHA512 4e1bb6cde484ed4ef8e6cfd14aadf4ca0f3978892400b229bff2a157dc4e60b51901f6961abb05381c86004406e4097ba595281e54ac6c7ba98b1ad6b5f4491a
+EBUILD serverfiles-0.3.1.ebuild 546 BLAKE2B e91b147197932e78498967e144c72a806a4b077a176d8b634c78a9183ef2b317ca960ddd3559527059d52f5a7be7724bf2157d7c5df648b71d43a24fc93dd60a SHA512 e1bb59a76199444264f6b9734c98cb4447ea027c2b8e57271b1b3154f7de27d78b1f6360d4595313857041d18a653280e433ffa53977e2f31a45496650b9e7dd
 MISC metadata.xml 416 BLAKE2B 027fc5dbf26239a59035ed1aee771eeea87517ce45a5236db1a1287dc157c5ec7effac6c8e49b914383886c3f1f5ba15c9d66c0c2a70b7180d6bfeafa6bd4886 SHA512 d38819ac8fe9d134cf5d6cba532f041248e2ddb5b2b27b47df4bc656ad373b5c51eb8b9f2e4d2425028f7c85d6e3a734140a336e76fcc5ec2fc15905c363288b
diff --git a/dev-python/serverfiles/serverfiles-0.3.1.ebuild b/dev-python/serverfiles/serverfiles-0.3.1.ebuild
index 70167fc2cec5..c8ced538b614 100644
--- a/dev-python/serverfiles/serverfiles-0.3.1.ebuild
+++ b/dev-python/serverfiles/serverfiles-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Utility for accessing HTTP server and storing files locally for reuse"
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 7733c98a5402..4a474f4439db 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
-EBUILD setuptools_scm_git_archive-1.1.ebuild 751 BLAKE2B 5ed34fdb08c16134d93847cbdbbcd648917d3d0ca7b5e87bb0868eb8ae45b12c0975ecce2c8262e33eb1c4573b98f016a9a8e2a78ec047ba021c7071d7267b58 SHA512 8088a7c96cbb7f2ae07d25fe95e02a3913b1dd88eeaacb4952bde219220f9f7e2e53a47825ea1f337788b4db8d30ee83ce54c42a46133129d3d3718bb0ba7f1e
+EBUILD setuptools_scm_git_archive-1.1.ebuild 707 BLAKE2B 196d1a1add0e7d41e5288f9a55775039fed882c2553ce86b4aeae155a2ed7d8fa27a034f89271478820121bd0d6e61c7e44b26854b31de15097c2c75e3bb544c SHA512 8c7f0c71f91e962aab383c5f219d966d84bb1a24646f76590a8f9d6dd4b38e7097c9513a59332226fa0103cc3614ef0871ef7eb71d6c854130d7654fb103aadf
 MISC metadata.xml 356 BLAKE2B 0ce1e000073c414d155684756b9da47f0ee379fea660e66156b58e84b5cde966603a96aaea4d37296e123cad924b436a25c53ede080ffa3a97d96c634be98780 SHA512 71a6ca661189964f06253961c6cdbde67cb1dbaba685eb3efdf187f47c4edf9be8cb0400045acedb3474acc8f6021ea27b7e38b9da2652dc9fda76e45ce9a04e
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
index 04680a37ecf3..47aa91fa85d8 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A setuptools_scm plugin for git archives"
@@ -15,11 +15,10 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+BDEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
 
@@ -29,5 +28,5 @@ src_prepare() {
 }
 
 python_test() {
-	pytest tests.py || die
+	epytest tests.py
 }
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 7552707d734a..03b54bacc602 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,3 +1,3 @@
 DIST simpleeval-0.9.10.tar.gz 26687 BLAKE2B eccde3c580f65bc22e88711cdfae4b1d6509515d674d62bab501d1cdc5dc1e91f76d391441e012f7fa51221e2c807b831dda05e7b620303d0845b5032b1a45be SHA512 50710221b49ff618218375d6d9b4eb9ee12b875ce0cdaaa63e2dfcaa112918f5bfdf8f02bbc3b5be98c7abc312f99563d910985bc5ad86eb846df935fc072eab
-EBUILD simpleeval-0.9.10.ebuild 511 BLAKE2B 213307964e51cc75a63a7c6e95163575328592d14360b3216e8c336c50cd355e79c38f617853c00184dccd1b904a46cce08678cadb504b49f07b991f857afd1e SHA512 cbc83d68a4d8cebd1a7d153f13d24505130916150970a179d8ca14b0e647927d43a0988f0562081f0c6d77cf9d2147a49e403293e2271533b430b1bba4bcc4d5
+EBUILD simpleeval-0.9.10.ebuild 410 BLAKE2B a470bd78fb70f0acc385933f28b0c0768abf1612f83641e58ed370fe405b86860facfd1a93fce8372ad834971b0f02fc7baca2ffddff2aac03c008cfcb72dead SHA512 8cdaf491cca9c3eed9553bf0cca5c0533e9093a98800c5adaf8cd448b897a7ddb055d32de3ec499cf988ddabf22af4352ce6a1af710611e0857b5617d879bcb9
 MISC metadata.xml 404 BLAKE2B 67311501b2868bd8b408afac33876a6f1c22668e928211f689d30a597a64b6aead900e67b6c4cc6c4aceebb97ca40be49ddbde771e1207a55f8f31efbae6866c SHA512 882e0b28786a05a956f57c1b3bcfc9fab815f602b360d185380a7f51ef663631ef3e18c5bc565c94bba5b07f6a307442fb097912494cefe404b5f18664e9d511
diff --git a/dev-python/simpleeval/simpleeval-0.9.10.ebuild b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
index f47417669031..5bf3e2d9b30d 100644
--- a/dev-python/simpleeval/simpleeval-0.9.10.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,14 +13,5 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.rst"
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index 1787770f9da6..0bee8815a0d9 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 525 BLAKE2B 4314fe954fdefd2e50f193d78531731c14c41e004ac65d7a9c8f24ac87cab2423ad1da90ce5510cd8d6633161610f85188bf6ec634853cea5cf757f94903cab1 SHA512 1b88413a31eab161d436fe5f422a0aaa1d80f36d9ec9a19303167266d3b232fdedff9902023acf2e385b078955b9fd720787f301eaf4555ac9bd28562c118755
+EBUILD simplegeneric-0.8.1-r1.ebuild 527 BLAKE2B 64cd198525603bb492dd9bafb32ba57e9948746d2fbb3c980e3ca5465810ae5415b42b567f86fa96f3b0d4dd188c849815983c501747f89794841f8a5081601a SHA512 26980fee6afaa01ec6b5e737e3cb938670ec8db7bf004ea0fd999800eb4ed0b0531396305a0419beb9e9f2016267dc99fa4342f343c0fb07feb1d94f6297a8be
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 8ab32da7b1eb..c062692b4dfc 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index de396bfb337f..84ff3868f71d 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1,3 +1,5 @@
 DIST simpy-3.0.13.tar.gz 410773 BLAKE2B 3769782806b4c68554810cc44a5e59e6dbba2fda86a57b225c9c73d62dfe434a55dc1bc16727d0866684b8f43ea69a50bea96dcdc2109a491dd887d9973a51e9 SHA512 7961cb519ec3ad92fddd16204b1741132371c9b9989a9bc9905227fc50ee8baf3c8bbfd65fc12165cb58653114c26179cb3fbe4d09b082062a4180f09d40a259
+DIST simpy-4.0.1.tar.gz 410082 BLAKE2B 09c6f29d2792ac15bb4a3b42a1cdbd4d342aca0ef528aadbe37e01342534645939c9663977230ec7f6f1542a4354925e25f0c5b3bf6e20b29b6da2e69f3d5a90 SHA512 5cc4baada79503e3c2f2425b9f7f00d68f263283ff0cae048fba86665c4dcf70590683f6b7df50d1c1a914ac7cb471ed4b6850676030bea4a3a70fb40eb2cdb4
 EBUILD simpy-3.0.13.ebuild 836 BLAKE2B bd8b350b7df69d77c4b62ef4a91f5c4377ed3aae2cd372ce1c4f46d61fa176cd683b1bcc40ea8cf19b866bde29618e034190d6631af0a67f6892b2e19a76670d SHA512 c292e68f8d5f5f6a04342ba18e803f283125049d7ddab9b7241910f8249a3be24fda48c417bbd41f703d5539593fb896a8bb0c1d573819d9c1ccde88bfe86faa
+EBUILD simpy-4.0.1.ebuild 896 BLAKE2B 583ba15835e3b4ac163ecd8ba41bdaec160d3eab0c6e5edad21367fee2a06ea27dfc088bd50361247d1384319f12674c148c347e0c295023a5eb2d1d5c9bf325 SHA512 1164b2445a0422b15e43407603861839b40bd68cdf6b95e4ab4b58f3bd1536b281ea88bcbf90bf00a09b2758f9e1b4135fbd417335ff94b275698be5851ebcb4
 MISC metadata.xml 383 BLAKE2B be75ad8df2181d19f5d653278454051eaa5c455fc5ff3882cf8e11bb50787847fbac3db1e33034c3f1372a82a15227d494f71af9644d6aee42069b41fb6b4f17 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169
diff --git a/dev-python/simpy/simpy-4.0.1.ebuild b/dev-python/simpy/simpy-4.0.1.ebuild
new file mode 100644
index 000000000000..89b69982a180
--- /dev/null
+++ b/dev-python/simpy/simpy-4.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1
+
+MY_P="${P/simpy/SimPy}"
+
+DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
+HOMEPAGE="https://simpy.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Could not import extension sphinx.builders.epub3 (exception: cannot import
+# name 'StandaloneHTMLBuilder' from partially initialized module
+# 'sphinx.builders.html' (most likely due to a circular import)
+# (/usr/lib/python3.10/site-packages/sphinx/builders/html/__init__.py))
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index b81b795be282..3d739301a38b 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,5 +1,3 @@
-DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
 DIST six-1.16.0.tar.gz 34041 BLAKE2B 764f8da9a0d89e95af002c79c2b19e852fdec9a6819655c57be019b48bd65a5f7909473e71887e6080073f381f983c077487591d4e44297542cf6b9a29ba42b8 SHA512 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0
-EBUILD six-1.15.0-r1.ebuild 830 BLAKE2B 1796d67b0193d7e8be88113297ea741a9719db600a8df6f2e1e047074dba7dc09cc003bff171173d33f2c2c9672062f1eeb8a488a64cf3f76b36e40da5c6057f SHA512 85f3222d2cd6c384f2abfcb86912df7ab3ba394b38e0ac2092e83b0980232f694db8feee48a05770590140a5b0f48fde51b0764343c863405fcd09032f91f5cd
-EBUILD six-1.16.0.ebuild 838 BLAKE2B c31d2baf2b8d79f70a6945bb47bd4612ee966af8af4c5cd83428613efc3dca11f3e800a4d60f89a18da556d9daae4917be7d083b538d33f6aa163732ce92de34 SHA512 75e4a74227dfc79ac72c9c03d10534a49bd8953730b271ed006278392c3ac913cfe1de9a606bb2bebe457a574ed9b2ff8c0b909de75cfa73bbff3ac53f81c70a
+EBUILD six-1.16.0.ebuild 830 BLAKE2B 1796d67b0193d7e8be88113297ea741a9719db600a8df6f2e1e047074dba7dc09cc003bff171173d33f2c2c9672062f1eeb8a488a64cf3f76b36e40da5c6057f SHA512 85f3222d2cd6c384f2abfcb86912df7ab3ba394b38e0ac2092e83b0980232f694db8feee48a05770590140a5b0f48fde51b0764343c863405fcd09032f91f5cd
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.15.0-r1.ebuild b/dev-python/six/six-1.15.0-r1.ebuild
deleted file mode 100644
index 830bec098c8c..000000000000
--- a/dev-python/six/six-1.15.0-r1.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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-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"
-
-distutils_enable_sphinx documentation --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'test_six.py::test_move_items[dbm_ndbm]'
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/six/six-1.16.0.ebuild b/dev-python/six/six-1.16.0.ebuild
index 7c6266910ab4..830bec098c8c 100644
--- a/dev-python/six/six-1.16.0.ebuild
+++ b/dev-python/six/six-1.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 6586a7692d85..9c188c8b50ac 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,6 +1,6 @@
 DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
 DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b36fa31a9dd315e363fc67e36d080df0dc70d82e65c6802c41377c2e98f56ff4e23cc5e9a92165c3d3b7565493f SHA512 5a59fcbb901e6f4456049f1ec2bbf781b1ec7c5a3ad4b66216d4c5daffa7f0606f74b941647fe2b53e6c8cdc476371305c7b7a2ca24d21450e19548f888be3b1
 EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
-EBUILD slixmpp-1.7.1.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
+EBUILD slixmpp-1.7.1.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-9999.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
 MISC metadata.xml 422 BLAKE2B db362b9a364d657718bf47cb72e77a4b63cc20e1db7586ed594522b2c0d4469532514fc8134006f8d641d1b995c7a6eb0ab6295dfa91a44ab25a1d14eef47044 SHA512 812173f68fc551369c4b504098d3b95b826ed382d03a6b21791b9c5cc93d61c4332bdded97c013f71d9ea6d26362e0572d108d1790d10b193dd415e595a4d47e
diff --git a/dev-python/slixmpp/slixmpp-1.7.1.ebuild b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
index 0f5e88aa5f6c..19974e840958 100644
--- a/dev-python/slixmpp/slixmpp-1.7.1.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.7.1.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index c01e5b1fb87c..4a1980fb4a1d 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -2,7 +2,7 @@ DIST snakeoil-0.9.4.tar.gz 271395 BLAKE2B 6aeaf03e2c2f48a85ce926f1b8e0b86271c608
 DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.6.tar.gz 261998 BLAKE2B 1f81e633321b7b1988865092ec2778feb35338edec0eb00c9a5be505a9cf7d4cf27b140c9bc56fc42156dc33a7990e8a269d1a69df7cac92a71b56ce612b65ae SHA512 a900c76ecd5a3519bf5236567e5f9d59bca7c5f7588bdcfbf1bec0d912352486c86dfd4677b0aea19170bc9170109ca782dd60232e365008ae016cdf9ade7217
 EBUILD snakeoil-0.9.4.ebuild 753 BLAKE2B daac420726043bcd5c0c742aba5384325c5206c5b9068fdfad02bed5e625f67ef388d8e5a19a8e83625c8b520370f87966fa26285f01d1236752510b6bc8f36a SHA512 f5abe777e2ef85f45681ca1c2acbbe774b50b036d8b0717076d987f5e5c640dc3f55ac22796327509b4c106757b8db1e249929a2cead7f6fe5f545e59096fe08
-EBUILD snakeoil-0.9.5.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
+EBUILD snakeoil-0.9.5.ebuild 759 BLAKE2B 8b69269a3d7f74be63c839863aae9c033a1c9acc2e399849c4d05560ff7f6aeef9ec6ca2601ea83a6494c2aeb6eae338d6613bd2d04f371ae42c759cc5f9196b SHA512 c0d8516988f0aa479bb81cacde0554e64197475a2136536b4b0836ef446bed4c06cb8338097312278149b5beccd3909f361f55dbc31266a87ce95ac7c6747baa
 EBUILD snakeoil-0.9.6.ebuild 844 BLAKE2B 687712f6ccb8c151953040595fd4a87e75e670c70502200b43f26f64f78d447ab009ae4dc7232b2b7df1353ae310aa0b97b0e4f52adfde0775bdedd077ef3ab9 SHA512 96a7884eb260cb0a0f2c5ede3a5407eabda735c046627ba30b2f0f634bd13c80b43aa4cbb34342f0faa414c2c88a040f52207ae2502785e50e8c0b298c0701ec
 EBUILD snakeoil-9999.ebuild 806 BLAKE2B d74dc5937e3afef85beed58d7c18b7d9744ea94465c96702b3b3926ab94929c0702d168053d9a80479f5d16b6e49dfc17604a209ba8e1da6533f5681347a2bc4 SHA512 d0402ae1d379f9d5710d287fbe9d5828ddecf3e5960f1e9ad603fce72e2b2fd0dd40116c60cf1b6eeaebec8a8bc7f7ecb2bf38d03156af1c0e9ef372fcc2d491
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.5.ebuild b/dev-python/snakeoil/snakeoil-0.9.5.ebuild
index c15346749758..c077caf2849d 100644
--- a/dev-python/snakeoil/snakeoil-0.9.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index df66e8408504..e5005e4f7e9c 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,3 +1,3 @@
 DIST python-snappy-0.6.0.tar.gz 21344 BLAKE2B ed5b3796a6af9b2196a1cd5353cefb808a878b324d2eae6f83fca12400365c069ed38ad50d790d6201ae9584128371a655ac2003708d324fe227e0153ddaca5d SHA512 185f43fa3adef2a5ec7468f993b83d356dbd76b3340badd308ff2350352b004c4c9528b73282407ebc4f6e1c23a03c1b9abd9f3915b04771ad9b011d7163a63c
-EBUILD snappy-0.6.0.ebuild 695 BLAKE2B b0b7f0368b55ddc651a00d7909ab6d04d81db634549df9ded9c0891279444fe4cf5cb3bcb7a091f124efaeb7fe8c5ca864fe41d82aedd1e52a7dab1c1d3024ba SHA512 12edb4b2df1c044b2e8c011d7199edf77eb9ecf6f9499680c959ac3c6d6ed3612ac8b7df3e21486adfe8f2cc6f6a0a59e48f2664938ec426a1e7bccddcd724f6
+EBUILD snappy-0.6.0.ebuild 696 BLAKE2B 81970e2669a797f365f62af32b1bfd8814732c7953bd86947e576d773c149dec35769c4430f74c401302b44473f87f5c0a4ce76ef5a945f20bd9e0d5567b38d4 SHA512 c2ea7ae542a5f4fa849649c7e9d6855f3f38c47e4c1cce4ed13c41ab4fc17326d3beb6ad015155cb2b93fc074bcb8286a0f14c9d173293bb6df56fcecd165428
 MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.6.0.ebuild b/dev-python/snappy/snappy-0.6.0.ebuild
index b2a7e507a33d..a2c4b7812b44 100644
--- a/dev-python/snappy/snappy-0.6.0.ebuild
+++ b/dev-python/snappy/snappy-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN=python-${PN}
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index ee55a643aefa..4c289f8e4d33 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,3 +1,3 @@
 DIST speaklater-1.3.tar.gz 3582 BLAKE2B cddf87583670ae185336b73631b28da3dc26b74b75df82224da23df6c528ee074ca31c95d5fbe2971eb87c50480be022493164de62f02f1987a5768d7ae69092 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef
-EBUILD speaklater-1.3-r1.ebuild 689 BLAKE2B 6c6d05bec145380fb8aaa30eb5de9cb61fbaf4aada4b4c489a7b3d4a43c4c34f44f9dc6a382923d85618fca6bcc78d794d97d19b31b42582945b522352024fc3 SHA512 3447ad49fbce41e5c614edb51e01e2015f5206c5319a286f5375b3ca078ae064dfd043912f8da17a617caf50b5adca0494a1ebb0715ada1821dfbf6ecd8896f0
+EBUILD speaklater-1.3-r1.ebuild 690 BLAKE2B 4f87980c5e31f48c1af242b2e9459b2aa226afc4c424783563130e10b8b820b41a1097c2877ba32362bfd12ca5d02ee5213dad54e77194fe8f104ff4fb41617d SHA512 4144d0b134c8a0b56c525807324577bff76a2026b6c8c884e5815036cc37e5fd53bf9a6de57f3ae99a985142a4076f67315f223ec07019abd8ea69d5e997adfa
 MISC metadata.xml 455 BLAKE2B 6270f4ecfb1f4a889daa446a01a3c135190af3d595231e410ec5040e4b869b52c210fdc33df13174566ed720130ad27523b0734baf578527412e25420eae8140 SHA512 8108151c4b3dec1c435e76c7caea98d68913812d32ae75cc72d000fbe90d20ad726dbbaa1186ea1443d1c4323785bab06006a4bb3176684fea6e534ab3d21e91
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index c5ac55305854..53f4c0eb1415 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 90e367bbd027..3aa03c7d68f9 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
-EBUILD sphinx-multiversion-0.2.4.ebuild 578 BLAKE2B 61470cbdf3a1457303318b303134f87ddf59408dba82e025d6925a3b99d1e5f049c340e924a20b6a06adc023725f1f067b1a979794837c156ec700d4a713e1b4 SHA512 94ed82bcb93b4ae92babd84f521efcbc15c9706a57cdc6aa4c437bceb40a06261371b0742620ac2bf0555c5e06ded5b9ba0c1f2bd9dbabafd1d6a62980e48ad8
+EBUILD sphinx-multiversion-0.2.4.ebuild 578 BLAKE2B 91170a073f06ff8b5a7c424252d083d486e068a6ca07f5e16c8941bef3f24e89c9cd0012db8a2f413881e27713170e6e8ea661ac7e37a5700f980e263b4d4d66 SHA512 5784fbc8f112e2ce6c13e4b24e2c6bd1435bc882a76b1aa5b3cca53b8bb93b5a1fd3b47042d987d6256bf938e5a81fcf09b1b7b7d57ebe3534212e8dd055bb30
 MISC metadata.xml 364 BLAKE2B f5e8984e8144c8186ff1f46360e083e3714383a4043fb74bd7890b042688a26dbd8ed43ef865055b1f8b2dd3c7539f481d9ebdb05791b47e4068e35b3de2f1ac SHA512 a2be6179f3becf97abbee610162114a9c323e78a3bf2d30eb917acc99c62cca35da47f8b30fb3887704e69362f8f9cc9fdcd9b851ce60dbe809bdd34337d7259
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
index f2e37d40c773..feb4c5bc9e93 100644
--- a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
+++ b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index ea80e301dd24..13d4309b844b 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,6 +1,7 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
+AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
 DIST Sphinx-4.0.2.tar.gz 6162889 BLAKE2B c0309ca6752a76c11b5071d3ee368e80499bf68ca51a7f396be10d15b9bf9b03f85de3fef2b4e3c4795de99efa78af42a5b95b00d1f737952e6775631e63128a SHA512 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.0.2.ebuild 4261 BLAKE2B ac6ac86c0f87ae00bb2095eff54a3b4c9eea9f6a5fa44c5f0409008055ab558331d4e5cbd73f6964f3c5447b9323d013a6b6364a15b7a2b6b62beb01cc444f36 SHA512 fb00dd88d13acb2773b0ea11f65ebfc06d22cf6d608076c6eab6e86efe5d673df363dec00f539290265e5e8690ab2aa5dfa747672b0013a92064cef57a504e9c
+EBUILD sphinx-4.0.2.ebuild 4294 BLAKE2B 192a601e803f47438f757baf4f0b981a19802c46c6f0299ac3990ebd5eedbcd8ad37ed6b378df3b03fda92b92db6d2d955f917c7c52bc7b4184a7dc988ef8e82 SHA512 ae00b4d6e7455fa035fcf5a5a67fe9fb9e7d0a72c8b1b5bcda75152378e855213181c294f773f1bb7b974ef3adc29dc85a3aba92af3f025e4edf9075e7038cf1
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/files/sphinx-4.0.2-py310.patch b/dev-python/sphinx/files/sphinx-4.0.2-py310.patch
new file mode 100644
index 000000000000..db0facafed5f
--- /dev/null
+++ b/dev-python/sphinx/files/sphinx-4.0.2-py310.patch
@@ -0,0 +1,28 @@
+From 531a5ae9ef855761407d44fb49064ae6227868f5 Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Wed, 5 May 2021 22:11:41 +0900
+Subject: [PATCH] test: Adjust type annotataions in python 3.10.0b1
+
+---
+ tests/test_util_inspect.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tests/test_util_inspect.py b/tests/test_util_inspect.py
+index 7b86c6ade..8df06a865 100644
+--- a/tests/test_util_inspect.py
++++ b/tests/test_util_inspect.py
+@@ -183,10 +183,7 @@ def test_signature_annotations():
+ 
+     # Instance annotations
+     sig = inspect.signature(f11)
+-    if sys.version_info < (3, 10):
+-        assert stringify_signature(sig) == '(x: CustomAnnotation, y: 123) -> None'
+-    else:
+-        assert stringify_signature(sig) == '(x: CustomAnnotation(), y: 123) -> None'
++    assert stringify_signature(sig) == '(x: CustomAnnotation, y: 123) -> None'
+ 
+     # tuple with more than two items
+     sig = inspect.signature(f12)
+-- 
+2.31.1
+
diff --git a/dev-python/sphinx/sphinx-4.0.2.ebuild b/dev-python/sphinx/sphinx-4.0.2.ebuild
index 1c6f8a61729a..7cc217f2e354 100644
--- a/dev-python/sphinx/sphinx-4.0.2.ebuild
+++ b/dev-python/sphinx/sphinx-4.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -60,6 +60,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+	"${FILESDIR}/${P}-py310.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 210d93b1aa7a..efb7c90eb8ba 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx_rtd_theme-0.5.2.tar.gz 7606638 BLAKE2B c104121b36c89f4d2b7c2fc12433ffd1a7cba9b9d532358dafd53061b2ca9ead4bb93b7b596394c244a9da51c0b9299f2fe0ec8d4ca102015b6c7dfb92081813 SHA512 dd46bfeb05b433970d8130c06cad6dfa9dbc4e9db2d9a8190b80232d75b4d0a86590c17d64b9b1dcd2cb1d042033f4d2c2ce2e5cac0239c6b86899628b94b274
-EBUILD sphinx_rtd_theme-0.5.2.ebuild 833 BLAKE2B ff7a8c385029e6d193684b6338763ede9b8415240afa0008336d0eaf0796a58c78ff999f288d6f3a72fbc17f8a6856ac96230b721fb19d271b4f732507221a01 SHA512 d90a9d64414915db813a097e5c552587d0be984d6e323a3b0224145e38a13a837ba20e03e06d9bc9c2b33698eba6ea7403c7d4c3b788fd1c55bde55e3dab7516
+EBUILD sphinx_rtd_theme-0.5.2.ebuild 800 BLAKE2B cf10a015d3a3e64745ba2c645146ab1426049a7817d47cc3274d36f902d77f8656bf7445749643aa3e672cd3071eba5a3aec36f3a41d12093117a2ab72c91550 SHA512 72e27ede056229a3cf25eebc2c1d38fb463b4677bb9f465c80dd0c29a3d406fc28701101c3ed4ed0f0a02150e2316c68d239ac4d3845736150cd780d8ef64707
 MISC metadata.xml 411 BLAKE2B 940c85be81b5a0cd6896bda1f43a803c46ecc619a9c5c9de62b69063faef6326a2897f294bb9435ab717fb3db723a0d243961db706a9f6cc95f8457ac7fe001b SHA512 a094111815931f7efcaea5c2f05aa421921cd919c1698ddecf9744107e9cea8b1e7005d515fe50e13159c5dea2afe1513ac97ec562ff781504c2e3d9774288df
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
index 006ff6fba06f..e63a57663ece 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ReadTheDocs.org theme for Sphinx"
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index b6ce0209416f..ebe66914abc5 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
-EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 839 BLAKE2B 62f41c35e0954c2b5c12c9445714939c25fe74f62b9b542b947be3a190751bece38b0e5d3b21be71c06ab3d91e54209000da26b22d1bbdb011cfdfc778cd3d4e SHA512 f0f4b57f77a643745ff8cfa91d29e3f2a1333152afbe37baa71ef97d0663ad2d3ac7cac9a1facf1541f48a63887151276a9efe4f03fec676865f785b2bf6bac8
+EBUILD sphinxcontrib-applehelp-1.0.2.ebuild 840 BLAKE2B 00cdafc5dc0957b1a05810a5c67474f6e4962b634a4f1dcc93eb48fffe2c33e001eec8b10711595f7bb2c9d4e830f5763e3ba402e80e0f7d2787cad766040993 SHA512 8717c2efab703d45af8310c4533474f43a5c55c27f46dc0e168cd0b2fdc17a4c3f17daae5f3d8879d18dbced8e51363fc02ae7ff828fd26ca33a24f6c759055c
 MISC metadata.xml 400 BLAKE2B 5c06d0d11daf8209bf0b905a34986e4d1083cbc8b1181c8acaba8c4e2786950f59ea4bd7d2bf3f4337b6437f0ed0dbaa1c16af4b5821226c9c7d3990a638fc0c SHA512 cd0be59af961b0720f9cfd1e8b331b700110b0424b67099fda72853ca85e5bbe07ad5e10775c665b4b04f28d724b7cc83c9501e522d36859a2de99baecdb91a2
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index dc5f6707fdd1..235da974ce65 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension which outputs Apple help book"
diff --git a/dev-python/sphinxcontrib-autoprogram/Manifest b/dev-python/sphinxcontrib-autoprogram/Manifest
index 15b12f4ddb41..8956110f0293 100644
--- a/dev-python/sphinxcontrib-autoprogram/Manifest
+++ b/dev-python/sphinxcontrib-autoprogram/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-autoprogram-0.1.7.tar.gz 18663 BLAKE2B c1ad18df1c9ccb8fb1947ba7abbe2bc52fb531ce8142340b71bc063a6a758831d2a46913fb969f52791c3a86cb86a8eddd378c6403e1be4eb23ece2380386eea SHA512 df416759e9d6bfc69780f864bfd2c0fb847515df1d5416e4c7fb78ea0feb9cf0e360da457414a6bed5a56f69fd8ece3ccd2ed5af5fc1f56b40063765ff04f7a5
-EBUILD sphinxcontrib-autoprogram-0.1.7.ebuild 617 BLAKE2B ec74e3668f528b330f4f2c82156ec326236bbf7b62e3ccea9481a6320d668a94054b6569505aa300e7d3a16d4fbfb6e37fffdb5a80b42ab54f5f4b01c6c21f4e SHA512 90919cd3f04074906d832ab73fcdc00cd8f10f880bf227a383c6d2733fddf8e16462f5a2d468eba3c373b5c5e3e84a71390f7ed6ee21190594d23407524b2973
+EBUILD sphinxcontrib-autoprogram-0.1.7.ebuild 618 BLAKE2B 3d2583dc38983f75ae51f43dcff16eff5d34c20009a4341281c9e21a8b9e6fb4ca1d3b7851113c616f61f52fece9637c227789c852d4c3f23ceee4056ec5e2c6 SHA512 962014a005c4d72dea9c24601ba2b54fe42530b875ff9c833bc20a035c656ee15b33d9f1b8d78d7fe5bba87c57bded3f982cd8cb6c7ccd226eae932126de2b93
 MISC metadata.xml 370 BLAKE2B 3e217f5663e7e09b655c973aa87e19bd5dabe65528dff8aee18a753e47bc38633da24d53165cefe1d5bcda7f6c03282df682badf272226fdb3d6cfb30e4c971f SHA512 0e104d16e890f79be7a791b692ca39dca50bd3b2bc482f011de9d47a387591fdc3e5f75899e8e3ffb3fc6696ea331b7439c75bce74d46dba08e26e4e7de869ea
diff --git a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
index b539027a7f4d..bd789b675d0b 100644
--- a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
+++ b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index f493bbd48586..b7f99b97eeba 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,8 +1,6 @@
-DIST sphinxcontrib-bibtex-2.0.0.tar.gz 135555 BLAKE2B 8a542ff7895a89a8dbf6b8ed1df3ab4e928b68ce86881819c1fbfafdda626c2e1106f5513832ee09248381c89f54f06d4d1b42f005b1f775b0fbe8962a0a0ff1 SHA512 bffd4cb1ea8d88b947b89f5bd1c55bbb8bbab8679f205216f87f932cc0170d2bbabfbe4ea8d32fb7c980826d3f7c4a20cd49c2fb36f288b5cdc4500ad9ff75cd
 DIST sphinxcontrib-bibtex-2.2.0.tar.gz 96027 BLAKE2B 77ca45e36f1730fa6992cfe41763a34e2a0bcdc99c520412591be3c219dcb7a8af240cc74d08c260548475b88b6cfba24b82e7bad2ab21b24c0e9cb62590792a SHA512 fa78d35f04825f841f757e2708d0ebbd3617a7bf20a893249eaee7e435ff2880ffc8bd23608356904ce41fc11d7fd49bab20f3da501d4a217593c52d99caebaa
 DIST sphinxcontrib-bibtex-2.2.1.tar.gz 96251 BLAKE2B 3ff2ad5b7a37535177c19ba82cf53bd3a57e9f143f9157a7c5be6fd72b5c402893c172e9d902b2e12ac527833c742c3ffed81ee3407eb48fcf2937eadc3aab3b SHA512 c34199cc5180dbd8b804daf4ca1bcd830605b9620a44312c632fd9313ad87ab495b6e134f5042167daefa36c5295f61c03ee90b69396f746bc6ec7bfa182a69b
 DIST sphinxcontrib-bibtex-2.3.0.tar.gz 100159 BLAKE2B 96c9ebf48f11354ea3978a053828f9290457aff4fa1f0bb3d9f94bfe6fb5d5463f83bb12004f22bf8e34a517393848482a27d6754c682d25a0de64c3c7d06ecc SHA512 84652cfc7ad19ad5cdc1dba9a8aa7f835c5c95850a8e941067fd79b6b271733a63a1ba457a59e18156737888c2f42350b7fe0cf2d55ea478629b74b00d14f908
-EBUILD sphinxcontrib-bibtex-2.0.0.ebuild 717 BLAKE2B 68a5f0e8ff7ad027deab9d1c265b4368969891ff7a04f0afcb7d914d69afa6ce9cd225ab7f473cec0d054193bb30e9cb5afd5d12fce04a2bcc879166dbf90c5f SHA512 d6a3b48beac66e0d5ec41dfb7d0a84bf2117588043680785a2164ac7a4433b1a0d63c9a09a457ea7298cd0babbd050910fd2811cb4e46f5c7c1f4562ea3e8836
 EBUILD sphinxcontrib-bibtex-2.2.0.ebuild 792 BLAKE2B 0e3002f9741dfc7343d49bfe75fe2d8683ba5f1d7b3ff3a001c5fea45289c8c23f51925ab51bb6879ed88b3c6ab968ce9870168979f25336683291c6dd47a3a2 SHA512 7cd7b81c93902735eec977b1d815c9ba04f10cbb35b5ec40a9e75d5d248c9ac440700f5bd5289662cfea241a0a1aa1c272ebc2385bf41548cabc600b6e7729ae
 EBUILD sphinxcontrib-bibtex-2.2.1.ebuild 718 BLAKE2B c5a00172554daf788b4913fcd11393c366c99edcf6aefa86899d9fc87f4686933831ba81ddb57a4f864010338de44126963fba9c69a14520a2e5a261ecaf1661 SHA512 78c6d4bbbb6e79add7f6c7579017a7d94564e9418e8d9357b92642d443467ef743bec3aa4304b609452f9df3d2bef50472a8eb695d9c2f7f5db7d8707d7d07d9
 EBUILD sphinxcontrib-bibtex-2.3.0.ebuild 718 BLAKE2B c5a00172554daf788b4913fcd11393c366c99edcf6aefa86899d9fc87f4686933831ba81ddb57a4f864010338de44126963fba9c69a14520a2e5a261ecaf1661 SHA512 78c6d4bbbb6e79add7f6c7579017a7d94564e9418e8d9357b92642d443467ef743bec3aa4304b609452f9df3d2bef50472a8eb695d9c2f7f5db7d8707d7d07d9
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild
deleted file mode 100644
index f16eabd5b3ad..000000000000
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for BibTeX style citations"
-HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/oset[${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 86b6c87289c2..29edd46310d9 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
-EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 839 BLAKE2B 8a50e02b13cb4649532a2ded56a50896eaca5e706aec490da32a61893a2b2c255b470dfca312b4351d585cfaffeb255f37ee031216f4d6745b3a4e23d79dea08 SHA512 394e34756fedb6e486b99cde09390363f12f88deec1f15639f4bd7a29b2592bdc620a49263b186ec70ac4f53bf92c348080b65dad0878350d1933eed60bb2e16
+EBUILD sphinxcontrib-devhelp-1.0.2.ebuild 840 BLAKE2B a40ad56323f8ba52475b939d5f90c7fba69be338adb00b7acd793095fc75f376af2aaaa6bbca61ca3deb9256df9d5ea774163d874dcb066a3d5750a6602be267 SHA512 5f359c12b021e9ceb1b19f2db98a7a3cfe26cccd25d32b439fea9eae4d89bea4ef98fee7d06c7032d5162785e01c05f67235df5f7e86fdb10811c1dd65770985
 MISC metadata.xml 396 BLAKE2B 5242eadb2888d9329d6adc6afb99cda4d388835c066160e6dacda16bca425555c8dd1b4ccd548667d7ddcc28b595b931842e4cd757225e4d86631d9dc86112f9 SHA512 16429051b15bd1ee3ad8f012ea983fffbe4c4540f84735853ea919ca1bb46ab1aefdbcb8c7e502d5f330898ab2163662faf4733c4aa35309b2d42e33f0e93edc
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
index f9a171a090a8..b2eae1f99fb8 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension which outputs Devhelp documents"
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index fcf8ad95d23a..4e485736a4ca 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
 DIST sphinxcontrib-github-alt-1.2.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
 EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 641 BLAKE2B 1568d98697a52f5f6500f1305be52917d466a7e0f77f7cd21821c5fbf28339cfc1cedcfaea55316410ba21bdafc147e619f17e607b272f517390db21ef6bc993 SHA512 8b2d87209af9d86def3dc27dad6bdda84b15bee627f3e88fa53bd510faf8c79c8ad88d530b1ffbe1831fb1593b92d07ce2645e222443535dadcb901de5c330c6
-EBUILD sphinxcontrib-github-alt-1.2.ebuild 643 BLAKE2B a9ef9b9289c1898e2fdd7fab506f3248bc80726ad0262f0d78442c71c48a4909b10c3857c214bca33c6fc8814af59e477e407b3c01cfb27219fc0f0e24ab1389 SHA512 17a5ebb5763ca9851cb9513e88cd1974209e374b59d605471577f658ab984932ee08f9dbc847d4a5be7bf8f1a28e6715479f41081a0d3ecde141ceda2c64acd2
+EBUILD sphinxcontrib-github-alt-1.2.ebuild 644 BLAKE2B 4206faf06246f7ece9c8d489db1a2f44a7abec2523e8bc8f22a305dcee8167cbcd127bb3429e69c73a4f3791e018a2bcfddc3594ae087952ea9180357e233d15 SHA512 353dae7d45f320097d10ede59f02279736cea14df20f39c8b67613a837fe8977f1b9d901a77557a8615489f4c11e38898f37e504507d3fb37b6f2fca81b48467
 MISC metadata.xml 436 BLAKE2B 66cbd7a712c5d961f49809b3cc95dc80f3f10300ab36c0a91c636a514c52d46a4a31fd3d24665fc2d1dd44ed859ae35f8694193bb5fea26fa8f1e02c39546898 SHA512 9c198eba6ed705786f266b89e1313dd2a4427eff716ec0698ed3cc6e25eaa9b168216d8c46e48009d3e67ad820628820566bdd9184ffb1b147d942349bc66d4f
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
index 7eede18eca54..86d194e6bb43 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 6b6eeefd4e54..8f44993c71b4 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
 DIST sphinxcontrib-htmlhelp-2.0.0.tar.gz 28144 BLAKE2B 09b0d9bcec57140278c4476fa0bbc40d359fc167d8ea891a1585fbdeafe6eb0b52442dbbc8d1d5b6edb3953b04fc29a71f6f74e58a281ebb0d79e5a30cb02749 SHA512 6ed673966615f3e818e00de4b7e59c27f0a0d7b494294f804540777c580480870c36002c08d8ad626b7b41a676fe40edc0b0b5ffc6ad8080f38f59c24e157636
 EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 880 BLAKE2B dcdf06525954627e866d02f8e46df726d52794334da88c5a4b86768cfe32cb1459e9e15fb041f6077d6770b011ceb7ecffbd9b8b6debcd06f630317fa836d785 SHA512 fde00e62f1fe8244e6b0883344b0ec2cd01a0aa2aca6229bc0d20eeed32d79ecbd1e008774780edac645cf64bfc2d019c792d23a206a832c3694fd9d8516de40
-EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 890 BLAKE2B 597c07091265c29ad4bc16e1fd83e0af86afd003311abc3aae87c3b8f1380ff1fb4cd70d37af02c5a43cd2f3c6bcd5e86088ff9e2afffb0636d75b118fc8e662 SHA512 9341158c2c9b5da1a41ef0e0297cf78bf6399f34f97c66bbab24781390fd4809e0eff888960f974119e369b3e8f0498092c7f9d2e49846e6394264190695ebc6
+EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 891 BLAKE2B 40f614f66f0584b0a516dbfc722a6b3b7397cebdf81e2a5ecc88df69767f0b334643ecfc7730172376113cd27411ca85206e64a3104d323add50110ec7f1e79b SHA512 11d207abf7f385a3f941bf01cfcab0a1f7ef3b35cb2370fdc2d3c8839becadf08f61b285fb2329f09bf719bd94d5028b0171fdd50089b07c4b3532694389f9dd
 MISC metadata.xml 398 BLAKE2B 84cee02bfaa0420c3bee0d1324270b84678a306904ecf3b30237d4ad7ceefffd97528109552e00d3aa1b2ad4eb6d9cd0e10341fb122c7a1830031870c1919dd8 SHA512 63c17014837ebf2e8bfce709fdfcd9de27c0071aa527a790c6e1e66c1246ae6e4635e8c30b7b486c9bdc727d7e044bfc30d848058bfb4eafe3eb8c32478a5b69
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
index d48fd742660c..14ab5ad12120 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension which outputs HTML help book"
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index d9944e2f9308..a6b396a6ba02 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 856 BLAKE2B d90a11666626c5a66b9bcbf41e59230c26a9470802953b4ee570e50b60fad54c1f6a7a10edcd5838a8e103372c59ef1dcc0cb79fb9bf38f4e09a49bbc92eaea0 SHA512 592ab3b7b7c0afe0a144cd23f54488170503b6499e9cba03b04b1e6901f68f65411a856abc282da8f6af89914e163b2e24b82ae7a6011d9348ed6a8aecb1c2d4
+EBUILD sphinxcontrib-jsmath-1.0.1-r1.ebuild 857 BLAKE2B 887a8d2cce743e66a977ad4d55e34e2749b854837090f79b05bf8e4f4dc00f01be7855942155d023ef56f8234d9834273d85d5b97405c395a24d33cf8665ff70 SHA512 fa8cc4a20e4cd99f930424d71049eb2b673cb5c2d2ef57a679d5afb76dbf70c3452fec1dbb8755d3626279497939142607dd9da4a1265083d1d53082f77ccbb1
 MISC metadata.xml 394 BLAKE2B 058f215c90b50f36bc6985d786f824147fddd41327bd602fd95c9564a656a1fd6d93098ceae32bdf150e0b6295bf583066729d9e27bd5f2ecefdaa47a9b51861 SHA512 ed096f53fd968c8bc24dd0838ef327ffa15f542fcf4709d6c15f4f82394d09e8603197e2de88dce96c5dfcee8125cedbfabba9976e4468783265d9a25ccc1477
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
index b72dc3c93b18..c4cadff84cb7 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension which renders display math in HTML via JavaScript"
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 72131ad60fc5..5ddf550a22d6 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
-EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 837 BLAKE2B ccc2baaf3f1cb8ef8f0ce16b30190a6669892a2027ea04749e49f4ada72df388999e34f464860fe6cd0ebe7db51837fcefef7b14c262dc2a80fee7fa9ace0ab0 SHA512 70fb1abf7c848e6e4f22796447127222fc0ca5f6fdcec2c0ee8731864062e5671a0e968ee97c0e1e30e8bc18f34fefdc7c0e5f3e542a26cfcee8b655b0206789
+EBUILD sphinxcontrib-qthelp-1.0.3.ebuild 838 BLAKE2B ef59f8631d0564ac9544b1de974ed6213a441c0d218610833309912e0b3864c93a5f29359014b4a77cdfa76ec54c5d57baa2eaa74d0ae9f7181dec082bbb4af3 SHA512 611276af296f5dae1702c2fd4a45d783d467668b46f846ca5538f93173531d1ae61992193cc13906399c2f1bec9b90f8aa68066316025f427a372c696640958b
 MISC metadata.xml 394 BLAKE2B 07ab4ac78a9ee115f9287d86cb944a58297d3ee3fc9d71f2ba63b977b98e73fe41f05b05220d9ed0d127e1c63cb7d04a184159416d48bad0d92392a18ee7a5f8 SHA512 d37a5363341ebd6a0b8f190fc1ee99bd48e2f1fa37b9a6cd9a00178b504dde84cf09656f622867bf6c158ef342f97011d69759be4ee27738ee5ea042e62cdfa8
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
index 02b4812f89c9..6699642adf44 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension which outputs QtHelp documents"
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 7ff6402b764a..91ca568e0e80 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
 DIST sphinxcontrib-serializinghtml-1.1.5.tar.gz 21019 BLAKE2B e2da8b1e1300a327b8d508ce98e7c0d3eff1e0cea28cd874df4fbd9ed0bd4de6c17e107e622ec72e00bb237025ae26b2c5aaa33b2156cee2fad7c8f8d2c65ed5 SHA512 c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667
 EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 900 BLAKE2B 91819fd2ab09f086d43eb83e921a39feb186fe8d1b457981cccde0b20552fc4227542c767507b73e6b4241f5d53de6fb40237ba1b0a4f6e4f8f2273275dd40d5 SHA512 22a872ee63762ce8e34a3e96b9542189a927f1480b5b8914f05d7b6247fd4e17f5f67806fed9be17077c4a1ac197ca45b1be4e2721d91c72c673816ca4b62eb4
-EBUILD sphinxcontrib-serializinghtml-1.1.5.ebuild 867 BLAKE2B 967f55176b960c52f018704821a372ffbbaf7bca632717bb1c34038f2c5c2f45cd49c7b16f3f6617d41feb4a64a671afaf4d9f41d9393c0b87140e7fe098ec18 SHA512 56905b07ed3666276eee64c24aac5ee4eeb7b74f6b86b667cf8de1ad7d020e63063014779928e6dbafb3f8d209cb4b671c0465a59a99b58ddd527d500a5c1370
+EBUILD sphinxcontrib-serializinghtml-1.1.5.ebuild 868 BLAKE2B 892609bfae5872d24613e3f828eb4df2fba8e44f822c8726a367d79d034f954b1b808206c8caa4891df9585f15fc9a81ea4a98d11043f756d709ad8de846d304 SHA512 013eea94bb100f1b5eac099a53128f2c10b30a965694f42477d29858ffec6fc4ba2e6ebf19af765b0f8190b8990feb1b855aa2d4fa1150d1b3a22d3881d357b3
 MISC metadata.xml 436 BLAKE2B 1ff1b18113f36620c2fbab9af2fcb1ba8e827f5a3aa3ddd0eca46d40afbef8c6835f0b0df1e49e9783974aa536d1450f5bdfe8c5e1764e17339f5ebdb8dbd74c SHA512 ce1452b75f6f585ff90a1da0b6455693b18f462ec97bb4afe1ddefa2a1a684fcf87928a35911ce0fb99f2f4f039ab580bb4f17efc375930d57d788a00084936b
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
index 1ad6f58cf77c..7169bf18a7b3 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 4810da0de71f..945e57c567ab 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-spelling-7.1.0.tar.gz 49353 BLAKE2B 59e1f5e3fadeb175fb3d1b7a77acdb23e532456de053f886507c76189bf5f657a948d6288625110ccacfb5b673f23d209e6164f3535da30559f0ac4e792f34e9 SHA512 b8ae9ad79afacd362a986dc63d3be87b91d3560333bbcb026ab7d64fa8139e05e048d5e868df0fc40a159a3c44aeac01191df5ef8208bbcd7e35242f9a0b97be
 DIST sphinxcontrib-spelling-7.2.1.tar.gz 49584 BLAKE2B 7211acfe344b157c0d44f356aef4c31fabcb1b30256cec1693fa67d2652d80c8f3657441c193f82ef26e0e7acd7d141732bef0704462a292355d70a18ab3c2be SHA512 e9b9709b627545e1191d64753c97c0cf65e100d5379e7cc1da46faf9c5d5ea0eeb6c7aafe99331f9518488fb0801c245e0c1fa9853360bb6cf373515a4fed2ed
-EBUILD sphinxcontrib-spelling-7.1.0.ebuild 1294 BLAKE2B 5263b8983129d0c294052eba258e2a377fb447bab21547e75480aef2e595e85366b5bad1955bfdc8705797caf7c8592cde2dc80fdfeae5e7ae793b4758aa26ad SHA512 7ba4902205d9c745dc61141cabfffbd48cadc9e18ebf92bff0461a80eaae1785d2d7c50a6edae059a88fff3dc43366dbeae1640306df74e1a19c37fa2b8ea245
-EBUILD sphinxcontrib-spelling-7.2.1.ebuild 1256 BLAKE2B 50dc85cef7ab7aac2b2988c64cb57305e9209e700c673b6738d94a7940312406e69d6d82dc4f6b92aed0dd9f25748686efd667a5a4c59a376e90607938f69770 SHA512 ce7172e0eb17a889d5b66c25dffbf7741bbb688cf1cfd48ad9160c64d7b3ee447fffc7ec9ead8e804f59520d1620255da4600981baf186661edc020ab80568cf
+EBUILD sphinxcontrib-spelling-7.2.1.ebuild 1249 BLAKE2B 8bcabf8515709d06a98eb28abf0361f4445b1eb2e02279fd79be8a755946a430877af0c572e4607dcc42c96cdd9a7e153c9054ca8f26d6989bdffa0b71389dbd SHA512 82e1fb7eb4a5ce5c811517f3733c69a45c836b6a515843d3c5ab161b3fb1ae0fc67bd6281dec6c6372bb13d0230243bbf563474f6861e355882143a402687485
 MISC metadata.xml 450 BLAKE2B a64fc81ee1b159f6ad2d8fe754cfbb8be207a77d128d01cb7cc0d46b6ba4deea1e49e49654a6b0759699d4dbddcede66cb38457c0b476e4120eb3bd5d34cd37b SHA512 0decb41e64275e11d327f2025732865ac4469b7dffe45386b100f6813df5554e71097bd957f57331856d64c9c8c89ad371abfbb25e0db54f3bf7efe2c85ad1ec
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
deleted file mode 100644
index 467b89be2b89..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://github.com/sphinx-contrib/spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-# The doc can only be built from a git repository
-distutils_enable_tests pytest
-
-# We don't want distutils_enable_tests to add the namespace
-# package to BDEPEND under "test?". Therefore we add it to RDEPEND
-# after running distutils_enable_tests.
-RDEPEND+="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Needs to be run from a git repository
-	sed -i 's/test_contributors/_&/' \
-		tests/test_filter.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
index 28d6e037b439..668e2c8538ae 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 7a7a02385d60..dfb270f8be41 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
-EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1286 BLAKE2B 6cdc2ba48604d0118b1579c9e6309a64676bb4643642e47ff4095b6ffa6388fb3ab7fab58ee4e0711829c67ea4efe0ef8df2cebbda9cecfd7734affeff6ae1c0 SHA512 9d294bd2474e0f588c3aef395170f104dc03539d0169708142627cc7d1fec4c1aa9a1b8b323b8056efdaaf55a072bc45fc0f6d257493f075a80e85d00840ba1a
+EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1253 BLAKE2B 80b2609b0b304c92bfb3d8f03181bb262fbc2ef873fa1aeb30eef097e52fc39ab147a50b0bbb93a3b96bf3850a5bed5c8a1e2e32940a4fe41d2c981552c3240a SHA512 e2e015a39c7f1a84a21dab29b7018b68c79e6888ea119adedfe0a4ee9ff97ddb88c58f7ccd957c454966915cf43fb8f0c5759e83f0f08ccc28af77e0eafecc01
 MISC metadata.xml 613 BLAKE2B 2113d218297d01838878ae22852cf3e78c7bc8807f2c46b1eee03442b3e0af2d3762d331adde3d116cfc71bf5f0e0d7f2b5d1f26a18d9c5fe068eede34f971ca SHA512 ec3a2a5917a3332c95d48f42d0ad2d0bf91745c2f61f57f1efa11d80bd828e635cff0c22e604cc11aa7ddbbc73dc93ff58415c75c87b4c00cb60c668e721b993
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
index 85d0069d35ec..dc4c7087a7db 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx websupport extension"
diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index 17920abf269e..127083c5d199 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,3 +1,3 @@
 DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
-EBUILD spur-0.3.22.ebuild 1175 BLAKE2B a25fc95c81904346aa8a638ad9511657f93fa891528d3698acfbae2789d0718da462d157c8ef74a0af6eaa3ded39801b47e7a8ceaf7e7722bfea8d781295288e SHA512 8ebaf70c576977fafe4fed221dfe11cb2ffcc5738674953a7bfabd1eee67940528234ff9ec9578b8679d89b3f3cde6b60c79925b5abad1840d76b262959ded1a
+EBUILD spur-0.3.22.ebuild 1181 BLAKE2B 0c412a5e7dc2ebe94df7656faf7dc6817404d9da29284e50cf057373591cd9e348c4fc320f406db0aa4d1713107fa109a207b68b5f4751bcc717de3924be0e3a SHA512 b9ed0484614733eab36836f9c81d07a2f3aaa40004dc3fb384451f357cda5ce9a8d9ddd72cc417b7e5f9b09fa2e7b3339a1edd6cdd98ef8a190bb678d116f3cc
 MISC metadata.xml 309 BLAKE2B 691c5684a629e9e2165e4969f044c7b2697d40e03d34834d176cd35a97c454ced155c4d24d35d1661bf2825850edf7f2f2880b1fe543baa39e35cb273ebf27aa SHA512 c27fc80d7273b71a103ca016560c6e7f219a1898707444dfb8015fcc922f4c83f1791e0c9b59f54a72dc2546203d88256fcb39f5c8ae958279bb1213a7165c83
diff --git a/dev-python/spur/spur-0.3.22.ebuild b/dev-python/spur/spur-0.3.22.ebuild
index 43eed4c60ac4..3e253f842d32 100644
--- a/dev-python/spur/spur-0.3.22.ebuild
+++ b/dev-python/spur/spur-0.3.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=spur.py-${PV}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index f008c6834262..6ce8b7d583c7 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -7,5 +7,5 @@ DIST spyder-5.0.3.tar.gz 20586502 BLAKE2B b8223273b638b57827f17037c47bb7bf53f199
 DIST spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz 75780347 BLAKE2B c344ee0798e5780bfac5a8483c2992dfdddba5222fdd4a7c5603514bc612cc7300ec0cb49ebdcce6633d0cca8a5a36cfb5a2105c7f91febb5982dc2ea40fb86c SHA512 72f4644e872c57e229da8958a125bf405fa073ff99071b3555d97d8f8f71dc7b9f0dffbe61adf886e6bf3191894c639dd408d8dc76d65bc170bf7578b5b05558
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 EBUILD spyder-4.2.5.ebuild 9322 BLAKE2B df0f65151072a0fafcad3392be2404e9a45e154bd2e9c8db1de6835b3057d8cb47193bf80c0999fe67cd75dd6a05470650ca23fb9a6be3ce1fe02b5e0f18879c SHA512 06c087701e4f93161f5671b5e2cf0c26a78038cb3c85ff15edc247565f47a738ba5f2eda9c17cf4269030f997e6a836953c56ca2a8e9619d36dc9862d2310013
-EBUILD spyder-5.0.3-r1.ebuild 7207 BLAKE2B 8e830b8f4f59e9940d21f0289ffcfe0114d09aa86af06e02d498e23d52ef047b8f7850859f435ee83fcd64b6a3ca6268d4218f23cc946c9d487d9493c3a1143e SHA512 8db811aafe765208dfa866912f79cf43d786cf92ab580de9c619f5dbc0780e29f504a9ac6169019e131c918a88b53b5e22df629374fa7c315c9bb0480f11635d
+EBUILD spyder-5.0.3-r2.ebuild 7129 BLAKE2B b6041830b49ad3d0293b8e751abcd818478375bf6f193d588dbc2f20a1ab56b80ed747908c94a089c742f44e586e0296c4d57f96e9c5138a414b1490e11b0764 SHA512 08f5c936558a18f69bc93379a4be9bf2fd8e96eeb1289324a833c8f4558013506a051c3106ae66eaea0e6f0388c9620827ff5d365854fd8f366fff3d6444a855
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-5.0.3-r1.ebuild b/dev-python/spyder/spyder-5.0.3-r2.ebuild
similarity index 98%
rename from dev-python/spyder/spyder-5.0.3-r1.ebuild
rename to dev-python/spyder/spyder-5.0.3-r2.ebuild
index dd013535f655..8c1d5b901ea5 100644
--- a/dev-python/spyder/spyder-5.0.3-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.3-r2.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
 	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
-	sci-libs/rtree[${PYTHON_USEDEP}]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
 	>=dev-python/spyder-kernels-2.0.3[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
@@ -151,10 +151,6 @@ python_prepare_all() {
 		-e '/pyqtwebengine/d' \
 			setup.py || die
 
-	# allow use of older rtree
-	sed -i -e 's/rtree>=0.9.7/rtree/g' \
-			setup.py || die
-
 	# do not check deps, fails because we removed pyqt5 dependency above
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
 		spyder/tests/test_dependencies_in_sync.py || die
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index e34992035d45..a497b4bbec87 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -12,7 +12,7 @@ EBUILD sqlalchemy-1.4.11.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fb
 EBUILD sqlalchemy-1.4.12.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.13.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.14.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
-EBUILD sqlalchemy-1.4.15.ebuild 1701 BLAKE2B 165da9ccbcfd53b3da315b2bbbc3c26dcc5db91fe35fa1d460f570176cba17dd9c5706372e745c805c2d4a2d03739bcc4c8a2019dbabef9ae6920adcedbe3c87 SHA512 4b9642194c976dd2d2bc74d2ffbc81a980d9f661a0e571c53c110e91c41c3208a8c04013aad16b66e5c043a143a6f98a0057cd54361a79f5e9098c0753fd61ba
+EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
 EBUILD sqlalchemy-1.4.16.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
 EBUILD sqlalchemy-1.4.17.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
index ece650fd161d..34d7b91a49dd 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 58d3558e3ddf..a8c945598a99 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
 DIST stripe-2.57.0.tar.gz 216286 BLAKE2B 9f2c3b7d4ae3f100647a1cae32d09f258703890eb97637ab2a9d3fc1d2fc30eae7042e4245d8f62a5cb4a5226337a7b22813d992842326aaa57d7ecb3a1da200 SHA512 c63efabc8febe79a01167ad4c166d9498f8623a3b1d36c292a3554cbacfc6aada1bf5ec720723b5a9de6e5c4fb770b8f44d1c95289aff4394a70a0301df61e93
+DIST stripe-2.58.0.tar.gz 216926 BLAKE2B 398b16ddab4050373ba5d7da3c8404b85b88d50749a5c3ce2e1704dbe04cdb99abc90b6c8837afbc3e086551e8dfa72baa3a5e68edf2ebb4e30aff157fb3ce8c SHA512 eee6154384fae69632e5e9ae7f972d97915b07da85c9f1af3849f5b9fea1e6f291c3d3e5b0e319c0d6dc0c035fec167f7711f650032016d3eb4709b333f3d5b7
 EBUILD stripe-2.56.0.ebuild 1720 BLAKE2B a9d99433b7d151404034b4f8f8e54f4fe48bf54235a337bc2d682ee6b4f622f2765ac8caecf82c42fc185fcb16f428de12670bd8af6de839658c8a52a3158a3c SHA512 90bad27eaa41834eab73abfd0d2d8093335854df0758d7d01a52f97d1dbd03195b0ae430f60f5efa7427ce161b31a2ea10c6fcae0c521b8e735b584671219aa7
 EBUILD stripe-2.57.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
+EBUILD stripe-2.58.0.ebuild 1723 BLAKE2B 2b333392240a5fd20f5c7165fd2755a607677d2ae53d86c3ece65b7cdb81c1f65b9f1d0ff9ac2d8602ed50f290ce55f68ff9c0c38fbd8a861c3923583224865f SHA512 bf9e36a0c4957439ec88432125db54eb237e9f06195a3f252d3e5c846e8ddd4647471de433777f2e664124d5ae8661c04aac47871299f54623d45b60698cbfa1
 MISC metadata.xml 347 BLAKE2B 864b8bb1a2e79187e4ad90b1377591685a989619a955f7c85eccb80d918b6a03977ecaac744abae18408b97fabf8a205035e941f967a94d6ddbd550de05484f2 SHA512 9f18753a3d3a452f3d0423af1f10fbf476a5a9ae4a70ce4131eb9beab30fc5475dcf18437532a4ad386d780411ac5a00156a1d818348ae7f4eba2fbad5d191cd
diff --git a/dev-python/stripe/stripe-2.58.0.ebuild b/dev-python/stripe/stripe-2.58.0.ebuild
new file mode 100644
index 000000000000..5499e1b64756
--- /dev/null
+++ b/dev-python/stripe/stripe-2.58.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-util/stripe-mock-0.103.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index e6576d2d7292..bb3e09601efd 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,5 +1,5 @@
 DIST svgwrite-1.4.1.tar.gz 251446 BLAKE2B 21ca55911f6ac1be949c1a714bb61ac58b4b1c04397b1e9076a626080a8420c18a63afb5989c48c7ba6cb843f73bccebd9bd00ae0b032894096135c0ad366cd8 SHA512 74015ed4a72cd781a577ab8c2f38a30a1f6561ca0379e62ecaac8136f40998c926597d97a0c1006fdab69ac4a23ce1841bda296881ede511f3f1b4a2e8dea06f
 DIST svgwrite-1.4.tar.gz 251138 BLAKE2B b105fa60ed75628c59b3ad4d0ea32dddf83f618e213ce6974b5db0e93d519e563eb5a9ff5e37012f71c7ce79579ca927acfb8709d2f8e8ad316b04bae8abafcb SHA512 b722fc51c6b3755064942bb6c7ea199ba5902ee37e426962ed24e0b67659e72e8da36cd2516193e2348a939ab2ccd2c5114349ac72d7b9ea52a7b7d68ad1ce74
-EBUILD svgwrite-1.4.1.ebuild 572 BLAKE2B c117f111cd77172547f0da93cc8374a61aaef1de67de00d556733fa599151724e4fa22eb08a33a5c8c10e683bf6496c20c1bfc5da048edcaa58b73816c02a3f1 SHA512 001170e4fa91827fc95c1973921193bda4c7b7316be991403edb904cc787f6eb7670db47590cfa6f673d23a2e966640c7e5a68bdaafcc6d7a5320f3139f4ac08
+EBUILD svgwrite-1.4.1.ebuild 572 BLAKE2B 5ab2a54c34e83de9b89799b3617ff99072a05e5ab196045291b1f16122eec847c36d783ffd1fc7cd1006657230f29c55e36f89acf65079e62266f21fbf88a6cf SHA512 49856f2fb7f0ce5eddabc80e74dc6a8fa25042062da52f2eabeb9e7ebeb766dea21096586a838031e848cf077a07f457ff5221f3910983110aea2de5e0248049
 EBUILD svgwrite-1.4.ebuild 572 BLAKE2B c117f111cd77172547f0da93cc8374a61aaef1de67de00d556733fa599151724e4fa22eb08a33a5c8c10e683bf6496c20c1bfc5da048edcaa58b73816c02a3f1 SHA512 001170e4fa91827fc95c1973921193bda4c7b7316be991403edb904cc787f6eb7670db47590cfa6f673d23a2e966640c7e5a68bdaafcc6d7a5320f3139f4ac08
 MISC metadata.xml 335 BLAKE2B c8d7679a8d335c10e6819b97aac29604070e333f657d8f0d82883117d765d97db4917124e657a1d7131ae37d925a47f808ec42d490795b9cb98a3c4c076a5d57 SHA512 659d867e66ee12c0e62ab7a6903429adde38fec68bcbd7e448aa6d27bb28b3b5fc5d514c61658444e56435e38916bdd71055482c3d0a5e0255aae82f31c7c147
diff --git a/dev-python/svgwrite/svgwrite-1.4.1.ebuild b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
index cd4261420871..cc4dd367e2ac 100644
--- a/dev-python/svgwrite/svgwrite-1.4.1.ebuild
+++ b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 5949818d465e..8286c822ac6d 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,5 @@
 DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9
-EBUILD terminado-0.10.0.ebuild 803 BLAKE2B b8181832241ec69788aebbe64a6fc1109d6212ffef44f9120185855e543904c03e26d21e4f21fab2cac199295b336d27c6e07dc95165863527825630178d2b70 SHA512 49a6be7dca9d0af8078ba7e4dbd255ab31b1496720c57f211566cb1a7a0a16f76777f73592b1a1ff86569a4c17d84b49d4c7b7a4cbea2d56d9a89540aa3316e1
+EBUILD terminado-0.10.0.ebuild 804 BLAKE2B 74252536fd56836f9f06542699823650be4aa4adf5e33d5b1c628093aaea266545afb04baa3e81c546be3500206574248f0d24d0d50952e18418fee1912befad SHA512 fdc5cee2f293f4d8837fa31a9feab80233620dba458db1d6e078a0c5600fc9206e84d2b5d719421c633caf82ff2a424e521d77e3451df146fd1bbef4187a3103
 EBUILD terminado-0.9.4.ebuild 801 BLAKE2B 0151f449932bf36a7e0da4faba3bbba4ab785c03e899994f55eee66526470deb3b288a251af7b35101e20471fd192ba57e203fa071dbe346b336c68876fce2b3 SHA512 7e2cbdc88d7b0ff8197a8967787991ab0322b89441836e3bfcfc86639e167f417aa498c77361053c03d2fc2d290bb4d89652c9afe7e1938705af36043360276a
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.10.0.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
index 45482f499c02..17dea5b1553d 100644
--- a/dev-python/terminado/terminado-0.10.0.ebuild
+++ b/dev-python/terminado/terminado-0.10.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 9c26b353bf48..bc027f760a7b 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,3 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
-EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 25f2171f6f80354c16dab87bb230a3eb9765be8871cacb3a3c4712e83c763024ec0e40cf8f193382041670365693d39198f5624821c48ae3eb3fa596188c4c3b SHA512 f7f6e6a1c5d43cc8cf005efd2e63cf20a078f1a8438bee9ef0be62be77aac993e5fa8eddc26d032ec34077edc67ed2cd216cc8ebe10e4d5d203313214a13e298
+EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 08971e38b78287d94cab02879d9e69413e88082b4260b2300d327b2ef799f14b0fea33ad06ffda2d5aed458f7a50c7f64acba70cdf6f59d67cb5a0fa080dbaf0 SHA512 75c06be587e7d91021cd69f613865a0b9eb6bf44876f4d84ed837f8a07feeff4ab2e9b4509b8269992cb5ea5c02261c692b65fc97f14ded9d364825e03bd5302
 MISC metadata.xml 431 BLAKE2B 5d9af87db71b8a78f9c6c883fa6309fac2654ddd3ae38cea955eed0ec1218bf5f852ad143f7792cd5b603ecb249ae6ae8cb9e3b7d61d444a1b08423ed2f1689e SHA512 e1d53e1b39f8fabc2bcfc639c03bb1df299293276bdd3c02a74e5a26a64bc2ad0a79c2be51d35bdee9ed6c1c4f2c439ae9423cc85193e97b2b5efc4dd9db16e1
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index deba595b0fe6..2d478f1a011a 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/timeout-decorator/Manifest b/dev-python/timeout-decorator/Manifest
index aa5c66a1b41a..7e77f6f902d6 100644
--- a/dev-python/timeout-decorator/Manifest
+++ b/dev-python/timeout-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST timeout-decorator-9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz 6178 BLAKE2B dc89ba8c4fb861d3e69322b531a944ce6587800ea1f6d871fd5bd95e69ce4fca74c403cc430adefeda08675972a11e872e2296e14b7d7819c78a46fa08db5fa9 SHA512 2e691d40fcbe55a3d6be81f9744c2a06c436b61a17d701ad0e9df7003e7cf41b6e4876b48d4bd4a5b429ae2139e8f6ef8ae05092b599d80b3b5aa05716bb124e
-EBUILD timeout-decorator-0.5.0.ebuild 583 BLAKE2B 355d198d8dd888602724beea0c8d9673a7041354a01b899687fa03d1413a3f744d1e988cc6b6eb1a9951b1121edbc8638dc1cb3f9186d2741f99e3174f67003f SHA512 5e8730d2b2394ab3b6dcd3cf26c84c0b399140f945a37ec23250280705ca949f79d02aaeb94ed6b7b9167bd085ae7edf905e7cfd3fe139cf0f0097a502ef9dbf
+EBUILD timeout-decorator-0.5.0.ebuild 583 BLAKE2B 9a50efcebe16603a78c7d93687dda11d63b68b645b2ee551d8509b7ec05fe99a1e25aa72d409c75e0650769b47796348b0cad854db6f50afc640ca1cc627dca1 SHA512 bf4c759d9e8184ee24ed5a6e090a62cf9c4ab427ea28c0e82a5a22354b89c59e383c705b45378ad2fd24b4842688e99c438c3e4747b5ac992238d3d9a7e2ca08
 MISC metadata.xml 386 BLAKE2B 4f198691f778ea9233ba84506a7a598558a1ef412bea88e50ba63d7567d51fe79586ff416a5e016b8604c0c96a7c0eba427d279667136617f219efd8db24b2dc SHA512 aac2b6666862755f80fce2932cc9a22278ebc445820803667fb23f834cfb07210c9f84cf5fb798f0d82702a1c1300cbb1acb7553b237c03817cda8f2b5c8e69c
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
index 7b4bfb970679..17eaf9705be7 100644
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 EGIT_COMMIT=9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265
@@ -20,6 +20,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 726cdeafd870..d3946de9dac1 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,3 +1,3 @@
 DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
-EBUILD tinycss-0.4.ebuild 730 BLAKE2B f76957135272c2cb3774f1054fc5f69eda4605c5e05042a8f472328c361b5a115906a475d1652bf47f342c04ac25ca1d7cf37330bb7fc7757a6c50cf736584c1 SHA512 8c7a51eb36d86bcbc1a5434ee02bee34b67205393cdc7bdef3dfe85bc2d411c94f574109ec50c23afb2c14631f725daf54d6ccfc4eff83182aa48912c069f562
+EBUILD tinycss-0.4.ebuild 720 BLAKE2B 778aff15644d2f751d19ef8d1d388c7e9884a7b45c640f5489885cdbbc545d047ac136a2f0f37e393a09f177765c05c3215f859d3bac99b4a51d7c9f0cfc44e7 SHA512 6a75c8c1f161754830219bd68016d98948d2be03e632ac3fd15a3c7733ab3be1f6fa0ed0af8fc7660a82001e88b864c647fb4b7503708442a1fd4685b0b1d8df
 MISC metadata.xml 405 BLAKE2B f354f5674460756963329efc30afab26fcc4ef03839578e35f9ea9680c12d015b0a9b087c6f05540a25b872f3453b49fcb5ac7f7791e123c29317b42dfab8d2a SHA512 f546c72a8d4d5d785f3a666f40e95d2b581a6aadec69acbe07cc5096aad8fcf1a84aa05a9388dd13979d74d8c1d3851450a7db8b86c351b9682549e61760d981
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index ec3572444b53..0a904322af03 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -30,5 +30,5 @@ python_prepare_all() {
 
 python_test() {
 	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
-	pytest -vv ${PN}/tests/test_*.py || die
+	epytest ${PN}/tests/test_*.py
 }
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 3c2d33c4ae68..e064a2384d02 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,4 +1,4 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
 DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
-EBUILD tinycss2-1.1.0.ebuild 1061 BLAKE2B 99d2f55b1a956cfd345c4fd6a270b33db187cc9e41fff4c3a997651a858782e625b5edceca630e8fa5eca6d1081061236462ccde9d96bf22e0e31ec0fb151c0a SHA512 ac44f7ef17255a84a0df749a6d6198d66c5108ee19e650f08be8963d717438275f967f79ee83cc099b3ef8c713e7af45a37a527dc93ebed70de4380eaf6f42a6
+EBUILD tinycss2-1.1.0.ebuild 1062 BLAKE2B 30a028eb09924b12c7e524f29a0e201c485c6b2e536680fbc83857e4b94fd2d8fe42f661d9b6062156d02e2126b30ebd3080282be99c1d2360ca56ba94165662 SHA512 b20567003831017649d598d161aad76ee7bca4be6db689cfdbc73183b67ada4f9d0c1b27b9359ace5c8f7a2f7ba796527e011e15d375b3dc422c3b336b110815
 MISC metadata.xml 522 BLAKE2B 7954745f23764d7736ce267e95b61c55efdad096d4f6cc7f552438edde811bcf2efce828e3710f5dcc580ba225a980cfc951a3bc52788fb518c3e22ae82140f9 SHA512 45dd447790194120cdf6715e569a39834a7839bafb6c9272da5d10243bfdec5cea26b97dd6be139d62a8f03ab035da1b0e2022c8114b6f0a1b9d18c56d0f7b8d
diff --git a/dev-python/tinycss2/tinycss2-1.1.0.ebuild b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
index cd49f3098627..82996aa6f7a4 100644
--- a/dev-python/tinycss2/tinycss2-1.1.0.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 0ac223cb90d7..43c8e6ceb35b 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -2,7 +2,9 @@ AUX tld-0.12.5-names_cli_test.patch 731 BLAKE2B 6e670b04f8bd8b84862fd054ec819620
 DIST tld-0.12.2.tar.gz 1347015 BLAKE2B d284581917a9ddee026d316961f2cdc6efc8a3c8dee8112c7266d55a9493f1aca831db0635db02b737bb3e02b3910a8822e121a5317ab02f5078075839e02c91 SHA512 b997bd3cdf22f65862c9b3e7d446014325d9538dd06eeed86f4b9b6c6ba440829b5d611cc19fed9bf8bf039ef01c4258c71b5c765bbecdfc345dd00e73c7fca1
 DIST tld-0.12.3.tar.gz 1498596 BLAKE2B 7a1d33c3527bc1dfeb18bfcc5af4d153f9cc39b52e858f4ac5907d0edece67da6bb6f900d028937bafb468b31534ed284a54effae6d97397dd33e27261af3730 SHA512 fe33bb18bceea6e1eb4ba3ca46dc54c81a8d3a1f4187078488676b951e6734a885a44525f6f5c4dc8c2fea1b0f4ffd8060244fbf33f9b1bd9dfafbec12876711
 DIST tld-0.12.5.tar.gz 1500013 BLAKE2B d6b51e144f9c1305212ccb537b3488b7643190598674103e8fc7772c34f1e5a6eefb09d957a6ecd1ffa3e9ab0cc41b07dd97ef70f031259393c7410cd05e0b29 SHA512 90fa3911f64368e3c75d034b5854d4460ac41b603b431ef94bb0b49bbd37f5fadb0a084f24849aa8fa2a74608ea9555eec2d4372641bc4d135e1cb4fd3ad23ed
+DIST tld-0.12.6.tar.gz 358405 BLAKE2B cf7bd68f26507cd4ac1c681705d8c495131a8b3aa64115e0259f7ef33f61c5db4911cc8cb1493e901237d401bd4eff4bda9cd687d19d9e1e275c3d87980069ae SHA512 ff10041178976af97c920a519ce3bb5a0a46f4299c24419db9a0502e89296e2bd66885dac5927e940c3abc22d6b390336916622cab771a57ba1c8f0960de2583
 EBUILD tld-0.12.2.ebuild 490 BLAKE2B 354bdf41df04dd5a27e14b3efdbf1cbd156e41b6579a2c935b4314221fe259c5eb92d1e6ac622de92e20eb51da822a2752dc3db50ce15258e94db46458345d80 SHA512 60c451052622785ac4ca5afeff3c327950b6a962bbfb5a7bec2126dfd052084ffc5c358b178621c30e862a9498077d9c3326ddf90dc48799ca18e2fcfaabc66d
 EBUILD tld-0.12.3.ebuild 461 BLAKE2B 630553c09b2f1f6035f1f204c82dd43abbdcb99e33a2d6a476064ad31b80434a46c55d08af95f38002ab71e55968b64793cffecd25a73074568221384c3bff3a SHA512 00c3f5d42d752af7d910a2ae59b284177fb78fd13b8b79b9a78b9a60d37f2a8eb8cadd9f9b03e5ba18b04283aa1e8b221e226cb170a693c2519ba23dc30b8004
 EBUILD tld-0.12.5.ebuild 716 BLAKE2B b2679852d1a62e875e89af34be66e4cd94ab748bfc4d3dbc3f252b5077ff7e69d6bf083f6b9ffcd56ee4b856f5807e6ade34ec0f069bfd766be84ac53638605b SHA512 b3a60e15619fe923b0adb979f93e09ccca0211d6d155a4765aff697ddce9dbc2f37724bafcd7d392529fd84004df8f5680a160efa130310153960bc4b0f3a308
+EBUILD tld-0.12.6.ebuild 610 BLAKE2B e738daf9a15e5a9b9f7f6196099ae7f91a4a61f42d852e5848f669bdcf44c50593b63ca4d23a715c4ee3f871100eddebc558a27f31c0bb455bac80ed582e88ce SHA512 ee432d82a3c30c16e3b4a2061ddfc317a147d13baba2a18363a91a17c4a7cb0e0c15445a25f8b473877d49869f8e76319a152add66fdc25f120ee5a7a18392b4
 MISC metadata.xml 478 BLAKE2B e00ab9c47661bb6c6e2d0ffa74bb43154ae546a5b92d3c5ce0396a5935b44e3a3b3d4ab201d305d106e98c8c26a2fee31032878bb2109f8e45f2509a09280992 SHA512 97d25f0e6286a1434f0a27ec986d842ba0693559a646073493d6cebfa8a573bcd6ebe870cac8603556ff65d7061703af8aa963701a1c9513a737402819bab030
diff --git a/dev-python/tld/tld-0.12.6.ebuild b/dev-python/tld/tld-0.12.6.ebuild
new file mode 100644
index 000000000000..e969ca8f57ba
--- /dev/null
+++ b/dev-python/tld/tld-0.12.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extract the top level domain (TLD) from the URL given"
+HOMEPAGE="https://github.com/barseghyanartur/tld"
+SRC_URI="https://github.com/barseghyanartur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/Faker[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' pytest.ini || die
+}
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 000cf135122a..75bdd9cc14d4 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-21.3.0.tar.gz 31787 BLAKE2B 1ad54cb2eb28d25131be13a7fce5aeec3df07fe198f3200202d612b2b49cbef76d422025e143b19db498af224ba522f3a67b66fc10ec2cfb0ab81a52aeb7263e SHA512 b6093864d590849e29311fd1a085cc40997f88ada38e92bf159d72fd809691e014f67ac87844886cfdb27be0f9abc8fbf79d5d7e800688eac34e9edec6d6a2f6
-EBUILD towncrier-21.3.0.ebuild 975 BLAKE2B 5ff73e6409c0922ef39d67235b56a02f35762fad98bdef9dfe2ee22691699da8362caa24709f62fb4cc5fb8748d95619e043963bba45fbd467d4b3d91c97ec5f SHA512 44b054918cc12ca94d62db4ee78b2432d172c62960c8896d09edf4670f622bbe9a6abc85a4685a61449b0320fa500255717a685794362fa8f11bb2a91c256c28
+EBUILD towncrier-21.3.0.ebuild 942 BLAKE2B 90cd831fd1767946ecd23f4d8f20f9c6c834c84515026f2a7a160b6c433a759b6f445954a2378516a9a2b60872db0aa0a6d7d56ee089d402bba91e785a8d9fd0 SHA512 47d7781dc54451b5180250f98d2e7cb855510ba72863cfdc5c1aadb237e1ae23581b50d06f3f778ab0c36354c9ae68e2d2cfd090b85355686c94626bf22cb59d
 MISC metadata.xml 393 BLAKE2B 13ef5f326a92ad5a6782db2ee51475704d22d1a38d0df127ce67973308e44ef685125affc87832dabddeb571748c5714213b2dacfa5819d9243b7a28bacd45c3 SHA512 8818196f77ed34c7f38b0d4d575f3a6f3e6b52e1d0eb74e5cb810f0f21783cb1ed30b3e09289258ce4a2ef5c5702c380c7ea79432b0d7a68d0546482ca6d16f4
diff --git a/dev-python/towncrier/towncrier-21.3.0.ebuild b/dev-python/towncrier/towncrier-21.3.0.ebuild
index 3d95faabc45f..f56e522becd7 100644
--- a/dev-python/towncrier/towncrier-21.3.0.ebuild
+++ b/dev-python/towncrier/towncrier-21.3.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Building newsfiles for your project"
@@ -15,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
@@ -30,8 +30,6 @@ BDEPEND="
 		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT="!test? ( test )"
-
 python_test() {
 	distutils_install_for_testing
 	trial towncrier || die "tests failed with ${EPYTHON}"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 22d2672b292a..c1f1e5f36aac 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,3 @@
-DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
-EBUILD tox-3.23.0.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
-EBUILD tox-3.23.1.ebuild 2143 BLAKE2B 174169d5b1bd6944baecb00350f3a6e1400b337065132428747a09dd043fb128a73a395b5d2236fb51eb5dccbc10ac9c52c0ee427108e38a7a6dc147ba628563 SHA512 8507808cf62949d6c7c208ae797ce1727a7fa4d153e745f2f0018f485eb756006fa9fc745c35a64a0738e21f92da8a50f2d401d21eb1e1e59c563b07ae99dc46
+EBUILD tox-3.23.1.ebuild 2136 BLAKE2B b5a0246552b7f0108257cb1865bb6c2d4587fa85164ded460ed5ee1cbfd5711cb8348b81d4a4a8cbd8d245943b0104b9eff7450f0fda0674c8965b57bbf323d5 SHA512 db77717103550ce445639f9c68452554b701a8880ba5680bb8c9d0417fc294cac00fc919c3f56107be1d43c42795d3f30d0bedf9380f3aab5173d7781b8cf89c
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.23.0.ebuild b/dev-python/tox/tox-3.23.0.ebuild
deleted file mode 100644
index 78e1824c9517..000000000000
--- a/dev-python/tox/tox-3.23.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# broken without tox installed first
-		# TODO: figure out how to make importlib_metadata work
-		tests/unit/test_z_cmdline.py::test_tox_console_script
-		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.23.1.ebuild b/dev-python/tox/tox-3.23.1.ebuild
index 44a1cb28a248..dee644df11ac 100644
--- a/dev-python/tox/tox-3.23.1.ebuild
+++ b/dev-python/tox/tox-3.23.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 05624a09a0a2..f606e6c39f47 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,6 +1,4 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
 DIST translate-3.3.6.gh.tar.gz 1140841 BLAKE2B 77d8b930ba8a91e801a04c67bdd13c0c6538d4df2418f26e1f6bfdb98c275fe746062840034c5345dcf61abc87ee6b8e1b2cda34a71c8e3850ac37df707b8a34 SHA512 c6eedcdb9ecece4804c25aedd57de37da12baf9b2f3bae1c87377f9a07e1e5f1cfeeed8073861b73201de3b35ec4e5da5f972d775c7ff35fa7be21c97746435d
-DIST translate-toolkit-3.3.4.tar.gz 6060105 BLAKE2B 01f8e718a4a60d0f4d439be14b30b2e3f040045630d6f6254ad291a2558d59718521bfb79761d20933f7bb1abd2229ccce67fd71ccd54f6e43dffa7e7ecedd8c SHA512 6bfc4387aa600610fa2a9e7e58368924768ddcc8eb2a697ef02c59682e1e1304b7096f48a1e6e38cd47c68c644dff01d35ffc988d378dbf4833b41d1c5432c05
-EBUILD translate-toolkit-3.3.4.ebuild 2437 BLAKE2B 95e2afa1a0cae8ac04fb62a0a38c9361fc6a9bf93be0584a7ea7678f239858b2195b3b5e0864548943ec54346030e68a53ee777ee86d840b03f894801448ca9f SHA512 f27847bb686d765a48f1e654a367bb12b980a745309b93a2b545148fd0f3163042dfca56036f84116488199241c5abc02a1ab30f1eb25144dd50f3c2ba426f60
-EBUILD translate-toolkit-3.3.6.ebuild 2469 BLAKE2B 2aabcafc788c07285359021a60301e57eef231f98e562f582bd855e26e49c5b8c745e28d1ea8c356f80cb7a0360e3a44899af206cb260bfb97fcd799d33e3e48 SHA512 00c836a23ed0d5b4adda399ee7cf0ed8dc100d10191a23c68f99bab10ddab126512dc77c828da2e1ed33858ae1336cf4919c1b8791bc0118c83466d04ab604e9
+EBUILD translate-toolkit-3.3.6.ebuild 2466 BLAKE2B 045ef0a99924176b23591574e9b23d226fbc593c01c5878537f64797e8cf68efb6748d00e4a4b72e1e79a142ae15c1b5d4a91eb163409330a047bcd09d87707c SHA512 3a5099f26e850b7da77dcecac1e41e13d4695cff3a2d8ca94785400635a1e79b13dc0d91c28f5144649faca8ebbbc70130623fa7e873d81112ac0d8ef7b3a393
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
deleted file mode 100644
index 721d7f3f9907..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND+="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
-	local deselect=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-
-	if ! use ini; then
-		deselect+=(
-			--ignore translate/convert/test_ini2po.py
-			--ignore translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		deselect+=(
-			--ignore translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest "${deselect[@]}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
index b816d199c9f7..56cface0ebea 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 5da94fa34a53..c04a111670ab 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,7 +1,14 @@
+AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
 DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
+DIST py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz 13411 BLAKE2B fa7e7f969a9136286ef18220f5776def84404121f9b7cce35422c925e194380d4a5a3fadc3da50d2d52d85f4100abeab1456e9749f93be20af9f3dd0854d5177 SHA512 4de7084928990ae61628599a8d6440606d70589b8becef6ee58ffdc1ac632660d050cab3947727dab6161dd74ccf6b9f74e83bfe4ff30c41d01caf25fbf6b8e5
+DIST tree-sitter-0.19.5.gh.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
+DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
+DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
 EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B 435e4dcfbef4d0bb3acbbe40222b1b834f2bb5fcf4b62a727f2421015110ec65b8756d38d0d8046d5436756c8523ebdb37eba89f0258404ee45294abf7eac3b4 SHA512 41d6e08dbc381bcb68b40f1d420f11500e0c53e549e68d352840bdc2079ce28c3aad741953c29e1680251df124fd9f84b8aa38bf86b120b881ca1254369ffaaf
+EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1237 BLAKE2B 381537dcac4a494969687ed8b4d333d6984497ac0a4482fc867f6b1e2f3ce99a32bf9cb78c7d6b5ed3df66118a215047c4f41f1cec21fce5a039e59f90e27e6a SHA512 3a2a2919eb756ca358e47d485243c2386d6944d7260e71447ec1377e513a005f3fdb8b2d3ffc895d946bfe585d2984ea33665805cea00f26854f398bfba9703f
+EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
 EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch
new file mode 100644
index 000000000000..3eb9d103a0e0
--- /dev/null
+++ b/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2528827..bb2a817 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,11 +33,11 @@ setup(
+     ext_modules=[
+         Extension(
+             "tree_sitter.binding",
+-            ["tree_sitter/core/lib/src/lib.c", "tree_sitter/binding.c"],
+-            include_dirs=["tree_sitter/core/lib/include", "tree_sitter/core/lib/src"],
++            ["tree_sitter/binding.c"],
+             extra_compile_args=(
+                 ["-std=c99", "-Wno-unused-variable"] if system() != "Windows" else None
+             ),
++            libraries=["tree-sitter"],
+         )
+     ],
+     project_urls={"Source": "https://github.com/tree-sitter/py-tree-sitter"},
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
new file mode 100644
index 000000000000..a3ef55d401f3
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.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..10} )
+inherit distutils-r1
+
+EGIT_COMMIT="b4db17e4d43f27a040b4bf087695cc200512e4ea"
+MY_P=py-tree-sitter-${EGIT_COMMIT}
+FIXTURE_PV=0.19.0
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter/"
+SRC_URI="
+	https://github.com/tree-sitter/py-tree-sitter/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+	test? (
+		https://github.com/tree-sitter/tree-sitter-javascript/archive/v${FIXTURE_PV}.tar.gz
+			-> tree-sitter-javascript-${FIXTURE_PV}.tar.gz
+		https://github.com/tree-sitter/tree-sitter-python/archive/v${FIXTURE_PV}.tar.gz
+			-> tree-sitter-python-${FIXTURE_PV}.tar.gz
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/tree-sitter:="
+DEPEND=${RDEPEND}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle.patch
+)
+
+src_unpack() {
+	default
+	rmdir "${S}/tree_sitter/core" || die
+
+	if use test; then
+		mkdir "${S}/tests/fixtures" || die
+		local f
+		for f in tree-sitter-{javascript,python}; do
+			mv "${f}-${FIXTURE_PV}" "${S}/tests/fixtures/${f}" || die
+		done
+	fi
+}
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild
new file mode 100644
index 000000000000..c82239603325
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+EGIT_COMMIT="b4db17e4d43f27a040b4bf087695cc200512e4ea"
+MY_P=py-tree-sitter-${EGIT_COMMIT}
+
+# TODO: unbundle
+TS_PV=0.19.5
+FIXTURE_PV=0.19.0
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter/"
+SRC_URI="
+	https://github.com/tree-sitter/py-tree-sitter/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+	https://github.com/tree-sitter/tree-sitter/archive/v${TS_PV}.tar.gz
+		-> tree-sitter-${TS_PV}.gh.tar.gz
+	test? (
+		https://github.com/tree-sitter/tree-sitter-javascript/archive/v${FIXTURE_PV}.tar.gz
+			-> tree-sitter-javascript-${FIXTURE_PV}.tar.gz
+		https://github.com/tree-sitter/tree-sitter-python/archive/v${FIXTURE_PV}.tar.gz
+			-> tree-sitter-python-${FIXTURE_PV}.tar.gz
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests setup.py
+
+src_unpack() {
+	default
+	rmdir "${S}/tree_sitter/core" || die
+	mv "tree-sitter-${TS_PV}" "${S}/tree_sitter/core" || die
+
+	if use test; then
+		mkdir "${S}/tests/fixtures" || die
+		local f
+		for f in tree-sitter-{javascript,python}; do
+			mv "${f}-${FIXTURE_PV}" "${S}/tests/fixtures/${f}" || die
+		done
+	fi
+}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index f3451046a94f..3256a0a90633 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,3 @@
 DIST typing_extensions-3.10.0.0.tar.gz 45509 BLAKE2B 34730a537f83bdb6fc126cef947621ea13e93ffaa0ca824d4a60319c57b3b5f79f640bf59b2214d6287d9311c92487da396313e327d2122646cb6e1dc8e3b17b SHA512 1c262aedb092d506bcd90d033a640fa6e1f9131f95eafb77d30ed21ff7d6b0f492b6092d3523ecb773bc54904679e0fa1aa8c3b4af62d77f1a7e6fe5fd6cb10c
-DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
-EBUILD typing-extensions-3.10.0.0.ebuild 742 BLAKE2B 4f0d6c91890b92ec7bef63ea9427df89a231476c38b7aeb0b11084a41155a26ac9c0eeebd0bc044cde5938f753a1460962009871a67cec2de6293a9fc71a982d SHA512 8068628c559e2c49fee703fdae746a3beb584e371249116be0ef9ceddb2c63e032e3bbea45b121cefddbdea3debf480004c9e7447bedada81a1930374b6581c4
-EBUILD typing-extensions-3.7.4.3.ebuild 733 BLAKE2B bd11089d030b3c95a9c6d6a4c58d117ce52fd8dfcfccf1bf3c735014d02f9966ea1ff680a4162faa4bbac82a4fe30f7ad9d8b729c88a8516545f991fb9f3fa88 SHA512 dc06bb47945d839eb9a214333dd49936d8645296378b63858d811c26039188f6a141af6dc80f1aecd6914d3b554f16eaf66db4f2956e71f24a2938548cfc96d6
+EBUILD typing-extensions-3.10.0.0.ebuild 734 BLAKE2B b9f74febedb3bb79a1cb5cc849102488c9c55e6c8571e932190f7c206bdb5220faf1bda96b48f7bc7a2eb8a0d0e44a7c813a76aa4b39412b1564fe4f67ae6631 SHA512 08a3f910034c1f588d1ed08c5b8f8a738debf212aaf36c046db0486ac51d9fcfb47b372415eace95a6ca810cd734fb00f7dd5757ba95244963bccd63be9dbcac
 MISC metadata.xml 397 BLAKE2B 2eeee3841e9ca728cf2ffddb95f17521d7f57f8f8b85d3dfb30200fd666a69d39e31190a15ca0cfd039d253e81497514cdf99d4a44e9cd2b47f5a3d3c5e85291 SHA512 6850714adb8b2e46bfb6cfa4beb97f097547c60c9362a355534a35723f9a667f4c1be645287bfa27e6ceebe4dfc7607ca2ec7e12ff1d539e9598c911fde54825
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
index 605d374c00e3..3a841d36a777 100644
--- a/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
deleted file mode 100644
index c652f5b386bc..000000000000
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
-	cd "${S}"/src_py3 || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 8f843bb172ec..e562d32330b9 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,3 @@
 DIST ujson-4.0.2.tar.gz 7129106 BLAKE2B 8ebf68c6bac65100baeee4f95f175ada09ba48b9efe1876b7b1ff2c3cf87d1a50d8300a981fd97eac73e4c5a70af1b7fddcd468aa6067aac8a2e44133f397057 SHA512 ece12d4407cb7cdb647597ff7fc32e4390fc4c790c59e764da5c5644e5dec470c48cb6a6aaa18429cb713643e5205c5d26b2d2d2195bc90f3a171615d3dbd80d
-EBUILD ujson-4.0.2.ebuild 543 BLAKE2B f1e3d5946f7964f4088d019b6a851935e06b9e1ce241335fa798d1621de9b4426a490f9d59ada01b7d1a2ac47e78c3035a5f41b9e2e7947de49d3adb752948bf SHA512 eeb3502ff893ab0962a2adc5551e0406bf09fc9cd1d04bff8b5ac3b8d398049804a5738e95e2e4358c0d823b7aa9e24272e2b4472c68cf226641bc8d59f230f5
+EBUILD ujson-4.0.2.ebuild 544 BLAKE2B 0c38370f6a502b4b0649af5950768ecb08e52e499fe6b10ef9250d8e2e7b5d9151d3a6b8847c29ecd606fa2877ddf2b3f89992c4aa1ecd268b98bfde81028e88 SHA512 eb9851665382569b44ab5d4bd156b0b4b3751254670282f436f24d524d476e0f49e975357c4e5e15fd49134e2f4871ab68f554ffb45ca6af807102a4f862ffe3
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-4.0.2.ebuild b/dev-python/ujson/ujson-4.0.2.ebuild
index 555f2bbcce49..f7d4a69a2229 100644
--- a/dev-python/ujson/ujson-4.0.2.ebuild
+++ b/dev-python/ujson/ujson-4.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 68cb5ca279f1..895c93ad8206 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST Unidecode-1.2.0.tar.gz 216042 BLAKE2B c63a192bfa726a9e91224e73a42236088de0b39f34f3f6404eec1c3adfe6512e843ce1f75dab32456ce6be4d938b0b8acfc1e6243c394dffff7d4d47d07d0905 SHA512 aedc16be1b676dbde7e45444e297be916b1ca2874a76f07316e2df3aff9687dcf73def24b2441e147c94641f4407cc745ac35937508e09c670f8aa1473977859
-EBUILD unidecode-1.2.0.ebuild 582 BLAKE2B 6c775d1505a7ac027e68639a94ede19d495a64b15ab40e9d1a18a0129f95c13a7f4cc1d1fb22c36170bed4c58087ec681ccc858f88fa40158428d272d7b48caa SHA512 2aca9446fedb1ceacab2ac07b463de63fd05f4c5277512a46a475f33bc757700360de0683c613728be6594042127350b3646d0fe82af55ee1f2b1ebb4bd830af
+EBUILD unidecode-1.2.0.ebuild 583 BLAKE2B d9deab82ba3702b84725c613064cd3f595c9a0fafeeeb73458e0db4e4e82351315595c77b0a3359bf462ae1a8e528815fab1fb2c76e4ebbeb59c19e5a50cc3a4 SHA512 c6e18e7c21b1150197a8a671e671054095ed67e7ca6fc030afa1ff3f21a13379835fa0ad9803248f843ab24fed6830619628e6c24af887dc8ff680f860d027ac
 MISC metadata.xml 456 BLAKE2B 7e83e494d3d8a8626be4f4e3045cd2b2b4a23d6866d4786d2d33f40a192efb08d5db59462fb2fae4db0a721f323ee5002ca5ea1d77766c6f904533da12882cbf SHA512 e797d601b472cd2bdcac5c1053e38f8e88a8fc59a971db8b65be326153ea0b2fda5e340050560efc954f751ab7e56629fae0205277f95b5384af2139094d8f9c
diff --git a/dev-python/unidecode/unidecode-1.2.0.ebuild b/dev-python/unidecode/unidecode-1.2.0.ebuild
index df4537dad3d1..27f57a6cc0ae 100644
--- a/dev-python/unidecode/unidecode-1.2.0.ebuild
+++ b/dev-python/unidecode/unidecode-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 PYTHON_REQ_USE="wide-unicode(+)"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 5ef4ddd93c02..240541d143b2 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.6-r1.ebuild 638 BLAKE2B d670c929bd3155cf84e0833cef191751e8d4032945ab9ed90c886836248396910c68348d0d35d3de3a13398102406a777d87d4c95c1988a74b6c96da21019b76 SHA512 5f6860e5d33f6dd5cf83aacea5ac2fd2900eedaae47a00950e53181b9c6dbbd6645bf752b7f53563ff700e0f72d429f7ab53ef03a999c7cd27aee2cb49904d4f
+EBUILD unittest-mixins-1.6-r1.ebuild 638 BLAKE2B 50bdf4670188d0946cfd6ef8b2c986c5b3177354cb7ca76af5ad257c738cb52654e727a6dbc08bdf32caccd7ead41b12f51bec2085f1fbe89cf2ddeff5bb1f72 SHA512 c7150fbe02895b784f3a1080872f5faf33191cc2de10b84f505b50070b7c23c1cda7243a90478505e17585a0e9ece735355f0c73956ae46116fd912ee8d36f2c
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
index cb98fdf42340..4090d9687286 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 9a44de1382d8..23bd04c54b34 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,3 +1,3 @@
 DIST uritemplate-3.0.1.tar.gz 32806 BLAKE2B 71fb7ef9fbdd61f3a3f67c5615cfb65ab261b5f9ce1c5a534e155a9723990599bf50e9ee0934d870161f7f26fc3d0fbcc07fefa558fc55bca29e96259bba767a SHA512 260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48
-EBUILD uritemplate-3.0.1-r1.ebuild 663 BLAKE2B e28b4ed5f760c6fd38b06e140a97bddf21f86239584ba23e541d92ff35efcc95fae4c01ff486d533281ac2b9e4b1f7fa13b748ae7a7b4f1dafadc73093ee690c SHA512 c23ef528d4750747cad7715e1672b17496a01e603c83ee72c1b321cd5b51dd3d39cc7ab82f9edf1d7604eaefa7eaf511ce04db0e6ee5622f4159b74194fac8d2
+EBUILD uritemplate-3.0.1-r1.ebuild 664 BLAKE2B f3eb9b855dac55e57784bbd1e40b72805dc444ed8b972fe0f2528feacfec3556547b289c72fa8ab298efd1cb9eb50ecded14a9224ef2f13c4800ee2bbecab057 SHA512 62e8742772ef5aa364edd479813eddd0c44341d9c6989e8779943846445a437d533a8aca12039698903eb958cf500887cb163c2214b530c0f1ed2c53eb75a3d8
 MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
index b2db2fd1f6e4..67e0d2d5b696 100644
--- a/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/url-normalize/Manifest b/dev-python/url-normalize/Manifest
index 795dd068178f..e69f84b13c45 100644
--- a/dev-python/url-normalize/Manifest
+++ b/dev-python/url-normalize/Manifest
@@ -1,3 +1,3 @@
 DIST url-normalize-1.4.3.gh.tar.gz 8478 BLAKE2B 2f15a597642626653c96f378b67794819645918473d17faad18187abe35bf7892b11c0bc78451e78f1146389beb3a6470fb3ea1610e60157fee7fbadd9863614 SHA512 46eaa1753b37e89d56cb19818144a7cf5b38653811720eb506732c35bb3732ef0c556420b22a9ee2c08e70e5b408aab7f44cea5e15d1ebe3d717c0c77706bfb8
-EBUILD url-normalize-1.4.3.ebuild 659 BLAKE2B 61ab5f8e8b0c99c99c8f96c09c5a3092b2dc1374186ef8facbe1abeb0b6ecf7b391124a188a257b65a34bc7c462bee94d540cc415a2cef34ed17eab4a9e85e52 SHA512 36d996094cd44789077b3a06419c635241f2c5c661bc703ba3411ab4aaaf1e5a043757ff2a490bb2a9661fce53fdb2464631fc5423953c071da7c6eb399ffc51
-MISC metadata.xml 355 BLAKE2B a205425ff06928adf5c3e29d13c2e740484b29468a9c440f89c902a9df7d3d6e10906c6b1f854455cc57877948f3d49739b2b1fc38f65c4cf6bfe46c4e1795bf SHA512 f1e9946b44282eda2f21f8b6edd9dd8264109d356826d96e9baf4cb20de68e544026825bc6cb7328b5f4c1f374ac8770a3d9be575388d4ca474adcc3ca452197
+EBUILD url-normalize-1.4.3.ebuild 659 BLAKE2B b24b0603d79fcb704325f0c119283336e6fa0617b93c5a77ead37da8e15e7205f7e6746ed3d49fa67216d16552b1216e916f3c077db208663c218dede87d92f5 SHA512 8923bb6cf8797bdcbfc4cee83014954e902389f96b8e3f24f7baa68fbc2b92c998612600913c21c45d917f3f916905ee471857fc06b71f3d0d296498459fd552
+MISC metadata.xml 379 BLAKE2B 957b49c3001f3244143f49af0556d9d39dec3c5c6a2c21c03fb2ee4088725bf94728583f43d10f6d81f5c4437d108c110348171125f67200d46f9d8f0840710d SHA512 27a9ce7e3edde4d2448b8e54603095da16765ea36b3243d9a06e0e17d78cf6ddac2e02a0ac8613bd0eb1eb18a69dd4b0ba4de1b6dbec9938a9b1718f0e046cfe
diff --git a/dev-python/url-normalize/metadata.xml b/dev-python/url-normalize/metadata.xml
index 601aeb3c280e..1644029b53e7 100644
--- a/dev-python/url-normalize/metadata.xml
+++ b/dev-python/url-normalize/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">niksite/url-normalize</remote-id>
 		<remote-id type="pypi">url-normalize</remote-id>
diff --git a/dev-python/url-normalize/url-normalize-1.4.3.ebuild b/dev-python/url-normalize/url-normalize-1.4.3.ebuild
index 79a18fe1ba92..e85c5c5e95f4 100644
--- a/dev-python/url-normalize/url-normalize-1.4.3.ebuild
+++ b/dev-python/url-normalize/url-normalize-1.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="URL normalization for Python"
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index 6191a12ab41e..51be602464cf 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,3 +1,3 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.6.1-r2.ebuild 785 BLAKE2B 20dfd021a4c62760e7d5a4cf667aa866e72ebd9c38ad61bcc3c1ab36f4ad15364932607350a5ee26baa1b24ada65d953943aa8e5adda1a2db291dcca1732ed77 SHA512 29f1070465e4094a0abb0210b0c842dbe21866e59df3e696aa4b38e60fb93f769b027c28ccfe103c91f9ee563c76ed049f5ba93955506f9bae2a7b9b207d202b
+EBUILD vobject-0.9.6.1-r2.ebuild 751 BLAKE2B c7d5e87b357ce4789db293506d72cd820d61cf23570dfb98223fc08db54f9df60ad05126b2658736195decb561aa732b6a4e50d1f41409bf4172a783ff65fabc SHA512 e99dc51345a19aee2a8ce22e2b0a4c074d03225cd3a4b8576cbdbb1dfb731e7356078112e9336cd41bdcd059746ae10d0d3d1af4c86d4122928e845431fa4f06
 MISC metadata.xml 391 BLAKE2B 04b9d75028ac6adaa3d30af50db74121c1abb0a91cb5c87fe05692df93d56001462711cf30025a1fea89d71270a5957cdeb14f87314c8187bb79a5c88966df1f SHA512 206c8605cb4ee10c08b892ba63584af727e17fb0430b2d09dced0c202fe63d3ecb60554ba76cbbd7e2e85ba27f594314bf427d25619f83855466ee23bf7d4ac0
diff --git a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
index acddfef79410..d1901452a521 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 38a29175e2fa..b1671f444dd5 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,4 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
-EBUILD voluptuous-0.12.1.ebuild 537 BLAKE2B 237523acc088fa6a6e7cfc7a37ccd32cff74692e155748e6af3e00930851e0c9a66325565801acff885c6710486eb4419e81d065fad051b53712171bb19cbbb3 SHA512 2c60fa013c651fdd99a30166e38cd11e61a76eda1e2e6ec80ec6cc01103fc44c79aba0748d7b3d81cb25c88cbe6846e05617403d1775beb0def04daaf385300b
+EBUILD voluptuous-0.12.1.ebuild 538 BLAKE2B 1ef91e2236295fdc43c989cdd0cd49455f2792c966c7f0475d44b240b7ac966b3f5bda39156b979944a97c0ec9fd4c4871cbc2ba302a5c3bdb64b015dd5a8be7 SHA512 d6ff61f338eb41db1eef7b1eff3468263668a212a34376c16cc2b16d03656342e95657b8026f8525d4545c3a9ea4189d594c330799ed91298226e563a585dce2
 MISC metadata.xml 715 BLAKE2B 92fb6bc999d76837e4be608825631148540662d16e6e37aa0d456e56f8a541a383e20a06973c2bb6ed0fbb9863d70ef38781017a18253d891518c91ca8306b83 SHA512 30893147da484d6aac982527f9a00c59d7a283239482eb65f9d191751443d436e65b98a66f0bf9857df51d4497235b84db9dfa12da6d23175f638edaf6fe6396
diff --git a/dev-python/voluptuous/voluptuous-0.12.1.ebuild b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
index 3e923fb6121c..6297a49b2c00 100644
--- a/dev-python/voluptuous/voluptuous-0.12.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 59a875631e44..5d943616320f 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,3 +1,3 @@
 DIST warlock-1.3.3.gh.tar.gz 11147 BLAKE2B 1281348076500315c5aa105691b8e5a50ccf2ba79335fb8581a0b89bfc96bb3076a797c4ebe011f6c347667a0971bbbdd2b1bf413d0692ae5977216c524cbee0 SHA512 8a9135a17ccc0d0939ad98eee16100ec68b911d672b3af549f7629edcd6e08129f9e4ab707082593274fc896bc405ab6d6ba9e4bf6fc40b8522ec99327c983ec
-EBUILD warlock-1.3.3.ebuild 716 BLAKE2B c8d53b6778627487ef8342a0e5b8c2cc3c0d1b4ee323fe41ca9674b72cff3e49e8c53940e4f7a95c7361f7c6c9dc52cf5a0ca04b369bfc7f71d6a2646b8a8d8a SHA512 4a02713d53f48824cd6d8d2556962808706e0ce06d30cc4dbb6f1eff458afdb6b9bb751b0473a93f40249a6c01eb116c91a9f2ce56524272c8b2b8de149bf25f
+EBUILD warlock-1.3.3.ebuild 717 BLAKE2B 7dc0528d6c9c078cc72387fae9122ec0468ecd6637d743b2569a6c56ff18dd13d6133be018da3c29d5cb50fad69b304b1c26ec24de02f2aee874608710c315fd SHA512 bd56fa309ad37b0e2baad7c45b345aa6839d56bc0e303ab34abb578e98088a44a6db9f13093e4e4474f660c09e321bfb80106962891f067153acbc5c3cec398e
 MISC metadata.xml 481 BLAKE2B aff1012a1482024186193a16b8e8abab85b300f76ef10a235ed9a40cc25586d4fbf632f37e2bb5a050478c74128cf0b2243345429f6edaa9a5a4b53276637f1d SHA512 1ec1e5a94f222a031e0f73c06c60a76d1e16cdb637d4ade4f0fd1deef8d51fb35cec46de7087c245fe68b8cc77637be822fb7eb9aa6b9379331a797d4e3a0166
diff --git a/dev-python/warlock/warlock-1.3.3.ebuild b/dev-python/warlock/warlock-1.3.3.ebuild
index 9aeb1ca4cddd..8cfb75ad026d 100644
--- a/dev-python/warlock/warlock-1.3.3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index 4faaeef22487..b91b3703db79 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,3 +1,3 @@
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.11.1.ebuild 607 BLAKE2B ee38d26b14248937cc3f45368f3084c9f9e678b6300acf2ef08fb84089d36f5db050ec2ebfb48fe091db0ecf85fc2ec313b267eb153a552f285fd8f3478f5c78 SHA512 18bd620b0112b003a9d03a6add67e5cc43e2e7e5af37718bd409ac902361d99a3ff8602590beff04e66eb061f85ce9c2d7d7492d002ac32a4d557eb5d5ec14ff
+EBUILD webcolors-1.11.1.ebuild 608 BLAKE2B 639ef662c50940c51b59020ab87ba7baf7f80dfbdc159ee95c598ea01f009657bc1fcbd732589f48bc23f668da155126ae35751455e0ae6b7a718319eb9a62bc SHA512 1e3089f441804eedf1dd97bef44a032c4a2d2ed126473782bcaa40a964a2b83f238f65b34dd61bb7de4a5943a4f4f78f7529fe162bd9fd035d4b1a0b0c267592
 MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index c6ef920b7c0d..b257d1c8c67e 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 289f17c7d275..73a498c17430 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,9 +1,5 @@
 DIST websocket-client-0.59.0.tar.gz 57897 BLAKE2B 9f15c563491bd105a1987281cc20c0ab80ed1625036eeaa674fd28334b8226b5f9660b150743649f6bc7717d4306cbb1778222f9caeeff29507ab364572ce2b5 SHA512 c7f4a0336093de86fd00828049a836477a3c859cc4bddebd9e7d31eb746dab4de8fa11205a5fb182e5df3590964aa73f279310575dfabc4abc32157e80df42b1
-DIST websocket-client-1.0.0.tar.gz 58557 BLAKE2B 8234fb246d38673d06c9e16257e00589fe27d1354feba2e1521a41e15c089e899023248dff61346cafbbffe8a423f1b1618a546ead2fee4db67a6c2441581f77 SHA512 6c62ea2f12be0e6409409e832e4654338f6b6cb7838b0765e836c575bd883545c885985e9a05a04cd4ce5fbd537bc97d8c6fc4efb82779c2ec3006580ca19c3e
 DIST websocket-client-1.0.1.tar.gz 58561 BLAKE2B 852693b08cec5d8345ee0cd38d87a93abfd5ac52a72a0715705ae4a7d5f810288d9409e920424a317867e7292568a9a67b4fde8b892e9ff3fa011cf31c016f35 SHA512 349ecf0f80859e146e6039a29b50f8bb9a377ad65655c49b354702a7895ebed4f8849d979f04b1632c7926e3dfb707ae5791a75b3e9c66d35ad1445040d651b3
-DIST websocket_client-0.58.0.tar.gz 48216 BLAKE2B 5e559852385d95caffa73fdb4bfcddd3e00f7bdc9d23d07e7bd6b9e8de599742e153d31bb3a57bdf1aef02361f5dc0b13a443c21872c27576e068f246102d655 SHA512 c587945831427a9bddef96be53d20fec7f55ffd7efe2b676dac96b8078ba446ecda85379a4edfc49c36de936516d3994cbd0515decb9b615cd969bde1117167a
-EBUILD websocket-client-0.58.0-r1.ebuild 824 BLAKE2B 3502b651e758f1ed8fb62ee84b988e49748c6ee99ed76ff93b1ea447ff8b77ef68d7680d23aed8d06d4f0fc7e76b5aa08237b973607031b2030e289feca09d6d SHA512 b8db735fcef22e1a983a245b29e637968ddc7710799bc18856a967aaa24ad9b671961f6a25e02de3953218053d1e6cbce255f27a62ee9d8b316ea156822dcbf4
-EBUILD websocket-client-0.59.0.ebuild 869 BLAKE2B e3b886958cf82f1d6d86b53a50e8841d25d4866bc4ba5663e624b48a484433e0675dc373dcab11b99018fd3a232f1ae150352cf2708bc69f872639d43641146f SHA512 96836b0874714f135fe571abc3411d6b1aaadec62fd4ce2978b7fe3d25316053090ec8c36d00304ea2877fe0078ffacdfb33ca3f69de332902beaedb8324f899
-EBUILD websocket-client-1.0.0.ebuild 764 BLAKE2B 89ed43844172266435fa74b16ab4dea7ce26ce48d1712611cb9f5d14058fa5ac7ecbab8b9dcebca13714ecd9635f875f4d6935d760f33288a989eda590b11c2d SHA512 b5a50cf6905e0abaa0fbb2de460f58fd1bc125c3239202ff33c4073aaf0d6f20c5eb10581f84e02aeb85c8db6ecb737242596167cf2433c4ddcc594a47b2fdc6
+EBUILD websocket-client-0.59.0.ebuild 866 BLAKE2B 6a9c6c76c1cdbc28fd48e2d8aa4a0cfdf9512fb3a28402b3f2801d3d55548cffb68fbd1bc5bd24c0a1c46dee479f05033d920d475952ec7b6e3e45dca77d35fe SHA512 5953b0b84e30a4027a1df4060ccd4c6337ffe8acaed0cfc04c3263a78c261e93d29ea8cf0ba637b2446edced40aa70dc187492be20ce0314d3941e27ad88e950
 EBUILD websocket-client-1.0.1.ebuild 764 BLAKE2B 89ed43844172266435fa74b16ab4dea7ce26ce48d1712611cb9f5d14058fa5ac7ecbab8b9dcebca13714ecd9635f875f4d6935d760f33288a989eda590b11c2d SHA512 b5a50cf6905e0abaa0fbb2de460f58fd1bc125c3239202ff33c4073aaf0d6f20c5eb10581f84e02aeb85c8db6ecb737242596167cf2433c4ddcc594a47b2fdc6
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-0.58.0-r1.ebuild b/dev-python/websocket-client/websocket-client-0.58.0-r1.ebuild
deleted file mode 100644
index 9d1502563095..000000000000
--- a/dev-python/websocket-client/websocket-client-0.58.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	sed -i -e '1i#!/usr/bin/env python' bin/wsdump.py || die
-	distutils-r1_src_prepare
-}
-
-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/websocket-client/websocket-client-0.59.0.ebuild b/dev-python/websocket-client/websocket-client-0.59.0.ebuild
index 4babf39be5aa..2b3d19ca2df6 100644
--- a/dev-python/websocket-client/websocket-client-0.59.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.59.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/websocket-client/websocket-client-1.0.0.ebuild b/dev-python/websocket-client/websocket-client-1.0.0.ebuild
deleted file mode 100644
index dfdf4b220036..000000000000
--- a/dev-python/websocket-client/websocket-client-1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..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="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# Internet
-	sed -i -e 's:testConnect:_&:' websocket/tests/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-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/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index f3032bda3886..586f89e81091 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1,3 +1,3 @@
 DIST whichcraft-0.6.1.tar.gz 8676 BLAKE2B c08dc453b1143da9c46f63d894526784724bff4861c1862a460f557c74e64bbde72c0127f9df0f6547a5c2183fe770e3ceaf417fed88ce70691ec28605f42e75 SHA512 3a8bf524437f3ee0b5b6ee16e4516ba1c75bee738edfef03316b1ef32a58d036734d75e626f113ad434acc29ccc0cce145668867148af7aa10de1fd5f739d5f6
-EBUILD whichcraft-0.6.1.ebuild 499 BLAKE2B e7f07acb08e9faf16b8191145cf442fd8d63c9c026e0214f06a5d78993f6c15ad6c8a126f7ba2cb447fba3d9e7cbc6a78070f934b538b664f96f955ec261e7b2 SHA512 5dc17d1003d5a5f45051b8824ad732a9a3f6a4b9fbb2a900635caea3d4896c0ad4b914edada67433ffd7d4215180a15865a16e894469fdc10f647ad6347e2f41
+EBUILD whichcraft-0.6.1.ebuild 499 BLAKE2B 4b6c8ce9a519e31b4fa8b4bf57fe31bf3b687beed68bc107d080cabf1a4ac169a82e348e720bb1afdb54c7d0a511efd0d231da51200bf15e8bcd7e5ac1a85da0 SHA512 ac0a93e6f1fb8f3fa367a777de6273706f17784e6f42afd6e05eab53aee74292082d849c0146ab950fea8c2272be2e0a246c0e8f9c9d9e47d7a10f3d8a12eb91
 MISC metadata.xml 376 BLAKE2B 3cfa50c1e893538962db2fc182b980d7f55699accdf221a0f5e1de183953143fcbcee0e4597a9b2b986b38a6c66777aef83338adb2ed6f8ee906fd9d01d3c922 SHA512 d221f99186561f484a961b6f45282e64c4ed8a9f3153eeb55716f70478a5f720647f8306bd9df5fc375ba4d541571ea26a87e8a4cc38f70233d501d208623679
diff --git a/dev-python/whichcraft/whichcraft-0.6.1.ebuild b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
index b2ec3df20692..e49fff059db1 100644
--- a/dev-python/whichcraft/whichcraft-0.6.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 325c8039cdb6..145ac10b1df1 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,4 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.7.4-r1.ebuild 930 BLAKE2B 1b43c5049696546837508b20e87a2daaf983411e9a31bc833af326daae6cb26c60fac5ddaba0167a07655419927acd03e8c90b6eec0fab1b4ed9755f81c81a07 SHA512 c795c0defd53d8fc1ba4caf5a8a5b6a465c9f154c2c849aaff75df7862d1d9bd86053a576831c6c746a5222aa881fde1df861ca2bbc273daa162209afa330cd9
+EBUILD whoosh-2.7.4-r1.ebuild 931 BLAKE2B 15e9cd951a84b4724d6ef7fbdd1b5b704b0ca00d632a38e1cf9fa9911b1b597bf25048c3cd9d792c75a6223b0d56d271049f702dc5a9fea8255ec99cb291a523 SHA512 465fc09cbc5868050c13d42a8ab3c2c5090eb863910787c4bef0e8182c76b4f48a323c4b83c4a330240723985c384c82f6b3e32ec1446519f06f3db1d9bd456e
 MISC metadata.xml 760 BLAKE2B 6c2bb15db2b263c2583af425655eab29bcbe6e1903a88baae4a5922d31dfe4de19dad5409a927da3504db5c10757c48de1d2d2e7811a33da539c74a87a911d50 SHA512 df5ac5858ced41e412bf97b321d05e1a9dadfbf23e185d5713be11a669f97e73a731ed53b08c3a2997e2b4341fb8d15a7013b483b9e00dbbdb056a56c859882f
diff --git a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
index f119f38f5063..c5e5581f8b5e 100644
--- a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 2a5b1282ba9e..d39f2c2e1abc 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.3.tar.gz 9723 BLAKE2B 75da0f27e07b52ed730d239ef807da7ba9dd342144ca2e78c32dc09b20c1ebfc006aa9969b1f811d172ca18b75533a4560a29112e56d6dfd472117a0d072fc8e SHA512 0fe97c7fa94cec1b9cf019507f55ce633a9b4bda86329937cddcfa25ba94755010813688cda77ee4fea1c50918e45cd50770bb27e7583e630c46e84d27c155da
-EBUILD wsaccel-0.6.3.ebuild 598 BLAKE2B 1059f1d4aab750616b8d19c3a5fd2cafcb97834debc77c589c1355cd30c8c8d8b4f97dc7a99e94579daba861c6a93de3857b61abb627cc74e1cb23118af47c7e SHA512 7ce628d101cae5cc1c691cf1de53db438873435b3ae195c1c28bb1b443578596d1ca75cf2b020e90fe84ad14dae3db5bbac8f531a8faaeed2a9f082639312430
+EBUILD wsaccel-0.6.3.ebuild 598 BLAKE2B 17e24b3eef6ec9891d528a0c88e8680b9560646bd7a9e9ab95c69ce9eb5e02e15216c603b2883d6a700a7a4302b5cb7fea7beebd9ada0f76149c8028e1fd50ba SHA512 549a6981a89caf59574a3893569ccfc59c3656272a6be57c1605a3ba2f9b986476e6cf68639cf3d13cb56540f41aa7e7ef35b6311f46e0030ec3437b918a574c
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
index 825d6a73e6c3..c2071ba6e6cf 100644
--- a/dev-python/wsaccel/wsaccel-0.6.3.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index e5b57f2996c8..10619dce6b09 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,3 @@
 DIST WTForms-2.3.3.tar.gz 162945 BLAKE2B 5f9f2c920ffc784c34d69f42cd259c1cb6007edbc99028bede98b7c3e24b8ba616b89eceac241cc9b20b241e758ee0c88a9c6736597ddc83c90542135a004fec SHA512 934cf1483beec37d698d13a81e44a733d082baad1f418d3087306fd908df809d37fffe000ed1ecabf65d2c31b57034bf6f25c3b77cfc5598ae1f65bf4a115fe5
-EBUILD wtforms-2.3.3.ebuild 1166 BLAKE2B 6dca881b349b94b47d5f3a42b890f0bb9f07db4447a3bb99c9467aad56fc37526c4d7b28c14bc692d3d4eead587c24f63c517639fa583d8000407e856f4262f2 SHA512 bfb9d20e8e8f7351159576b5ec8f2c5859795243d0d88cf0ed737ab09e89faefa4155a743278901eac862fe470d560bb8b6d7552b4fae3205f7b99e2dfcbef36
+EBUILD wtforms-2.3.3.ebuild 1426 BLAKE2B 9db583f8bf74048c9fbf1629ac4b26998368557bcd3656164f0a4df38d9deae99adadc52a08069af37f70132b7c50910fd9747f722c24ba64ffcea123d8d9c85 SHA512 46d12fe9b6399e0638aa11e1ded021dd1ab6be9d6e7a16c35cd41ea4b5315e782ff974dd32ec7920d6cfda20c6fb62913f42869267d16ae00db1b162e5393e3f
 MISC metadata.xml 452 BLAKE2B 6f54aff59134f0efc15ee22abf968b703c0ebc4bc36cbd1e6354ca3e77382334b2692f3d0a44983c2943e72c5af9d67e213c9b77a5c5a7479b1e9ebb644b18ca SHA512 77f29486b5d7635aac3f3c8fda3286b14a2791ed817b00551f4401405e308e128c19b43b40ea68518755d73208905bd934a0bdcbf3480857e94ac724847494fa
diff --git a/dev-python/wtforms/wtforms-2.3.3.ebuild b/dev-python/wtforms/wtforms-2.3.3.ebuild
index 2f4d412cdd51..feb41b797919 100644
--- a/dev-python/wtforms/wtforms-2.3.3.ebuild
+++ b/dev-python/wtforms/wtforms-2.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="WTForms"
@@ -31,19 +31,30 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
 python_prepare_all() {
-	# Extension-tests are written for an older version of Django
-	# Disable pep8 even when it is installed
-	sed \
-		-e "s|'ext_django.tests', ||" \
-		-e "/import pep8/d" \
-		-e "s|has_pep8 = True|has_pep8 = False|" \
-		-i tests/runtests.py || die
+	# use pytest instead of ugly custom test runner
+	cat >> setup.cfg <<-EOF || die
+		[tool:pytest]
+		python_files = *.py
+	EOF
+
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	"${EPYTHON}" tests/runtests.py -v || die
+	local ignore=(
+		# requires gaetest_common... also upstream doesn't run it at all
+		tests/ext_appengine
+		# requires old django; also extensions are deprecated anyway
+		tests/ext_django
+	)
+	local deselect=(
+		# incompatible with sqlalchemy-1.4
+		tests/ext_sqlalchemy.py::QuerySelectFieldTest
+		tests/ext_sqlalchemy.py::QuerySelectMultipleFieldTest
+	)
+
+	epytest tests ${ignore[@]/#/--ignore } ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/www-authenticate/Manifest b/dev-python/www-authenticate/Manifest
index 33f2cf43b293..62a70d169486 100644
--- a/dev-python/www-authenticate/Manifest
+++ b/dev-python/www-authenticate/Manifest
@@ -1,3 +1,3 @@
 DIST www-authenticate-0.9.2.tar.gz 2480 BLAKE2B 642640f29582983457134034d9d93ca20fb3d8992cbe3f5b3f9b35e3d95c154fb744dc8fbe35081d4af6b1b04ea37e27b35501bd783130d9e1bcf8aa6a0eeaba SHA512 5ee3ee733013d922bfef96981fd33b22947874c0a2a56c6d2dbfe11b0bc447a3ff6b6f294efaea2beaf2ff570cd3bf519a21bc71ce62fc0a8ce5edc5d68308f4
-EBUILD www-authenticate-0.9.2.ebuild 439 BLAKE2B de29a8c6b4d0cb948e4e706405b28573246cfc7f02cf7154db4cbacbb76b405e1d9baa6e5afb192d523cf4fa978e0053b90debf476ffa2616d5cfb789ba261e4 SHA512 dfe915ed0f99e99ed6ad3ed064b96cccb1df34c9106e2db6df7274ada4fbb5a2b57606c47f5c8aa3b051c896546d8c0b338009a4fc5e06d29471bb30b82800ac
+EBUILD www-authenticate-0.9.2.ebuild 439 BLAKE2B 73d1334cedc73b7eb4a0c464a3de9e8624cbc10255430242c91f8121607a78041340552668124953fcbd8c9f3e4ea7369156b982f3fa182446178f6539b3a99e SHA512 05b91dd3b6d85a95fde7796835a5562c5048afa503e1d79a4d91c63e33e24d28823f4cf5d12ab9edaf929d7e5c70c9fa92c938c6b0ef9cd29332dacae7a5c057
 MISC metadata.xml 387 BLAKE2B 48442f1e88e03bf55104ba3f54f61a4f09cbd0fc3761b8e4b79497e7dc746f90b90359cb783faa1813cdc19318dbe66303379357006bdcfe30d42bfadff244bc SHA512 c6a7433f233618ec283e6ba0c0ed2730fb01d5f85a795e340bddc29435cea3c6399095d9fee2b1795cbe5b7949e8a79ecef5c979b502bed2162643426410273c
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
index d8e65f20dfe4..1b82576cee09 100644
--- a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+++ b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 3bfbb332325b..3a2d9589b6e4 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1.ebuild 669 BLAKE2B d7679f7703b4617ed81fe71ea010e77fd3734434dfe2c7f4610dc69558020184e28f02445b8711fcaaa9dd360ab40ceefe5f9a3a036d5e497d3ea671ae84c60d SHA512 d493387e9293605f998141b32e7200e090b4ce59538a6d9ca26a786816e13a12e87c7daa0ed3e58745f1509b5a9797def6d0764d2b942c2221980583da24f18a
+EBUILD xcffib-0.11.1.ebuild 670 BLAKE2B 78653f496362290b0a17e0ca9c6106276a04206e2df8c00d8aa89a307681be7ef99d15ee76d99fb1f1b71fdbe3a94ceda09bd2636c2e96ec3963fc3f97fd1602 SHA512 28f0022764d71b8fd30f3c5768ab42feb6ebf845ac02c4948c8dbf6b11c9f6e4eeaafee003d252e60d7e6fdf28dfe77eb8aa35ff2a465f1f222252d99020eb9d
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index 61612529c9bd..60c1ed82f7c0 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xdg/Manifest b/dev-python/xdg/Manifest
index 5a2af32b856b..6aedca213426 100644
--- a/dev-python/xdg/Manifest
+++ b/dev-python/xdg/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-5.0.1.tar.gz 4120 BLAKE2B f80ca1ec0ac064d64a2603f101301d427e7b64133eede1ff0770db0b7ba4368c8640b2d2eea8f1d28a52874a6b632ce83d969c38a036c970e20c2abba3a1f98c SHA512 c6da757cf0fd11a03d97506f7b898b902f560cb74cd9a90ed55550d89bf60eef5e32abe2aca19816279621e6ad0ad7899c7326b126a777231c67cc6cb30b766f
 DIST xdg-5.0.2.gh.tar.gz 20457 BLAKE2B 87ad0914bc5165b7ea5918a7e9f88b14b4c3adebcd43552a98f9570c1682febf1b02c0f65ece03a449a489ea9de57932cebf3f5d8e4465e366a89734cdb77b90 SHA512 38c418dda2b7ed3369757e8cd40eaf0667643e1d8b23d609be4a2ecfa53e8e634bef9cba6e61f38e08b56d85297f35e38469b87ddd58b1bf2be202f6ad5f5838
 EBUILD xdg-5.0.1-r2.ebuild 478 BLAKE2B 4653632e0acd8411619945f6979eeee30bc91a86ead055ad63fd188cc6391628b2d88602c8e1d6b1ac4383156b4611c1ec1e1a607b526a57ff9939d789d38059 SHA512 a33f4c10b6e0335f43f7e0748e7d6c867c1df3394f6ff5d16a611909e88a440777e5381a8463250cd6261b3e5797ecba72e8b39fd0bc30c92fe86da5268bc22d
-EBUILD xdg-5.0.2.ebuild 587 BLAKE2B 7f24d3c9f02abdf2a3a9aa36670eb62574608db7e0b464d0bbafaf554efbc308b29364fb5c50c69451e458f64f10973b25f7a46c2fb4d23f5bc1422cf87ff707 SHA512 2d79d858239d3eacab5ee5fde9a9e44325e01b3f59296ac246a738201a7cdb78cb34a55b14302bdb33c5cf632c162b657da211853b7993ae95e2f18c158db524
+EBUILD xdg-5.0.2.ebuild 588 BLAKE2B 7da2b8712e71ac552b1357e9c044d4e52a82c1a071a903abe977da8391ae44af5715acd80b7632eccdf00bb9d0e2270aa5840dfdabb0aede7a061923efecc775 SHA512 77803bd3fc3388626d2efd09a1cf4bb967f19a30c4f84ac52dd05d7419e12b50c421dd2f637c7ff463e9cbe7813a81af5994f35ba75f506d0a249efaef3644e2
 MISC metadata.xml 621 BLAKE2B 5a3cbf7eafa16a4c1b3fb84a6d81e1082543df391109ae16527afa59aad4e9301e4ac103582221da5e215ebdd0dd9a07bc98236a861e62195f044b03e387743b SHA512 da8000528c3702d3737d357ad3f3ce05a04090568506012811debb4bc68a15d00345f1c92e2535dacc3f48f000db57045ec91c6caf2222549732d959d2f248af
diff --git a/dev-python/xdg/xdg-5.0.2.ebuild b/dev-python/xdg/xdg-5.0.2.ebuild
index b7d2813bd94c..6f45c65fcd8c 100644
--- a/dev-python/xdg/xdg-5.0.2.ebuild
+++ b/dev-python/xdg/xdg-5.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Implementation of the XDG Base Directory Specification in Python"
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index f4795c2f434f..2064dcb62cd6 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,3 +1,3 @@
 DIST xdoctest-0.15.4.gh.tar.gz 179295 BLAKE2B 0b44276a219119196543671d8ac24469ecd73b040bbd03ca416320d407f0dd34361dbb2778121621f6efb65835ea421107883277b6e712f03e4c06ea2b03dd6a SHA512 a0a35d5c73a8696266d9be44d11e9dbf05c9ac1165a05e681f7b70ef07ae7d56f4bd179e863b6675e2366f1627015e92092e8250ca592f004680db5ad886ad49
-EBUILD xdoctest-0.15.4.ebuild 827 BLAKE2B a34f9f71a0b1bc098df19f51538fca4c7338c0e00f0e268d1100ea26246425e770a682bdfd7177a0520a035f54a3c838a164305efd20c0552e0a411c7113857c SHA512 26c3d3221fea5bacfe95e5611d29a20f6ce2dcc795534adb1afa7c1e2e460858e00a0aea0f21b353bd9334961599542f433eb6bd971eb701a8387fec63bd622b
+EBUILD xdoctest-0.15.4.ebuild 769 BLAKE2B 8e7a0e547d3a5c1838870609d8e20f25a5144ad5a4ec0327c8cad2a6be87560a9be3095deb1a7a6fb70b193dce3073f2fd1db97206fb8e365482bf2be77209d6 SHA512 513fc94a1ff78a69e77d41130e86dd96f3421657c3af7be1511d664911b6777ecbd18803188b0d53e54987caf9a7562ad338d017ebde356bd5b01abc9c275b1e
 MISC metadata.xml 425 BLAKE2B ef6df66f437f7b59189999a895fde27e87580c6eff536aa9b80855b7db9e83c2a0edbaa4784f9438846800b89eac58857c4c303752d1110f86d43194fdee21f9 SHA512 81c57c3abf70d2fc182b5d935ae35187e2f5a9a99b3a5958c282f478fceb0283ee2c09ebe2561da8753dca35c73f54ec3fa17d29ecefd7c50f3c8b7bf42f9657
diff --git a/dev-python/xdoctest/xdoctest-0.15.4.ebuild b/dev-python/xdoctest/xdoctest-0.15.4.ebuild
index 89bc48d329b4..bf899d7a581a 100644
--- a/dev-python/xdoctest/xdoctest-0.15.4.ebuild
+++ b/dev-python/xdoctest/xdoctest-0.15.4.ebuild
@@ -22,10 +22,7 @@ RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 # dev-python/nbformat-5.1.{0..2} did not install package data
 BDEPEND="
 	test? (
-		|| (
-			>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-			<dev-python/nbformat-5.1[${PYTHON_USEDEP}]
-		)
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index df18eded7dc5..086c676173fa 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,5 +1,3 @@
-DIST xxhash-2.0.0.tar.gz 64099 BLAKE2B bf4a013b70f02945b00b01043b34ff32bda0ce8aac5a533a0c7c606665a4054f443a46b1f60454b4d19a064db276ea66370a159d4037df49d5213dfc33703421 SHA512 c0d303f2705542ef8edb78ccccf42e3da6904e81cecb52f45861d0f0215f0882ad1617167273781c19bb5ff7ed776ec41a36a380eab2ce59e02636fc76f4b009
 DIST xxhash-2.0.2.tar.gz 64283 BLAKE2B 01fe9868b45f0be762c233a80b550e4069bd7f259fac8aeb90407864ac1fa6cda314880c87ce03d8854bedbecea1eba665ec4e00b27b68a8573c398238c5ce97 SHA512 8908e78207ff7b835259e359e2617f6b96555bd9dbc5bb079c850e9de22fd33c15396fbde0cd824cf8af2a195217f3ddc1aa8e62f1ed4071408b4a29bab31f2c
-EBUILD xxhash-2.0.0.ebuild 655 BLAKE2B 84d44524d4daf38bf3c1a0bdef7a629c154ef08427d5cac6dcdb235fbe164e9e3b56c7b214ff20c13383bc85c34244782b8b695ed5bec7db97032cc149e31b0b SHA512 6270c7a82a1aa383d4640724ba9302cb3fde4531f6ec68620e84be3f150f95d4f4d09bcf19ab8528ac54a74c0d630ac232b9aa11b7162e7bff0ab2ee17e8dca8
-EBUILD xxhash-2.0.2.ebuild 590 BLAKE2B d0f65dc8f691c7129eb118e2fd277757c9684f86a1c5e0863071377b5c38493ff0b0edff31ec01dfa1818a83931aa213d5348280f4029d2f837abfa53b8616cc SHA512 9a4359d6834b447297274159188ecaa3cf3a42761890689f41441f5cb6a3827a46f0e7d358bfc1f1026142bad4f30c547cd399870e328788eae1b53f7ef5ca01
+EBUILD xxhash-2.0.2.ebuild 591 BLAKE2B b042cdc1a8c5362b80294da4d10e3b3150777cac4c8b61c5d16d8d1f222465019a14e41d57670f9582cb78a90c0c2119b75a1113e8f7eae6bd25dcfc76005dba SHA512 573f721d3c20fe7b330679c5a2c2b1805cf010e645eb69af552c04b015e7bfb5be579123e89820162635e424b1fbe1716313d306247546166d68d2a57db0981c
 MISC metadata.xml 459 BLAKE2B 6d21bb3d1d6c87afa60f906321f40e0cca071167ff256655a1d16357cf2104850305ed3fe3e4dbd9a3d8c40876e95f2e295f9519f159e2c3228eb492b9063094 SHA512 6ae6d99e9495dca1a0615d0ba908f01454fed46abfb8fee74bb8b00ea73d4f2ab335abaa729b42cd0beecfb61b0a1d123085d28642fbab50ddf031f8050a704c
diff --git a/dev-python/xxhash/xxhash-2.0.0.ebuild b/dev-python/xxhash/xxhash-2.0.0.ebuild
deleted file mode 100644
index a27b42c102fa..000000000000
--- a/dev-python/xxhash/xxhash-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding for the xxHash library"
-HOMEPAGE="https://github.com/ifduyue/python-xxhash
-	https://pypi.org/project/xxhash/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND=">=dev-libs/xxhash-0.8.0"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_configure_all() {
-	export XXHASH_LINK_SO=1
-}
-
-python_test() {
-	cd tests || die
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/xxhash/xxhash-2.0.2.ebuild b/dev-python/xxhash/xxhash-2.0.2.ebuild
index 0249b086214b..57d6734c93ad 100644
--- a/dev-python/xxhash/xxhash-2.0.2.ebuild
+++ b/dev-python/xxhash/xxhash-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 06b5bc0e3882..230ce5d7ca55 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,3 +1,3 @@
 DIST yapf-0.31.0.tar.gz 176856 BLAKE2B 080867363df59615d1df77ef51645cd68d931251807da83c5b9d8737a89b01e8dee7457a2b524a76ad2eb21b859ad78168a30f706ef70c3b07bcb94a98990752 SHA512 5f376e985e182aab289c41e4071fd98c0784e5292974e2efcc4beaaca68cb83068b297e228a46f51f0d9370634dbd32948bdbd03e6b65c76b43efba0fe0d3454
-EBUILD yapf-0.31.0.ebuild 631 BLAKE2B 20c3d7694b3692af0cb0eed1dd51f06c496ac1d6c1afa7400cd7fc2d552d94daf8c8a6624fd05acde9e97971a9a6dd120d38aa1a3f8363f42228e220f416b864 SHA512 578b8ca8516fe9a27af89c92bc78d84be145a767518a6eaf28bf69663ad439e14dcaa7c3642f4f3b934b330e0993787fd2689ccc1bcc45b87e829ac599e8ad26
+EBUILD yapf-0.31.0.ebuild 599 BLAKE2B 41ad874cc7e4d54036ca846ae8675f727b57ae49f18f9bd8d49e00fcfbf294981537e5463d979e2997f5866bdb3166676ec0a10732ef52599fdff5544dc4d0fd SHA512 42ed637103a9590ad829f37d872433b3be7abab0cf1e56219f65fc2908757a08e4384c1b5da1c3267e7494abe67c8303536638af5624434a71226838fadd1d91
 MISC metadata.xml 757 BLAKE2B 069cfc9b7a6c7b01e7dbae1e3c971f7fdb9a39fd0c28b3e8a66a2ebeda44320f828c5544247cc7c03e2035c5c9c38fcade775e5a9b5a8725a67e23ea0b1b6c8e SHA512 8ff6be2cbfc43583ddd7a9868087c9e3d66ec7a4fae85db5926c3734f04b38a453525867aa683521a01fa548fc8b30672e0b5ebea2a9b88944cf7b756aa02115
diff --git a/dev-python/yapf/yapf-0.31.0.ebuild b/dev-python/yapf/yapf-0.31.0.ebuild
index b9decabe1518..75cd6c45ef31 100644
--- a/dev-python/yapf/yapf-0.31.0.ebuild
+++ b/dev-python/yapf/yapf-0.31.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A formatter for Python files"
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index d3b209f2fb24..be9b7c7d5e57 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,3 +1,3 @@
 DIST Yapsy-1.12.2.tar.gz 83986 BLAKE2B e6a2650383a7f0c9bf72d4abf21fffb2abcfdc4115a2a1578a2987b7eef1fc04de9099947c1b9dd510d54a89d9b11f86ac0ca3b13510c6417e94ff92dfec12b6 SHA512 3fdb4de1a6d8f836e22d82354492b99ec9883443c389393d25ea40a08bb0b6ae03db9c947af55237b67764facd4d55a09a36cdba107c8d9202f3700fd55c31fa
-EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B 6e09894396112d17190cd36a31839a5ecf5f423840a6aa3cb1b67724d9d676d4ec6cd923784ed5a60b81855970dd38a05efe8cc8f0b7cffe0ab0f9be42fadd73 SHA512 a4d6c9628bd0023a3094032282f174a4257e3e1fdbfbb5dbdd9e790ea603cd9c368f2cc82f10d279192f0866cbe2bf9cd59b804ff1f45c0d298b47e6514ff159
+EBUILD yapsy-1.12.2.ebuild 481 BLAKE2B bc9f0dc4a2aa8c289590fe3250d5cd47065c444786a03f3c0d192099be8913fe3c84ff2a7e671d9b8a6e1a4cd3034e807cbf8320e7cb5b1fabd2f4ae6735d9a7 SHA512 f354165cf2b16454c217d4cab29df7ac82666ffd55cbe5b1849527d461f3750459f7334e85a34c0b26b3f6e356cfa8bab1a236ba93150db9497516c22d598a07
 MISC metadata.xml 466 BLAKE2B f86d60766949f90d56dfb674db326574de8995470658e1d468365bda4fec5fa11e8a18215c31d5828f251d58fc8fb768d595d4a872218b3610cf9e156ac26853 SHA512 5b0bb85601ebb66d9cf1168e5564bda60c62d8f4088377d13b3997469a33c2bd50a15bdfc2f5c7756f9a229fac7f54294e636f6f31af86c72c9caa59f4437928
diff --git a/dev-python/yapsy/yapsy-1.12.2.ebuild b/dev-python/yapsy/yapsy-1.12.2.ebuild
index 08b75b8f43d7..e4ffd85300fb 100644
--- a/dev-python/yapsy/yapsy-1.12.2.ebuild
+++ b/dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 16748fc82d2a..0095c583a13b 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-2.0.ebuild 1058 BLAKE2B c7c694119ba5a1ec85a3869805593df8dfec2f4c17f51ec34079a2db9845461862aa43e029cf64f538b1fc2a445d9ff4945c248f277d9d8bf0567cc936caa24d SHA512 d5e514d3e7e8ca7aa679bb2e3a0c8e0653694eb23ccdd740f3e5aa5c14a0a44729d40a9d3435ed0f3de970453d53c268348a79949598b1900a799bbbc1d2e659
+EBUILD zc-lockfile-2.0.ebuild 1013 BLAKE2B 511c3ed7b8e6aed2591a3d8578223abf7610cfa745e6f1192f73ff524de9a47d1ef2693bb913572ebf2076d830205ade205cb21d9e62661cd048c05f480360ad SHA512 08c325e9164a2cda1148ed24c97b0c77a14beada2ab165377dcfaeca71909e5d77b6174a052eb0a00669dbb75eec50373ce833bf4978ee5c6b653238deea4eb2
 MISC metadata.xml 423 BLAKE2B 41733af56123f04fc6f6f464597c83b1f72b60867edeaa1c04d90e76ac49463db1976ed54b4399d03aefa5203d71ae5e004a415e512d9aa7dd4c9095b32711e1 SHA512 138224c2b0a22e5b77330ad2c2d8050ed28b2470ccfedbccaf42d412925e7a5c06e278045ddc70be6f398dd50186b403135f75c0c5e308582fea12f42394ca7c
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index c7055d449fca..29784b2e318d 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,17 +14,13 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Basic inter-process locks"
 HOMEPAGE="https://pypi.org/project/zc.lockfile/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="test"
 
-RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/${MY_P}
+BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
 
 DOCS=( CHANGES.rst README.rst )
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 2a9df29835e6..bc3b60f1e16e 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,3 @@
-DIST python-zeroconf-0.29.0.gh.tar.gz 62466 BLAKE2B 430a9f4d4460d66166a2484862a8dd3af65f3cfad0e25557648abf26ebe88a7ae581934273db270ff30fa4d714b32a822448b22fd7a95e9e382b68ffae9b66b4 SHA512 a084da17cda264b531e7f58975d30ae0b5adb98f33ca78d1e865e1450dc42ad2bca69bc319c268f7977e70e082ae713142a57f97a9f050486c47b50698002590
 DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
-EBUILD zeroconf-0.29.0.ebuild 1020 BLAKE2B 96682217021cc24e84c8002bfaea5f5e5a4aa23990c68a3ab8cfea1ae0a7725cbabb5b153c07142a8298812992c833080b2fd65c0d1c4c20bf823c8010fdfc80 SHA512 d448b0d72a8078a50e5297de3f2d9626aa17368b75fb74d73b590d9244162fce010c43f5be198519851cf27969270f6ee324fc42bc4b66ca04d091ee3e34dad1
-EBUILD zeroconf-0.30.0.ebuild 1091 BLAKE2B 22b5020085a1c2c29e9469fb81d77388367d6df91cc3c7e080949c9873a5094f1539a5a0d4584e1d2c586c47327ba816bf680022a68f62971985607168e317a2 SHA512 fce0041c3b9d40de22e5e42e923604cc794b4c4ecf231c985feed2cd2c29a2b7d22d88e4290805e4a4c0f4908f6d5729e62a87356f24b52ee5ee56363c13ae63
+EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.29.0.ebuild b/dev-python/zeroconf/zeroconf-0.29.0.ebuild
deleted file mode 100644
index 83912114f7e2..000000000000
--- a/dev-python/zeroconf/zeroconf-0.29.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local excludes=(
-		zeroconf/test.py::Framework::test_launch_and_close
-		zeroconf/test.py::Framework::test_launch_and_close_v4_v6
-		zeroconf/test.py::Framework::test_launch_and_close_v6_only
-		zeroconf/test.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-	)
-
-	epytest ${excludes[@]/#/--deselect } zeroconf/test.py
-}
diff --git a/dev-python/zeroconf/zeroconf-0.30.0.ebuild b/dev-python/zeroconf/zeroconf-0.30.0.ebuild
index 7468e3466c5c..3c5bffd941ce 100644
--- a/dev-python/zeroconf/zeroconf-0.30.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.30.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index c3b3fea2a3fa..1b046617c4e7 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -2,5 +2,5 @@ AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cef
 DIST zope.interface-5.3.0.tar.gz 241964 BLAKE2B 4b1ea32f3f08e2d49afa402358760dd575057bc4487ad52686a2aaceee782501c3c1891dda00cbd306abe35e7bfea4cf41a4a340644258cf478a637abd62c103 SHA512 3544c64d64f32e4635031325b38500b8ed5888b03821c5ff2e07c2d88bb50ccb0b6fe24c6a55813bbe05caf2b847be832182e04dcd8e9ff29f1e68c1fda7c680
 DIST zope.interface-5.4.0.tar.gz 249329 BLAKE2B 3a35ce6ff2a9984ed865cfb3bc3371e8069eb416d11bddbc56e27db4d76762fb1b87d295b51258ec006fddcbb38a8752b47a2d7874c0c8a959ca78101eae2750 SHA512 ef15d63397e05ad9fc44b2d5d786b0399b6973bb5f4866fab839ff612756f3157f2099d0f5c0469b574a5c8b5920a7c2a5c6eab8e8f84c24d5c43e816669bffe
 EBUILD zope-interface-5.3.0.ebuild 1318 BLAKE2B f79c2dcb0f3f82d67fa31baae50373c229eda4b45c430c794bb092c438c71f12fa4734bd49edb4119ac53cdac69546715fe743af77dc92230cb394e92f35a491 SHA512 f8c9f951a59d4eb33676a1278fced53d0a5542e2514b90e1bc698c4525e536a890d28c48807d8a4ef2022f45216e0d9221967541ebb797f340cb7e11c88f3f06
-EBUILD zope-interface-5.4.0.ebuild 1327 BLAKE2B af92c1ac3ba54d0a663622448204fe85a2140932503d7ad86760363c5b3cbb9697e1317dda51f08d57fe1da5a9c5d12a52fe2bacdd60f26534eff9f192af8cac SHA512 88615ca0be275366c934ca78602e32ec1c571f2c8c1d6ce2bc213e343bffc20a2f29e8b095a0e618844668d6ae15ddcad5420b0253cab5f8aa4049289c9271e8
+EBUILD zope-interface-5.4.0.ebuild 1320 BLAKE2B 2204e1d67d99cb6dd3066ffa97e5c376a544bcaee92c609b231d8d876e170d6377539f6f2ef3dfb65870c7bfdc04d4f0560739c66da7895db6218f55db4ac8f9 SHA512 15e861f08c63b914679239adff95eea179c7b48c4a8e5fc729044b1bc0be77d5ddce8e7b6b25610bbb8656258e77bdb432df62b9eb3f70cdb10e7026dfc9d09f
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-5.4.0.ebuild b/dev-python/zope-interface/zope-interface-5.4.0.ebuild
index 9948ed90575a..c82137866901 100644
--- a/dev-python/zope-interface/zope-interface-5.4.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.4.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 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-python/namespace-zope[${PYTHON_USEDEP}]
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
index 45a6d6375725..fb53c3667902 100644
--- a/dev-python/zxcvbn/Manifest
+++ b/dev-python/zxcvbn/Manifest
@@ -1,3 +1,3 @@
 DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
-EBUILD zxcvbn-4.4.28.ebuild 508 BLAKE2B 4d1b9213d9c6579e928e70c2c30320c90b4debab6f591bfcca23b5ab2e7de5fdad80a3bff2823ea399c37bbb75cbd70e4327449f6bd50435c38ddfbaa9b37992 SHA512 38dc1da0b4d1df892fe291ae5bf209290b1a6af6684e6f077efb51cd91849dc7bfa6de77ff43e2d6ef273d135dd973631b954f315034dabc245f9de237f15ac4
+EBUILD zxcvbn-4.4.28.ebuild 481 BLAKE2B 88807de63c5b53324168f5ea4a80a547e177601938c3f8930d1f8cdfe46cda222fc418dc0f57a19791f7a29de321e5da236fca5cf4c468259e6443c17813cf72 SHA512 5b98610c07efbbbf6a57671f752f7c586e0846a46da47e2975f1f950111d203c746d597427c1e9f4e8fc844e3b9e7ff1d6afa76a07f7ce01b249315dbc0fbbe5
 MISC metadata.xml 287 BLAKE2B 83af213048e4beb93034bb8d4ab8eb6710fc67a2f3c1ed0c686918aae530a1a7b35f0ff9b691676ba3d4af08cccbdcdb905e5661a9bb08c5dedf77d5fd7bf337 SHA512 71cece3d691079796102e3deb3e44ddb7595454a1367ff911a08de12fd991ea6ef80230af0b61ae96d3dbce00a4129c7d0b319b6a3c02d34c2f5d61a52602bf9
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
index e33e8732bf52..66bdf399468d 100644
--- a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A realistic password strength estimator"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 17ad6584000c..04cd9b9f99fd 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 0cf48d19126f..56c61b857435 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD actioncable-5.2.4.5.ebuild 950 BLAKE2B 403c8cfe76ac5cca772aa47b7820a88a5481192ea6c0193fa34bc3ed6c806d94fa7757fd7e2a4edaf482d9f7d457fcedee2741ee9fc218c14f20c3a58e612e0f SHA512 a4f64ce3e42212afacb9d6c05f20a69243ae4db40dc1b7e668c5ba980b38f757169af664ee62593bc591974020be34b25ba83ebad1bcdf7d1bf718d95da73c4b
 EBUILD actioncable-5.2.6.ebuild 936 BLAKE2B fba18465f441371ce5291ae284941a48a408131f2f9973b608c59246fa8c81c0cd527c51d376baab722f8f0642705ff8969659db32c9b9d0d3405e32e4473fa6 SHA512 27edd8dc75e905e734d218d93c3c34e11c565758766eb4b49a5ad22425855eece0d3087daffc4ea1a587473d272a0e11c976636bfc45921f103412bf851a1659
-EBUILD actioncable-6.0.3.5.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 EBUILD actioncable-6.0.3.7.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
-EBUILD actioncable-6.1.2.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
-EBUILD actioncable-6.1.3.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 EBUILD actioncable-6.1.3.2.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
-EBUILD actioncable-6.1.3.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-5.2.4.5.ebuild b/dev-ruby/actioncable/actioncable-5.2.4.5.ebuild
deleted file mode 100644
index 8acea8ea41dd..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.4.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.5.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.5.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.3.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.2.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.2.1.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.3.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.3.1.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.3.ebuild b/dev-ruby/actioncable/actioncable-6.1.3.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index da78f127ca79..87e27cd2512b 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,13 +1,5 @@
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD actionmailbox-6.0.3.5.ebuild 1775 BLAKE2B 90207c1545b4bba3d5751f7441f10f25bcde49bfaf82fc7472f6ff836328095406a99fe6f4332cec9c9851f8942f368b7f703336a31a1b9c8e0428d483fd3e64 SHA512 3ae91c36cb621c167f3cb41a3058fc22d07fb868c90d143f542e397714b123032bfe1df01fc208c4bd260b336cb9919e4d5ec95d003963cb6a4c13e1c60c6b45
 EBUILD actionmailbox-6.0.3.7.ebuild 1814 BLAKE2B e60e59b4131ee930ba2ae2b99a4ad5be8c59465df628cec5f620feeafb73be8abf1da1e94a765d3db0294c64554726ed1a2e44cc98d4c0e51a6a3edf215a9905 SHA512 28d3e4d518203c3b2526e924b6b3e849e22b2c84f2ee36ac56b506e823a2e1eaaf79ed06714a1081ba921e198bcee2cdf67ee7d902eac5ae999fab6a9a05d031
-EBUILD actionmailbox-6.1.2.1.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
-EBUILD actionmailbox-6.1.3.1.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
 EBUILD actionmailbox-6.1.3.2.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
-EBUILD actionmailbox-6.1.3.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.5.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.5.ebuild
deleted file mode 100644
index 2f950375e6db..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild
deleted file mode 100644
index 06f3358e6aa4..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
-		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild
deleted file mode 100644
index 06f3358e6aa4..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
-		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.3.ebuild
deleted file mode 100644
index 06f3358e6aa4..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
-		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 7bd58f9a00b2..e6c5e4c8c50f 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD actionmailer-5.2.4.5.ebuild 1419 BLAKE2B d6aace152a40760e2c49dc536869f6aa382cc5bdb13f4b35f411df66a2f5698bd02dfc6a9114fc9b3691ad785e100bd75cf8b60b337fc8a57ba1d99084d4954c SHA512 4001cbf68a332d36f8f8a5c107c5334779e5f952d39462a65f66ee2441ed7888b2b6cc84ef1d1f7621aa0b55de9ae85e72c5119300ba5831e354e6c821f806a0
 EBUILD actionmailer-5.2.6.ebuild 1405 BLAKE2B 1d24e387325e99a3c395fb599b5e92009ddfad7f577498b1adfb51cb782942c9f893d2c1b8e1e96f1cc1ab56a50de30aa92a9b0f1280626e000ee0f31b70d23a SHA512 7acb061f5bb4946282a576d3b87a441b8fcc3a11f8dfda7201f4b67e0573c4147e6faa79a3f2f1eea6f8baaeee763d55f0e762e90855cfc51b97429bf2c86e37
-EBUILD actionmailer-6.0.3.5.ebuild 1261 BLAKE2B adfa0c8b65338e95e0d7f1a768a084a966fc1f4a204c9a7bc32a796ae12a6ac45b4745bfd4e5704ea5c019fc3310b264bc4cc931fdec6087b7a9ce794238c125 SHA512 a31fa8b81382754824398c371fe389114cb1f19d95dc6c5c13525b932e778c5bee83c213a3e9adb11361553a77eb2f5f0de38df5d0a2001e62d01a36757887fb
 EBUILD actionmailer-6.0.3.7.ebuild 1369 BLAKE2B eab6498c778d7bdd71a4e07aff5ba62284ba7814da18d1e9cea25d9c6c4f98ab36f1b5c27b1949494c04cb652e3b3e3620da0acf4291af2b89cd18698b8df526 SHA512 235f7c5944630291f7bd95125013224b03c8e69bc951ce3a5064b000375efbbbac12fcc36950b4b7dad7f7a8a97cf11a51aceaad9d1c76580cb335f8eb00bc9d
-EBUILD actionmailer-6.1.2.1.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
-EBUILD actionmailer-6.1.3.1.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
 EBUILD actionmailer-6.1.3.2.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
-EBUILD actionmailer-6.1.3.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.4.5.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.4.5.ebuild
deleted file mode 100644
index d0f0e960c5cb..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -e '/\/load_paths/d' \
-		-e '1igem "railties", "~> 5.2.0"' \
-		-e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activejob", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.5.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.5.ebuild
deleted file mode 100644
index 56d6cd09f47f..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild
deleted file mode 100644
index 054f20f77e74..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild
deleted file mode 100644
index 054f20f77e74..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.3.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.3.ebuild
deleted file mode 100644
index 054f20f77e74..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index ee765bde3e6d..30396af0ab6a 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD actionpack-5.2.4.5.ebuild 2217 BLAKE2B a6c65fb3bceb9176abbab2950749f5172f0a90e7d4cc002f8685519f56b69a0f3f949052aa515eeea6cef63c4f532ef7bf68a48b23f38451ba30566a09601185 SHA512 363e0a19a734ad23c9d7a500a42072a6073046dd8deaa7fed4db20a4476f76ca4cf1714c97836001445795e4ee2f28a73f52b48fae1384b8b6b77db7f81e3b3e
-EBUILD actionpack-5.2.6.ebuild 2211 BLAKE2B eed159c18478215d8d5fa710d8656a2039ffda06ddb9edb215c67faa2cb614c9be58e781bd90b497949035a42601523d6becb590ff064c476982e84ffae128cd SHA512 0ef781335fb7da727df8da4432097829b3b1e49643f6b22ae660e20fa2ac191455833caeea85e944097a61d54e60a76b2d8badd0dfba3f2c05cf06f6908e012c
-EBUILD actionpack-6.0.3.5.ebuild 1816 BLAKE2B b902dac6018601ef750da4e242fd2ac8860bc160ecb85d4f9446942f15339afa2f2a087b5168d7f92c9bf4583b58eb601be1e36c07af3cb7f3cdd728d3820666 SHA512 bb99bc2c41925cadaaba9b979077823d1375dde7af3f869dfdd7566d90b51d66ea16dbe7d8409f93102bf90a5d3f6243fbcd68a341b1e6ac8e481061272982d4
+EBUILD actionpack-5.2.6.ebuild 2210 BLAKE2B b2a432e92d419452ead9e92b3e78d83ee82d2d8a21f8f7c1bef69820f0bbf657aaa634fa18e00cf73edab6332b85906336a7f3a3a7d15dad469a4f2f32cfacfc SHA512 cd4e8d49cd04507d1ab995181df66d6793c422efed150887fbdab3dc7abc328ad76a958b149b4f202dc111635141fe49188470b5233b36b73721935cbe5be3f5
 EBUILD actionpack-6.0.3.7.ebuild 1920 BLAKE2B 7556855bb223a6b73fa72c7b3f8c30e0fe65abaebd00422018304e7fcd201ce5260be87f0472b3db97b78fc052375c958bd0500b5963425f4f3c55a3cea4f743 SHA512 877d56f35377cbaf77c8f32db3d3bdbb70b037275920b9cefcafb9e907e9a610632a66c72fb12b2319dc97b5b1e4d329ae9fd76cc99692d0d442176674dc0ade
-EBUILD actionpack-6.1.2.1.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
-EBUILD actionpack-6.1.3.1.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
 EBUILD actionpack-6.1.3.2.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
-EBUILD actionpack-6.1.3.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
deleted file mode 100644
index 7d43f2a0a814..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	sed -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.6.ebuild b/dev-ruby/actionpack/actionpack-5.2.6.ebuild
index 7f958d467850..ed0dd38eada0 100644
--- a/dev-ruby/actionpack/actionpack-5.2.6.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
deleted file mode 100644
index e35e318f6c89..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
deleted file mode 100644
index 74a56ac801f5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.3.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.3.1.ebuild
deleted file mode 100644
index 74a56ac801f5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.3.ebuild b/dev-ruby/actionpack/actionpack-6.1.3.ebuild
deleted file mode 100644
index 74a56ac801f5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 1170fd9f8eed..f11d913e6189 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,13 +1,5 @@
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD actiontext-6.0.3.5.ebuild 1672 BLAKE2B 5a69dfb27d7b1b2a052a275600c665b353c57d12d20e86a66da020caa3f4df571fbbc5be2e72de5a4f72b7db2b86333dec6a339943439193bd922abfa7817687 SHA512 35b8cabc849112607bb9d2e3888dec82c5b08fbb23d866b765b69d43042984ba8cfe4e140beb9b6845dc755e366823bc589df2d9ba91f5de993136c5bea98d2e
 EBUILD actiontext-6.0.3.7.ebuild 1711 BLAKE2B 619a52854c7a3403284f7d89a5fcf50b2a9177f769d411ffaebfd0f89c8d07f49cde8aa48733716e294d57f60ab71b5b789eac0a7d56fcddda11c0e5e3b901d7 SHA512 52a7dfca2f53467b2b4ae19a31980d8d606de0716703976cdc98ea57a54e5e25b221941eb8953c0b4712c4c66d433734f2b40d3a3acc8c6a378338294118cb1e
-EBUILD actiontext-6.1.2.1.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
-EBUILD actiontext-6.1.3.1.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
 EBUILD actiontext-6.1.3.2.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
-EBUILD actiontext-6.1.3.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.5.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.5.ebuild
deleted file mode 100644
index 8e697a420314..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.3.5.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
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild
deleted file mode 100644
index 052bc4fa1448..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.3.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.3.1.ebuild
deleted file mode 100644
index 052bc4fa1448..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.3.ebuild b/dev-ruby/actiontext/actiontext-6.1.3.ebuild
deleted file mode 100644
index 052bc4fa1448..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index c24717a45503..23b4fed3a0dc 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD actionview-5.2.4.5.ebuild 1955 BLAKE2B 4c3cb4ce9c908f2ae7e02257a70a75220d0dc8968ffe3fd3ede5c9ba92524bbc215b234149a84c24da68f88a6adb842de09b89dbd0ee8e5388be801851eb784a SHA512 9c28142efeeab99b610da7aa749b7d6c1629e5828dbb90198d4d2e5a07562e7dd9251450f06aa3f8fab4f4298e73995d39a515d2473c77bf614a2b508add142b
-EBUILD actionview-5.2.6.ebuild 1949 BLAKE2B 0295e29226a04e65e80a96f87f3ebb2b8056d5382e23c9a85eee90986da22b1385ac5ed5afa9aea2f0a91ce51919e397fa74898203523f734bcbeb2234a132ec SHA512 21a74cf78db622d0c31d646f99a2e57cf034dab26948ff1b9d4f5c3a1f49314cdd1a4144e99eb756219f88a148899fd7e7e3708cf311b382436c5c396d3802f0
-EBUILD actionview-6.0.3.5.ebuild 2132 BLAKE2B 9cc32f050e5e2ec4ed3e893ffc68b45498699dd2c5eaa0e2a04b4b64c7889dcf3a1dfa78656b5e51616be029e23b310d334757ebf3eb4405b0d4ee988d4c4ebb SHA512 34cc51bd9bb1ea703d7a0f074ff29c99587219ceb8579980eb54ff99d7b7ec2dc6d95c932804070cb9db592417488ca80672834d9aeec9da3e6d9c11486c89d9
+EBUILD actionview-5.2.6.ebuild 1948 BLAKE2B 91fab33b6925a4cf77c575279a5d329f856931362dadff109acb4e6bdb9195a1e1f3bc90c1520e5cb78a478bda6c681825b20c09c7107626be51647bac76c7ff SHA512 60cb6494d5b13170bd0730cb13ec3b75dc64a66b808fdad3219bd739ba997adceec772c6e5844c94654050921e4e1c030479dfc17af7f8e4abf91b5aa10aa63f
 EBUILD actionview-6.0.3.7.ebuild 2236 BLAKE2B 51627c40a0d651d7977817680a91609a35ce7aa0ccadf4c093eb3cfca81fd38968a4f602b551604e5091769585fcbbea6370d0073ec36d41e46edc238c303f68 SHA512 13f27245931992e8117637f77864cc777d02722979faf570271d79fe6ac18cd86e393c70f85afa1cf782010fe93ac043c91d5cfec1e538a03dafa89ca3681ab9
-EBUILD actionview-6.1.2.1.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
-EBUILD actionview-6.1.3.1.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
 EBUILD actionview-6.1.3.2.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
-EBUILD actionview-6.1.3.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.2.4.5.ebuild b/dev-ruby/actionview/actionview-5.2.4.5.ebuild
deleted file mode 100644
index 982cb573783b..000000000000
--- a/dev-ruby/actionview/actionview-5.2.4.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.2.6.ebuild b/dev-ruby/actionview/actionview-5.2.6.ebuild
index 30f8499d597c..2f55f788fce3 100644
--- a/dev-ruby/actionview/actionview-5.2.6.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-6.0.3.5.ebuild b/dev-ruby/actionview/actionview-6.0.3.5.ebuild
deleted file mode 100644
index c5604219b363..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.2.1.ebuild b/dev-ruby/actionview/actionview-6.1.2.1.ebuild
deleted file mode 100644
index 14ddbdd81c38..000000000000
--- a/dev-ruby/actionview/actionview-6.1.2.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.3.1.ebuild b/dev-ruby/actionview/actionview-6.1.3.1.ebuild
deleted file mode 100644
index 14ddbdd81c38..000000000000
--- a/dev-ruby/actionview/actionview-6.1.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.3.ebuild b/dev-ruby/actionview/actionview-6.1.3.ebuild
deleted file mode 100644
index 14ddbdd81c38..000000000000
--- a/dev-ruby/actionview/actionview-6.1.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 0f0bb0571bed..02b460f10e19 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD activejob-5.2.4.5.ebuild 1088 BLAKE2B 18db058ffe71f681ab28cb6668ac8cf7fbe3d922d49520f68bce8f5f69c773fcf5627179b9bd7a365f6113ec992ad5f04ee49907f8c4907a602cd1fdbaebbd0a SHA512 fd23cc4e42417afa6ba2091bf5e8ac0b6332855aa72947c32b367d28336412c36a8f02c69b6271bf5c80d3c6282f46afa7a241a90f6bc95f01e559455958f495
 EBUILD activejob-5.2.6.ebuild 1194 BLAKE2B fb5d5dc3f503d114a248d4b5a908785923754a59085a142124547cede3c177706f0ed937b14fa7611bd4a9bbf1a5b3cf5ddc84463bc3459919ed321c47718100 SHA512 4b9e1d5c99a192bd64a678541fed2955a5abd7ccd69ae13b3341ad05eb7bf5b895372a732cd9b54e92898bfa3c3ba4f1af27fdc802985becc57d3ad589dde687
-EBUILD activejob-6.0.3.5.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 EBUILD activejob-6.0.3.7.ebuild 1207 BLAKE2B 2381e5b47f9ea214bf25fce72612f345fe2e0a1427d2daf5b17cab981c95233486b6c94a5aeb363951f589541a92b46b34e09c449170de9dbe62636258b25e11 SHA512 3192959ef70e56e1c53f5795086a26322301638411804a11891169c754acfbac907ae40eb149efc3034cf514d54a422469cd28d873f575b4399865d6f9114f1e
-EBUILD activejob-6.1.2.1.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
-EBUILD activejob-6.1.3.1.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 EBUILD activejob-6.1.3.2.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
-EBUILD activejob-6.1.3.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.2.4.5.ebuild b/dev-ruby/activejob/activejob-5.2.4.5.ebuild
deleted file mode 100644
index dd0f8f666cdf..000000000000
--- a/dev-ruby/activejob/activejob-5.2.4.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.3.5.ebuild b/dev-ruby/activejob/activejob-6.0.3.5.ebuild
deleted file mode 100644
index 9d4e3d897654..000000000000
--- a/dev-ruby/activejob/activejob-6.0.3.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
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.2.1.ebuild b/dev-ruby/activejob/activejob-6.1.2.1.ebuild
deleted file mode 100644
index 9d4e3d897654..000000000000
--- a/dev-ruby/activejob/activejob-6.1.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.3.1.ebuild b/dev-ruby/activejob/activejob-6.1.3.1.ebuild
deleted file mode 100644
index 9d4e3d897654..000000000000
--- a/dev-ruby/activejob/activejob-6.1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.3.ebuild b/dev-ruby/activejob/activejob-6.1.3.ebuild
deleted file mode 100644
index 9d4e3d897654..000000000000
--- a/dev-ruby/activejob/activejob-6.1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 8b01a339bd99..22a130a6313a 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD activemodel-5.2.4.5.ebuild 1040 BLAKE2B 1fd431a1151cb50fe1414be304343c94974234af1ed54630a75103641968eb8da72a10bc9d5c894d394677d8edb52dda2ac4cf2a5fe047461c12a106953a9052 SHA512 24fb38b95119ae872d738fb7b0961ef5f94fd0f4d56786304f0876e95bc38ef777aa6a0bfb0951285b9b2dd20bb1bec68e2d73823d1cdafd08d78886653ba47a
-EBUILD activemodel-5.2.6.ebuild 1097 BLAKE2B 61c9792af01f4edde80dfc6bd21bd3953bbbb387d3e6cfb83d007d32370ccbc72688f0418f0bb4d1efe542f3c4ac6d011bdbeb64011a2b69e6cd111c5eec1c7f SHA512 4a2076db87fb09c2e3fd6e2932017cd098a8cf69dc4324a14ed8a0258cc115477fa20f35624c8cd195a03f3586e1e6b033f963a6873bf90830e7a6824fa69282
-EBUILD activemodel-6.0.3.5.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
+EBUILD activemodel-5.2.6.ebuild 1096 BLAKE2B d5117f14855812a0b7e3788fd89fd0d75e74c765e1ac3a2e6c88aef7e877accc0e40245bb425a5968bcdac1cc7c9de79862b11af69bbf7b60fa002c5ea2e9f11 SHA512 b326348e70498784c1f045cedf47498a57eecaf633c90826cfd7e13f6913e3421b4e0cb6ab159d99c133af61579c0a8689e0cff40c94c70e4c121b06286e0b51
 EBUILD activemodel-6.0.3.7.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
-EBUILD activemodel-6.1.2.1.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
-EBUILD activemodel-6.1.3.1.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 EBUILD activemodel-6.1.3.2.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
-EBUILD activemodel-6.1.3.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild
deleted file mode 100644
index 73bfa6ce4084..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-5.2.6.ebuild b/dev-ruby/activemodel/activemodel-5.2.6.ebuild
index 50fce2c90278..0c0940bba5d3 100644
--- a/dev-ruby/activemodel/activemodel-5.2.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.5.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.5.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.2.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.2.1.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.3.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.3.1.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.3.ebuild b/dev-ruby/activemodel/activemodel-6.1.3.ebuild
deleted file mode 100644
index cd76ad67cfe6..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 884ee48c2e8f..55c1e89ec682 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD activerecord-5.2.4.5.ebuild 2953 BLAKE2B 90b3f2cb10f6332b1db43996cb9ccbc3ad7050be55d961de413bbda68f88573fd6cdb65e547804e441af2bf13d0856037d9e2821e4ca34f030a2c22b2d1cab5e SHA512 cf94e6be6c7b2bb5056078c0bb751376ab55555f704897bbb08086a1f6276707eae85221d426637f8d72ee6df712fac0485cddb67f526badafbd020377dc6389
 EBUILD activerecord-5.2.6.ebuild 2946 BLAKE2B 81d5b3915867571e063987354da77067a07e7d6fd2e28b6a58031679948fccca12b6629f159188a3f87d3ddcd28baa0512e502cfd59dee60db2783482a66d4d5 SHA512 6d42fd304dc3a052f74d7dd1e978db0bb6130136ed9449de503bf2202b8de3e46aecb09ebdd4a21797bae455c8d4f149f3665e9c2e96ba10fb7337804c5abb67
-EBUILD activerecord-6.0.3.5.ebuild 3044 BLAKE2B f07649a429dabcce15f3ebb409b071d57dd324aad6ece5d8d2e0a66b7914a1df60f4aef2c015cb714bab01b600362aa0f7a84565321863587706cc0533397b5b SHA512 05ecf7f3697fa388c48e26b44f2384c1175a8a37fe3e3403c9096ba6cc641ae0e65bc9d54d4e9454ae85c18dffd24c205950623682e060092e6cf0e30c92a5c9
 EBUILD activerecord-6.0.3.7.ebuild 3146 BLAKE2B 0cc48fa450e81317d315f59a65d101b852066ee57058655db05b0d2576390bf9bf757f4c701aa2eb09d31c13cae2f5952c644913ebecc49d7f562496257a5a4e SHA512 275a42f6d5f3c14d9cb4038dc7affbd321f7e61b265703cd2d4b72a953627fd3867d5cd0e6a0072f522001734bceb5d6e868606fae5273dee6ba5df681af2f40
-EBUILD activerecord-6.1.2.1.ebuild 2944 BLAKE2B 742767c3c07c72901bebf25508402c08ada14d1ad75fe3ac942f6db85d97dc0f36146f60e233dea308387899060386e76ae122b0dd90e3b53b93cd3c96c5a5bd SHA512 47daae8d655c1605dadfca19cab84fdc5edf8c7bc51a11f6c43ec2c70f775e31a08f377bdfa505db277166ea7174642fc7238ab4463cb869933b96b6cdae6b40
-EBUILD activerecord-6.1.3.1.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 EBUILD activerecord-6.1.3.2.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
-EBUILD activerecord-6.1.3.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.2.4.5.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.5.ebuild
deleted file mode 100644
index fad213fecb9d..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.4.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:9.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' \
-		../Gemfile || die
-
-	sed -e '3i gem "activesupport", "~> 5.2.0"' \
-		-e '3i gem "activerecord", "~> 5.2.0"' \
-		-e '3i gem "activemodel", "~> 5.2.0"' \
-		-i test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
deleted file mode 100644
index 58c3bf61a999..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
deleted file mode 100644
index 3ae472c4221e..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
deleted file mode 100644
index a1ef44206920..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.3.ebuild b/dev-ruby/activerecord/activerecord-6.1.3.ebuild
deleted file mode 100644
index a1ef44206920..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 11b6a0b07705..260aa3e1082f 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,18 +1,8 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD activestorage-5.2.4.5.ebuild 1950 BLAKE2B c84cfaf29709d53196d6228fb09bfb187e52724f2e8d792a64b39c1fbe8d72670b486870a870d6819af6ef5c21a9d4a91c6f8cb3da3a2b9b307c60b655055b7f SHA512 a74a871b1d6e1f2a1d9c7f0df9ee501ed67b4c0212ef5531124bbe2c06bb521084bfd6426c626cd1d8725e0ada4ff56e9706086db0c87aa1a7cbba195166d65d
 EBUILD activestorage-5.2.6.ebuild 1931 BLAKE2B c21846d95430ec061a032edfc7fbf0c73fadd63e6cc7b3fa9e05ab254e5c9770911cc1e070af93f5b2ddbde7152fcaa5e6b18fbc133e4be00aded83c1f3d29d2 SHA512 cc5cb62936d3e6088bf9fab11d754650dd931aaec24b41bde568a28d8a644ab7c9f4780b60a6bfca23722c406c90be6872ca84a3a4fe3b2ae1b51a405d691739
-EBUILD activestorage-6.0.3.5.ebuild 2006 BLAKE2B e5b8e6b63ef12cadf6dfa29dba4a7c8119ebe568d135554136564e18ce728ea426207328856d773678de7bb17a6f54f0227cbde1af2526afb317c9d5623ff2a0 SHA512 5655aaae7e5985feae47f045db4f99090e65b4cba7fcf4fa92122c493fe3722f5bb8808d0919dd47ec0652e0a6979c3f1eed666b4f735a90a29e9199c0c93e62
 EBUILD activestorage-6.0.3.7-r1.ebuild 2173 BLAKE2B e175dbe0b39307c2ace8d1a5d2f10ef4fa9bb28cd9decd234213d5a3fd3431a6c298ad2114c97b30b956f3a8a95dc847506ecb6b8bdf0bafc765a2c503b02ba7 SHA512 5f8115acebcda3b591bcfc197bbe074678abcb80f573008329983dfbd151f7c7400984654bcd211290e257831e132976b32e960ab7d317c0c49c86ce5dd2a7e4
 EBUILD activestorage-6.0.3.7.ebuild 2172 BLAKE2B 819a6f86c0a04cf76d2312d88272ca94e62336971da8a964309e3a48786ba04450424438e3dc11a27dd226768ea5295f66957f1b2efe4a5b39b3f74ca2fc5d42 SHA512 1bd2beffb0876aa31d83d88416c82109bd8c38704e8a109539b1a99efc176e79b0867c4e518a635214fcd4704ae95d80b82da70566a3b8b73ae194622c6a44b8
-EBUILD activestorage-6.1.2.1.ebuild 1971 BLAKE2B 9b50b0730f55fe990f227dd86fc3e45cbcd14d264ac7425a3273be6616e2c2a43bf02fa3224e384d4412568c1b4a10e65c5453e074212aa2e505d7fd0f4fa28f SHA512 91eb4f9275ff68a0a3f07ad7084be8330ba3e6697206f26601cf0ccdec15c0e12d4ecf23b2bad2c56020f08b7fbdc3122e583a606e3e57c08dd5575f3d361e74
-EBUILD activestorage-6.1.3.1.ebuild 2074 BLAKE2B 9990f1bc96733d48b6aa487122db56e48cb9aee5fcc2f4f2ae770497309c4ec1cfb9beace6dcd9198dd40d2e07075bd13659a15e6e51d94b4eac606750b91fda SHA512 6126ff26e7bbf049bf219ff497d6b95160c77576c770e627f74c65ffb84ff38fbb7390a331575faf2a1e859a9f4b6a2cc3ae1e09ddd9033f010f9b23cc8c57a3
 EBUILD activestorage-6.1.3.2.ebuild 2074 BLAKE2B 9990f1bc96733d48b6aa487122db56e48cb9aee5fcc2f4f2ae770497309c4ec1cfb9beace6dcd9198dd40d2e07075bd13659a15e6e51d94b4eac606750b91fda SHA512 6126ff26e7bbf049bf219ff497d6b95160c77576c770e627f74c65ffb84ff38fbb7390a331575faf2a1e859a9f4b6a2cc3ae1e09ddd9033f010f9b23cc8c57a3
-EBUILD activestorage-6.1.3.ebuild 2086 BLAKE2B e4ef3d63655930d6e045603ab2c04540b809162e83fcc1529937e516b91459f8a607359211624cb44c3f02b44c458084d61df28631be017b364585bc75ef80aa SHA512 6324329a4c3791e2c80dd9e8b0f28443c27c71bfc6834d10fe00773e0272b8248094a797682fc80849253825b46b75bdec3fdb5b4855d32d97078a60b0b89fbc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
deleted file mode 100644
index 6d033ca351e7..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
deleted file mode 100644
index 971e835a54f3..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
deleted file mode 100644
index cca8924b1b51..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
deleted file mode 100644
index 6064db838572..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activejob-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/marcel:1.0
-	>=dev-ruby/mini_mime-1.0.2 =dev-ruby/mini_mime-1.0*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.3.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
deleted file mode 100644
index 926cc2421e97..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activejob-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	>=dev-ruby/marcel-0.3.1:0
-	>=dev-ruby/mimemagic-0.3.2 =dev-ruby/mimemagic-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 2486ce82ac80..2c9a2ed1d658 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD activesupport-5.2.4.5.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
-EBUILD activesupport-5.2.6.ebuild 2544 BLAKE2B 89c3266c94b5407cd4c0993adc002a5f9aa2c1e8b59463217e9b8c844c936f2047900ad646cf4434aa69841008e00d39b74cbf97b67dd6b507fa5fe36d74e9cb SHA512 eaa1fa70d910c50ef5c8bc2424e0bc695b3f91c46a4d9e4a76673c5d78627816c04d79823c6cffe6f400f2e91c951e4ea06b1a199f909a23041608f4e56f0ffb
-EBUILD activesupport-6.0.3.5.ebuild 2527 BLAKE2B 54901c557010951c87ccb187b3995e351b75a08bc733a63a75da1f7093fb765cbe89fb409ff8a636020ae94092d1a5a5690689ecd8b01a402f184a332614f52e SHA512 671953781017b8e14c2d09bbbecd4cf388c1a9cb857999a4aea8511e36da90994e71d045a8e4a2a9d6bd0a63b9caa3dc5ab8f96c1b06ac4b6dad8198c43b68a7
+EBUILD activesupport-5.2.6.ebuild 2543 BLAKE2B e3c4f0707894c506272988e3300356e465ee8b215b8fa07e2433b8495e109bdbaf4727a165389db27dfeeec0748b5a47d76833f7c213a79847af210f11a591ea SHA512 e441d84273ca22516cedd638d2ffa20dcc7c8a03ba2134a4922a233bf810fad1a698120191e9f8e3a625ef48efd731165aaf2f27712dcc0009ba4b62c0134c56
 EBUILD activesupport-6.0.3.7.ebuild 2572 BLAKE2B 4fbdca25ea5dfb1238f450c31cc64fc09b2681c1b04839321883340d0ca027a1a25c835fa5b41936b6c9fb8e9b7ce9d0c0f39851cd7f41846d0bbeb1d0974646 SHA512 78bb467f5f188d4c65c93805aaf8cb50085b53f465282fcea2251d0e8f92b7e59ffdebb866928f31e4dcf2397e71b41b503c650abcbecca7684796b446120a88
-EBUILD activesupport-6.1.2.1.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
-EBUILD activesupport-6.1.3.1.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
 EBUILD activesupport-6.1.3.2.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
-EBUILD activesupport-6.1.3.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild
deleted file mode 100644
index e74656bd99b7..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.2.6.ebuild b/dev-ruby/activesupport/activesupport-5.2.6.ebuild
index f76d75f297b6..81b2ebd9b8aa 100644
--- a/dev-ruby/activesupport/activesupport-5.2.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.5.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.5.ebuild
deleted file mode 100644
index 2283081961c8..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.2.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.2.1.ebuild
deleted file mode 100644
index 077b419f7711..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.3.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.3.1.ebuild
deleted file mode 100644
index 077b419f7711..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.3.ebuild b/dev-ruby/activesupport/activesupport-6.1.3.ebuild
deleted file mode 100644
index 077b419f7711..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index cad807055a8b..52b5445cbe49 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,10 +4,12 @@ DIST bundler-2.2.15.gem 389120 BLAKE2B 1f5b9d56dc6613626492321b478607db4a936fa70
 DIST bundler-2.2.16.gem 390144 BLAKE2B 02e9c0a7a67ce80e31ad111e7dc8a08387ca615773e6ca7e998cbff882518dfc0da898fc42916749280e4b9726075491b1dbd53ab5ebf93d4aee8ba6e80100ac SHA512 3a147677cc026df2f10bdd5d73c6c4c483637c4cd507a521ce604fe385146254c653b29618c774545b1c038f08b7101315110ce7f891d83bff4c79412c6e3c64
 DIST bundler-2.2.17.gem 391168 BLAKE2B df62cde58408482330c3e59a78a70dbed059ee822e7bf54ef218a5df75d25896a87bc07e8e3672d79bd63c5ac41a8607fcee89055f3839dacebaa31e5eefbf51 SHA512 f07158a4de687bd384bdf8e62ccc43dfde4f4454357a7532a248e5fef27ccdaa761b89b77964d21c46930f6eb75ca8ef7f87d8c6386132d2a239233022a8f335
 DIST bundler-2.2.18.gem 390656 BLAKE2B f06d2e08134fa4e3fcee15de648121aa39742fceed004746fd42718062247a95de9ae231093ae4423f5a121c251b83a7de98e2d165c566df2d049e546b60a69b SHA512 871a98b24e7a89a554d181338d359f6b298e19f6c251b1c5fc81ad6f4ab46c49a9ae14e6fc68766b427c24e0cd25b6abe468bce5d8637fe0d4433bbecfe46418
+DIST bundler-2.2.19.gem 390656 BLAKE2B 212e41d2f5f8e9b689265bc0b3294d25c0ffaa681f63b8c4595d72497752b0e01f4477348699e568bb003b812fb447bcdca6e0933d91cde3680425db3608aa01 SHA512 692460145ac7ee72a5093cc1d7ee4cccdf67b6a7da4006019960c212a147553d447f0218dc15d5e3560ff5b901cd90849e40d5d9c66ad6d098be5de6fa649425
 EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
 EBUILD bundler-2.2.14.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.15.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.16.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.17.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.18.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.19.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.2.19.ebuild b/dev-ruby/bundler/bundler-2.2.19.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/cliver/Manifest b/dev-ruby/cliver/Manifest
index 4a98c6e2900d..0dedf7b3dd78 100644
--- a/dev-ruby/cliver/Manifest
+++ b/dev-ruby/cliver/Manifest
@@ -1,5 +1,5 @@
 DIST cliver-0.3.2.gem 16384 BLAKE2B a96637b5da20ebc28a29479bda76100b2ce7dac1c3620509c2891ffad8f195a54dcb381190a22abc02d1e3df1d69bf9ffa194e19c836115a70232fa7a783ecb8 SHA512 db0eff5119b84b4390f0c2f3e68cab891daedbf06eae55267c798787172734d3355cd82f2b6775e54fca26ed54c6ad4688743af588c76aa0ec6507a77443362f
 DIST cliver-0.3.2.tar.gz 14022 BLAKE2B aaaec8d52db1ad5f2b6cbe483e7e63ec8204ff4b465239f4d2a4b714037c922c2b417cd26e1fbf2da86aa9f999b1c1bfc6dbc7efb363fa016e713385f8713189 SHA512 96786561c3cacfce1f3d3be71461cc227620e81035ca594e65fb351e477ebdae9057c8cdc3a91ca62af7251afb39bf3aa633e79fbc77d2b7e921fbf398974014
-EBUILD cliver-0.3.2-r1.ebuild 596 BLAKE2B d2f761d8da392aa98fc485f4dc7fc10d8a0c9360d69e08f54c04d37af1f7612e9038e51c02d048618b90e8ab6f25faf45bc8eb498fb3e6d6dd0ba359a49c61d7 SHA512 dcdbf8c82a245a993127a6ab4c6728d96fe557916916c513ee9b359d107602e284606253cefd62933b46b4dc174d25669dbdd115005f412a76bd0619eaa7b2f2
+EBUILD cliver-0.3.2-r1.ebuild 736 BLAKE2B 7a7c249da3049f17213c5ff99629acad2551933cc67153820064a0a97e92e12921501700b6938fb75beffd7b03fb22f12e7aeca0b5ff6c21dea83644ebd734a4 SHA512 1706eab6bb36940fd8e012cbb10f13af1c77277d8b17f9ddaa0e43dd1317d9434d24dc781547da1fd57757504118d449194a81e362268fbf8f5a3fbf811e2793
 EBUILD cliver-0.3.2.ebuild 397 BLAKE2B 74e895c914de1c7f09a05b127fafa5aa0dca24caeabdb8ce0884219a817ba8940cb831c205d64179b51d8bafed7094f22affc5c4e419ccdbca0f4b495072d855 SHA512 7c1c43787e2ba601514b49f2d5ba94c825c6caad553ca0f921b3ab0fe7404a96d9a949988cd9a137546c844e96b4e7d448b15de0556c5d1c544d2c089d281478
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild b/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
index b45a1f891a6f..0764201f9c65 100644
--- a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
+++ b/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
@@ -23,3 +23,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index 106bb565d76a..1546ec83f3e7 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,4 +1,4 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
-EBUILD ice_nine-0.11.2-r1.ebuild 507 BLAKE2B 834150c14a3d0b13f3fecf51ac6fd01039a2bb4186fea5d751035d581d461b3ea83589e9f8fbe15dd150f8ecfb1de5d340cbe88aeb2dd0849e61993868ba1556 SHA512 de324b610af791636c96eba8f575aa03d909ee32ff23672a0dea4d357edbc281a25c38214ad0ba6816bb46e8bf7819703be26c6057816bfaf446ac10bc5b7fae
+EBUILD ice_nine-0.11.2-r1.ebuild 512 BLAKE2B f257d18de28ccd963ecd1c47c6e5bdc7ff4142eadedcec39be201de35bfc5d82327fc9a11408f56670b15a83050d09f82616f1715c1e7cb8b3632d317389c1b2 SHA512 ded4616f0d60ca7a2e3ef725b9a1be5094b196ca2de76b2c78b2253ce755440f456bb1f4b67a4d0ae5acee7280a0b68af747e166ac185060ca0dbac25e6aa308
 EBUILD ice_nine-0.11.2.ebuild 482 BLAKE2B f82c6d3f77d67f3625d762095f13d41b2286bd5dfee0524dfae92c5e8ba9480868b10589316f5c27e97f652a2bdf7a8642231cf5cfdf925f362816585d914cd0 SHA512 375acc105766abd661058257f73b0a1d7e1389c7e6babc722f7cbf5ffc4574f0d85a82942dbdd989e4e7ea3dd4008cfc8808a59ac0cb3d0fdfe598fdf08f6d61
 MISC metadata.xml 392 BLAKE2B c266b687f07d70619208ddebacab2982db31ddb32360e98ee1ac693ccb561cf29288429a4f563b0dc03b0d8ca3d80adb8df8a2c24da351138dbf124b8f3b73a9 SHA512 9af884bfae6d4066b734267f544edd4b9cb82ec6ff01ba510cf404abd198ddadc626812978cfd3ee9c66015fe602f806d49535fa51c72df9d5a88973b32984ac
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
index f3f634c7260b..714186ccb68d 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 6968ab253210..eb1e0653801b 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,9 +1,9 @@
+DIST loofah-2.10.0.tar.gz 70379 BLAKE2B 1de980e181bfb0c6fc8c98713b01aaedbd5d7bc7cffb30a0b8f477ee0e475c255a8e14d9b54254d318b569ca4327e78a6b42c73f765c7bafd8a265f083cc4449 SHA512 c51e3981b4f4f2d93a1e8817c86df57c50818b0a0589e260fb4208b34c69f08b270ea399999e3354c4c15b670bbd3eaba6b3274e4f4d67a8c97fc99b28bc8ef2
 DIST loofah-2.7.0.tar.gz 69272 BLAKE2B 1578cba4b4b12fb35a1095060af8d764ec55d3745a44cf756f1de5bf43bc0bde37276372e7aa53a3a26c2c83a8c3da417140d3addb102cc0429f7d47b8c01806 SHA512 698f7976e6048615643d8875aa4dc09c4bd261234bdc9908589edc08be9073a83f84f04fff7e32b518712d63cefe2611895543733967a8b8de12e6cecdb902c9
 DIST loofah-2.8.0.tar.gz 68844 BLAKE2B 52b5b5c7a70939069d84d0f66c4262e456d2ed81ab4ef2541eceb9068ccdddbb1c7b470ca7504700f6f66d4aa4507b9edfd4720c1302f6026008c10100c1fecb SHA512 a9d7c21be733e1aab8353ab7bfb3db14d47e8da2c3f20eba11d0041b782e4f2cb82865bbd5a2a9321aae7ea04089f6a5fd1bd3119cbfe8a00c2ea71a40cae53b
-DIST loofah-2.9.0.tar.gz 69098 BLAKE2B 097479b8de0f2fdebedfab9b1a0a656811c4650c13cdb73d2594c513a6be7bd9d6e6f81b5594367e7f0d783ff22664d22dcc8e06014cae51493057069831c174 SHA512 9dfcdd1142256b4fee10038ace13e33f5086aac0ab8e449fae878c33d66bc0882e6e032a9251dd16188dcb4549260403768771f2c7f5f38d55686a6a88792b65
 DIST loofah-2.9.1.tar.gz 69652 BLAKE2B 76bdd6c1ffda325314eb28c4bea6e5c8b8a69c3a7e9a661f328507a523ca086c2caf14f58b2e83cc2213c072342176bbb2de7be5a68d68e54675f30e81657b92 SHA512 625c38de7fe5fcbd8e3fb01aa7aa28560e7f3bb4e5354912bed072bd83cf35e824cf84e491155fa44b50ae418c46a187f02d4f605062abbfde05653d022bb663
+EBUILD loofah-2.10.0.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
 EBUILD loofah-2.7.0.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
-EBUILD loofah-2.8.0.ebuild 1203 BLAKE2B 9fc912673ccae3465c0052ddaaeb3128a48e8ca7adf001c9edb84e1ce6b07e405f85b7a27534f02f878b288768682a85aeeca325e9709cedfa6daa18903a8ad3 SHA512 71d7f379ae47270d7f811a6e7532091d76d2951ae7c3755412c865e0a5f83680e4a9f87929dee382daa4a63db2fb4780dd9925448b7acacd78198d4c22f0bf5c
-EBUILD loofah-2.9.0.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
+EBUILD loofah-2.8.0.ebuild 1202 BLAKE2B 9de000a066c830aaa8b960a1b79735a824c651a7a2d5f200463f30b362b69c14d18b9dc9d9dc62d30d4e9a05e69e44ec14b7203bc71ef00a14396a3adf885c37 SHA512 0cd53bb6da0b4d83abf2c9d83469c8da6f2d31190e549efbd42a0069499037fd858b6bca161595f25585b380e0ff0c308101e311b8a1804f076be34608b7109c
 EBUILD loofah-2.9.1.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.9.0.ebuild b/dev-ruby/loofah/loofah-2.10.0.ebuild
similarity index 100%
rename from dev-ruby/loofah/loofah-2.9.0.ebuild
rename to dev-ruby/loofah/loofah-2.10.0.ebuild
diff --git a/dev-ruby/loofah/loofah-2.8.0.ebuild b/dev-ruby/loofah/loofah-2.8.0.ebuild
index 000b13cda4d8..50570d6e95ff 100644
--- a/dev-ruby/loofah/loofah-2.8.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index f81fffea1f72..850254e80279 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,7 @@
 DIST nokogiri-1.11.4-git.tgz 5867481 BLAKE2B d9b0df4d6301a510824f8f31bd51e0f3beaf3cf7d3685a703782ae5fab0667b6276c0ccea20032252efc6c2dd6515577fcb21942f5d27a65815bc48f8af91137 SHA512 ca4bf385b06416f5a5b7f8fd742739181cccf93b42590c7d2d4f666846fd3a25d45c16717ae50bacd85e25644efe8584e195df7174450b8a59f2c6ef47624354
 DIST nokogiri-1.11.6-git.tgz 5869434 BLAKE2B 222b6b9e871c124a14ac5d9ac3901d9edfa057daaba7e1179853746af50d661bd70568b326603663f890b4b0d80fbb68f8cc22637ca340fa49699f475cce1bec SHA512 a9d2977ba5a12cb252ee615cffbbf043227e78d746ecba4bfcd82fa825f5ef9fdb74feae27115b16cd65da6dd189e4ac88f1d605e776dfbc52aaf2e0e3044381
+DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
 EBUILD nokogiri-1.11.4.ebuild 3140 BLAKE2B b53910356936e9e450ecc28220343ca68491ea93eceb070c4adb09d67e9017f0d9b20319ed2d2ba2494dc8cc40df220d49450001cb8f60b881f88564464871e4 SHA512 3fe0a0805e12b52556483f1e0a0daa6ac84a0faddad121d2fa0b3f62976f289fe5fb50881ce493d712f2f39408acce5c9b174f515da64fde3ae33c0b4dcc1899
 EBUILD nokogiri-1.11.6.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
+EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
new file mode 100644
index 000000000000..0a05340414ac
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
@@ -0,0 +1,107 @@
+# 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="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://www.nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.12:=
+	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.12
+	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.1.7
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Account for fix making it upstream into our libxml2 system version
+	sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# Clean up "ext" directory before installing it. nokogumbo expects
+	# the header files and shared object to be in ext.
+	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 0e45eaf1f6bd..60af4656efcc 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,17 +1,7 @@
-DIST rails-5.2.4.5.gem 6656 BLAKE2B b6e0b99fd9316c8ed04a817465c89ee9aabeaa60e1f81e0e65c900e19904a5c50fdbb47a6899a8829f9c5ebdacdf01d9dea4ff9a5f84b34262de0904b4d99731 SHA512 28b91ea8f9a483cc4cfe02f2173b308fd34b16f254266f19a7a8f6fd7895546b8cffb08f48eceae80658e32e564595cefb1695047a9d58390cbfe112d4f1dfd2
 DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b95046625f060f89d799a641e5a79fd06efb606a4f5527d556c10a86da9d972ce36c526dcdc639623b6 SHA512 9c6965dd1ad4d5a12f7116e372f7b38bd95a93d24d93b66860086922aedf30aa1ad5cc27578f87d72228d893c1d73b431c195b0d1f8b1bc5a645b00fead05f9d
-DIST rails-6.0.3.5.gem 6656 BLAKE2B 0c1a10bb92a249bde203adf128052258f2471b85d7bdf8efd6f4293b34d51157b31d21a51c37f5ffe46b360866a9a9d570276534dee246d81f1feb7715174854 SHA512 308571595e54d1fc92fef1332ae449f484d9b6f66504eff43da61b74341dcb32671f84a5481899ded1a0b32f1b78702b2dd4a671db5b47d267b60d67bc04041a
 DIST rails-6.0.3.7.gem 6656 BLAKE2B 25edf742dd7713b10649f567150b0271f9050b346c4f0ef50e687cbf86e3179ae74cf59b606ac7b4dd5cc6122f7a7dd4a8065b07a0afbbf2948284a7a3bb159b SHA512 15352bf9a50f9d48c8ece56e65e95ead9dc98ca7aa6892ebbfce4fa99434cb1f6c71388434d0cd80f031037e7094a8e528c252faba2658bd650027b61d868616
-DIST rails-6.1.2.1.gem 6656 BLAKE2B 5a1407b4ac324acd2a1c9bf45222cc7fe1f35fd4e666fbcf74df37e78afddebeb4910b48ed90b2c481734dcb324fa8b050b2bd757f9a9d41a0ed440c9af2c6b3 SHA512 a604ed34d3fab4a549d7bbe1054ba396ee201116b1cc26e466776ba3bf78a6c09b7178d79927b87c04ab17ec49801c7c1a41683c9ff50559b06ee986c88e00b6
-DIST rails-6.1.3.1.gem 6656 BLAKE2B c339d78f0461e885bc4355aa45df74a83423b1c4480239ecdb046dee483ae4f71d5568cb60a43e8d61c4de8f62286da068c10a02a3f8772a4b85db09f45d8430 SHA512 4a938c7341da3b1c4cb831bb2c16554f2868716a24f5db39f95d6ffb0f0b6c017fcd1ec4d7010f0c9a011517600912efae9eea2d8cf7d1350edd31e6e9f84568
 DIST rails-6.1.3.2.gem 6656 BLAKE2B fbbe4a7af8c48e26aa6c6ddd1cc1e9435523cd23423c3f2e4a58ae5f9d2abdd9ead9da19b6f152c164e4518d1f7f5bdbb321f9a5929c2ca425d28047fbfd7c02 SHA512 18d0ad80cedc92f0090b4f918a2005a94956613b4888b782c0249549f904fbcce8190de75b2d1b403cb9b3a430091f13e57969a59574e1f8335286970eba938b
-DIST rails-6.1.3.gem 6656 BLAKE2B 68ceedd4857d9a3676fe493e79aa9c7b448598b5cfa2ec2469be4a64f70f495326e032204cec3ce63367bd96559df7fa4eccf041a4e59be9f63ecbec9992bb13 SHA512 085d05096d14c1132c43291b4082f7db9ddb4ae0674e058e38f821524c17fe86d302c56b28b30fbda6f0883e9ab079fa9afdc2d02a9121478e8c2d7d9b39b8a4
-EBUILD rails-5.2.4.5.ebuild 1049 BLAKE2B dad39d6f247d08f10dfaf1f275d2976198b3345292eaab303e468358e1908199b54f13295a4b62ad3ec3efb999d9b40df8e58dec638141ff095289f2a747b26c SHA512 068d411668b29eb2713e63e03b3d1b50576ea753f60956f5bccbb87c98ea78755102f7582e77e946be8ef3d4666f311fb8781186ca0c355a83a082051693b2df
 EBUILD rails-5.2.6.ebuild 1042 BLAKE2B 88b896643b501daddf1625c590c9b59d197ef96ea7e6d6be9d999dd94afa0f81ea5e132417717203f246386dc6820e44f6d2750a87e5af5e3bb1b9a20554d339 SHA512 8ffcd1181a8739014be3b7b5fe1773f0c01a76c4a31b03ed3a220c2791407a743faa61229a250a070a58dd880f96f2f7ebfd75b1c273ee5846262b5b4371bb57
-EBUILD rails-6.0.3.5.ebuild 853 BLAKE2B 031f75c83a9ccfd985f38325c00a3297293859ab898efb6304e3683bd006d699c62d8a086c1b1db3258a072f365d07d5a4a6109ef2c9914d0f4c8e9bdff21ac4 SHA512 b8c050a95d72a2a0bfea3a83475e86f10963750ef35b98c0688adf5d7b73bc06e6c361c2cf3a536036bd9dc76555c29507f85d5aa5f43fac5db864a5e45792bf
 EBUILD rails-6.0.3.7.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
-EBUILD rails-6.1.2.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
-EBUILD rails-6.1.3.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
 EBUILD rails-6.1.3.2.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
-EBUILD rails-6.1.3.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.2.4.5.ebuild b/dev-ruby/rails/rails-5.2.4.5.ebuild
deleted file mode 100644
index db30d6f28ebf..000000000000
--- a/dev-ruby/rails/rails-5.2.4.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-6.0.3.5.ebuild b/dev-ruby/rails/rails-6.0.3.5.ebuild
deleted file mode 100644
index a6d73b63f618..000000000000
--- a/dev-ruby/rails/rails-6.0.3.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.2.1.ebuild b/dev-ruby/rails/rails-6.1.2.1.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.3.1.ebuild b/dev-ruby/rails/rails-6.1.3.1.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.1.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.3.ebuild b/dev-ruby/rails/rails-6.1.3.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 8641ef55f5b5..75d3ab1aa565 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,18 +1,7 @@
-DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.0.3.7.tgz 18570545 BLAKE2B 6433705f18075e286d14d25dd87def61a3ac9c7a8fc5160f37b9a6f6ab0d7f36a7235602713888df45e55cf4afb56f922c476989304397d422016dc34f147353 SHA512 91612223c9461731741c056a700879ce274a177737fd19ed6341ce07acfa4e4862728ef12bfa1a70cdb3e5c8492ad0da6aae2e7d0ed5ad32d680d8bd8c3ab102
-DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-DIST rails-6.1.3.1.tgz 10991507 BLAKE2B 6798364c4d8c6339269950b5b583cbaa4c6d86b7880e7fa181bb6e52bb0d18b051eec233b2819af1668dcee8c4f40765fa9c46c6bb36329d0eda19f559a7472b SHA512 8c40d739b8300eec5d054bb0481133995875fa0bf854c1f5febceba7c0d156c9f249952687f0132bbc36ac59606013625b395faa301173ecdd247b4de0bc168b
 DIST rails-6.1.3.2.tgz 10992572 BLAKE2B ec4b7c33180ecc6b9dc9bd0270c9c03e48a774a7c0fc1d79638bd6b52a4c9831f59c5d8714e24c9611ac9e8ad03dddc664c2969da8be568eade76464c04d5697 SHA512 3b30facfe0555c3161b5fc50efb7dc1f3df0eeadbfa19f16df3ebdb4877d6fb9a978ae7a6713a502d79e6d8f1be20157bd5ef64919fdd558cad89492cc2d9672
-DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
-EBUILD railties-5.2.4.5.ebuild 1677 BLAKE2B e2d2423c876779e913dff56c258f51f506a85f10c30978da55e9f28d660a1dfb215e49218a5c75d6348903af91764372af191087f4c3e618d6e4f8149d79f407 SHA512 2cfcbcdc7918972ff33d3535be3758aeb029476a2ba59bac84b6d33bbd780307ae57268eaa21edac627b3b90bbd966b0ea744aca2e26bcfe11c1e651034bbf2c
-EBUILD railties-5.2.6.ebuild 1664 BLAKE2B 3fc8bec028ad9409de3af88cfeb3d88addd66bb952c2934929ce81126922f7e528ed66de6afed4dda920fd7b7860ad2617c064bb87be5f9ed76ae2c38cfcfefc SHA512 f6a153d7d8ddb0f65983044e468e4be2dbe7f2ffa928d08587692e6160f0adb032183a994eae8af7fa086ae9f6b562d948fcd21452bf7ed8de47fd0c0771624f
-EBUILD railties-6.0.3.5.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
+EBUILD railties-5.2.6.ebuild 1663 BLAKE2B 9ac4fa8492e6e8907867c8c00bf7cca5098900bb3ad86b9be99547a162843830f341afeb5ff8e1e163ecfa368ae25e03197d414c3d6855df2dfb8c8fd6a005c7 SHA512 51fe1b12adb5dd9ca39b6a026eaba3327d0704bae9fc656bc68ca98ea31e39dc5a3c4de3d731e4af05f0eda96d6a25c02ba732e4eda7019c6e9dc4d2d4dc9aa2
 EBUILD railties-6.0.3.7.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
-EBUILD railties-6.1.2.1-r1.ebuild 1612 BLAKE2B 2282f8266ec199411356c3e2885cba3bf8cfd57f196c23fcddcee8b73e6a4e8016e7006b906262ddd7d8ec03bf538cf0bc7c7bc169297e4e922578a40beb9148 SHA512 420246895bdb137ca40b6f3dc64d6695201fa1b5fc34b15d352951a83d69a39bd4de5084aa1b847e752a7e37d4fc8d635f8bceef95fe82be8df0b6b6fd47361c
-EBUILD railties-6.1.2.1.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
-EBUILD railties-6.1.3.1.ebuild 1612 BLAKE2B eab6f4e79d43a55178dd268acc187d7e08591e445832ba401e0e9e47281a952d739ca0022ffe365a550cec54366f2de2fda932275ddb44670753af35e99e36d1 SHA512 2dd04ffe832f7fb2da035e1eb4a9c6f32eb53de3af20283d80dc8c5878ea6909e6e701021e531d29603d2ecc3b9fb59d6ba6baa3b6c6eb70c6d5c28edae386bb
 EBUILD railties-6.1.3.2.ebuild 1612 BLAKE2B eab6f4e79d43a55178dd268acc187d7e08591e445832ba401e0e9e47281a952d739ca0022ffe365a550cec54366f2de2fda932275ddb44670753af35e99e36d1 SHA512 2dd04ffe832f7fb2da035e1eb4a9c6f32eb53de3af20283d80dc8c5878ea6909e6e701021e531d29603d2ecc3b9fb59d6ba6baa3b6c6eb70c6d5c28edae386bb
-EBUILD railties-6.1.3.ebuild 1612 BLAKE2B eab6f4e79d43a55178dd268acc187d7e08591e445832ba401e0e9e47281a952d739ca0022ffe365a550cec54366f2de2fda932275ddb44670753af35e99e36d1 SHA512 2dd04ffe832f7fb2da035e1eb4a9c6f32eb53de3af20283d80dc8c5878ea6909e6e701021e531d29603d2ecc3b9fb59d6ba6baa3b6c6eb70c6d5c28edae386bb
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.2.4.5.ebuild b/dev-ruby/railties/railties-5.2.4.5.ebuild
deleted file mode 100644
index dd4edc018545..000000000000
--- a/dev-ruby/railties/railties-5.2.4.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-5.2.6.ebuild b/dev-ruby/railties/railties-5.2.6.ebuild
index 205ed2e0b256..61e22a861968 100644
--- a/dev-ruby/railties/railties-5.2.6.ebuild
+++ b/dev-ruby/railties/railties-5.2.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/railties/railties-6.0.3.5.ebuild b/dev-ruby/railties/railties-6.0.3.5.ebuild
deleted file mode 100644
index e1d845f8c3d6..000000000000
--- a/dev-ruby/railties/railties-6.0.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.2.1-r1.ebuild b/dev-ruby/railties/railties-6.1.2.1-r1.ebuild
deleted file mode 100644
index 47607fc99d82..000000000000
--- a/dev-ruby/railties/railties-6.1.2.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.2.1.ebuild b/dev-ruby/railties/railties-6.1.2.1.ebuild
deleted file mode 100644
index e1d845f8c3d6..000000000000
--- a/dev-ruby/railties/railties-6.1.2.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.3.1.ebuild b/dev-ruby/railties/railties-6.1.3.1.ebuild
deleted file mode 100644
index c0b9e766ecfb..000000000000
--- a/dev-ruby/railties/railties-6.1.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.3.ebuild b/dev-ruby/railties/railties-6.1.3.ebuild
deleted file mode 100644
index c0b9e766ecfb..000000000000
--- a/dev-ruby/railties/railties-6.1.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index a3fb4c41e897..408702479471 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,16 +1,8 @@
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
-DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef14073ca5267ec29e5011880274d2749a7a3d1f5cb2a6a5107d5c848537367e1f725a6de9bb9af8803ccc8ccedaac415eb SHA512 fda810bc18039484725df5c6092b3d1b31f398e337cbace253cfdfa934274902f2dcb4e64c4fd0bb24379c79ea2976383313c1a5cd4ad246ecb7eabfd1a47d64
 DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
-DIST regexp_parser-2.0.0.tar.gz 85985 BLAKE2B 6d206de85e85cd5f3f472f6b2cba49bc03aa43fc246af145188c2ebfe3da1c23e0b8b5d307d8902662abcd220b3c7a439825ada2012a09fdfffd9c390865a0d3 SHA512 a896f81988c8fb8074e05abe6c9723a314b147ac2098d11324842b79a8b74ae3a8237ef1ec0f80cadc223c13b06fa0ba231013ffdcd00710381e5c2fc7ebf175
-DIST regexp_parser-2.0.3.tar.gz 86862 BLAKE2B 261703b7f005d234bbb2be655b6f9974e9f160b36af9082339653f469b9a18cffd39e04878a0a007c09252be747928bcd04e59af1c5572bc3f627495432bcc3d SHA512 0df0c6a023b26c48570ec5761af4bc90ab78afeae4f6f6864529102b826301b11b8a2cbfa7dbdd4b18221be7450ccd0d69c603a4cdd800c0b68fd6e5cc3c0eff
-DIST regexp_parser-2.1.0.tar.gz 89371 BLAKE2B b63dea78a98b85566ac45078350c545ba8b0e77398e1307aa530b160b607aa98c6605dc2c01dbe51eaef15720067c9197a50c81c442e04ee39473a58567c01ca SHA512 007c1b3a0d90fa0667dbe7ee85ed35d5b45bf511f8d90feb787d7f8d5c017155987368459b64a635ef3af529b6f73920e3c566f37ea7cf4bb68cb641aee9f55c
 DIST regexp_parser-2.1.1.tar.gz 89399 BLAKE2B 7632b1e65e929f610e6bedc7954f81ca080f4f290794da617dbaeaae324186581a6e0ab78fb8d7311c33876b8cce090fdb6d4b868eeb80b82fa8461da5d82bfe SHA512 809b8c5f7bcceb0c31e97256d5a40a04bb7919cfa0a139e972e90a72ba15eee6dce8ac1f8e65f5e8f7a5f992a2fab91d6ae19f27a1f5ec7795fcc082ff037e13
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
-EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
-EBUILD regexp_parser-2.0.0.ebuild 888 BLAKE2B f4c4432751aeba693e2d7ef3769b96fdea6ec480a0fb7d0393770cd9c98c32181cbcc12c0dc185e7996f1e4cffc4ceba47123d1246d123456a420316f58e3752 SHA512 18364c915f58475c0ae9175a928d3c033211048ecb33ef0787f5ba3e10416fb619722cd37280f74610ebe49b8c382ef524bebf37a8a9184f3dcf791829a5f708
-EBUILD regexp_parser-2.0.3.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
-EBUILD regexp_parser-2.1.0.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
-EBUILD regexp_parser-2.1.1-r1.ebuild 922 BLAKE2B fc2d2be3b974dacfa67df09e05ff4bf61623567b8c54c53f261586566f433e6d441bce7d74c07336fab5aab88f41b48989159af95842445470e35911180641d1 SHA512 a10e0cf15b3d8a8978bc91fc92c5b81ead52d89c3c86df8d1dbbe0903a72d05799d6253e849f9ce6ae20a94d0fa0a38a0542c395a881399210e5ebdd3e311036
+EBUILD regexp_parser-2.1.1-r1.ebuild 927 BLAKE2B 20fddc1727e88c9389a8503610d4c8feef747bc990577f9ba78ba71d6c4cfa1670c34ddbbb14dc4700b0e69095c3bc7c9d05f2923f02e7b8b0d6bacce44368b8 SHA512 25c786962cfed96b84920e48c04198d3fc578fc8048d9a7c5a9f44c1d298126fe611449eb35944da998fe6f43d228ba9e177ee8e1a1369c1a348cd70111eecc6
 EBUILD regexp_parser-2.1.1.ebuild 907 BLAKE2B 6bd68f31925a8eaca632e9e15c2863a080d0b0c81cf2ee09f6a96f30f8b54e6ce41b3a0be4ce45b7bc01713d952028245e9b08aa42cd197d710677cd6b4ecd85 SHA512 a9d499694fb8da3f72c5e306c266d43d55e12fb6e093c93917fa46ec624ad2d4ce8c9e1487f3d3b6b61b2f479d8a1426620c179efcb212b4e22b228b1382c1e3
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.7.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.7.1.ebuild
deleted file mode 100644
index aac70a0d1954..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-1.7.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:full"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
deleted file mode 100644
index acb742e4973c..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:full"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.0.3.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.0.3.ebuild
deleted file mode 100644
index f159a54f45da..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.0.3.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
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:full"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.0.ebuild
deleted file mode 100644
index f159a54f45da..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.1.0.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
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:full"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
index 71af07902089..a4803be95fe8 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 7000c7c5aec7..7210e5f8d534 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,7 +1,5 @@
-DIST ruby-prof-0.18.0.tgz 93925 BLAKE2B f7e0825e5291fdab017035b2a71029407d2b01161f4c4c7aa1f10a80b4080ac14f7adaa2c0340fe5c80f7352181d085d724dee66597ed29825ab7116d37c5e58 SHA512 1743bbd97789c9de66e9479384d204b0870e43a265471f0fbdf7a72bb19d77a30afc25da9d0ac66a921c28ce83d8a8d72279bdd9b23cf8505ccde952092dd9a5
-DIST ruby-prof-1.4.1.tgz 90180 BLAKE2B d996474330146a5daac50f1dcc2e39ed9d3c43ab5f4851805ab264168d3a242371cf216df53c474360de164dd42c14465b4d660c4a6aee7e8983d69ea52dc4e0 SHA512 a436f5fb81bc972c799591ee1077d8fe3d092680c8c0c40ca3607f7ba49611e6fb986464df16bacc7e429ad51276f76c800457a3a68beb659ef8ad01d183434a
 DIST ruby-prof-1.4.2.tgz 90386 BLAKE2B 55263f6cd24b18112a917c2b03a57ca91619419244f79b2b06f6d6794f76d9411d4e1b39dbb2e4b7e2ca6cc03b244f529f4b56fec54ef5fda18853ec2ef05fb4 SHA512 e75a8898533dd2ce9098fcf940883e3cbeaeaecdaebe3592ee67321feb4e294e25bdf14ce6cac50fb6d582cd55d33f175929a1d5446a21b74eb86c468e779fc3
-EBUILD ruby-prof-0.18.0.ebuild 1561 BLAKE2B b40c03ca0544a6c08a4268e94063224124e6f4f2b6547a8b0ff589b0c495ac0224e56a311d75d32d3e622307df13f787fde893ffcacc261702da59f25e649595 SHA512 e102520ec428e74171e4b21c27887b6ff5b167ffbe070900ed3bf826e17e8cf342b81102431fb1d343e85bb6a77c6085ca819b825f30955b64531f387bf8765b
-EBUILD ruby-prof-1.4.1.ebuild 1314 BLAKE2B 1419b093586c754b90b5b7178c7095a24107def55933ba924ac722f5a53c183cd0381fe8e996ec947fbdca027cf5a626804aa22a8127d7713d9915a9f66ba533 SHA512 3415902005abf753ddcef077af7c654a9d455eb9f39eb7e80b298007ea9f705d0f3f24ffb435a2984f1b34ccb311513d002776cc95cb26a77a611ecab2c50764
+DIST ruby-prof-1.4.3.tgz 232032 BLAKE2B 68df149718869afac89b2240263cd3dd48c28b592f32cd7bc8a918b67de7a10abc3a1af04cb00eeaec9e6f7292e5258d22ba8bec0243361289add943535ffe39 SHA512 fd19d97b88b52c07331bf885c69215267eccb3a0519eb3bb6cd6e5907af55ebbace32f3bdef5b1f340bc3c4779666d7f4100878e647fdfde4da3a4df2a946ebe
 EBUILD ruby-prof-1.4.2.ebuild 1336 BLAKE2B 244a6ec8cf01fd2726f6c7b5d6f0bbf379b63aae51b576bee68d7bfaf753bbb2070425c5640550f4be27041207305be0a544efbedb90b7bb7b194dae21daa77c SHA512 4367d812a86f884fb2822d1f140746b8773f67cc7ba8f4863edd605a9ec90d454e1849074f36fd09fc8484d90beff228785c9a04670d2784e15dc41abb9114b5
+EBUILD ruby-prof-1.4.3.ebuild 1143 BLAKE2B 9237d1ef512057ab6f3bdc569de1f414644bf13d379c26cab84cea50a22f6d4a17ae84e6ae19bf4ddd15268a40a92c88a6b77271cbaeeb775c22be5982e6e43c SHA512 1fb62f262b0f07043a8364e7adf851f7309dbd04b855d62d4bbb7a6742d9e116fd4851e635e1f7abd63fa6a1a902ec7738ac61dfef33405a5b2a1b28dac343a2
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
deleted file mode 100644
index 867b5dd4fab2..000000000000
--- a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A module for profiling Ruby code"
-HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
-SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Avoid bundler
-	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
-
-	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
-
-	# Fix a timing-dependant spec since its thresholds for success are
-	# too tight.
-	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
-
-	# We install the shared object in lib, not ext.
-	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-
-	# Create directory required for the test suite to pass
-	mkdir tmp || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof
-
-	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for dir in examples ; do
-		docinto "${dir}"
-		dodoc -r "${dir}"/.
-	done
-}
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild
similarity index 73%
rename from dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
rename to dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild
index 0a16a9c15184..1924a8778cde 100644
--- a/dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
+++ b/dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild
@@ -10,6 +10,9 @@ RUBY_FAKEGEM_DOCDIR="doc"
 
 RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
 
+RUBY_FAKEGEM_EXTENSIONS=(ext/ruby_prof/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/ruby_prof"
+
 inherit multilib ruby-fakegem
 
 DESCRIPTION="A module for profiling Ruby code"
@@ -27,7 +30,7 @@ all_ruby_prepare() {
 	# Avoid bundler
 	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
 
-	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
+	sed -i -e '2igem "test-unit"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
 
 	# We install the shared object in lib, not ext.
 	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
@@ -35,17 +38,4 @@ all_ruby_prepare() {
 	# Avoid unneeded dependency on rake-compiler
 	sed -i -e '/extensiontask/ s:^:#:' \
 		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-
-	# Create directory required for the test suite to pass
-	mkdir tmp || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof
-
-	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
 }
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 612bc6092468..8f480dc654d3 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,7 +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
 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
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild
new file mode 100644
index 000000000000..95016b97fe05
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild
@@ -0,0 +1,36 @@
+# 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/sassc/Manifest b/dev-ruby/sassc/Manifest
index d16211baef9f..b7c311911e46 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1,4 +1,6 @@
 DIST sassc-2.2.1.gem 302080 BLAKE2B 626601d2b22f91f354a4ddf7a68e4463b0a56b0a79e5d2ca122a083101146dac32699e348fd4573ef4ba76a430470ecd39427a8542caec931a8e16b26a23bb70 SHA512 728ad274363fd79aedee74fb6d4dbfc60f31b334e1a8054943ccf9cfa534fa3465abb00a2bd3020e198d287327058890411bb1983da6dc5dc3c4413b1936e2eb
+DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
 EBUILD sassc-2.2.1-r1.ebuild 1048 BLAKE2B 8c48e20062edfbefd711bd25e824d18c23b57015b3a45e813d149a3d65f7267c0834fd0d68a66c557983e4d2a1dd77c8cd1986bc1af35f271f4f3f5d3324d3f9 SHA512 12909cacf82d0ce4bb059024a17464143fe37f902bae472f3aed317dc720eb79c12cf948199c24922ad5e2e42d65e84e93b1db68eaaf3212b62b9c67bf7eee51
 EBUILD sassc-2.2.1.ebuild 1032 BLAKE2B ff9fc9b4fd8704d6ce318fde53989aa914bec96cdd10f3d9898e89dc02f7e26640df8150f0ae18c09db7fa97f541452eeef39ab4900602f4442eb44c47668ce0 SHA512 89ad98172e679447138d251dd34fcd1e5a1ca4bc21d438f82929052a0b23ca6f8bf0ce36ec13aa2a98f5665e8669b0ea51044d0c145ffd7eac2cc76356cc06e2
+EBUILD sassc-2.4.0.ebuild 1048 BLAKE2B 8c48e20062edfbefd711bd25e824d18c23b57015b3a45e813d149a3d65f7267c0834fd0d68a66c557983e4d2a1dd77c8cd1986bc1af35f271f4f3f5d3324d3f9 SHA512 12909cacf82d0ce4bb059024a17464143fe37f902bae472f3aed317dc720eb79c12cf948199c24922ad5e2e42d65e84e93b1db68eaaf3212b62b9c67bf7eee51
 MISC metadata.xml 341 BLAKE2B a87edcb982765d42f3b800c9cc82e1552e92c758454449fe45da64ae131526134e6f0c3e828547ddf4e63e464563589b67de46c11539464c78b4de4291be6b6b SHA512 4cb9faf011e514021d70371749be7c56529e0bec0b880815cba83fcd66fd9e5b1f44932b3d498a7cbe26238659d590bb5a4e3f98e04553b8299299aaec71c70d
diff --git a/dev-ruby/sassc/sassc-2.4.0.ebuild b/dev-ruby/sassc/sassc-2.4.0.ebuild
new file mode 100644
index 000000000000..3040ccc0c12f
--- /dev/null
+++ b/dev-ruby/sassc/sassc-2.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use libsass with Ruby"
+HOMEPAGE="https://github.com/sass/sassc-ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="2"
+IUSE=""
+
+RDEPEND+=">=dev-libs/libsass-3.6.1"
+
+ruby_add_rdepend "
+	>=dev-ruby/ffi-1.9.6
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test_construct
+	dev-ruby/minitest-around
+)"
+
+all_ruby_prepare() {
+	# Use unbundled libsass
+	rm -rf ext || die
+
+	sed -i -e '/ffi_lib/ s:__dir__:"'${ESYSROOT}'/usr/'$(get_libdir)'":' \
+		lib/sassc/native.rb || die
+
+	# Avoid version-specific test so newer libsass versions can be used.
+	sed -i -e '/test_it_reports_the_libsass_version/,/end/ s:^:#:' test/native_test.rb || die
+
+	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index df4669cee9f9..296093882b4f 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -7,6 +7,7 @@ DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e3
 DIST test-unit-3.4.0.gem 121856 BLAKE2B ff975888027ba6122146f074926074ad7eb94e7fd442ab3d9f5d4f2eba83695e7f7ff2d17bd4578fa81caed5971170d0d8d287d8c87426dca63bf7ace1c7a850 SHA512 b7fd84165c956975f758b09c13d6d8f3a613e5d72c381cc3ee7522b5c6e1ad2751d8709bf1d45169823260769909ddaad487f51cdf68312b1e29c1d861f8107f
 DIST test-unit-3.4.1.gem 122368 BLAKE2B cb1677c83d11c0edbb6ad2eedda63f777832993d262ad0b1b5022fcc049d82d8eaf9284bad22f9a49f3d43febed6f72291eeb30d8844f3ef4703f93b9f556f7d SHA512 08c5877cf6ae80e6ef5de7c806dac74405329cd08a97431d174b756ad173e727a536fe315a624c5e1d5b071d5b887cb4b8498675f5f54073bdffe9d5ec4eb745
 DIST test-unit-3.4.2.gem 122368 BLAKE2B 3b308eb539915573762aeffb96b02bca3194b5c4e70d00ba4711e2ebf57215e5865f79e5246e5872f2ba813b81256deae289872b8f550ce630249dcf6ff5069a SHA512 ccf04ffbea05334f2d4ffed48db6d236c5eb85cc3d0bd79b5a195c43d218bc03b3b310835d7c23f78d2548dcfc8c4be5d1f3bf92d1aff6fd56ff3f483b2f1b0a
+DIST test-unit-3.4.4.gem 123392 BLAKE2B 7fe5fd5d17712e0b18e5757a22ca60d0504857c46d311874bb2528d6e6eedffdf4f468899cd08c3dddc4808bd41cb21d254d1467f4ccc259eba8bc2405e9cb57 SHA512 3387cc32fca94c2554fa5ed691eec1e0bdddc119ad26f19860c5533764041d17b0ae0515d0a3703f7427558e1eb0f0817c106f2de46b2ad5299ca08c2922de33
 EBUILD test-unit-3.3.3.ebuild 904 BLAKE2B 7c4251d9e4113cc1a3f90eca98cea78f8f288d107a4e6e37c567cf614fd8e21f8f20d46bde4332aa48ba33d0c401ebeeb154cda9ee657ca2ec5de9f2f9daa81b SHA512 ccb513f456f01217a88927a8532c4f0d8bf9630dabed5b0321b4b3d068902cc756dee598d5cdcb1823ee508a2a4d2e2eee028725a74b833de87ec98038f08c16
 EBUILD test-unit-3.3.7.ebuild 874 BLAKE2B 15fee01d1015bae7196d2e0d022520337845b4f4f6fa001ed5bb7cc2ac2c74f5c187447f0ecea8bc139f8a020f9605bbd28cf80f0d6970eae7dbfd982de6df15 SHA512 272febdcb0cf394379e5b7062ea7bc24a51933574a18a47f1c83d9bbcf7c1d9438a5f47a61f3e7c87baa4dc7eb6364e1ec49b0da322b5be348110ff2010eec37
 EBUILD test-unit-3.3.8.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
@@ -14,4 +15,5 @@ EBUILD test-unit-3.3.9.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81a
 EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.1.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.2.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
+EBUILD test-unit-3.4.4.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.4.4.ebuild b/dev-ruby/test-unit/test-unit-3.4.4.ebuild
new file mode 100644
index 000000000000..805bffe784ad
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.4.4.ebuild
@@ -0,0 +1,33 @@
+# 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.md doc-install/text/*.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index b92d8412879a..3901163395f0 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -4,10 +4,12 @@ DIST tins-1.24.1.gem 306688 BLAKE2B 64020840eca05dc90402310d2f66a8af2a029954ae8f
 DIST tins-1.25.0.gem 306688 BLAKE2B 1dfbcfeea4fa88d1a227c5b15dce5f8fbf2bdd8b526d6ec6aae14a309bb8267c89e02b861e0f89c6b0f22638cfce5fde53b07f4bc61838530672b6c9dda2b95a SHA512 e8afd89f39647f0722db3128fdb4e826f8beac5f4c081a4fc95c6e8c9a59129f523af81f953dcffd513172c17173c6ffdc0ce2c215b6073c3b94659c998dc3d0
 DIST tins-1.26.0.gem 306688 BLAKE2B 0e3dc0a2493d95d4d32fd0f37c462cf37ad736b186ae5ee421570a9be7b8155b9d7b10d66ec748b22df99eefc31ccd8d1d7c22f8552d1e62a82f94991ee85149 SHA512 adb5e29420d13a0c147262bb4eaf5289c793795ea929a0e4e9e611658bf97e76edfdb008cff657719f497b0b146a23c497c8adb128014fba390389483e533cfd
 DIST tins-1.28.0.gem 306688 BLAKE2B ddb7706ac0a24d913d6bd9256b819218e4d31c0c614f0c9b59758b60b5f7d3670c9bec89c55317a00bb6b4c6d381b236c86cf049489f899e1186d21fe04c2912 SHA512 5b24d1f68226755b1e35e6af5d7c234d0126be5f2638ff50aea61877dca2f640bf5cfca73d39268bbe5624cdc420d256e128dfe0faf59129228826fab36defa9
+DIST tins-1.29.1.gem 307200 BLAKE2B b7e95094662df021d81ea7b580cee5c4ce8f9fa6a09ecf63afa2c84f42ffab62f96f37ae734392021506da373ccabbf68c2dbf55f5ff09224168e24031b1fa99 SHA512 043a49d0755bb158cfd60554b530cd315cfe869520ab02ee819addc0fea39f441960a6c416753c0e69dc0dbf122523842f940ff89dcb43e64f5825a2c0c5a53e
 EBUILD tins-1.20.2.ebuild 625 BLAKE2B eed2203644e3a0212d6cd17e69b854ee6cd226bb90da0c094e0f5b19a91447a24b7bdad65e3ab4127ccd2692ba0c949406e0c5b1be7f069b82b6fc8cd157d302 SHA512 21f2ad099da1d276ca7df14d4941b39fbfd0e65e4130cea31cd8492b8d20401e1353deecbb29977ac25f15950b558384216bc9a02fe0dca46bf35ee10faa589e
 EBUILD tins-1.22.2.ebuild 598 BLAKE2B e07a09b9a60ff60d623ca8ed3ee86c0053566aff02610271b776aa0c90e78e1d5252e6bcc502cea6b989ec691d50b34fe68d8eb8e12d525a41c60abd6ef95f18 SHA512 1957b049fdef634bb43bdc3b197e5445cf70608dddac80190d1270e991de8eedcb949da4ab209658c96fd5b11b022c198ff37a1a5eed3d183c5f6508c9ead330
 EBUILD tins-1.24.1.ebuild 842 BLAKE2B 8d7a0334cbca086b1c1ffebd2f6ed0db3f302b6a670c6eaf12b21472b91ba4e02b32e9bff0e85f9c10483bdd2429e8e77ce615d572fb45e2309d8c1d6e53ff19 SHA512 8a404b386187e2ac21abb936c31f8d91dfaa282b0bf79fdb7ac7f8999e246fa5e58f46d0111f8c5285b8a983a1757731cf922b515eba34bbf52d586f1a09f8c7
 EBUILD tins-1.25.0.ebuild 849 BLAKE2B 8e2a3dadda4cda9331901acb3483ced17b1c17eaa3d5e46a98aea07203d218d7c0247617f13f1feb6936bb29f02deac44cefe641fa78dc661f3d2b45a86db605 SHA512 ca2cc4214b8c8a4f214c893af129aed0334aa5510bbc34cd3b49adfa31aa862e4f648af7da8eb76253a3c3739dc7760b2317abac53d6316fc07588124e36a114
 EBUILD tins-1.26.0.ebuild 842 BLAKE2B d52c83625b5dd10d7bfe866c252f1ec68254c170a50760f389008239171336e7ac8f5bf525067bba025d40765ac99fdf71726f691b78c88b81b3175d2af262d5 SHA512 db5fa43ec2f62233406e94b821b948d168e5d1ecea5253358adefab192f972577a231a923bdcfc8ddf7ca245b45e1733dcda7adc9f2436d01f555dbe14d4593e
 EBUILD tins-1.28.0.ebuild 848 BLAKE2B 6997f7521890f4432b7230965ff8825423c62bcd7d1a173da6df0ebd8797e20f0070983d4b1c8e1928530d5b504b3ebdf7587e126800a98d53efef2904d35062 SHA512 8a8a644845eb3a59848375642d871a6066d9e15788597c426e696ad57094321f1404ba38858f7283d4686a36070cde3925db5efb99e000bca1a828288d8db799
+EBUILD tins-1.29.1.ebuild 848 BLAKE2B 6997f7521890f4432b7230965ff8825423c62bcd7d1a173da6df0ebd8797e20f0070983d4b1c8e1928530d5b504b3ebdf7587e126800a98d53efef2904d35062 SHA512 8a8a644845eb3a59848375642d871a6066d9e15788597c426e696ad57094321f1404ba38858f7283d4686a36070cde3925db5efb99e000bca1a828288d8db799
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.29.1.ebuild b/dev-ruby/tins/tins-1.29.1.ebuild
new file mode 100644
index 000000000000..3f51213ee411
--- /dev/null
+++ b/dev-ruby/tins/tins-1.29.1.ebuild
@@ -0,0 +1,38 @@
+# 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_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Earlier versions of ruby bundled this dependency
+USE_RUBY="ruby26 ruby27 ruby30" ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby25)
+			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 534ec0d2cbf9..5ff0d53c253d 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/bibtexu/Manifest b/dev-tex/bibtexu/Manifest
index 059e6aae49de..f645a3737572 100644
--- a/dev-tex/bibtexu/Manifest
+++ b/dev-tex/bibtexu/Manifest
@@ -9,5 +9,5 @@ DIST tl-bibtexu-2021.tar.xz 292 BLAKE2B a4dc5c282232b3b8c73aa43d5b0e482dc9521f4a
 DIST tl-bibtexu.doc-2020.tar.xz 67480 BLAKE2B 7885cd45a3914230a002ad37dd045bad38bc737a8258b2c64cd0fcdbd7ec08ea946b3fac33f30498ef0d68c2c35003af98c092f84d94f1ed689c4574a2534bd9 SHA512 0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4
 DIST tl-bibtexu.doc-2021.tar.xz 67480 BLAKE2B 7885cd45a3914230a002ad37dd045bad38bc737a8258b2c64cd0fcdbd7ec08ea946b3fac33f30498ef0d68c2c35003af98c092f84d94f1ed689c4574a2534bd9 SHA512 0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4
 EBUILD bibtexu-3.71_p20200406.ebuild 1652 BLAKE2B 5469c677ebf6fd8d908ddc33ccc84facb25b0438cb86c35c995f1082956d4472801b5855bdd8f0077d4a833f0ab449f9901105a0fcdf9e80c6206c0e173f93f6 SHA512 05d58b4b5fda4f4ff19ae24549414271e990ba84aa0a56000a10f9139ae5a463c310cbe9e221445069b1e26da9450899190195214e2d67946a45bba120813a66
-EBUILD bibtexu-3.71_p20210325.ebuild 1660 BLAKE2B d1a9e04ac570fa9e8336b6b125c3db8f17398fca60d6412a0416b375c633954c22819482f8b1fd3ebee8387c994049799eb48db30a97f2959b67edb8bca99dbc SHA512 d0085b68d536ccb113d07d0e3cfa033c67c7e99eb7556d707f9ea64b33aedda186c7d08bde21632de39a35d550f54e0ed04d14922ed0e64b323792031b225d54
+EBUILD bibtexu-3.71_p20210325.ebuild 1652 BLAKE2B 6aacafd9ef49e6df6f875866fd458662dcf53199196c5494b6c95d948b67a3440c4a2a44bffb82fb736050a70fb01c37974137ddc2a156d676e612a87753ca59 SHA512 00df7eab8b98e17d58d07018bf8f10345d696855282c90515cf016209a47736074df24955dc388136c0b33a754a0a7899ab43ec6aea828c2cec6062deaf153b9
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
index d2361671dba3..ef43ca4aa446 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND=">=dev-libs/kpathsea-6.2.1:=
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index a506799e092a..873ddcc3d789 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,8 +1,8 @@
 AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce028317c8cea9305b7643e540171693ef70bdd364b6f6ff72daabc0baf66f32bb8ea526dcb0406fb065 SHA512 fec1a4ab9a3a493476a255001303c84a30fcf67873bd2639d177b414cf90880a149d31a68d6ce0dfd104b877bfc3fc2d39b1bb38a0f9d7c511bd311e0bfefc48
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963
 DIST tex4ht-texlive-2020-06-24.tar.xz 880952 BLAKE2B d021efca48571711d06d7ed6ecefce068339a49fa83efeaa476329d892a77f73b27273a711dad2cb7ce212ece87ef8a776a10127cec5dc2e0096ce36adbc42a4 SHA512 b6109d27fd38eb0f2f9aab8b96adee2e69081c7317de3c9f527e47053d1520b93c0499e23fdc66f38f04c50633f72930e4fdf5d07612894427ae31dcbc1f66d4
-DIST tex4ht-texlive-20210428.doc.tar.xz 136156 BLAKE2B cde1e0326eb4d38261f7aae132cd5cbb2a72e05f54b708257e0ad3bb5da3fb82ad60d686c61ecd3854d3cc70df75dcbf90499892937c0adfcc6503fb2088d695 SHA512 1f674179ba4e6ab355bf478778c7a1498e4dfb61da0cf7cf9f4a663396ad9c6bac592f5cb1b32d972288fbc201541927a5e5edde18caf73a298b0b8a618a25c5
-DIST tex4ht-texlive-20210428.tar.xz 906228 BLAKE2B a011425a9e1ddb88610805e4af5b65c42dddcc88ec0ca7b2e02ca9a8276423c4a96adfe86980d21b1f2a568bdf95c3ca43b4e814d98e8b5d53319906af13edaf SHA512 89a13dc4fccbc893a113d2cc43d9cd70b20b65b5f4f642bcf9d14994b61667aabbdcdbb9a91ef05631e02e88fcf10b0e1de3739c741f5975770e4b93166766ba
+DIST tex4ht-texlive-20210603.doc.tar.xz 136388 BLAKE2B d379e35b8fcd37243e2e1e9b4c378b78004774c530031ecbc0f10b99041a9f785d2317054d2f41181f41d29718d3dbbd7e9632541013eaeea6d54fcdb3568f3f SHA512 de7c2fb855010f62d8dc7dda39826a549aa38daf5acb9e89abf19cf26724db5ac25f362a490058a1456a056ee9954eaa52985b9a05dcb89d6a947474593a77cb
+DIST tex4ht-texlive-20210603.tar.xz 908004 BLAKE2B bbc5ce16c10314120b998b5d2b527cf918c0991f47e6c7abe322dba62c1371a38f80ba971a971d756df548aa91d8c5b1f1f0ce3128a6dd33ac052ee465e0be99 SHA512 5a51db0b4cfacba33f9cd83b757d45f83c8470bb451a0376f328a1e78ffe39e5f22dcf2be6f9bed5724eed373ff020c8fa4aa38d9bf34bb45a05186e224e144e
 EBUILD tex4ht-20090611_p1038-r11.ebuild 3773 BLAKE2B 746fc0ec18a31d9fa9c687bd2e3a481defcbbdca5119a09673772da9118db4aed22dfefdc9e02e7105bd4205d5410fdd7933d7d1d6cf27979ade7070d14a1799 SHA512 ab7caac635e1a2e7451c8d4e0aa320f115b12f4271e5dca0b8cd4731d7b9f03bbc6dfca3f87d011bc23ca32234bb05becd1d4f7b1d7f2dafbbc36e37676c593f
-EBUILD tex4ht-20090611_p1038_p20210428.ebuild 3973 BLAKE2B 6a200e1b48e9fcd7bad319f25dd94ee22abfe6b30ba13264c2416080bbab19d5914ed826ff909b12ea203efef2b2e317aa8c5dbcda58d0492376cbd1c115b5d9 SHA512 250e5e31a52fff2ec15125ac7b0b1c0291dee144d03f3cc3d25ba4c366afa6502b2f8c4e92f1207045349c8b019b42b52e59afd488737a5140e9f266fb5a28b2
+EBUILD tex4ht-20090611_p1038_p20210603.ebuild 3967 BLAKE2B a74f6746ddabe033cb910ce30b21a74f4faaf02b12c35943882576ecfac0e4a3c59798d63595724b98ffbde757bf10d736fd4c3c619d2d1bdf2db17a0882bfa5 SHA512 91378227dacdb8bb666eea172ef43579c7bb9628649714ff1c80eaed4b0a58df77ee4d1f6df903d582078efb2e852c56b5fceb06d041e0d37866f3ed8cd339aa
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
similarity index 96%
rename from dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild
rename to dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
index b746096e2afd..44bf075390e6 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc java"
 
 RDEPEND="app-text/ghostscript-gpl
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 5ec1de3544a4..958bf4eecb7f 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index 2de92826eabf..ceb77d28ea27 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -134,5 +134,5 @@ DIST tl-unicode-data.doc-2020.tar.xz 3704 BLAKE2B 6f8f515fbbe754ff240ad18d5724cc
 DIST tl-unicode-data.doc-2021.tar.xz 3820 BLAKE2B 0c236332623be1650e995f895cb89a98a5d10c36e23a14ad06600afcea52cd134eca2898c672c6708672ca5ba73d22be4a24f7db6e4374001f536e97dc5aa58b SHA512 1093c6e78d8f8716cec8ed34444d5e95628c2d0be4b61cb3dae72563b2e3acfc1596b5e25dd8c101dbc8ffe15b7483a198c30f459eb76418381be3dc6caadbef
 DIST tl-updmap-map-2020.tar.xz 300608 BLAKE2B 0b47fec9a68384b765db4ba210774111efa009ed42a8bc50aa034a730bb2f61bf210f43b5481b9eb954d5955e3bc8cf5280004e6a629346069cdeeaa14dd0a39 SHA512 087753526998c68fa94dc86df6beebd6293dab9bf87f0969bb80f362b6d33215bd4f3b9baae5c8a22adbe0e3ecd5d1b8e4d0f71eab6cf6c1a932e7acbc94efbb
 EBUILD texlive-basic-2020-r1.ebuild 1678 BLAKE2B ad317fef79e7c3181286241c926328a057668cc70c4192d8ba0abab37f509836812781c400b35ddf178b4d26a94f6ea92bec247187ffe84704c64f428fbd5e42 SHA512 f5e1401d13215701a3e97d063b16d5e96f0d84e3b837d16502772ef18d6e14dd3f3853ab2ce03f108871952e515ba00d1c0b2e2b37c2c3b16a58747ade4167c1
-EBUILD texlive-basic-2021.ebuild 1553 BLAKE2B 66787c6bda238c915475f9502dba279e540738e2c367cf104e84c808b816e40859717a148934c9032e7ebdcb5fdcc8c721a580822ee3940b51e2764a64084557 SHA512 b17ff3bf86e5970570157c0d044627cfffb5e8473c28c3ebdd126ec422f187916fddd83809105070e3daa031c98a86798d5a6359fc950e5043a87a972696150e
+EBUILD texlive-basic-2021.ebuild 1545 BLAKE2B 9821943a7cb132c1e735ac144abb3d90e0d9ebebf115ccf4cb4642296a82ecbdc29b41726fe3398477c3afa02f779c7b9a5cbda1499d9498c87936317a10c7a0 SHA512 63b2031124b3dc0445c75505bcf441766ed3b90b4795ded12e96e0f2ba468d756978448e3284dd62295a06c412e67cd09ae8e1b51362859e89a8d38dedc341a1
 MISC metadata.xml 688 BLAKE2B aa7b007f62d5b0a2abbf20faf44b53118960ba7cd36777fcd168ee50b41256a6cb46838e0b3757bb45f0e5c7fc5cb1b9ee3a53bbe9c23f2563cb852a24a810f9 SHA512 59ed72f217730364d768f0240839d7dea3ad2e6f01c9b24658e999f7e3415711ef1783e3260391bcfc9d396528d2fc7eb8d28ef96c7c19731f123574a2c64f69
diff --git a/dev-texlive/texlive-basic/texlive-basic-2021.ebuild b/dev-texlive/texlive-basic/texlive-basic-2021.ebuild
index e3847976a37a..d975e36716a6 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2021.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2021.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!<app-text/dvipsk-5.996_p20160523
 >=app-text/texlive-core-2020[luajittex?]
diff --git a/dev-texlive/texlive-bibtexextra/Manifest b/dev-texlive/texlive-bibtexextra/Manifest
index 6ed2cd39f2d2..4574a177ece9 100644
--- a/dev-texlive/texlive-bibtexextra/Manifest
+++ b/dev-texlive/texlive-bibtexextra/Manifest
@@ -645,5 +645,5 @@ DIST tl-zootaxa-bst-2021.tar.xz 6228 BLAKE2B 796c41db57159702436e8dcc779774378c6
 DIST tl-zootaxa-bst.doc-2020.tar.xz 135268 BLAKE2B 46f7ef7a4a9d5c58be0b4b891329ff2e0c6b19fb3a50cafcbe7dd1412b6b14ca6ea4aa18f92d9f467b529b0459a150e3758a8097f5120f0ad7c7820e4e7fdcf0 SHA512 f843aa27ab0c2139e1051aefaa9b667f2de489cc13578200ce7db2bdfc2397888856c6cbe68b6fa201e0cb269bb95818cb31f1b03622c49ebdced23fa5960d65
 DIST tl-zootaxa-bst.doc-2021.tar.xz 135268 BLAKE2B 46f7ef7a4a9d5c58be0b4b891329ff2e0c6b19fb3a50cafcbe7dd1412b6b14ca6ea4aa18f92d9f467b529b0459a150e3758a8097f5120f0ad7c7820e4e7fdcf0 SHA512 f843aa27ab0c2139e1051aefaa9b667f2de489cc13578200ce7db2bdfc2397888856c6cbe68b6fa201e0cb269bb95818cb31f1b03622c49ebdced23fa5960d65
 EBUILD texlive-bibtexextra-2020.ebuild 5701 BLAKE2B 282a7098d77abef984ebad4248a55f770fb7da32d6dd5d607690586f8a3ddb00e87ec5702cc9f8162af0c88ceb708c8f526517823550cbea403c12c4f39ef10c SHA512 55e1ba132c302e49ba4258074e841e3ec277523cbf31c48788c48a7ace9c50fd36e2096f487e3d3c2777de4b5874b14dd50bfc55297b289210604d7f20cabc0f
-EBUILD texlive-bibtexextra-2021.ebuild 5899 BLAKE2B 7d8c4c6f1c1a5f1412aab6c2521d63f6a6bb02002bca146e1e2ba3cb78cb55cc2b036c14a96fcc2bb200587379a4dd50531c5e669583ba5a9c45021b073b7422 SHA512 7b258b3ed418d2329a32051211e67697c95691cf03c475c7bda69fc652f87b7db03dd9b58a113d097c1146d7b2c4b0e86a4789012c58064f7ecc0558e321335b
+EBUILD texlive-bibtexextra-2021.ebuild 5891 BLAKE2B adae5b575533cc93fe489911ff087cec2d45fb868cc3a88efb8fdeed970efa7f69ac594ed6542d514f7c7508c404633652d7417ec706c59f5d02e5f34945e9b3 SHA512 7d9ef6d6c94c808ecbb59f9954cd3c0cd46d81a3419500419cc529af79844df3d81ec0dccaf3d666ae955f66bb593b01a9ffc5cbe5b0cbd3ec81a36dfc31fd12
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
index 65ea3663c6a2..a865f4d6731a 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
 
 LICENSE=" Artistic-2 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021
 >=dev-texlive/texlive-latex-2019
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index 4bedfbe211ef..a72c3cca2c56 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -149,5 +149,5 @@ DIST tl-npp-for-context-2021.tar.xz 664 BLAKE2B 5882669c85f04553ad8d5f1722f4f27b
 DIST tl-npp-for-context.doc-2020.tar.xz 2136232 BLAKE2B 241dd233f3faec33222496aca1c6a9823772af68b2daff4256f532e2f5a28634bf0ded0c733524a053b6b985472009409fd99ac0daff719f8c54f9b181f632da SHA512 b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd
 DIST tl-npp-for-context.doc-2021.tar.xz 2136232 BLAKE2B 241dd233f3faec33222496aca1c6a9823772af68b2daff4256f532e2f5a28634bf0ded0c733524a053b6b985472009409fd99ac0daff719f8c54f9b181f632da SHA512 b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd
 EBUILD texlive-context-2020.ebuild 3351 BLAKE2B bb5f26ad4237738f8abe27aeea971effc1c763f3b829b46e6d3a9b33aa82130170ad8eb64ac773f46d95dca9229675fd090d9ee3f9b0915a8b02660a49070669 SHA512 40d25a7a9d05445395ebdd0451dbcb30672044f421c5cae3550abd8b28ef0bfeb5d266b1007f55654ffc6ef18645a834bd8a1b6a1a1569b9cecfb5a751880bfd
-EBUILD texlive-context-2021.ebuild 3349 BLAKE2B c592f8c392bc3451cc5cc3aa5bf418d7925cb70375efd0a480ba362c902263662e4dab82f8d17fed9c8486c556c977de9ecb3c0a3c4184f938b3dfdcdc56ea54 SHA512 5d2aac479366b2d5af0377c5e3eb88fdfde1c44cce5db17f05e3924a888f0265946b9791b2de5f07fffa5401dba564962a0ebf972339a29f07b7505477edb6ad
+EBUILD texlive-context-2021.ebuild 3343 BLAKE2B e5dc00cc6a1b74d9e797e2ce1a069284ed85475a93dbfb28bfdda42bbd9a11eee67db1ba1e7f2d7db06fee96506a66ecc9bf674c53a9c875521cbe2d342e22ff SHA512 af8f497b4bffd38024b027f471f55ba9211a6ed727cc81ad6597b675a66ca86980b61573ecb2b5d9ebac578100b5f82da78a62e97adc43f87185e9216ebfeeb7
 MISC metadata.xml 517 BLAKE2B 18bea3fc4db71d01c85ed3d254367f5cc9be257dbbb6d524c2fdaf87215efb617bc2268bd598f3c69bb8bd3b1bb1cf529268db118305fc6394bec447504c72b3 SHA512 6a05b0aa2626563c21edc01c8d842ac54e7533420e86d41d91a2f6730ef1dabcaf96bc2d68088a9ddf89fae4a932b9bee5dff998b75c1824d789cf6937995311
diff --git a/dev-texlive/texlive-context/texlive-context-2021.ebuild b/dev-texlive/texlive-context/texlive-context-2021.ebuild
index 04d0eb738858..7d59f4afcfda 100644
--- a/dev-texlive/texlive-context/texlive-context-2021.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/Manifest b/dev-texlive/texlive-fontsextra/Manifest
index 4c32218c8285..83e8a3b81829 100644
--- a/dev-texlive/texlive-fontsextra/Manifest
+++ b/dev-texlive/texlive-fontsextra/Manifest
@@ -1396,5 +1396,5 @@ DIST tl-zlmtt-2021.tar.xz 3072 BLAKE2B ed536eecad020104ce124f74966fa056bba0d9f6c
 DIST tl-zlmtt.doc-2020.tar.xz 45412 BLAKE2B 73d94d5783ac247673d740a711325b9c381259331a0f94d239342b7ba2ae77b352565a274e8b9db49c37b1d670b2ad264e5fb13181f364b41f2607b314025ead SHA512 22e301f72e0b62078d7b6fe7d7740e0477d9b18beb59ab55b81dd65c50cb250ae711886f01944cdfd25f82d0dd2089c41e662cb2f16eaa0252d70c1006eed8d8
 DIST tl-zlmtt.doc-2021.tar.xz 45412 BLAKE2B 73d94d5783ac247673d740a711325b9c381259331a0f94d239342b7ba2ae77b352565a274e8b9db49c37b1d670b2ad264e5fb13181f364b41f2607b314025ead SHA512 22e301f72e0b62078d7b6fe7d7740e0477d9b18beb59ab55b81dd65c50cb250ae711886f01944cdfd25f82d0dd2089c41e662cb2f16eaa0252d70c1006eed8d8
 EBUILD texlive-fontsextra-2020.ebuild 8519 BLAKE2B aa175f23de00e6435c35418fc67acb7b5c0be8a5f6f6518bcc4d7da30e5a2df1e8bae3f20a49587acb034a67ac99f6824889599b3744f51eac69e43817202a08 SHA512 cd9c98e8630147de921179b183bd7e5defec3cbc196b0976df3847f6d612cfdba0f60e3beec56d5d7eb31997a361bd025cde0e30211847f8e8c4e3cdbfeb0e1a
-EBUILD texlive-fontsextra-2021.ebuild 9188 BLAKE2B 0c563c24b2e3be89ba0dc2fc53afd28dc3f0fe3c4821ee6a7cb6b8fe7f4c7c8bb4e2c52652be45e5621cda355973d478fd6588fc0b0301f6b3a29217d586ef91 SHA512 7aa02d48beb8e7d1aef4b7e1dbc7e123b5610acdab554bed4175137d4b773d1d3fd6fb4e5541f56170daa3dc0809d80a69f25ccaf511a14d1667a8ee03d85cf6
+EBUILD texlive-fontsextra-2021.ebuild 9180 BLAKE2B 9674eaa56007f4ebe3220ae8489cd8720ae564e594d4c88cbc246b5ddfb2b9a3d0b430aac316629ec68841fc9876715db2db27e42d2ed2eeef8f61c029ed7852 SHA512 f33de2fbbc772c451b5a082800fc940ec89ab576eaa517e1c45649e8feb1ef3080d91d13b1a8cb7b6171009ff612d30c5df2e2556ef84d1459baf18cc323bf51
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
index 844f40984324..93ccd6c41bf4 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
 
 LICENSE=" Apache-2.0 BSD CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.3 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 "
diff --git a/dev-texlive/texlive-fontsrecommended/Manifest b/dev-texlive/texlive-fontsrecommended/Manifest
index ac74b56155a3..22b499d7410e 100644
--- a/dev-texlive/texlive-fontsrecommended/Manifest
+++ b/dev-texlive/texlive-fontsrecommended/Manifest
@@ -124,5 +124,5 @@ DIST tl-zapfchan-2021.tar.xz 79924 BLAKE2B 1b3d117f1dab984e1b8ef804edc12e40e1d4d
 DIST tl-zapfding-2020.tar.xz 46964 BLAKE2B d3c7e0e3bb47c94d4f486dda1b842c0c129461cdffcc32f53faecbfd847f6aed1e7b635b09415025fc5fa8543e8ae604ff3827910e864af7a53b9187bad88bf6 SHA512 e3e6e69b82858d8bd653bcb112ed81b8b5aacc0b915b5e4ed4288f5aef896211e75b85b1b647989e0ffa431ec204a9d8ad27b2e60bc2b28eea83eb3518945bf1
 DIST tl-zapfding-2021.tar.xz 46964 BLAKE2B d3c7e0e3bb47c94d4f486dda1b842c0c129461cdffcc32f53faecbfd847f6aed1e7b635b09415025fc5fa8543e8ae604ff3827910e864af7a53b9187bad88bf6 SHA512 e3e6e69b82858d8bd653bcb112ed81b8b5aacc0b915b5e4ed4288f5aef896211e75b85b1b647989e0ffa431ec204a9d8ad27b2e60bc2b28eea83eb3518945bf1
 EBUILD texlive-fontsrecommended-2020.ebuild 1209 BLAKE2B 98f99c4e8bb5d0e1b697e7b20e5b4118d12a00eda2e527b55b780f5175203f1f8006fb2b93b4c0613705c6b30f0b6bed52cfa4712114e0a691196294d43d59ba SHA512 695210aed5f2ab6a89968f2b163efe1d3e7593ba845646dcf00c3c1610807bee75995c0af55e00c1a318190895ccf8c16ffca20e0f159579aec3d889d5243bbd
-EBUILD texlive-fontsrecommended-2021.ebuild 1254 BLAKE2B c68d14a7d852c0eba2fc4e56fab3f65cc869ae1bce94bfc241760cd07d71b7fb73b35fa9a25696bf0897fbce57a9dbc6c72b3b4b742c8cf16c8df1a619d2bb7d SHA512 5ab868bf457102d986daf62a067cd19fa24402ba0495a154ca99d9014be53e7ae2b1d74bdd34bfb11c10fd047f6ce0f42f5286f7fd6bccaf5d12b35bb88c8643
+EBUILD texlive-fontsrecommended-2021.ebuild 1246 BLAKE2B 63d34da7e97a8c819c001ccd2cd14886bbe674e86248ad82a161ab748c416ce9ba7c7312fb90f4daa365ff60b4c1780ed6873d49d86a59118b167424341a6032 SHA512 8e25148a91cf3cc455d350b4216f497f65f8f73253b55bb4f2fd8d3ac468aaf598ce4a1c5ec8ae852088685565559b7609e964ff24f2dfca075104a4e749f088
 MISC metadata.xml 569 BLAKE2B ae2ca0d4582cf74769c8537a954af064ea8e615318b8aa1d23f8ada27e6c8c41dc177654bf60ad9ee99fd29e14472ee79d8859de134bf50100aa384a10a69dba SHA512 0753e724c31d9af811afffb43e2317076a8f83211d5a45eee3f5002d8bcc5e424af95b5582d6b556cd2f42133984f5e0979a399d812f3844def897643344b101
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2021.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2021.ebuild
index 94b96f800c48..b802b98e9d0f 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2021.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
 
 LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-fontutils/Manifest b/dev-texlive/texlive-fontutils/Manifest
index e7b143e41f14..0d594c7e01d8 100644
--- a/dev-texlive/texlive-fontutils/Manifest
+++ b/dev-texlive/texlive-fontutils/Manifest
@@ -66,5 +66,5 @@ DIST tl-t1utils-2021.tar.xz 620 BLAKE2B 5eea03f24822a46761866a01855fa13c37dcc01b
 DIST tl-t1utils.doc-2020.tar.xz 94352 BLAKE2B 9b388f5827e90e3c160bcc1ee05c8c6f1ff937cc7a8e282219eb7f095d9c2615896cbf95a95143da504178a3d188b4cd33b45b27e044f0757e7d54ac4c83eb02 SHA512 096f8fc612ef1793c4807fdc134b3d75650f98a79b49ddbdf11c346b175ec76a900b68189f7e6ba02dd1579396503faed58398da8dfb42d70a7d69dbe24f5f5a
 DIST tl-t1utils.doc-2021.tar.xz 94352 BLAKE2B 9b388f5827e90e3c160bcc1ee05c8c6f1ff937cc7a8e282219eb7f095d9c2615896cbf95a95143da504178a3d188b4cd33b45b27e044f0757e7d54ac4c83eb02 SHA512 096f8fc612ef1793c4807fdc134b3d75650f98a79b49ddbdf11c346b175ec76a900b68189f7e6ba02dd1579396503faed58398da8dfb42d70a7d69dbe24f5f5a
 EBUILD texlive-fontutils-2020.ebuild 1436 BLAKE2B 7f3a543efd95cd93d228a0f2448f18d6bd42fb6c2d083cb83e2afbac5f5060c7d0cc97628dc3d742c3dad0af92fc11ef81d1f0f91428fe4fe8808db39e824c6f SHA512 d345407b38e241032641a552b0fe8fdcfada85e99b8c2e23ce2fb7e3d53006841aa82c013390f5aeb80ea49fd05c79d1b034188b0f7055e0d4eae8fdec56d5ca
-EBUILD texlive-fontutils-2021.ebuild 1452 BLAKE2B 1af0e9e817c1fa2f87df99cc36b879dc88a8af52ae5d8b6a9417f7e262c25bd6ea462f21da0c8098c7b77f347e5d0d7e081b6360f89558b6683b668c668f6906 SHA512 725344b33d29c4d2fbbc45004bf6535f656a13efb7a7ec5872811dd92ba06afb122757e49708e77dbce3d4fce01daa86f42bc5e6dcae8eec304c80c84080275c
+EBUILD texlive-fontutils-2021.ebuild 1444 BLAKE2B e1bbe168c4380f19020f8a0b13dbeac92fe7566cde018a547ab14e7deb6e325e66200e1721bc678dd81cd9e0f96003fdeacb0785a84bfcd714da09de943fbabd SHA512 c5216d8d53ddb0a061973c1d4cd9d58fdc9c42f46c87695e84b17f8ea61c3b49daf29735c37b088479a205cb2b910253047824e828edc06a0af58601bb097e32
 MISC metadata.xml 638 BLAKE2B 309dd88d7961480feda8e50f7c6c2f63274d24fd2beaf6c751cff8224243fbb25f23c176c92df85f0d09dccc8f6a90c9f63a301bb2c8527827aff6c97df85410 SHA512 c2ae5eb56b99612125ed6063f369979c8888a6b253a3a47bb4f125f45a8923207f13d5eacba69ef6af3717017a50e1603e17701cad95b484270c5715cf2c56ff
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2021.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2021.ebuild
index bf9bd7fe5aad..d1d23c3a1fb1 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2021.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
 
 LICENSE=" Artistic BSD GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 RDEPEND="${DEPEND} "
diff --git a/dev-texlive/texlive-formatsextra/Manifest b/dev-texlive/texlive-formatsextra/Manifest
index f46dab20e2ec..f74e163ec849 100644
--- a/dev-texlive/texlive-formatsextra/Manifest
+++ b/dev-texlive/texlive-formatsextra/Manifest
@@ -81,5 +81,5 @@ DIST tl-xmltex.doc-2021.tar.xz 17004 BLAKE2B 1a9fb27e98f4aac8af5fbe1d62e5dcfbcc8
 DIST tl-xmltexconfig-2020.tar.xz 488 BLAKE2B 74992dea02ef50bac91256980c919df27a313a5d35fb41faa9847d19465d91a22faae30444d818bc78a5a7c16e63474dad5ab083695786dc9f75a52eea39c7c0 SHA512 2620dde42acffee6561f406527794cc62d87c1104135da846b7cd3c7f4109c4d1986d562ea612f2b5246e1863eff86795c4789075f8475d45de00763cfb539fc
 DIST tl-xmltexconfig-2021.tar.xz 488 BLAKE2B 74992dea02ef50bac91256980c919df27a313a5d35fb41faa9847d19465d91a22faae30444d818bc78a5a7c16e63474dad5ab083695786dc9f75a52eea39c7c0 SHA512 2620dde42acffee6561f406527794cc62d87c1104135da846b7cd3c7f4109c4d1986d562ea612f2b5246e1863eff86795c4789075f8475d45de00763cfb539fc
 EBUILD texlive-formatsextra-2020-r2.ebuild 1105 BLAKE2B ae688b036f3c33385eeb4934d6aa74265c00c51cb56781239e8f0ef2e47e918048c3e178b21cbff18b63dc3e5b5a89a1a3548a3e34fccc7718dfb98dc3cb3251 SHA512 966b644ea89e55fcb34a9aeb27715d678ec770dd8ccd4c59a056ac8fecfb83a79689aa44457877cc244f7dd01e85d450260aee377fd1e773408431d8bfd932b3
-EBUILD texlive-formatsextra-2021.ebuild 1092 BLAKE2B a308b0dbc8972688430276609b173e152f5130e63e411cfb806bd9f7feec7956c193121150d5af09e81f1bfc653136c4c6adf1d0215c38ea19470c41b0eab91a SHA512 67861c30ad861de438f7110bb46a61a3c07ebca2da6d0e06d41bdcebb15122aae61b5e5bdd0087350bb2cb2fbf7056bf5820c35e7f4502022e5fcf93aab04a73
+EBUILD texlive-formatsextra-2021.ebuild 1084 BLAKE2B b0b3d416bb118f05de92d10203925a4ab9eaa15b331ad42fe2d108ca8c5fdc7ba23fa4a17ef45de9cf2e16dcb3dd86f67db8750c76523b3e4106021d65d4c963 SHA512 e96f3861a1d28cf6f8ca6b35cd92f31bd07f09cb5aa0b8533fb2d99e2b4cc78806a0447e22a7b80a6a3c0227faf666e21f389fdfecb599f8ed1ca543e6fa66df
 MISC metadata.xml 683 BLAKE2B d76a08b76354e21ad30a29835dc19c8c280313b330106276ff74f9221265472565ae8dc5582cab4963450482513f48a281af0adf7e2ebaa9adc7de2a14274975 SHA512 044d70fc0c48a776f9d169e0c5abd41c29ffc2508f05c175f301833cbc64f39f841effa2dab8a3b8c7ca94d487c25f3412593d3b173914c826874236e66db556
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2021.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2021.ebuild
index 51a76c0d5df4..0815510bbc43 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2021.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
 
 LICENSE=" GPL-1 GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-games/Manifest b/dev-texlive/texlive-games/Manifest
index 49ab9cf89bff..e28bf27ed92d 100644
--- a/dev-texlive/texlive-games/Manifest
+++ b/dev-texlive/texlive-games/Manifest
@@ -177,5 +177,5 @@ DIST tl-xskak.doc-2021.tar.xz 789680 BLAKE2B 561351c89556e6f281a55647a8c468fc629
 DIST tl-xskak.source-2020.tar.xz 14172 BLAKE2B c3e73783732adf08731e33a3a0b0429093b9e2dff41be0e2ef5383bb47bd4f1c1f4a03af825da49c94f7c70994f8806ad30024898ace13b35faefe6824fece2c SHA512 11119e38b4f21663e36764d2b9e7da22d9493de7296590db4beefe185b2c9e89224806257d3880c78b07c3984478843b1886e37e5a33fc798920be221789de04
 DIST tl-xskak.source-2021.tar.xz 14172 BLAKE2B c3e73783732adf08731e33a3a0b0429093b9e2dff41be0e2ef5383bb47bd4f1c1f4a03af825da49c94f7c70994f8806ad30024898ace13b35faefe6824fece2c SHA512 11119e38b4f21663e36764d2b9e7da22d9493de7296590db4beefe185b2c9e89224806257d3880c78b07c3984478843b1886e37e5a33fc798920be221789de04
 EBUILD texlive-games-2020.ebuild 1663 BLAKE2B 1873045fc7f892bd63830f336271b462902c153c42fe55feeebb1c81509c924ac41e36f3a37e4ea1f26a4568eaaec1df74cb67f0eaa5453c26ac1665f01e2171 SHA512 c012958af4c2416411ced3f6f2a34cd7575a058e1c79106bef2f88cde969fa58f5fdadfd68538f6f41df3eb85ce5ac13fa09a3e80a2fbdb49c847e8dad23dbf3
-EBUILD texlive-games-2021.ebuild 1830 BLAKE2B bf9dfcaf5930571fb1b460585d2588c0b4fc095b9c072e0ae373c2ce091fa297239fc04e2f78f1261d939a1253227d4fc52db9f9b5c75ca6995c7f290014e7c5 SHA512 e1e514dba276ea57b7763d0b6f5b3f7122ee6d9662268e10a16e25444ffb01da329e6c3290104bcf28bdaa75eda215c9765d4f471f08f5406b084f58532f4a4c
+EBUILD texlive-games-2021.ebuild 1824 BLAKE2B fdbc303d9ccef149863c0a620f4d85dc2a10bdaf791ffb24408d7690db073ec5c2e97372d73a149ac753eacf34a41c3c05cdee844600c5cb0d39eceaab0c97d4 SHA512 15cc5dd3dd709dc23352f3338e001fcfcfdfe91c4e428e49bd13341c55c0938c8ec035d211491483bc99fd47c9ae22adfc97b43ec5dc8f3ca1c9db7e2e469450
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-games/texlive-games-2021.ebuild b/dev-texlive/texlive-games/texlive-games-2021.ebuild
index 8708cfbb4faf..bf7424249208 100644
--- a/dev-texlive/texlive-games/texlive-games-2021.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
 
 LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-humanities/Manifest b/dev-texlive/texlive-humanities/Manifest
index c7b6ea5181b2..52154f66fb03 100644
--- a/dev-texlive/texlive-humanities/Manifest
+++ b/dev-texlive/texlive-humanities/Manifest
@@ -264,5 +264,5 @@ DIST tl-xyling-2021.tar.xz 10540 BLAKE2B 3ca946c655e20ca775d85746f8cd1afa9651a0a
 DIST tl-xyling.doc-2020.tar.xz 148332 BLAKE2B ca9f2cdd941042d3336ceae9ba2573a5609958d5413f9b1275cae43a0e908a045b295c2830bed7eb8ad0ac11121685c6ceb75be040d2d4da584d511d46296dc7 SHA512 7b4ca312ea917329260eb0a19bd504ac2f3ddfb5f066806296b164fc541bfe26e6ed1c03ffac5b52af6b19fb4ba1e77b5228ac4b4db0c2ee8f2394fc0f888d09
 DIST tl-xyling.doc-2021.tar.xz 148332 BLAKE2B ca9f2cdd941042d3336ceae9ba2573a5609958d5413f9b1275cae43a0e908a045b295c2830bed7eb8ad0ac11121685c6ceb75be040d2d4da584d511d46296dc7 SHA512 7b4ca312ea917329260eb0a19bd504ac2f3ddfb5f066806296b164fc541bfe26e6ed1c03ffac5b52af6b19fb4ba1e77b5228ac4b4db0c2ee8f2394fc0f888d09
 EBUILD texlive-humanities-2020.ebuild 2161 BLAKE2B 4d57172649b1c243d65031a219b86f4a9a609eafaa6da4584d466fbe23d86c503db86734f7cff8033f17abe3f536e0d38d14cc92bb1dedd892fadd7bd9a59f81 SHA512 db19d8d38c7990284f69e2138df1e8367a4d6060b708637aeddbf0b2db707f2571e29909bc27631232b5fcd85033d3c22cf3b03ff75bd7078f935e090b9accba
-EBUILD texlive-humanities-2021.ebuild 2196 BLAKE2B c37fc38ab63cad126e2fef9787671c1176e92847b393cf24924cd82512cc09700f608c70762482a305fe55071699cc3640d47c913f77e605d633495bc6fbf04e SHA512 9b59c95d31a46e910bd4651a488aabbbc4269df0401edb161267d5fc3251f8f1b010607a71d79884cb5460e4449c61ab217227c164577a2d14468c23abd39fe5
+EBUILD texlive-humanities-2021.ebuild 2190 BLAKE2B e83758eaa7858b79b4f8110f895e283bada6f0ad4c9522c4914d19012fef028d452fb40d93839f2d493cd016c69000f42690ff8fbfaed7baf0bfccb4ed0e8f7a SHA512 f66f087f770dbd8f471cdf38ee6852d66bf7e9cf8c7c8c0787d13bd697aaa03deba633cfc7f53720720bb9758a7b7337f8e7fdf656c3d73ec3a4febf708b03bd
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
index 42dde1f4897d..e130a47c861f 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-langarabic/Manifest b/dev-texlive/texlive-langarabic/Manifest
index bfbea3c192c3..96f4c83cb4e4 100644
--- a/dev-texlive/texlive-langarabic/Manifest
+++ b/dev-texlive/texlive-langarabic/Manifest
@@ -108,5 +108,5 @@ DIST tl-xepersian.doc-2021.tar.xz 987500 BLAKE2B e7e3d10c12571d65f2516bfd4fcc477
 DIST tl-xepersian.source-2020.tar.xz 91404 BLAKE2B edb14317957d824efb5438b0d940caf10dbe89c238f6aca82b0cc9fc33e2e79c349f7d40a30d21e41b4f419cee41ff56c89bc42f5eae484a301030206d474e16 SHA512 3914efe8c8fa627a0b53ed4da3ccba7774d7b9c2847320fcd8096a52b271b9640d80e44be64fce95f1ae3b0ea55a40fcb6bb4669a2255722ba1d9be972c5d86f
 DIST tl-xepersian.source-2021.tar.xz 74624 BLAKE2B 2d8075959efa5be76c2ef5fcaf701a47813f0e99e6c83af20abfd58046e1f777292c4a60fd97958ce4321bbd30e93bbc9257d0e7d1f0d5502078b59f15b7cefd SHA512 866a5fb8007fa600c50b343903a306d17e26d5616eb7fc14487ae93005cb7bce1209d382104021cd2b345ea02f2a4b058518454bf797600ad59e8f9254bee8af
 EBUILD texlive-langarabic-2020.ebuild 1152 BLAKE2B be860e3142638332be7b39fad4ee095fd4d9051ab570e16b774cb0b2d1ec3031408ce72a643331d4cb48a407dd4e781358b31ab72527d05aba790d20b2a284f7 SHA512 b1689b4d9c74f28e01f0e3fa082c499e0ce78af991383d9337d302b48d95cabcd20c76a39bb1ece1864384a92f79ab46c098257a2bec3dabd8cba6c3258c07c3
-EBUILD texlive-langarabic-2021.ebuild 1235 BLAKE2B 7b056df0b4300ff7031aef7531ad43fc8c525b76d1d6b7c43c36e55f443b74619dd30aed28def0d8c3da8449820db23b14f1f927fef3b222654cd771f2763275 SHA512 ff73730c0b42d7457e70b7ff36ceb91b2c560e42e62f42e798f4f4c5b2675f9ed049d5962793656aefe9939cb1fd265f8c849dbc24fecb9065926f79d2913b31
+EBUILD texlive-langarabic-2021.ebuild 1229 BLAKE2B 202ce6dce6cbc54603944cc0083be900c54f8d75d44c2eb2a016bc47b469ee2f91ab558086462f24fcecfc0091a308654ef9a01810c9a232c6b252fb74c825b8 SHA512 531011c66d5928645e05f1c8aa4ed7a43d16059356dbd96a26c5c20d9c5c2544dcc3c3b84a1b231e8974bf834327cee0036b8f23eefe8949ecc2e8686a5f39ad
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
index 6d2fd8a34fba..60105cc5228b 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
 
 LICENSE=" GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langchinese/Manifest b/dev-texlive/texlive-langchinese/Manifest
index 057a19bbe45f..bfb04d11d1b7 100644
--- a/dev-texlive/texlive-langchinese/Manifest
+++ b/dev-texlive/texlive-langchinese/Manifest
@@ -129,5 +129,5 @@ DIST tl-zhspacing-2021.tar.xz 12276 BLAKE2B 661d0aa212dceda505e32b67f5eb38b56bc3
 DIST tl-zhspacing.doc-2020.tar.xz 169376 BLAKE2B 1442aeb7b96b55184266374794fc3b16781efee96303f1a9a39116b6ff1edf9bdb3cdaf1cad102a28b005846df00c26c43b45d18e30a0412111dfe0a7eee3745 SHA512 7fd15e4f29671081670e881e9366ba627f5bed6d981fa0ef1c670d0744e1286c04e785e28b92279d66af851803d84949c2f463370f23c64987fea78531172128
 DIST tl-zhspacing.doc-2021.tar.xz 169376 BLAKE2B 1442aeb7b96b55184266374794fc3b16781efee96303f1a9a39116b6ff1edf9bdb3cdaf1cad102a28b005846df00c26c43b45d18e30a0412111dfe0a7eee3745 SHA512 7fd15e4f29671081670e881e9366ba627f5bed6d981fa0ef1c670d0744e1286c04e785e28b92279d66af851803d84949c2f463370f23c64987fea78531172128
 EBUILD texlive-langchinese-2020.ebuild 1652 BLAKE2B c1cbc851afad12bf274fcba09181d2c716b86bf4468b4c160d4203ecf9edcfbcaf6f0004783ffbc1de3b291e0d6f4f89bc2b8aa85105af7956cae162460de949 SHA512 55118bd13cfbb062907bbbd722f3a8a14aa448e7dfa6d5c0132f4150ad10055bf2764b4c652fbb9842f29e83828ce6552ea38345a337681712959aad0485cc61
-EBUILD texlive-langchinese-2021.ebuild 1745 BLAKE2B dba850a3b92f58beda54315c2044b6a05b09851f45d08f6ff28e2d55f0d0fac3c8e82aea33afaec559cd441e3266fe4525a12a39c0dc11edc2d0e8a6748b5b81 SHA512 6cd209e06725750f8d67bd3f01a6be715c779de82621f9728ffc041ebc028afef17a142e61fe426bea6a837380c7a3ca920a2b3ff65fc42a301dbd6abe67cb82
+EBUILD texlive-langchinese-2021.ebuild 1738 BLAKE2B 4ca46a3546e60edd2aa6f5e326244a3061a4f1729709d0d0d57542f04f1bb8af445b8d341c0cf9a29c5fa0a809c983d80442d36d5464a004f918fbfb5e85be3f SHA512 f2ba335bdc18c203f6b0d0a7bc14ff0e4ef2b5cde9243d67664154f09e4479936189af2ffc3d357f49f06a35a501dbec401bc8d71115d41ea8e8f1d69b01129a
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
index eb432fcf8c4f..85bb8013728f 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2021"
 
diff --git a/dev-texlive/texlive-langcjk/Manifest b/dev-texlive/texlive-langcjk/Manifest
index 5c3e92629b59..ec8642e82660 100644
--- a/dev-texlive/texlive-langcjk/Manifest
+++ b/dev-texlive/texlive-langcjk/Manifest
@@ -62,5 +62,5 @@ DIST tl-zxjafont-2021.tar.xz 5124 BLAKE2B 2fe10b7a66157e1e4805fbfc2feb6fd0673a80
 DIST tl-zxjafont.doc-2020.tar.xz 179452 BLAKE2B 2bfed1ef0c7cf6839240434ac99bff82d90db82e5e08736f5e4c2313cae8e68bca9e1514c454363a341e9bf0d79ea955ae95fbc3a201aad57575f6ef23de4954 SHA512 c1cc759857b60c123ae798e1a9168f85e7fa663b875f241a8d5160b14cf366bcc282d09b9e527469986ee268b160cadc89a906facf8f38bd76ffb9d07e0a7ffa
 DIST tl-zxjafont.doc-2021.tar.xz 179452 BLAKE2B 2bfed1ef0c7cf6839240434ac99bff82d90db82e5e08736f5e4c2313cae8e68bca9e1514c454363a341e9bf0d79ea955ae95fbc3a201aad57575f6ef23de4954 SHA512 c1cc759857b60c123ae798e1a9168f85e7fa663b875f241a8d5160b14cf366bcc282d09b9e527469986ee268b160cadc89a906facf8f38bd76ffb9d07e0a7ffa
 EBUILD texlive-langcjk-2020.ebuild 1111 BLAKE2B 223b02a124fb52ba6c26e37b39737076db179cd62d5b7a236c5c8745c5931f29130bff4ce3180d2e7047e086dbdd316986c08dc7a9360aa15241991608bd1be3 SHA512 5ffa5339419b5d3bc46139d2a905bcaf13afdb4848d67a001c17a2723380af3ad09cda25f83667d4a33ea40e16b05c0662ad5bcb75e28b71193a632d9acf62fa
-EBUILD texlive-langcjk-2021.ebuild 1168 BLAKE2B ccbecb5a73a8d8a8e5ad16217817d974d7cc9d16df8313b6cf2d6631ce230ed2331edef236da6a43534f50c2916be4b3602b81b941df96f4031ddcfe050981e8 SHA512 a3fa8efeb9ae666464997d1c8b372055b6fd773eed4842bcd385c2405db0c214fd2731e289adb94d7ff77f963e5688eb1556ac2800861b2c94db0680059ce315
+EBUILD texlive-langcjk-2021.ebuild 1161 BLAKE2B c1b4c2ac6da488345a01c147daa0bc22d0d36b8eb78f934d32958e335dd66f714e055b6babcd4f4fbc85ae83f9404b8a942263f34d5ff54dda01f44cae75ad2b SHA512 4067fc9fdf9b5cb67b33d32da69bebdb21e368e0cd9d14a653d6cc7c8bfcb6f2545a7abd360a227446a9b01e542c2e8d430b9acfc1c11da261f2abdc9d2a1095
 MISC metadata.xml 723 BLAKE2B 9cb444063df06e44b6058fd7a4696a54ce0da42446175bad1b1ae17874efc1481f68d667358c5b649905b7a8ec8bdb2b631711e39c110d002bc56bd1ffbcb888 SHA512 d8503e8724dc8600e133fe921e1f2ee8d62a30dd7af0cb50657ece7d50a2cf07178f84252014535c6a7d4cb4664f7492396a924060781599540a8e88f80d9de1
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
index c2170578059a..f89273020d9c 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
 
 LICENSE=" BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-basic-2019
diff --git a/dev-texlive/texlive-langcyrillic/Manifest b/dev-texlive/texlive-langcyrillic/Manifest
index a0d05a81359e..b752b3f4a50b 100644
--- a/dev-texlive/texlive-langcyrillic/Manifest
+++ b/dev-texlive/texlive-langcyrillic/Manifest
@@ -193,5 +193,5 @@ DIST tl-xecyrmongolian.doc-2021.tar.xz 61944 BLAKE2B 462db4ad2aa6807e18c7905adc1
 DIST tl-xecyrmongolian.source-2020.tar.xz 4220 BLAKE2B 619b1658de2bc07c8c654fc60338a92aaac6d83583c7936e5de43ea8d2236b2d484e0d01ef6e96d3f6ae7a2a9cceb808953b5fd4a09b918c231f6afe323eea4d SHA512 57a31504636eb9ebe717b6eb9028d5ed0eacdc7b9d406ac3822539a9e40ed0718668a640d557677b1a48920b272f3374817d8182b9db04a8329d2ee20227d801
 DIST tl-xecyrmongolian.source-2021.tar.xz 4220 BLAKE2B 619b1658de2bc07c8c654fc60338a92aaac6d83583c7936e5de43ea8d2236b2d484e0d01ef6e96d3f6ae7a2a9cceb808953b5fd4a09b918c231f6afe323eea4d SHA512 57a31504636eb9ebe717b6eb9028d5ed0eacdc7b9d406ac3822539a9e40ed0718668a640d557677b1a48920b272f3374817d8182b9db04a8329d2ee20227d801
 EBUILD texlive-langcyrillic-2020.ebuild 2146 BLAKE2B e6c6de42596fd6a8b130b21dbf333fa69d6c272c9b39a0082deeba00da45c7db15004fac34aae0969d8490fa864e26efcbf8c866df338eafbb44296ce74d593a SHA512 550be66c9a3d36092d3638f95a9568f94da3822e5f48905044d81da493a5ffbbadc8d4cb3fe2c5dc4c13d165aed83239d69bba43baaaaa96f62f5b01c15d118e
-EBUILD texlive-langcyrillic-2021.ebuild 2153 BLAKE2B b13a58be4543e1667caeedc8798761d9acf3a3eeee56d03b18d29ca72340e7dc68497995be8b9fbba4c220ece91deaef02ecd3bc165780b950473da91256a1f2 SHA512 8edfd2397e54963b17e5dfd14d1226822de938a16d48ddcccfda9b71e375d19b1082e0c476a69e12f11540b455fa452dd4d43f522265195be449d25b2b042edb
+EBUILD texlive-langcyrillic-2021.ebuild 2146 BLAKE2B 311469d41ed5f93948c6403c48e51932877d4d920df5e88c72bd0625441478f166281940f2c4a101e760a568d820cee423f3221b6ffca5c17a188abef9a8e7d0 SHA512 08406355aa7cce570ea23d32895d9cb762b7966ca71819909928581b7ef0ed757ccace943489b50a8e3c583d3397ce8fa7e61ac7bb792b33deb286c3c14b1d17
 MISC metadata.xml 525 BLAKE2B c1d2a5c32b236c45931436789390fbb09eb05a21874a13c607ebeae2b722fcf4d317a5df44fe243aed230089354fe17ff7f8681e3b75fe03ec48ff0df6886113 SHA512 3ce96ce9895df4195578f5e0859a103fb64332cc6716bf5321751fdbfdf30ab19d32ca82aafd2d9942c2a410a17cf35a970f3ec15743a5b097b42706e4ef5fe3
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
index c061007eae7d..6e5826d42705 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-langczechslovak/Manifest b/dev-texlive/texlive-langczechslovak/Manifest
index 20a5690cf7dd..181908dfa734 100644
--- a/dev-texlive/texlive-langczechslovak/Manifest
+++ b/dev-texlive/texlive-langczechslovak/Manifest
@@ -51,5 +51,5 @@ DIST tl-texlive-cz-2021.tar.xz 280 BLAKE2B 35d39f52ba76142421702c9f13deb8b16c6cc
 DIST tl-texlive-cz.doc-2020.tar.xz 1152664 BLAKE2B 4c4508d693d34d0936487ca381b36c1ba4c30e33950ed16d59dddee6a93abc1a937fcf5741170d372c17ee3c0c30c7464502feb2350b80b60a47783d2a66e034 SHA512 8527c18ca429a877e747f66d68e3c6ff1992c42af0ce8e65d15a89743b689062e5d825578fb5896d5fb978251726cb2623d49207cb8126258bb6f419b36d09ec
 DIST tl-texlive-cz.doc-2021.tar.xz 1197876 BLAKE2B 9ec7619155ff74808e0939a88506a03453c70d7d449a35c79c1d91320f1476b7984d7195f65f6b4f84c75d2462b8f1d8bf777b6540e524c85495a7ef7fe736c8 SHA512 ecfc4149bddfb665c6f48e65b719cc3d2240d0be151bec94676a188da08a203e84443b4c8e77590476c3194fae55ea23753a248c6f60ddd0b27895dea703a219
 EBUILD texlive-langczechslovak-2020.ebuild 1342 BLAKE2B 2ed0519695a25329fa34f7b5405966f5878ee81201424dba192ee1f7ceecec375e756625253480f07eff09167a1786c7a59a386ca75e789bceffdc3afd85b5f8 SHA512 10443050cee86bf4ad9c2b61fed1eac6bca87ee654cb8dc381b7d1171906e3b2bc807ecac23ee112e9438bd1827f4dcfd647f6ba311fb2da8a3f7e2619d73735
-EBUILD texlive-langczechslovak-2021.ebuild 1282 BLAKE2B 8e6358329c1c0fb84e75b72cf4f6fa07c36156877c8f1216e5bc7282667e283931dc3da0d571d2e097757ce4b3125dbbcb362312f2e16deb6602bc57e4dca59b SHA512 cc95d08399aaca40fb8cb5c7359ce62e95e766f97b8b46722418f5c4ec53deb8f199787eb34e06503fc4e45c0a95d165ce25fa7ab50aa66ba64a76d52f55fb7d
+EBUILD texlive-langczechslovak-2021.ebuild 1276 BLAKE2B 28f9bf44e7bb95d460c4a81d11a48ef15d44c77cacb6fb8bc0df1f5d2558f8ff0cb7798f832cf3566bd6b2d68d445fc342fc3017533725343fc5ed6a76e007fd SHA512 8553a8cb63d35142f04a0b458c9f2eee1d260cd31d0ea67a4d20ec4c1df2f1f7e9613b562f8479594fb602c7355b59ef5ce4fb7fe5f0fa4ea23f74c712800666
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
index 3161240e552a..e8c941b6322b 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-langenglish/Manifest b/dev-texlive/texlive-langenglish/Manifest
index 732c5eea78d8..e89b96a2e341 100644
--- a/dev-texlive/texlive-langenglish/Manifest
+++ b/dev-texlive/texlive-langenglish/Manifest
@@ -254,5 +254,5 @@ DIST tl-xetexref-2021.tar.xz 444 BLAKE2B 2145f8dd02b3f8aaa22125b49cffba4a703c97d
 DIST tl-xetexref.doc-2020.tar.xz 157320 BLAKE2B d5b924f7b17f2d2d6a289c2fe1b54fd700fd16a86bc6de32b062930233184f079c3902cd0bcf9be14bcb72fac1311d42da840fd01246b6b52ce90cd0ee7a7a5d SHA512 ad0700f1e1053abd8264f20ad04b7ade28cca6f5757e158f8ed031f493a966f5b62a197a34ba39ece7c3cb68d469334521a6325c2b4276dbfbc5c2519e13b33e
 DIST tl-xetexref.doc-2021.tar.xz 157316 BLAKE2B 193159a6c6f755a956522e68c863e449d24d1c1c4d9790ef8493ad3a5d1179e795b30e42cc019729eb25522444c51c3f79f25d24de2c195c2374682e016db9c9 SHA512 24d62e618217ec5454bd23662711e10637a7f67cc11880288bfcf301ab89ab22d87a6d65af8c37c99d924a4dc77b95308ef38eb8ad6bb81cf2900cbd3ebeeef8
 EBUILD texlive-langenglish-2020.ebuild 2610 BLAKE2B 095dd2e5c9ee134ee02750aceddf04c2d9fc8bd7a6f5ae286c6e80c845b1c685c8ec7ffd748b4c10198604fc958bc49389d2dfeccb2f98964f76b0c611c72226 SHA512 f96e4f1f662868e99018bfb9e8f53a41067a07281ce6226a36f9e8352103ca13b133b9d555732d00651718ed9ab28133b8ecc6f549e49243546d7e1a8c3d2b78
-EBUILD texlive-langenglish-2021.ebuild 2586 BLAKE2B bc9f0c553ecf8db463343f05d143419dd54a8f690a3d0a3ed81bd1edc50a16dc4feb7bcc628e9b70ce612630055ce9ad24ef0aacb5f48bfab8e042b480d9a624 SHA512 31776056c9d9db0ef5d686021e4358d081378c5088024443c9eb86ea822328a6b8a6faee97ccbfaea5f39d468c25dcbee7ed1c8ccd3136c67163aebe321e6834
+EBUILD texlive-langenglish-2021.ebuild 2580 BLAKE2B 80857b53957621faf4cf0110efa82e55c2402491aba29a1480f4f48d14f08ac82e20500464125fd29e22a3ac5f385ee90b45a5d6058ba8a27dcac83156e3463f SHA512 c8ee782a4f22e7fccd0504c6e20a65f634dd31fa1a775f1db69a30ce39c3b5adc5de1eba6ace4589e0be59624b87eeea99b6ceaf1c12775ab0501c53e1ffd96d
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
index de7d327e23fa..712cd12624af 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
 
 LICENSE=" CC-BY-SA-4.0 FDL-1.1 GPL-1 GPL-2 GPL-2+ "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langeuropean/Manifest b/dev-texlive/texlive-langeuropean/Manifest
index d6a6415f6039..ceccc2b60f25 100644
--- a/dev-texlive/texlive-langeuropean/Manifest
+++ b/dev-texlive/texlive-langeuropean/Manifest
@@ -279,5 +279,5 @@ DIST tl-turkmen.doc-2021.tar.xz 109384 BLAKE2B 0d916db0ea1e6c9ae0a28c0a7fce76353
 DIST tl-turkmen.source-2020.tar.xz 3932 BLAKE2B e2c9c2b9c5be58a73373f36829f834e0c595a24bcd2d0222c237618240735c70514a7783ab1b523b6fa370d241e1c13461bb59436fab184a59abbd71c43745f4 SHA512 1d69e90b8aa74db44b7b89c8a3346ffbfca2b8514205a04610b5049e50e61b19ef063d9b3e9c99bf4c141d52bb03d600ad5ce1a13494b06fb7d13d12f47b860a
 DIST tl-turkmen.source-2021.tar.xz 3932 BLAKE2B e2c9c2b9c5be58a73373f36829f834e0c595a24bcd2d0222c237618240735c70514a7783ab1b523b6fa370d241e1c13461bb59436fab184a59abbd71c43745f4 SHA512 1d69e90b8aa74db44b7b89c8a3346ffbfca2b8514205a04610b5049e50e61b19ef063d9b3e9c99bf4c141d52bb03d600ad5ce1a13494b06fb7d13d12f47b860a
 EBUILD texlive-langeuropean-2020.ebuild 2909 BLAKE2B 2d0c2b53f999e6db730d1c1eafd66892b98e6a45cbb6a1873feb025dac6f8563d341d678f29245ba1feb621c7b5632a1cb992c3dd42558e3eac6dd4f19e4a82f SHA512 a3dafaa67a60cb1b92b96b1361dc2c38811a06d76f2ac50016225d4c80f873f8e9674b4e8cbb08d0d7623e69d6db37ecc619196da0e8634d3692569b04d937fc
-EBUILD texlive-langeuropean-2021.ebuild 2931 BLAKE2B 1375dcf6de2c7fd63cb4b07de2a90f0150e3a61583979295000c6fe93a5f8c32e2cfd4bcac7492aee4c40347545f7aeeb7e7377d119f6fc310c6afb171d93791 SHA512 ad86f14bb6e8b23e78e61036aeb7e71c47b09c269d64651a2d852008c3cee3e35414236f8564a25c9b4f770aeaab250a0a3536c0f60f9372541b25f4ed349280
+EBUILD texlive-langeuropean-2021.ebuild 2925 BLAKE2B 40fe2153dd3812502fec12093dd35fe7a78fb8b162c35f8bbff95da48867e7aa07361b7806c048d7087b92551417996a98828adb710e651cd6f04b044961da3e SHA512 d627641de0b05210a63dea6601f85c82634fe9cd10c19827140e2c8148edc4b9ae511d18a70eaeb49e569f654cb671102ebd3dd0c2c799a7b142ca8cfb426030
 MISC metadata.xml 567 BLAKE2B 1529aa51facc0942b5c0c6e8463aef9b45946bac106e2e5a73357ccb738d724eb0bbdabb382d2d86e27b581f7f573f4544e8e4193efb763039a6109a326aeb00 SHA512 34c78d457f3560fbf5693c5e601a908605082a182c0933b0c00aff363f966e0251b06e5e4751741e0ab9359f3dc92b5ec2bf8fbe72fc0a09ae7a0eadeb100727
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
index d4b9ee2f42b9..492653144ca3 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langfrench/Manifest b/dev-texlive/texlive-langfrench/Manifest
index c7195e3e7693..b10b33bec955 100644
--- a/dev-texlive/texlive-langfrench/Manifest
+++ b/dev-texlive/texlive-langfrench/Manifest
@@ -170,5 +170,5 @@ DIST tl-visualtikz-2021.tar.xz 456 BLAKE2B 7ad4e16b1a90cc47f300e1275c645c3bd0dd7
 DIST tl-visualtikz.doc-2020.tar.xz 3961060 BLAKE2B 4a4e5dcf9033321eef1b6bd9004f1a5e8939cb590efbfccf838b463d8d748b4a2697c6f8391466d523fc157ad96c8ac16a26c91b8fcbe9615ca1ba5b3249ce21 SHA512 556f4b852058c46a7d2a34db4898bd82429835ed4c5fc1eaf1c8bac9deba407c8a11fdd3eab3753b0f53fd0ba43a316c3b292cebe40c086862c6d94f8be0cc85
 DIST tl-visualtikz.doc-2021.tar.xz 3961060 BLAKE2B f667101c5a92289ee3c0f65baaffbfc773914c8d4b5204232e4979f23191b2f568b42dbbce0a06a7e84ef33b4ff52e232ade293791e6f4380725da75400617f1 SHA512 16a32e64ef4d00d2bf6f99fa05b35a071539d71944227eaa5b37762e838a62b80ee4b227a8bb9cc49b831bf19976421684872f8eb104f37365669907e9621a6b
 EBUILD texlive-langfrench-2020.ebuild 1874 BLAKE2B b0ecfcc8b7fc5c8cc41ecebb0e4832c7b79431faea3f7a42724a1a3df71dc5ee2c93c5b40fb2ee4701882bea4ea8ce72b705e32ed85da2fd964d4bd29a77d233 SHA512 d6ca27180006761af14d5feb971915b01c98c5f8c53f6031f34e0ff48cb6bb132637d4be4c581e76158dcdb9164678fc844975be34a75abf9691129bf7406058
-EBUILD texlive-langfrench-2021.ebuild 2011 BLAKE2B 741cf8654f66bf57892a408f208390654f850203e54e917cfded0ce0ad08ca517868496bb3e480142fd756127f5e2a1832a0de126c7bf1bb22a50698ab037956 SHA512 0d0d4fe43f14c6edd1090724d2fd6585cdd906a15f372bc7783e8d91589a1cd2b91e20b5126ffb4bece63626f31ccf81ef63c2e8cc887d762cfaae509dc58114
+EBUILD texlive-langfrench-2021.ebuild 2005 BLAKE2B 97038fc1f847e28017a14f9ddf46c92ce717463ebe8ba0bc87327f19450895839e59b93fc08aced9510523593426017f18c2734279206b331c487deaa2077dc3 SHA512 6b8a8f47481de98acee4dbc704df5a970bfe5239d19deac8f94916b48b998d86d0efd86ec528a7871540fd683df30ede6e8e3ce8bc9f6e636912415369605d46
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
index 80f10512df89..f13f8f06124e 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
 
 LICENSE=" GPL-2 CC-BY-4.0 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langgerman/Manifest b/dev-texlive/texlive-langgerman/Manifest
index bebfcb14ebd7..3b3545352ae7 100644
--- a/dev-texlive/texlive-langgerman/Manifest
+++ b/dev-texlive/texlive-langgerman/Manifest
@@ -203,5 +203,5 @@ DIST tl-voss-mathcol-2021.tar.xz 548 BLAKE2B 93f7acd0a2277133e6f8e95051654daad1c
 DIST tl-voss-mathcol.doc-2020.tar.xz 230644 BLAKE2B e5909c24b46b5ef771a43240bd636908eca41b95f6aac6b1009b7d36b867fc3db0acaf20d82cb16443b76cae1c7821f1c620a2c1242f3a7fbc2978c3126d0b8a SHA512 5d91b23d9eb45998282731620097f214b274ee744972b3d7fbeda1be2268799572f36b5f4c8b707f48e8ec2d825438bcdcee7f1376531f366af8949a862ff379
 DIST tl-voss-mathcol.doc-2021.tar.xz 230644 BLAKE2B e5909c24b46b5ef771a43240bd636908eca41b95f6aac6b1009b7d36b867fc3db0acaf20d82cb16443b76cae1c7821f1c620a2c1242f3a7fbc2978c3126d0b8a SHA512 5d91b23d9eb45998282731620097f214b274ee744972b3d7fbeda1be2268799572f36b5f4c8b707f48e8ec2d825438bcdcee7f1376531f366af8949a862ff379
 EBUILD texlive-langgerman-2020.ebuild 2300 BLAKE2B da163260a3f9cef1273ccf358483deb1c5bd322e9c40d10977bd8660c1a5fa568e81e9f2d1f3055ccc441b48909ed06e384cb5eeb96ce2a6516bc324aec2385d SHA512 063e78d0df2ac3de0f19c2b0e772a5b1d2350f3db29f9f77877f677708daf088314def3551e63f4b62a47aea2ec2a8fadfdc6ddafb86c0c3f9b85945a5706c44
-EBUILD texlive-langgerman-2021.ebuild 2180 BLAKE2B bef3e69d5942925d988bc944586b9524a5d2c434cf062bb0bca615fe11f9af5600062654e56cd7514d0055727ba071b2821bb0724a184e38d1d9890aaa36ea99 SHA512 5e5c37ef0970e4562f7d5a8b2ec9b44289984c231be8d01f9d07ba99675f7e6c3c6b447122a038e8f70896601748b5f57658d91a4a057d9bf7b4b3eb8a5096d5
+EBUILD texlive-langgerman-2021.ebuild 2174 BLAKE2B 1cfce39668b94ff041e25098853dfa84414c560f3eaffb3d93546f1528d9e37047d244d29b60b97f8fca23d78a3d7292b2d1f6071aecd088284a1e1a3dd85993 SHA512 ce5e91e38e44b21cc0278fa07745adae4d63bbf60dd1623cce88d70cee6be274c7e94c688f06d3afbb43cd77089e8d8fde6c1a0dab2dc7ba48cd39b23ee51373
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
index c94157609252..ccf8d0739513 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!~dev-texlive/texlive-xetex-2020
 >=dev-texlive/texlive-basic-2021
diff --git a/dev-texlive/texlive-langgreek/Manifest b/dev-texlive/texlive-langgreek/Manifest
index 210bc25f2c56..9d8d84659470 100644
--- a/dev-texlive/texlive-langgreek/Manifest
+++ b/dev-texlive/texlive-langgreek/Manifest
@@ -107,5 +107,5 @@ DIST tl-yannisgr-2021.tar.xz 37576 BLAKE2B 59931ba223dd10f71e853f6ac529ece7db176
 DIST tl-yannisgr.doc-2020.tar.xz 28912 BLAKE2B 7287b6f4cf5f0df50356197d4170cb90c5b3bc3421d6b724a730098b2fb7f67284c69a0708c51dae6cf0f99d30d10841bae2da170f2b95cfebc3e51704c20ab8 SHA512 40ecdfe71670357e8ec84fd262015b5b5d0b8e486ab80c05d0863a335649501e9548d785cc2b2374f989b820dadd9a074cc229674dd1ae9a6252d4a0ebeb4191
 DIST tl-yannisgr.doc-2021.tar.xz 28912 BLAKE2B 7287b6f4cf5f0df50356197d4170cb90c5b3bc3421d6b724a730098b2fb7f67284c69a0708c51dae6cf0f99d30d10841bae2da170f2b95cfebc3e51704c20ab8 SHA512 40ecdfe71670357e8ec84fd262015b5b5d0b8e486ab80c05d0863a335649501e9548d785cc2b2374f989b820dadd9a074cc229674dd1ae9a6252d4a0ebeb4191
 EBUILD texlive-langgreek-2020.ebuild 1371 BLAKE2B b380f5e9b3dee43f8eae7c05e28f2c4c9da2f03b728fa300f96b44ea84f7cd38755233a06edeeb8abf2b6b19527736079cf322619d5ac48f4572c4ed92b3ed68 SHA512 eb4abc2ec23a8d29c220d8142b60cd2055212b78af5bfb225887ef65bc3ba4da746c5f97c7e77f24e7b184affce1193cd6e59bc43673c2cab794b90c1558fae5
-EBUILD texlive-langgreek-2021.ebuild 1378 BLAKE2B 7b75859a4a4e8b73a095666e44e6db4c44b6a42db9d362dea17dd08a7fda382aad3062d3c80e88272a53130fa2aab4a1b9f0c1edae4d5138a10b8b0956675a26 SHA512 a349e702390f05e3509a4717c169bb0bc2115bf8fafd89dbb4356dc11575fb8ce28cadd26d1ea06218e7369c8e72d4b7b404df236a9654fa03923741b11d9fab
+EBUILD texlive-langgreek-2021.ebuild 1371 BLAKE2B c2c3414a50304dcd7bab7014bdf9ff0c7c43f1911eeed498c713982a8283ea520d160999d8b03975615eb55ba0660a827ac1f87dbe381123e19ad978f51b7951 SHA512 caf7c455dfbe8faf8bda58c648e8f5de8112195ba959a1717ad2bcefdd7699dba897103fb85111fc0098513eb2a031b4df1000d3720dfe9c177160f3170ae418
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
index 81fe4233701c..316dd1178a35 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
 
 LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langitalian/Manifest b/dev-texlive/texlive-langitalian/Manifest
index 059512befcbf..022d09b7a2a2 100644
--- a/dev-texlive/texlive-langitalian/Manifest
+++ b/dev-texlive/texlive-langitalian/Manifest
@@ -84,5 +84,5 @@ DIST tl-verifica.doc-2021.tar.xz 1158784 BLAKE2B e97e7189d30c53b24427d54587a7ded
 DIST tl-verifica.source-2020.tar.xz 21668 BLAKE2B 327d727367b5f4a2cff577a886093e9abe1b5e637bd70d4dc337ba961b8423e964f8dfc6b8705712810a515c77cb40721dc363b6ed568cd07fe22de63f1cd0a1 SHA512 a3418fecbaf2775b3aef2db90603dc64b0a2be211f02010d62e3c73517334d2628a68b17f911b3ea257f3cf439b5bf1f8360e97f5c3ea6ad0d7605ce904922b0
 DIST tl-verifica.source-2021.tar.xz 21712 BLAKE2B 2d47b11393dd752b890fbc897c8359640d3f216e9a0af6fc065ddcb83a4fb895310d3c7aecb2866c595bdba41aff73fe443f6d6a593c6e61107306f603ebba24 SHA512 85e46be6f8ee729753362243492c7946166049ebd0a89f0871bb9308e6803f5ef9416c30fe380be4961aa466a03afd9541d09e5920a196550582d326a6de8b9f
 EBUILD texlive-langitalian-2020.ebuild 1219 BLAKE2B 0eb10d1594a1dc1e603340315a117040490829b7a69f2ef6e08f7134535bfd44bba6f26ea3d216c6dc82ec146d1a8941377729b678d6f63b7bab83218c9af06a SHA512 2260a317ad7180cc0db2b62de45484bf619504be8ccc5801bcea47ac7f595aa379bfd349fe9a7498fc41d3e262cefb0cd907693913585fe5193f7654b9b78996
-EBUILD texlive-langitalian-2021.ebuild 1275 BLAKE2B 3dcf9d0914d7ae28488b4fe06f49e9f08ad85930e839831bb662ddc8786592fc5bf5297b5ff9d6bd0f9d65e22363f856e368b5f6961834c4bbb8cc528f8ccc7e SHA512 fbd4944aa7633799e9d8c78ef74c36df395320eb6cdff3989ead36c7ce986b72d224ddf8093afc6a7701f76737cc85557da19b0fe2c822a3361db240deed327d
+EBUILD texlive-langitalian-2021.ebuild 1269 BLAKE2B 03cf962325dbd894a5c1a7cf2a84c9c9d6f811a215de2af043e3a823eb4acb8fdfbcdc4af01d957b790d5f4dccadedd23b232eb0ea56060e12561b9b2f122e5f SHA512 2eccc95cfa01fb3bb0266921ad36f7c4ba3a4cdad15c696f941cb809d05cd360c013906b8cd6c960331ebc42cbc7cb0ccf8d7d357da58e5ef64aff6cad3bd9d3
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
index 1f81576a1fb0..91507bc18564 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langjapanese/Manifest b/dev-texlive/texlive-langjapanese/Manifest
index af02ea691ee1..a957e3d67879 100644
--- a/dev-texlive/texlive-langjapanese/Manifest
+++ b/dev-texlive/texlive-langjapanese/Manifest
@@ -248,5 +248,5 @@ DIST tl-zxjatype-2021.tar.xz 8760 BLAKE2B b5d3f4751d1cf3e07dbdfc21d2aaa60d3183f0
 DIST tl-zxjatype.doc-2020.tar.xz 138180 BLAKE2B 72c09847d7642fff58a08d05d2c21721d71a6c035e15a83d1d945fd3f26157b5de228e712773a10d73330beba20c9c8f2c22e7c50062a8a05ef410a438065e34 SHA512 0fccc73af66a05231cf8283920d65717600be4673329ed1f46b93a494d766aa9542deb1a56b5d23d6c0d6b93be98aa778234ddc2dcd9c0936542a45d057b6dc2
 DIST tl-zxjatype.doc-2021.tar.xz 138180 BLAKE2B 72c09847d7642fff58a08d05d2c21721d71a6c035e15a83d1d945fd3f26157b5de228e712773a10d73330beba20c9c8f2c22e7c50062a8a05ef410a438065e34 SHA512 0fccc73af66a05231cf8283920d65717600be4673329ed1f46b93a494d766aa9542deb1a56b5d23d6c0d6b93be98aa778234ddc2dcd9c0936542a45d057b6dc2
 EBUILD texlive-langjapanese-2020.ebuild 2547 BLAKE2B 4b365c848f38eeca34bfba239f5440ed3c695a9fc6efdde53b9ddee29a453e23a82bf42cc04faf3487b4530e30d2e713c506e9aba7a78146679218bfeb3d138b SHA512 5f2a1734e7bf32fae4489f8c5d1538e7ee8d9bc42dd5b05ea318b5c7508aa8caa2b94a7f12eca271f69160f789befa671acbbb6cd6790805e0b40ff791a2e383
-EBUILD texlive-langjapanese-2021.ebuild 2632 BLAKE2B ce50d87bbe001c7091a350764acb0e810232200d9ba327b96b1c6334e6243140cb0fa24eaa3ea2a806da04d8f90c5446693cbc197114422939276878ccec79ef SHA512 eb136891a650f76ea08466fa65efaaf3dcc6c571075bf4b83bf548eb9b1fcbf71ee4775fda003c74c098bb15ca7a2150a8bacdefa45648974d57000778fde16c
+EBUILD texlive-langjapanese-2021.ebuild 2625 BLAKE2B 25bfa511148bc21649bf9b2b4127f24317bcd2f837ee2f7f1e68a96b896de143e9990bc655c73e4d2fa025ecf15fc77fa3b985da5fc5cff3eebe541f57e83eee SHA512 43a7c0a90a529b06413d10e3f7291930eb6f4e2264d01c94e3768f5054fac01b2846c436f1518dfb9f999f10dbadd0a99b3cbb00741b13c5ead3bbfb2687ffb6
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
index 376aad4d4da7..7b663fb9caa5 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
 
 LICENSE=" BSD BSD-2 GPL-1 GPL-2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2021
 >=dev-texlive/texlive-latexextra-2021
diff --git a/dev-texlive/texlive-langkorean/Manifest b/dev-texlive/texlive-langkorean/Manifest
index ce4b72c2a40d..a4b310ee3a07 100644
--- a/dev-texlive/texlive-langkorean/Manifest
+++ b/dev-texlive/texlive-langkorean/Manifest
@@ -49,5 +49,5 @@ DIST tl-unfonts-extra-2021.tar.xz 6565804 BLAKE2B 40890d4d36f0f5f198edf6850665f2
 DIST tl-unfonts-extra.doc-2020.tar.xz 10160 BLAKE2B ee1f644ebf6a35572232f95ec8375624c1a0c0baf1061ab1d3225f2f90e04f4ce23b1e20075b06b8af3cec303c786b2b4c7989bb2e5ecbaf417001a2ce942ee0 SHA512 5fdc1ebd1d939ba99d4bb11c2d89128a97adaa4a0696abbc7517ab55ce39b87e7e7801e7a30b93c1f95e92bacd7d862144191f0ef542561816f6d1b84e9a7131
 DIST tl-unfonts-extra.doc-2021.tar.xz 10160 BLAKE2B d3bbc2235bd6576c86cfa81df2010d6f37de0f5e317b2b8f4b4dc37059a45672ae1de224f98b2e855f96cff3c44a9a0fd23162c848d1bbb868c8589f323bf31d SHA512 6173d49bb64c9b162763ff08af445e518fa650fcc13e02f5c72454d335285d9c82347cf79f945fae94429f3a9d15f9c9b58ff1d175c8f59ea7b75766cd279303
 EBUILD texlive-langkorean-2020.ebuild 1066 BLAKE2B e4fad066c25bb64e8f88c809ea3f08eb23b5b2dbe2f6cf0a96ed6e425f5207f302bd531e923f7251d68ac2d9bee2f81e83e39042c6ee0c17d42332041d093eb7 SHA512 510dcf76582457e2013edbab50ed4d4d8fac8dcd51220c081997dd63aa83d2b10d9fc0ea7e95649bbabb79e7efda52f8a96ff48fb5ff870397637b2a3353818d
-EBUILD texlive-langkorean-2021.ebuild 1082 BLAKE2B d874061575dd3b9986c07799abe9b2158948a0a433dcc61da516be20b53eb3feb5c88e5c681bc61851c688ac797df9620f5664638114a4b5b3db4b818e4b74ef SHA512 be0dc5033c66a83724154ed90d7402a8a4dce97d621430d486fa6154ca695258d89b0fd544990aa29a0ef9336dab477473f7759c7096c38c5595ff712156b01d
+EBUILD texlive-langkorean-2021.ebuild 1076 BLAKE2B ba593d65d04fe856876a8c1dec163087ea04984420cb3fb9c2052ac49c078af2535a69d985d06a1a206953dbdf6aea4d88094f289c676caf147bea88225d5a40 SHA512 8c1ffa9f781f9920811f3fb9cf0a81fcb678f3f518fefa550f65b2195595bae6ad3d7658a81842aa40a64fa3a5cebe818a02276cf1636c90251ddd913890d3be
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
index 37da30ffdd5e..05ff23dbe790 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c OFL TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2021"
 
diff --git a/dev-texlive/texlive-langother/Manifest b/dev-texlive/texlive-langother/Manifest
index 7159b74c7b34..926fa15790cf 100644
--- a/dev-texlive/texlive-langother/Manifest
+++ b/dev-texlive/texlive-langother/Manifest
@@ -245,5 +245,5 @@ DIST tl-xetex-devanagari-2021.tar.xz 12452 BLAKE2B eabf7b25af950f401317a00dc411d
 DIST tl-xetex-devanagari.doc-2020.tar.xz 992 BLAKE2B 1806612ed558a514644a65063b4ad1f1ac879c31cf3acd82c65aee13deaee021ff687b68b4f0b760671bb06ba6ba58a2f3f196d361087b88a20aa397811b9632 SHA512 0f360c3f43c6562520b8843269068fc46ecc405cd3a4d8faecddc4f606d69cedcab28950fc1d2e11699e297fe4d70c4c3d50765a2ec30541c237914accbc7129
 DIST tl-xetex-devanagari.doc-2021.tar.xz 992 BLAKE2B 1806612ed558a514644a65063b4ad1f1ac879c31cf3acd82c65aee13deaee021ff687b68b4f0b760671bb06ba6ba58a2f3f196d361087b88a20aa397811b9632 SHA512 0f360c3f43c6562520b8843269068fc46ecc405cd3a4d8faecddc4f606d69cedcab28950fc1d2e11699e297fe4d70c4c3d50765a2ec30541c237914accbc7129
 EBUILD texlive-langother-2020.ebuild 2545 BLAKE2B ab2d7d04034ebf0132ad6e4e613cfded7b8fe096ae547e6159965cc4186d8e0401ee088f0e04f75a050e94443ee47aef8f36d4d67a375466386133b79c87b751 SHA512 544db16ea09047ea088aa362cf6aa4036b262db8c5bfbae80734375a40a50fac6e9ff3bfca5f56d2b901ae2180b15a9082dfb95c7a4cc99b1543f946095a228f
-EBUILD texlive-langother-2021.ebuild 2531 BLAKE2B a93c7eef92666acf7356e3ad30b8afe44f3a48befba66a1cf677b22a36552eddad2def8149b0ea8ee3a056c613bcd883c487a87ca8dda5c2c5bfcbd606ffe9d6 SHA512 b83073f51603cc296404ce7cf11ccf20bdd6e2d17f9723150cba7a78b7f8f4ac1ea881f8d18dd633d1e0b827479ece07ed36c0d9d8f0740bf6a559f9fd37ce26
+EBUILD texlive-langother-2021.ebuild 2525 BLAKE2B aed56148e8b938e471641a748caf88a63383ae11fad709b4465b31221189c74b12368016be6ff5d0d6e2d84cb6367fa758cabfb6375b6aefe09382d244e8dcad SHA512 ab498334f154b5ac9f3bc4f6fea03b40a37ca6819d405e6bf61a802f40d86bda669a455473401aef8679d8522cff382b4282fb89f634fc27fced26473bfd7cea
 MISC metadata.xml 692 BLAKE2B fa87041bafc6f25a3ee065fa21c064cb2109470b9833a4d20c5d3d8e9488ee91fff4364cb078287f481402219a77d1c0fd655b90951ae7d7226011e5352af5f6 SHA512 6c9fbac4fe09b5d24c5ce682f68801725f66857ec30418a8fcd2614319750936af116b30357ab03b2dc4ef761dd397a8786e81374f7f230a4d77660df67c083b
diff --git a/dev-texlive/texlive-langother/texlive-langother-2021.ebuild b/dev-texlive/texlive-langother/texlive-langother-2021.ebuild
index bbba7950901b..c46058f3568b 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2021.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
 
 LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langpolish/Manifest b/dev-texlive/texlive-langpolish/Manifest
index 8b7c2c65072d..b829fbaa2204 100644
--- a/dev-texlive/texlive-langpolish/Manifest
+++ b/dev-texlive/texlive-langpolish/Manifest
@@ -75,5 +75,5 @@ DIST tl-utf8mex-2021.tar.xz 2868 BLAKE2B 388b3bab671dcb6e7c40ac6678c4df35519a11a
 DIST tl-utf8mex.doc-2020.tar.xz 7496 BLAKE2B 49b76229d1644218c86ee27fca343e013734a112d36191cd5f3ffc7c6ca8720d4096c6990d5537ce803a60738aefb61e149426d5e9ca0a71975e91aeb615e5ad SHA512 cd438089d90faa0e9144d23adb78ce91d85b80ce084cb92511cc23882c675cb654cb704aebeb623bb29c70b764c8a0ab19915607664895c457c583f376c1088e
 DIST tl-utf8mex.doc-2021.tar.xz 7496 BLAKE2B 49b76229d1644218c86ee27fca343e013734a112d36191cd5f3ffc7c6ca8720d4096c6990d5537ce803a60738aefb61e149426d5e9ca0a71975e91aeb615e5ad SHA512 cd438089d90faa0e9144d23adb78ce91d85b80ce084cb92511cc23882c675cb654cb704aebeb623bb29c70b764c8a0ab19915607664895c457c583f376c1088e
 EBUILD texlive-langpolish-2020.ebuild 1103 BLAKE2B 4b995489a81112deba28089b9d575afaa193fbc5ff6a4950df0236054ea9264111546335394a15340c9f387bde85a719159b091cba1961d618f9f0e603276777 SHA512 ef30d10e21d212113f0a158551033b68fa61b4d42d345ccf29ef577a973a976585ca36a6d9600a0745df9c5d9f0f17ec8c81d340fa4a684dd12f8155a7eb68ab
-EBUILD texlive-langpolish-2021.ebuild 1076 BLAKE2B 99b80922fe20f56c0ef40fb15fb14878970e3e5c65604f904325bc09953b984ec7e4d96ec2772343f6d1855ab17bb29115ca207c9057b33a8ba2507eb1984d52 SHA512 2d86b2a3ae226538d3eb011b4102bc849ab1b3304ca6542eb6021001069603b11bf9d726cf988ae200140c51e283f70bea4f6c19ff24d408f0d4acccdd54eb79
+EBUILD texlive-langpolish-2021.ebuild 1070 BLAKE2B 2166c568d1f0d04121ec7981b92e1f2bc1f2127349ff97c5ea653a1de264cf19638bef3fec4281af4b4dc316ff665c6bbd48ade99640943e6a7fbfdce49f9ed7 SHA512 d2c79b08cd2c6c85be3095a936a0c2d2ddfa6fe55d336c709500687c0c496f288498d6aa1c028e30714e0d59b5d26d887d103f17d5dbcbedb542a7c586cdb6d8
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
index 3d23499c6aaa..217cbbe3e367 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
 
 LICENSE=" FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021
 >=dev-texlive/texlive-basic-2021
diff --git a/dev-texlive/texlive-langportuguese/Manifest b/dev-texlive/texlive-langportuguese/Manifest
index 33adb3103a98..4c63bac5f752 100644
--- a/dev-texlive/texlive-langportuguese/Manifest
+++ b/dev-texlive/texlive-langportuguese/Manifest
@@ -49,5 +49,5 @@ DIST tl-xypic-tut-pt-2021.tar.xz 360 BLAKE2B 95292083c723c54cbaa866b0c483b0b2f1f
 DIST tl-xypic-tut-pt.doc-2020.tar.xz 225208 BLAKE2B 006de6f3b5eaa53a66318bf7e839018c0c1feb946c68a59b9d760ccafee8cc2deb71c2271dbc1a7b503d641653de15665bccd01761b8588972b68e6cd46a7817 SHA512 e27dfa0b36341bcd02ba63a8b543f1a6c55c674745cc790543ea2cfded80e536e5901f184a3af62b92b4534c738a06bf4fd5cbd4dfb4da865d13991279309aac
 DIST tl-xypic-tut-pt.doc-2021.tar.xz 225208 BLAKE2B 006de6f3b5eaa53a66318bf7e839018c0c1feb946c68a59b9d760ccafee8cc2deb71c2271dbc1a7b503d641653de15665bccd01761b8588972b68e6cd46a7817 SHA512 e27dfa0b36341bcd02ba63a8b543f1a6c55c674745cc790543ea2cfded80e536e5901f184a3af62b92b4534c738a06bf4fd5cbd4dfb4da865d13991279309aac
 EBUILD texlive-langportuguese-2020.ebuild 955 BLAKE2B 1c2fa44f2abc7407ce1a35f3555652667bfc0eca11a394e609f5ab060340e001e72a41241eb07363c952bd4e6cf0a852a3af5118923c16323f83c781a9a5b87c SHA512 b77453ee6cb980f354ac5b1e324571c1cc9eca0540f81c9d344c02c97ac2a5005e18daacd612f5c3111c5b6f6d7ab6f815a8812100f1cb1805a1be46a9fc9f0f
-EBUILD texlive-langportuguese-2021.ebuild 961 BLAKE2B 1440f45c7805b0092a2bbf4d594d26d795702c92e4108d92233ee86459b34a37b84c8f07b9a0276016575aa1e1efbcea122b947a7658ed7d4c0000a87955cc86 SHA512 e909621d2cc6997c540852ed4c5cdf911988c3ef7dcd2f6035ed3495a3c62e11f0145c081aef4606135edf7e8052b4f0bc6efa14253eaa47d54f315924e20387
+EBUILD texlive-langportuguese-2021.ebuild 955 BLAKE2B 46ca76dd6657203914c9b3cdb8d616be46a39a49d260ccddf6db87ae7d8658538392eb18c407621731fc9ebffa46d14ae349e785ebf2dddcf62a3efdd63516a7 SHA512 66436c7ac10eae7f74c0e887dadfc0cb9105428eb9ec1c8e446565ca986ede2eb1219f8e28007c5f907d01f72db0616a2cd6aa019b81295dee72fd1886a67968
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
index cd8b8bcaf72e..0747298035ab 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
 
 LICENSE=" GPL-1 GPL-2 GPL-2+ "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-langspanish/Manifest b/dev-texlive/texlive-langspanish/Manifest
index 6c12e9da5362..308595eec9ef 100644
--- a/dev-texlive/texlive-langspanish/Manifest
+++ b/dev-texlive/texlive-langspanish/Manifest
@@ -55,5 +55,5 @@ DIST tl-texlive-es-2021.tar.xz 276 BLAKE2B e70b75a27ec402b50db214bc2c2f6f0372ba9
 DIST tl-texlive-es.doc-2020.tar.xz 2279380 BLAKE2B 593a26dbe6a9f08637a5d3b486827eec174fd0866d58cd4679aa24353385b9c187d760ef64f2422f0b6b081fd2757d9f622a8843efabf59b5d2c9f194c35805e SHA512 32c4b3fad90a989e2b94f4fe63b8869721c36aa90df3a815177dbae38c8fc90bc420f197810266ee1350e2580428b8444ef73c5436041eab8bb46704bccc4fba
 DIST tl-texlive-es.doc-2021.tar.xz 3090144 BLAKE2B 51d8306c6ec0a565f684a77170004702b512694474f585b153fd6740f32529b147780d098bad58b249a978c9a26c0d054adcba17361e04c0bac083b0b2116a1c SHA512 c65c8cee1e9b46f9a778b625f880a70ddf9297a77dd0f925bd9cdeac9b2d18d483879f88b72f701277974d983c82870aeaa0023c39399552bf243e49bd235f3e
 EBUILD texlive-langspanish-2020.ebuild 1075 BLAKE2B 8896fa1666b50d852de775a723f695aef89b7593efd9700863c5bf42d1c7244f418197d1a75018e48bfdcc5f052de64ceb854eb9e32c57ac3d3c6fda73bf3e69 SHA512 b0f0f7a2a7a9643b1d620bd965a1aeb3f8df179438dac336e3d2253a35decff93b13fee19b72114d77e51655b6d7c4ffcceac2e65f9065ed2fe32b3b392d4ac8
-EBUILD texlive-langspanish-2021.ebuild 1085 BLAKE2B 8d1e6dff6c118901e30d74d37889ebbefa2a33a098b5e7b863778898d9a288e96aa65436755cc22b9b5e03f4c99a35347ced0e286487443a58f7e32dc8871c9b SHA512 3786c37dc56b837aaa18fa036b946d5c09282d8d755384ef0392bd835d8e1770da1b22ee4ee384569859949162c259f6afd6f9c63575dc1d074ed36e812698cc
+EBUILD texlive-langspanish-2021.ebuild 1079 BLAKE2B 0d8a77b5c16c174849cc9ee5ccdae64a7dd7f2cb4a46c9e2af4fad49dadd5eb2fadeafd6db1c3d2e0a04a953ff4c1d1655341c6cc55c812cc90bbcf11d668e5f SHA512 077d624d8c39fe46cc67e42fd35e7a43a2d56f811e518d43d7c9c7ac615115a50e0d453b5b3b973f5eee8e9c07267f22178266ddfef8308879640c276965e86e
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
index fe5ec5cc3509..3319fbc920c7 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
 
 LICENSE=" GPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021"
 
diff --git a/dev-texlive/texlive-latex/Manifest b/dev-texlive/texlive-latex/Manifest
index 92909fe1128b..41655d169ded 100644
--- a/dev-texlive/texlive-latex/Manifest
+++ b/dev-texlive/texlive-latex/Manifest
@@ -303,5 +303,5 @@ DIST tl-url-2021.tar.xz 5528 BLAKE2B 47a8cb11484acb5447d4daea49462c8f45190369a2f
 DIST tl-url.doc-2020.tar.xz 266856 BLAKE2B ab98708f72289663074b028d0c07a1049465d261c7736374f9de6f9f6ccf484893bfd8253b9a42c138e73627208f6ffb50f031c4fe72b34bdd08d6e5e0affa97 SHA512 65596e0ce813233491959ef161be8570450c6c71c787b3253d0bce503558e63902137a6d337ad1e7cd2499feacbba4a93b7b75559750d05d7898ff2527f1240c
 DIST tl-url.doc-2021.tar.xz 266856 BLAKE2B ab98708f72289663074b028d0c07a1049465d261c7736374f9de6f9f6ccf484893bfd8253b9a42c138e73627208f6ffb50f031c4fe72b34bdd08d6e5e0affa97 SHA512 65596e0ce813233491959ef161be8570450c6c71c787b3253d0bce503558e63902137a6d337ad1e7cd2499feacbba4a93b7b75559750d05d7898ff2527f1240c
 EBUILD texlive-latex-2020.ebuild 2626 BLAKE2B 098df49cbb04c30ed00413a74ecced225e426eedec99529cf59b4bb9296153ec9112fb0d63e8e9a04caa3ecf6006c180d04d43ab44b491870fd58e40290c8cad SHA512 fbaa946152eb1fe5b8301b51e0fa76a91a804f17bd915be6f43a887a246716f07b4e121c8815235b8fc41f9b87011752b9e1faa638844d4cd9fc6c767921c407
-EBUILD texlive-latex-2021.ebuild 2717 BLAKE2B 280744fb3d3d072a76e0943c70bde3e98fc671f4208bd03cc46010246d5c9bd6e7ff577d3092d5b3f17052bf061bf575eea5383d36a0e28c78ab1433a481c5c6 SHA512 06209cc4090910a44dd22eb4c775e5dbc6726078794925f5d5c23874546c8264c6e1d270dd0081505811b8d4678c43cff5c55b0db0b9efc1489b3d87cc04ffab
+EBUILD texlive-latex-2021.ebuild 2709 BLAKE2B d2a6866687106da0455f8a01dccbeb557178de88d924ad9bf11a4dde132a2bee489468b86d040382fda970101fe8f69e870548c18c28f0e6d534fb80f6bd2fdc SHA512 e965a1310c55f03b584841c848dc6f5ec8120f68bfab0bcf5149cc71549ed0fb29f5cf09ab3f6cd5480128e22de5fcc5fd7f94ae3767653eb9fcfad2982b72dd
 MISC metadata.xml 529 BLAKE2B 59fc302f07f83452a60415a6ef75ae13bc314b3e2e0c3e8c58aedef8e2079e7184879908ec6d978a43a09a4429b3c1b79a3cc786a9695238b2a021916895269d SHA512 394556cea6402e78e83bb5ecb801bc9c6d4f0e85f368437953ccd1ce563954a3be99badee441c26d7791c965e13b17acd003ec325cc11b87a6fc605ffa2dd350
diff --git a/dev-texlive/texlive-latex/texlive-latex-2021.ebuild b/dev-texlive/texlive-latex/texlive-latex-2021.ebuild
index 0ad34c91831c..64d1353e332f 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2021.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
 
 LICENSE=" GPL-2 LPPL-1.3 LPPL-1.3c public-domain "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 !~dev-texlive/texlive-latexrecommended-2020
diff --git a/dev-texlive/texlive-latexextra/Manifest b/dev-texlive/texlive-latexextra/Manifest
index f02c397b7cce..8ed88e321801 100644
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@@ -6880,5 +6880,5 @@ DIST tl-zwpagelayout-2021.tar.xz 8880 BLAKE2B 566315ec2e12e47b766a77ec8c98259cfb
 DIST tl-zwpagelayout.doc-2020.tar.xz 635808 BLAKE2B 5827aeab15882c2c20d065595aedb248dbece1f717898c23776e17482074a292e8f5a8de9741634eed931205cb18d9d50fa4490759a559d1309f4f213046dee6 SHA512 16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817
 DIST tl-zwpagelayout.doc-2021.tar.xz 635808 BLAKE2B 5827aeab15882c2c20d065595aedb248dbece1f717898c23776e17482074a292e8f5a8de9741634eed931205cb18d9d50fa4490759a559d1309f4f213046dee6 SHA512 16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817
 EBUILD texlive-latexextra-2020-r2.ebuild 44688 BLAKE2B a7c8678d73176d1d24f692e2628f3389a233ff32ed1e74b5358b869f7809b22dc538a545132f1897509c01e996ac4a19f892920e07d87dbbcc48e058269794d9 SHA512 d55d61104c7028f96102a6e969ae23a04b48442053a15e112a3051c103a88604663752f710698ceedbe6b4bfa27dc30eac284cb4b19d567c183b9731e4736fbc
-EBUILD texlive-latexextra-2021.ebuild 46772 BLAKE2B 015830a9f253bc640064289022845950669e2d031c27988b9dc35fbaeed9eb90ef7cd94a2b1ee0410a759c341d7b2d47d4c74d15e862fbddb55de42fd10cf5cc SHA512 2b12ecb7af06acde882facb3138510dbb62d504dbb7ca189ed18e0b3894c6b195c41eaf705ede2ee996881a3c3e0d2c08b2ac95b114609d48273fad0e7286b9e
+EBUILD texlive-latexextra-2021.ebuild 46764 BLAKE2B 53a5769329060d921e7843029857731b8281fd48df536e71e90bed77d8205ab984f5ce3e9b4214089df35ec084fbc3c0d69f35e58d8c61642b72af483f91b8d1 SHA512 1d90ba064b88a28c2ec49b96fa4903f312a67b906ab2c97f17c7709a5714acbf7219fcc333b9586c474cf60e3b61dfa784a6f8e38568af42403e0af1232a0a7d
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
index 5e67a4b082bd..dbcf962a794a 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
 
 LICENSE=" Apache-2.0 Artistic BSD GPL-2 CC0-1.0 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latexrecommended-2021
 >=dev-texlive/texlive-pictures-2021
diff --git a/dev-texlive/texlive-latexrecommended/Manifest b/dev-texlive/texlive-latexrecommended/Manifest
index 01ebbd4fad36..2acc12144b31 100644
--- a/dev-texlive/texlive-latexrecommended/Manifest
+++ b/dev-texlive/texlive-latexrecommended/Manifest
@@ -373,5 +373,5 @@ DIST tl-xunicode-2021.tar.xz 25768 BLAKE2B cbbc952fb657459a35f9e55c4adb28ffc9b76
 DIST tl-xunicode.doc-2020.tar.xz 584 BLAKE2B 09ecbadf1d7739a2d4fd1fa823ab4a21e062006072ffab78d38942d36339bf5dc3bd0188a561013b55bb0ccec657e914cbe2fd8c4a60e160e792c52a8d7654ed SHA512 fbd368180c97649944aa23fae4f50f8a8d1aaa776f643ba520f121b9aae196dca94c11906f9d5b2f961b6d494256329670af1f4563502b44a8fc9633e29373e0
 DIST tl-xunicode.doc-2021.tar.xz 584 BLAKE2B 09ecbadf1d7739a2d4fd1fa823ab4a21e062006072ffab78d38942d36339bf5dc3bd0188a561013b55bb0ccec657e914cbe2fd8c4a60e160e792c52a8d7654ed SHA512 fbd368180c97649944aa23fae4f50f8a8d1aaa776f643ba520f121b9aae196dca94c11906f9d5b2f961b6d494256329670af1f4563502b44a8fc9633e29373e0
 EBUILD texlive-latexrecommended-2020.ebuild 2868 BLAKE2B a4bc395dd7075977f76b931a8ee3f28fad1b1cf090cb8db6e1f681c51700b5cce2d168c6886eed16a5fc05f008ef4c35a3bad952191f1558ea1fd62dfc820675 SHA512 88cacf33fca78a0ef115699f29794dc43fef5a3a212cb9759785c98652665d9419db8c423ff94602d0b19d6cbc7ea2ba4f94235d42c2d69e78231e962e4ca93f
-EBUILD texlive-latexrecommended-2021.ebuild 3017 BLAKE2B 297334d1d6d781c5c8e7836f2205da6d681439bfd871cead49fb674c4716f0563ade412b348bf0ddb5145ad14e8b1cdd82b3577d121fb2d471f8d992ae430029 SHA512 45bad5f445dbbd22bd1739173abab6c9865d19b6ed7c2d7a1acd18d1a5251beaa182d2d5db172901855c252517aeac211a438da4f1ab1d4735bbe0e470bf850b
+EBUILD texlive-latexrecommended-2021.ebuild 3009 BLAKE2B 06d0a9cff97c766955ddea9345e7b214d09c5eb68f23ce9f4b8e6d858fa4187c7c5543f305bf3de2d43d7e60c62004153ce05aa066e339e13df05410c3e87227 SHA512 975f261690379e299d279065ae081c15644772b1669cd6f296ec111f8d45a76e6990c28c58920afc5f197daf8e483c3dce826e934a1b49e7203854278077daff
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild
index 2ee4de239526..7784c16cb8ff 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
 
 LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021
 "
diff --git a/dev-texlive/texlive-luatex/Manifest b/dev-texlive/texlive-luatex/Manifest
index 30e0452ec4f3..597bc0b38c62 100644
--- a/dev-texlive/texlive-luatex/Manifest
+++ b/dev-texlive/texlive-luatex/Manifest
@@ -251,5 +251,5 @@ DIST tl-typewriter.doc-2021.tar.xz 101056 BLAKE2B 6043494b217558258138bbdd27b324
 DIST tl-uninormalize-2021.tar.xz 5720 BLAKE2B 36c8746438d815f1854047260ba0c4a968df5d3a18eb0cd7361eedb52ebd3d94c4638c249d0c66e3688eb72be8c6d030dfe9b3292d0c3beaaaab60cb4285dc2c SHA512 b9b0e91a61d99005be4f37d2e5aababf70729c60d959cc57295a7197b5e360ed183bb9cd80bbb287508bf584db48f061bcbb25c6a5bfd0936923b106d9962f60
 DIST tl-uninormalize.doc-2021.tar.xz 63868 BLAKE2B ecc5b6b2f73aacae10680c8525977c935ae8ada4214ef22bad43076d3d5a43c225827f0a5d88f1843045b7350a06c278709bc215f22df5bc307137e37372cc58 SHA512 804c2e70ff09a677c30f531db5605512453506ab83dce8f9dab4bfbb5602f8605376becc8f65cf375b28c9d6d35ad9f3a92d6f185697e2e9f9d367638d58fb56
 EBUILD texlive-luatex-2020-r2.ebuild 2346 BLAKE2B b0a794cae2ed42d917c7fd8b024cd69be515760b931da448837c35c241934b997d65d9631b5c892c4e2468e1cd769de86d5439aff190ed72a817dee326d158e8 SHA512 b9c703845c35cbbd73629fbedb9640a054be062270c8391dd339e88fd79d831b5221f04229583154f14023960b1490a98319af0b8ab8eb8c4cf045f4016576fc
-EBUILD texlive-luatex-2021.ebuild 2710 BLAKE2B 7cf705143557a29cc4ee13bdd1a17ecceab474f1393b3eaf3c6b651d5c615a8ddb75529b5381f24d4a15d3393f9f20ec3691aea419687e75804ce60610f52f37 SHA512 f41f848450dda2972532279659606ce4e5d129a4847f08a3473b93826f75042128ec9c966e8b46c6ed173f1ec22f790db87c6ad7f25fe3e62deb39d06e248821
+EBUILD texlive-luatex-2021.ebuild 2702 BLAKE2B 0ddf91cba07794f0202c3d8029f750d266c9d9980ee1ac6cf3f2b4d11d12abc70925e785a6356bbc5f7e2a0fd9880cc0f292fde46c12f57062019c41d43c4291 SHA512 b698501959ee401bf42c647b9012e8d33b3859d208368d55619dc6c69298d8c1eb2ef4199e261f741d82207dcf37a235f0c564664bd7ec2a685f0e30b6174c10
 MISC metadata.xml 548 BLAKE2B 12926c8cbe1c42799921e43f05ea4b2ed0e314855e01131d271d97f1b72914ee3eeee039e959a81d27e6c39469a42f68443245420a50b7177815858f3a92924d SHA512 9952f37d3ba08676efe90c13476b43140d0039a6b698ac91dc028c26fb7704dbf9da880d5f38123b219f0af0c6a029bd463625a6af5527ebb94f2d56b1b1b166
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild
index 80a487b4b039..a3c84ccbc4a6 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
 
 LICENSE=" BSD FDL-1.1 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="!~dev-texlive/texlive-latexextra-2020
 	>=dev-texlive/texlive-basic-2021
diff --git a/dev-texlive/texlive-mathscience/Manifest b/dev-texlive/texlive-mathscience/Manifest
index 7a306ee27f70..338a7ba07bcc 100644
--- a/dev-texlive/texlive-mathscience/Manifest
+++ b/dev-texlive/texlive-mathscience/Manifest
@@ -1054,5 +1054,5 @@ DIST tl-ytableau.doc-2021.tar.xz 360820 BLAKE2B 2d2fcf2a7174d0b2c02cce3aa1955f38
 DIST tl-ytableau.source-2020.tar.xz 15896 BLAKE2B 5021ede51879c5cca84b7ccce850c36e8036320b50173c047ef743ab4d8622acf4312093ca10c1cd567dfe969984940c5ef8750ba0ebac4fc07aaf62ce38f82a SHA512 02c2aff53daaec5161a9715de2e633d03dedc85664868d73c49dc0edc5c8b0bc696e3e8ab6d25f3420663fcff830581a7b2fdd0718a3c4928aa808ca3b1cbde3
 DIST tl-ytableau.source-2021.tar.xz 15896 BLAKE2B 5021ede51879c5cca84b7ccce850c36e8036320b50173c047ef743ab4d8622acf4312093ca10c1cd567dfe969984940c5ef8750ba0ebac4fc07aaf62ce38f82a SHA512 02c2aff53daaec5161a9715de2e633d03dedc85664868d73c49dc0edc5c8b0bc696e3e8ab6d25f3420663fcff830581a7b2fdd0718a3c4928aa808ca3b1cbde3
 EBUILD texlive-mathscience-2020.ebuild 7263 BLAKE2B d13874a4dfda2fe18a4096c1792ba5bf46c361004b202038f8f4a3f421999bd6a3b669809a4d2aa0b186855001e4854f6c1794ab71b68891374b3e9d5fbf3bf7 SHA512 693d3faea7e300f856ede7b31a29431d0ac74c7b49ba93f9a828de5e89b4d2c6099bcd9f6d3ad1eb9d1de92f572fbef6518ad6f0e34cabb68c94e6124ca86e28
-EBUILD texlive-mathscience-2021.ebuild 7689 BLAKE2B 1b0e3a4c2d0386f5f52d1765647e140511d6479e5a2787e1b03e3a9cd090908a7f132a4322be51e85b33af53729ac43711650e77a0a0ed95fe70fe98edeb460a SHA512 5d1697fc566776987f099466c24b53079069f7084f20324966b06c1a1b959cb744fce68b5b8377ad41f40cb6a6d7407002069b06fca2a6ea8b2a592e64dff9fa
+EBUILD texlive-mathscience-2021.ebuild 7681 BLAKE2B 325a563492abf7749c3866e484ed7e400a389b3fe3820342c6b09e60f4e0acac10b9e9437843ac5ed93accc52d2a8dd6cc223853b1406fb2107f68c5bf2408c0 SHA512 b164768be34040bbb22325d058e3044afe767ba6c409f855663290e1aae7dc791291817fcc81f295d2b2ee2f9012b42f41502130eda90e542b7cf53d8723919a
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild
index 1000d8882ea5..26f4dd5d4a66 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics, natural sciences, computer science packages"
 
 LICENSE=" Apache-2.0 BSD BSD-2 GPL-2 CC-BY-4.0 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-fontsrecommended-2021
 >=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index 314f24670469..dd5e9933f7f0 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -201,5 +201,5 @@ DIST tl-threeddice-2021.tar.xz 2212 BLAKE2B 9c71fc87f54336849981ad347015810d86f8
 DIST tl-threeddice.doc-2020.tar.xz 119008 BLAKE2B ba4ff5556dbf6d86660882ec889e3fa22dee32c41c6b93e479d1962822ce073d84d30111bd8b85c682f757d2ce571378bcb2c94ba9af6b341d4692fcd7e114de SHA512 c750497229b8bd41eca05b221ed2ca2ca49db8cbbff03bfce2712869d352ae0385e4c10e9730e0b2f8286db9af1e1b87f10d599788a3dfe8d41c28efb8b0e4a6
 DIST tl-threeddice.doc-2021.tar.xz 119008 BLAKE2B ba4ff5556dbf6d86660882ec889e3fa22dee32c41c6b93e479d1962822ce073d84d30111bd8b85c682f757d2ce571378bcb2c94ba9af6b341d4692fcd7e114de SHA512 c750497229b8bd41eca05b221ed2ca2ca49db8cbbff03bfce2712869d352ae0385e4c10e9730e0b2f8286db9af1e1b87f10d599788a3dfe8d41c28efb8b0e4a6
 EBUILD texlive-metapost-2020-r1.ebuild 2302 BLAKE2B 38791f7a732884de285a22b685dbee66c343f6932c35888bbe6eca9c5b720ff9010aabe59330ac0c3b5b3b21e55ee25f4cd7f59dc2e44d0a14325d1711c9acde SHA512 ffc70d1e8d5730125719a073e77c2bb46d7e2f093486c497427f3eb780c20afda9f9b80690c411719a266cd71f3fa9dd089da76d7744f2e98b015680d6ee9b2d
-EBUILD texlive-metapost-2021.ebuild 2289 BLAKE2B 46e259cf1cb1ed5eeae63ce92e301792d478c5cf7caf6fc3853bc42006a80150e83ba22265113e6159dbbeaf824ea6b938cae2cd5b9730d97ef68070237a8843 SHA512 9e7ab3c9e98ade8ed518fd1933df62cc423f2c468229e13c20a4dbde5fdd82c19fbcce4c68da43053a18fe63d580cb1873d0373d8d0766210c1c9e743bf342e9
+EBUILD texlive-metapost-2021.ebuild 2282 BLAKE2B 7e85283efbc65befa26614776099787f2600ed647dacfc9209f8503ff7bfba1d5e4d64da614c3539eced4c57ab0aa0c67ef6126c4ec2e8168c948be91f00f5be SHA512 fa52152effc35a31c692447a6414cd904cd28876a74a6b78ed3e58ec45454f3a673fa4269d5638444143a13c16b1b51f69b1f0cdc76b47aeee92b48203b03fde
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
index 33cc723fac26..535905f2c030 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 "
diff --git a/dev-texlive/texlive-music/Manifest b/dev-texlive/texlive-music/Manifest
index f55b1811a664..5ffe55e36db5 100644
--- a/dev-texlive/texlive-music/Manifest
+++ b/dev-texlive/texlive-music/Manifest
@@ -139,5 +139,5 @@ DIST tl-xpiano.doc-2021.tar.xz 556172 BLAKE2B ddf49cf05f63d557bc719e130fb176e88e
 DIST tl-xpiano.source-2020.tar.xz 6324 BLAKE2B d6eb7fd8b17b26a18a03380d7018a7d620253f5cfc5bf1d654b759e41f2d3ba95454d78eed79580d5d179efee3a0a22c18b52453d3b14a2aa915085f1efb6b5d SHA512 b52814268736b61fe3f417f410e4b29f778b6492f838d16894d33db85645799d52d3d744f10b429e68e315a142964b2f5ff57f15e9c4ee7e93a58dbd4b0fa2e2
 DIST tl-xpiano.source-2021.tar.xz 6324 BLAKE2B d6eb7fd8b17b26a18a03380d7018a7d620253f5cfc5bf1d654b759e41f2d3ba95454d78eed79580d5d179efee3a0a22c18b52453d3b14a2aa915085f1efb6b5d SHA512 b52814268736b61fe3f417f410e4b29f778b6492f838d16894d33db85645799d52d3d744f10b429e68e315a142964b2f5ff57f15e9c4ee7e93a58dbd4b0fa2e2
 EBUILD texlive-music-2020.ebuild 1715 BLAKE2B 977336242211981602cd0980c0f5712ed44d0ab908720648b4cbb03768a43a96261414b9f09782ef2cd44b601ac0828fcb3725dceff14252896a93860d1197ae SHA512 9ae0405bdc21fcc12c39c0ae7ea01d1e823791b7ee568d607120031e13a57cd38eeb63d436cff11e6acb195cc980c86133cf46b169b32af6fa25e1054ff79709
-EBUILD texlive-music-2021.ebuild 1714 BLAKE2B dcf221ea2b1b965167bba756865295d5331cff7f7173e166378a97d6975cae0c8088d70e801c81e00d189519d1b79156721ba3d10cba2be82bde68706cc55bc4 SHA512 1eda0aea17217e7ec2d97efac9b648ef4982bc014d98a3857bc7297d5c4c704f5b70a437cb40dae5589bbc50811806745a94a9530428750c063ba1fd46ea02a3
+EBUILD texlive-music-2021.ebuild 1708 BLAKE2B 777a0ba90d86a1379cfdeeb8b936f7b6c9403a397442804b05cceb52d8b7f63332544891cc6b5bb73ecd2dca384d304208f2fdb107a99b13a482287e2f1fc2b3 SHA512 6895fa8ad4c6429d3ab377cf639c374fa82f03f877f48bd05814d6960ca93e608af65213b25ce5e68e325046826307d0018e15997fd3d6446792c977475b7402
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-music/texlive-music-2021.ebuild b/dev-texlive/texlive-music/texlive-music-2021.ebuild
index 80542e2996c8..6b110408adbf 100644
--- a/dev-texlive/texlive-music/texlive-music-2021.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
 
 LICENSE=" FDL-1.1 GPL-1 GPL-2 GPL-2+ "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-pictures/Manifest b/dev-texlive/texlive-pictures/Manifest
index 58f7892824cd..a18dbd68f313 100644
--- a/dev-texlive/texlive-pictures/Manifest
+++ b/dev-texlive/texlive-pictures/Manifest
@@ -919,5 +919,5 @@ DIST tl-xypic-2021.tar.xz 709808 BLAKE2B 7192d7d06eb8fec456213d8124465258e325c86
 DIST tl-xypic.doc-2020.tar.xz 3923196 BLAKE2B 3a1598c0f34833f8336a9301102b259b8ccf293b1866126d67c812e933c3eddb4489dd733aa47e0b8b4a79fe0965a06a981c0d4420dfd8beac148edc581ac89e SHA512 cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff
 DIST tl-xypic.doc-2021.tar.xz 3923196 BLAKE2B 3a1598c0f34833f8336a9301102b259b8ccf293b1866126d67c812e933c3eddb4489dd733aa47e0b8b4a79fe0965a06a981c0d4420dfd8beac148edc581ac89e SHA512 cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff
 EBUILD texlive-pictures-2020-r2.ebuild 6493 BLAKE2B 6b1bd16658a7f6f24919439264326fab375691191ef6b1bcc52ada87378b71f1b14aa6bdd90a8319a061a85b28015a072f33f644669a3e1dde632b5963a50ba0 SHA512 aa0f554bf2c7c6d89a5b51871710080725f8ebf3450a92dbc42224cb8af6e7dd77eeca1f1c5df58e85ae9d5509f361d6b599d0a2f7c2432fd57179bfcefcdba0
-EBUILD texlive-pictures-2021.ebuild 7015 BLAKE2B 8c60295276936f3c311522654d4ac71fb88445acfa5b56499a0a8e299bb309e387d00293a70ea4da5a5b9514d15a1331303a2e614907975f6b156143e0fa7604 SHA512 ad9fd943892b761c5597f5b2bf66175fef498f4bf2673601b7cc29569497fc96d8bfb3de787ca215078a34fbdbe20ad9e79d48e8704881b83457d2cb53cc79ce
+EBUILD texlive-pictures-2021.ebuild 7007 BLAKE2B 093cce271167a066ab8f86516db12ea983c9c063eecfc7cf7074646dbfe5471964a4935399faa8d126608d17028c8fb84ecce5e4162d4d1338e198da1ddfb9a7 SHA512 8150346715f4257a38c1021d810040acb3ce8028808241db0ed7367ebcac9becaa3f4918da58ee0a24b89547cd1fd979775b680ea0e4a7b30addf11c96e5d01d
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
index 70dfe6897fad..7e1737cdc9a8 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE=" Apache-2.0 BSD-2 GPL-2 CC0-1.0 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-tex/pgf-3.0.1
diff --git a/dev-texlive/texlive-plaingeneric/Manifest b/dev-texlive/texlive-plaingeneric/Manifest
index 31f484cab60d..6bf735ea5a93 100644
--- a/dev-texlive/texlive-plaingeneric/Manifest
+++ b/dev-texlive/texlive-plaingeneric/Manifest
@@ -421,5 +421,5 @@ DIST tl-yax.doc-2021.tar.xz 123700 BLAKE2B 4830edb12eb23cc98a685e2f61a5c86256d78
 DIST tl-zztex-2021.tar.xz 101724 BLAKE2B 44fd609f7b16a05f451e0e83f6fc040cc4e61b4267f00c10bc8778589da3c593292cf563bbebfbb71ce8503c0d27f30bc807e349411c1b6a8dff4b61582f2aab SHA512 eb325564ee9e001e0e5ff79b6e3cc9f22f5b9b100ef021552f54953802edbce1e4b1295ff4590832f959386db7a63aaf8e31dc2d61b38e5c8a140082ca423e83
 DIST tl-zztex.doc-2021.tar.xz 47816 BLAKE2B 5a755e47089db3836eb6566495978f733bb381fd18bcf7a3fe43e3d2d113bf1b7368dce9350182abb6ff25fad87ac4bbf3eace2198ca4ab2c4e243fbdf95cb3e SHA512 bd2a3a42b62da61db572058b4731161425545374584a575607f11bb2302aa2ce900b694aaf06562f4c9eb9046c80c4fbf5b50233f6d0526fac787c213070d542
 EBUILD texlive-plaingeneric-2020.ebuild 2769 BLAKE2B ab65b236cb85ff4e4e0b3baa4fe29175f0e1444e245985023fa92cbde003f047d2e8e95ff797547be7fbd9b1d7fad0dc07f518238824330d8f16e23a2c64177b SHA512 0351b5978ff470590c7742cd14349a0ae2324d6d46068a4f820bec918ddfa5e10bac4579f414a9ed3ddf0fc8220f8060dba3a69af901d03a35bff66370292f00
-EBUILD texlive-plaingeneric-2021.ebuild 3140 BLAKE2B b64483baca639ed0e4913f9a4667f99e4855dbd19443cfb3a615c3a034081eb58b1a8eac73d089ea1a9ed3a391c14b497fd9c956d44d1a9591b6346267a747f4 SHA512 f8773a12e6ad7931a5db81c7c19de594564482aa37afc99eadd2b2184f378bfea3cacb49802f9cb943f32a708d7dd9d36b7e5fb4c1d71a2e701a99cff1057fd9
+EBUILD texlive-plaingeneric-2021.ebuild 3132 BLAKE2B a41c56720b632a36dc367a78e464d7227992ba991c1339440c89c3ede4973bbd7778dfaedf3c574a2ef31b1145aac934b2c4d58a1f24b9304da6142922f01ce0 SHA512 6c4a0fb6b08a377489508e11ccc536cdec07f5eb9282244a32da6f23da9caf124c0406afb0d74e547319acfdf0068625aef9911c17dd9e6acc625355a756e825
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2021.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2021.ebuild
index aa7c676e2bb6..6c3703e91904 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2021.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
 
 LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT public-domain TeX TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-basic-2019
diff --git a/dev-texlive/texlive-pstricks/Manifest b/dev-texlive/texlive-pstricks/Manifest
index a04ec24f40f7..b8409e399b3c 100644
--- a/dev-texlive/texlive-pstricks/Manifest
+++ b/dev-texlive/texlive-pstricks/Manifest
@@ -505,5 +505,5 @@ DIST tl-vocaltract-2021.tar.xz 9208 BLAKE2B 985ff1f9c25b830dd8b5153af97e4b9454ef
 DIST tl-vocaltract.doc-2020.tar.xz 15924 BLAKE2B b4196fca7f9d64a664d37f141260de8997fd1dcd713720e29e4f7679f80e583fc5891bfc7fff36108a66993765dbb1b816fa9030dfb2edcbda1ef0d65b39f034 SHA512 36aa01a5be9da9a23e3a4de63fb14a39beda4a42cd2615f75f942abff677e71f2a4f640773d27556ef246a99004c3a1aa68caac9435957152cfda96707d79787
 DIST tl-vocaltract.doc-2021.tar.xz 15924 BLAKE2B b4196fca7f9d64a664d37f141260de8997fd1dcd713720e29e4f7679f80e583fc5891bfc7fff36108a66993765dbb1b816fa9030dfb2edcbda1ef0d65b39f034 SHA512 36aa01a5be9da9a23e3a4de63fb14a39beda4a42cd2615f75f942abff677e71f2a4f640773d27556ef246a99004c3a1aa68caac9435957152cfda96707d79787
 EBUILD texlive-pstricks-2020.ebuild 4093 BLAKE2B 61824b1e7367b06f99d322351086b66da9949e23fde679a9fadbfbc953f0b5a2960d6d8988029eef30470f7541ba2133b8d7444fbe7ac8417ddad444ec68daa4 SHA512 b9ec4eaf1fca9d796a18a678f1104bafcae2ee356d84f9f287e71d667c37d62ac626850c42ca4ed8c050456dff4d1a6eed8a30231f1679473ec0691707525a81
-EBUILD texlive-pstricks-2021.ebuild 4066 BLAKE2B b1d6a3f4e84a7ecb056232104a2292d4162af1036de07036b581e5833e3487d41aaa633d4d391a05d03d2f44f7818f57e0b97b2385c09eea2fad4385e7e4ef23 SHA512 cf4e0edcaca150b412315bfd58c69cb5c5b6a91c08f6c60a01ec41fb3dc7330d8152d32c2b7d937cfcf24e1c92275f09057fe6ad74781e0f1b48b6c2290fd213
+EBUILD texlive-pstricks-2021.ebuild 4058 BLAKE2B 8e3568f28d414f547103d259f9d510b23d76c587ec99097f8c594d357a53d11112b73feb302f0475a15bee2d6973af2e61dbf3831aca1751a2c99330d5e63d1d SHA512 9da7d1484cfe20500925d1d313a046dbf70544df296596bbb8fa2447fd0009c197f80c1ee1ef35b5b21653341dd0a289b12eadeec6902deba3e3ad5dcef0641e
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2021.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2021.ebuild
index 77d390a0467e..f74ae0348d30 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2021.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
 
 LICENSE=" GPL-1 GPL-2 LGPL-2 LGPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-plaingeneric-2021
diff --git a/dev-texlive/texlive-publishers/Manifest b/dev-texlive/texlive-publishers/Manifest
index 8d39a0125b80..5d86793aaf03 100644
--- a/dev-texlive/texlive-publishers/Manifest
+++ b/dev-texlive/texlive-publishers/Manifest
@@ -1157,5 +1157,5 @@ DIST tl-york-thesis.doc-2021.tar.xz 111744 BLAKE2B 7cea2428eb5f7252cbae7443b6b73
 DIST tl-york-thesis.source-2020.tar.xz 12580 BLAKE2B ed9f83a7f7fa3e97616af33f8969b0a19bb05a615b0afdae4b6e51439a0f2ce3644c547cf54f65bc5585419298c614af2037c8f3fa966c7472763c13f6af54e1 SHA512 3096ee9334bab690b38ff943559a0a7b0c54f8b831e7d1320ae4581740c48dd05e09813e220ce1d28d4523fb456d7fd01920e89e7e0d66da00e9dce88bfadea7
 DIST tl-york-thesis.source-2021.tar.xz 12580 BLAKE2B ed9f83a7f7fa3e97616af33f8969b0a19bb05a615b0afdae4b6e51439a0f2ce3644c547cf54f65bc5585419298c614af2037c8f3fa966c7472763c13f6af54e1 SHA512 3096ee9334bab690b38ff943559a0a7b0c54f8b831e7d1320ae4581740c48dd05e09813e220ce1d28d4523fb456d7fd01920e89e7e0d66da00e9dce88bfadea7
 EBUILD texlive-publishers-2020.ebuild 7993 BLAKE2B 2b87e46d69afaef4f05c705dc18fa53b44761f01f71dc438eac31ea664ad58641bdc3bd7d7f0b0e7dee563800712e872c54d1708776e7e1a63ec8e93f6bd4470 SHA512 44ea6198d81b2959dea5d377394936d160fcec29e8f6dfa4c8bfaefd8dc34aa1fa1f52d7f278c1e5b515823da14d37cabcb8532e49c6ccc0190cf94e27615ab7
-EBUILD texlive-publishers-2021.ebuild 8335 BLAKE2B a704078f5f0f8a6ea0d56eb77bb6e48b46b53acd4cffec479e7bab4f9d51269d84fc29de799da27e9923f7d3c20b75cc8c0700e79469bf4e1f0dd965f1c75778 SHA512 91e06203159d5a4118ddc5bd1ef3abb574f196217ae4b666ea44cf911216e2d8a0404ae511f14b161b5e6c09f28d121db791dc02e8aa2c16f824cb1818e49111
+EBUILD texlive-publishers-2021.ebuild 8329 BLAKE2B 90dcfe29100f5d577fd757e581dbd49f43894bb87123cbbb3c0f29a18e3ab70318cc5e47cb55b1a2743e7f3ffc7e4493abb0e71b25674fc4f6798690630b0141 SHA512 7098a2ce15320c6e4fb2b6ebc096b6588e2e96279844ae024555ddf359bdd5ae76a5b3c021e1ea17e00c61b6af5f5b7d04f1bf2345f5ede6dce01ccfb30f0fbe
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
index e51469afeb19..255ed12b3cc2 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
 
 LICENSE=" Apache-2.0 BSD GPL-2 CC0-1.0 "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-latex-2021"
 
diff --git a/dev-texlive/texlive-xetex/Manifest b/dev-texlive/texlive-xetex/Manifest
index c84473d802cd..7bc096229da7 100644
--- a/dev-texlive/texlive-xetex/Manifest
+++ b/dev-texlive/texlive-xetex/Manifest
@@ -182,5 +182,5 @@ DIST tl-xevlna.doc-2021.tar.xz 55384 BLAKE2B 3c3218e63623cd15b88303427e484082afd
 DIST tl-zbmath-review-template-2021.tar.xz 1300 BLAKE2B 99c18f7c006f15074dbc6d14e5df2be419865a84397b9c40832f4005b7a6279be2014ef3e714903927e6e617c281b6ab0e3bf8fd0d369142d0d9103aa1a571ac SHA512 4aa3b6e97e5e5c466977f9c0895229b075d2a1b47665c987841ce75d4d874131371424927e0f8741e6bdc54f9cfbf18333086d4439dc60b0ea65f6c9973604ff
 DIST tl-zbmath-review-template.doc-2021.tar.xz 184672 BLAKE2B 05a4ed6b0df2f71b6141b9a2eee0cdd26ff7b7695ad876f2ef2f9bd91da907fa502dbae9171ffa7c0d95422cfbb8296878417402b38b9a6add86f10e878509d3 SHA512 3e9575ceaaf677cd637eedc57fab9306d4cd27ea5611e00c7cb65871ddb4855d7b3426a6ae36d65693d6e92b363e49ec2166a6714a0909a16e394768e034c113
 EBUILD texlive-xetex-2020.ebuild 2247 BLAKE2B b3f7ab2f29ab02bdf51ef211689c2be144063d06ad2f5fc0bc9bb772e850c26245782f7d4b0bfb49dcd711cfb9eb71741b91646ed07024d36cd1af7ac809ab3f SHA512 a80858b103af483442247b1f17fb0f61550252d89fde0da67cc2e323a17936eb960d29d23d8baa077990326441d03de9e4866e6915cc1cc2c30801c36accfc6f
-EBUILD texlive-xetex-2021.ebuild 2325 BLAKE2B d0356626e145b13a896eb9370ebed44789e545809d4cc9bb4bd18d9ecf9b6cc9b65de355759f4e4097d4fa0307acceafeb240d575200f391c8b8bc15d4dc7bcb SHA512 46d656f7acd84c7fb45f2448877bbf873f3b4b5bf412edb64e422c824c5f30db437da6747780cb158848c4980190d92dc70f5e08733ea49e561fe60c722f4184
+EBUILD texlive-xetex-2021.ebuild 2317 BLAKE2B 720adcea1fa7e8cc20dc573dfd9135793f548606bac75810474238b7e4172acf8d8e6eb2916ffe4077435e5b542b81a6c615468a28ce730bf336db03d5671284 SHA512 7b9ce44c3e6d3485e06f083c0a37a3af41125d87b5b6e0aee8e5723d1286a7544300db4a882d80b747c363b5c68fb80f0f160b0c66041076ba854ea6d6d0fef2
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2021.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2021.ebuild
index 44da0be2e581..f8d3dea78589 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2021.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
 
 LICENSE=" Apache-2.0 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2021
 >=dev-texlive/texlive-basic-2019
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a3df92212da2..08d3be7b799b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 8135bbf05436..4d9239e875de 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.11.tar.gz 118678 BLAKE2B 209d904a84363a87e566798dcd65ffed96cdbf3d2e753af8dc2706adb995d2999bc112eabb88db28791cbb245c373eb330cf9c20d3d886bb2caeb5c01150e65d SHA512 6d362aede911a8ad35be30638a698579582ca5de770a7c3199bb205046f08f355387099261b8d857188d526ab62024f78e3d06a225734c5f9acca03e5dfea1ec
+DIST bear-3.0.12.tar.gz 118937 BLAKE2B 4ed41693a92583091b8510dd1ade55a3e5c897825205e59d9e9810aa63e5f17c5049b3b3de509665143083d44aeb6d85c63d944041bb36c6b1d842d0308d88f0 SHA512 e45e842793e9f5f2cd6b13a9795c2b6753c2fffd516e4af9f0362644c9d0952a2b0e505a4a9d53e9a1a4aa063d7368c6466367a78fececb70582ec7c4e8d7f10
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
 EBUILD bear-3.0.11-r1.ebuild 2071 BLAKE2B a133a2e37f574d2ad1b060023becf5277f3011a7d54bad2d389b146ae3ef08f2a5d55ad93d2bd1c4e2778d9c44d6f4cea403ece918e111e19d3261ee9bde5a77 SHA512 562c3d1a8c4bded4cb8f29cefdc06dcef5665d40bf37c7f097c848a01b29df8c7bde0d905bc2e11dc20fec291963579ddc4db6c24b8679ffb5935b3f52c43764
+EBUILD bear-3.0.12.ebuild 2071 BLAKE2B a133a2e37f574d2ad1b060023becf5277f3011a7d54bad2d389b146ae3ef08f2a5d55ad93d2bd1c4e2778d9c44d6f4cea403ece918e111e19d3261ee9bde5a77 SHA512 562c3d1a8c4bded4cb8f29cefdc06dcef5665d40bf37c7f097c848a01b29df8c7bde0d905bc2e11dc20fec291963579ddc4db6c24b8679ffb5935b3f52c43764
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-3.0.12.ebuild b/dev-util/bear/bear-3.0.12.ebuild
new file mode 100644
index 000000000000..86011aec51e5
--- /dev/null
+++ b/dev-util/bear/bear-3.0.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.7:=
+	>=dev-db/sqlite-3.14:=
+	>=dev-libs/libfmt-6.2
+	>=dev-libs/spdlog-1.5
+	>=net-libs/grpc-1.26:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.10
+	)
+"
+
+BDEPEND="test? (
+	$(python_gen_any_dep '
+		dev-python/lit[${PYTHON_USEDEP}]
+	')
+)"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test ON OFF)"
+		-DENABLE_FUNC_TESTS="$(usex test ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 0c5b912ab652..db2b08a700f9 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,5 @@
 DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
-DIST byacc-20210328.tgz 874281 BLAKE2B acd0fb0ebd99987ad5e823391e5186cedc64a9a7b5a1088ba42ac2c1a80d98d86f47c7626af5294853026a2e6bd4aeeca7b39b1a39527c170f118e33c021eba7 SHA512 fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae
 DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1849283e970dcf1c2f665e8c43f46ca4913a332987b7c9883fea68947953c28bf3f8fc983ffe6b7a4d804c17 SHA512 0b119efbe8748f9b5959926c36ac006174d99deb7a9c84ce97b7b80a01d197dd4d1004788dfed87bc492410a354b06f01b848b8da20ce0f64466c527c091bf48
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210328.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 EBUILD byacc-20210520.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210328.ebuild b/dev-util/byacc/byacc-20210328.ebuild
deleted file mode 100644
index 556684fdc8ae..000000000000
--- a/dev-util/byacc/byacc-20210328.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 619ac867d6ac..cce147570401 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 EBUILD catalyst-3.0.17.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
+EBUILD catalyst-3.0.18.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
 EBUILD catalyst-9999.ebuild 2291 BLAKE2B 5136e382f805c1abd1c8a7944bf3527a3c754000ce6e288d7e98bb85e50463286380eca57ba8cd96ed4c628d15cfbe88541cd5feb52632fac3f7982826274be4 SHA512 acd259cee286cc736338a0e31d2eeb24868d212a56322214417cabcc9aab2b77eadd5b07741e89f3f3fb46fe3eec62fd20ac15c5de791db9cae6eb0a406ad48b
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
new file mode 100644
index 000000000000..5793fe90faef
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( app-cdr/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 24deb369da2d..9321a6437882 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,7 @@
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
+DIST cookiecutter-1.7.3.tar.gz 253444 BLAKE2B 92ae74768c909ab8e2ae97ad87921ae0cbf24c417ab6985ac10eacd913981ee7756843e2588936174d3c04ecfa7a62077a6d4a323fdfa6d1872f3c84d943cbcb SHA512 a7dd7993ba40a084a719d553afbb8035f26976f38a3e8ee373c8074db64eac6bd7b711eca8cedbfd1050fc057a0b45409af4d59ff3bde57b344317dbee56f10b
 EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B 49b746a2ea6120a7dd3cb451fefcc9db8a6240ad1604876c435a8bf9dbae4a72b12995584132b46465a25c01a7a2d8f7fde98e123f71e0971bb06754830aed59 SHA512 5716f7cf06d42e181695680e7a09779d9f1876f02f8fee0e0bb116f6d255bfde5c2bd7e1efd591d2ae8d27c579c2f875b32bb0fbf8599117925e8ff446aa2dee
 EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 0b17d7cbc3ba94efed52318ffaf68e65f643e28bcbb232c963b9e7be48bfcde474f2c5c569d07964e374a56456376ff6435b6894aedb40f87d18d633d0ba8ba2 SHA512 1a331f871659bebfc8999556fb49d4098b1929404ed845fd4368db1f5b9c6652fe094071aca6dfcbe03fbf17f8ec318ba329ec3352788691b62134bcbf1086b1
-MISC metadata.xml 329 BLAKE2B 6c2335992c9d68c7854c593e8f1290bc3e967706fac92fcc365d12f7813dd5490d8ef5921f0e1e61d0c13fa9b1b43ec20c8e7d95fd1ba926ffd7cf82bfaab4aa SHA512 0d318a3a6a0ed5b048d9efa5dff3e5c447ed3545997cffaf1d494898b3d35144dacd2cd9fdb8fed3adb1d39d9621b23734d04b7f6026256a891c3b1c501681bd
+EBUILD cookiecutter-1.7.3.ebuild 1288 BLAKE2B be50638acc321952653b32e5f1b4a501292b7ea86acfb9effa062873b0ee460e3d926812c5694ca0c0ac675f6c61afe0007a82bf1c5d3ec8b615e55436267696 SHA512 3b3abc4e126172c7ef354cf60f7d519775738e7f2d742611ac24fb01588bb11d633c10bfd02d1467146c1f7e58343c8ab96fad09508aec2833885ee44f211c1d
+MISC metadata.xml 448 BLAKE2B 8b1da3b9426a697368f2fe27dc7f703be31f91a56e22cb481ac9d9bfe3825e0f903fc2b090893ee3c198aefa40f329bb520c15392ca853c58f007c2cc8b19bf1 SHA512 678abf4897103b1da004221ab3d7b4ae2c29c5f89a580b9a869ab547ca49eaccee175aadaa57677d5ced915f32755bf3c88226cf07c2ffebca65bd54398127b7
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
new file mode 100644
index 000000000000..b808d44faf12
--- /dev/null
+++ b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
+HOMEPAGE="https://github.com/cookiecutter/cookiecutter"
+SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	<dev-python/jinja-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/poyo-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+DOCS=( README.md HISTORY.md CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}/test_cli-1.7.2.patch"
+	)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/recommonmark
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-util/cookiecutter/metadata.xml b/dev-util/cookiecutter/metadata.xml
index 7877307ed7c6..6f48334d456f 100644
--- a/dev-util/cookiecutter/metadata.xml
+++ b/dev-util/cookiecutter/metadata.xml
@@ -5,6 +5,10 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">audreyr/cookiecutter</remote-id>
 	</upstream>
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 23734bc48597..a4d983b58131 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,5 @@
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
-DIST dialog-1.3-20210509.tgz 562432 BLAKE2B f3a36d01f85516eb7297643158d02585bb62d4e54e90784218f0f9a825d7011093ed9c784bbdfd9c466b96b054ad44c23f97115599018befd449398678c78c64 SHA512 338ea8ee1bbbc44f0d8f511c5c87b246ea242a287346dd27e490d4854fdc00e9b4241d2ef372f131ef7152ebc2429d54c6bc1eeec0f89a6476e0a05f2683c64c
 DIST dialog-1.3-20210530.tgz 562950 BLAKE2B 2aa33c4e2568f91a08d173c3a02d0d64f3b02127e70fc942fa76904fda9bd929fcb19b5254874199fc00e873e7dfb18365beba04350e80939bea5d75d8df8438 SHA512 8f39cfa5f3ba70795927c261861bc55bde668d68d3b45559542cf980e1cfabefb3d1ebabc91715e29a4a9ffca5cdb6affa640ed155539692c868942f6014e7e0
 EBUILD dialog-1.3.20200327.ebuild 1180 BLAKE2B e78b39cdfe37a0e49cd2db3299e5688802e692cb264842d7414b9fb1318117bca20e144137ff452feba85bb8c649e53691cfb010ad852efb1d8e49b56f356d2f SHA512 ec810cb43d692cec37720782c8c664923b0326581c1292f118e6bf061d7425b2e4a2bb4223d21315a3e5c9d6d30d9537949f4464d6445474343d47d655c4f190
-EBUILD dialog-1.3.20210509.ebuild 1313 BLAKE2B 1da46bfe37b8d0c8521c5f7e9c8ca9029229a9b44c6f1127e305e33684aad557232e2cd79c385a6b2af55a073feb0718afca621119be3283943b5641fcf155da SHA512 53ccade7ec7c6bd674e323f5b2c573ce3687e72681a3542141bb9c63188f3f4800e8849a2b2bdfc9e89a600f8deb8bd0d056cb9903984223edf5cda3f39e274b
 EBUILD dialog-1.3.20210530.ebuild 1278 BLAKE2B 0e73dff8c4dc885fe29d3d690cc74aa649886886b0136a68b731ef670873f56c94afdeef911dca9e56cf15ec6ba3eb04fe0a8fb43d7251bfe7ab556bab453fbb SHA512 354b361948c8768e45f1e16ca3a1f047ba01d0c97f252ee0fa1466e9b00627ae5d140c3022c350e7812617b3f92a70d4511d34ac060bdeb5c63a3eb1a04d6874
 MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20210509.ebuild b/dev-util/dialog/dialog-1.3.20210509.ebuild
deleted file mode 100644
index 06eb24055e0c..000000000000
--- a/dev-util/dialog/dialog-1.3.20210509.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 3e517e66fbbb..ac5d97270420 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,5 @@
-DIST diffoscope-175.tar.gz 1590841 BLAKE2B 86d6c910c60d1d472a7131cde8b5b506901ee0a838e96105194d1a8da167203a204c81076ccb06a47401338a90a0f7f49dabd13aa9ef100e88759336051e6b2a SHA512 950e5539a2d2242619426cbc3790a50f30119df2bbe36e5a03c63a9e01c741a0c529b0bd25439723064758c4c32cfcc621f67f7e0e0867071bdc47a7844ab097
 DIST diffoscope-176.tar.gz 1590912 BLAKE2B aac3ac90e4dfc23aa137cf69c6323419bdf29e9b9212b0aec9cd77c2325cb97c2f2e9a752dbe1171e7d6bf36999d45a9eff52e43735ede496575b05b5bbf7b87 SHA512 3e91dd69eb485f8b5005af91f7cffa7c05c08cfdc786af4fb6cbca4a79332b3e59c3faf98e34729ce2f231ca44161f002d93ea50b7c2ab2fa2ebde182c37b829
-EBUILD diffoscope-175.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
+DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
 EBUILD diffoscope-176.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
+EBUILD diffoscope-177.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-175.ebuild b/dev-util/diffoscope/diffoscope-177.ebuild
similarity index 100%
rename from dev-util/diffoscope/diffoscope-175.ebuild
rename to dev-util/diffoscope/diffoscope-177.ebuild
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index ec8dd245402b..3ebc80a153c1 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
-EBUILD dogtail-0.9.11.ebuild 1343 BLAKE2B 416004736b1fbe16fb366264f3c16c4beef578b0fdad98783ccaedcb356e1b9f54c5ef45e1680cc73c3aeae8608dc62211a6755db8b19c070fbc7a892213c755 SHA512 94e2bb98930586b8bf5aae0c6194138f622478a3fcacb1aa32a138540f902d046cd5a4d6e2e76833341c2586d621afef0fccc507598de419237a12a91bd3da57
+EBUILD dogtail-0.9.11.ebuild 1350 BLAKE2B ad347ad74b3f7421a63a5a153f0c1112ff8a67266d195e7368995119b172650337e18025bbef72329a2d778e0a38b6ec4d8722e29cabc47f43e5a99a50c190f1 SHA512 7de8b0058cf2505e37653fda7c2aab056067917021ed320282bc0e85566d814220cc18ca6de3e7d8a0b0a9613fab06e5bdf9e1d84bf79a946a67edc3777ef83d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
index 89c5bb69956a..90994c0714ee 100644
--- a/dev-util/dogtail/dogtail-0.9.11.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 4c4ac73106a0..77066c1812b4 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,5 +1,7 @@
 DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
 DIST flawfinder-2.0.15.tar.gz 253677 BLAKE2B 5c4a0e21e0a7f144382c6ca25f713aef9bdb413d4bb5a73f66632ef365f55c75e755ab59cf92fb54dc2d043c8b88be8c28d5f5fca36df6795dabc00313b839f2 SHA512 12b637bae789ee86710c7d6ee203b811e78414ad5d173730bfffe3ea783a76ce999878c57ddaa8019744cac6bf94967663fd9fd80769d7a24b0a79d23c0b0d9d
+DIST flawfinder-2.0.17.tar.gz 259899 BLAKE2B 03a3cf425eb9f2cd2a8528d574c1fd9ed1d00e4dfc5f47556f7d49db041432d311e08754220eedd8492bb6d747ed31a0da67eed5f878ede207b1118e3db5da9a SHA512 8691e561e634d6562d43fca9ac8c505b62435ac368c1b038b84eabbf60628513a0410de60b53592567d07a9552b97112ff8406ddc9aba3512a3b07846d28a8c6
 EBUILD flawfinder-2.0.11.ebuild 782 BLAKE2B 73c59c1af865aa768a8b9c8202de9b17f67ba7a53a4ed5dac79db2b5165f45cf790d7d54d1499a995396447fa5c786a26211d5541040ee7de4e6d6a60509673c SHA512 7dea1626824336d141020c1b4ab286863a19ae6231ab49e56357ed9057c433c5723ac9853fa2ff69665cc506848600f4d0ca049a19fba90bb537e2f1bbfdf330
 EBUILD flawfinder-2.0.15.ebuild 779 BLAKE2B 49f2d5e6085500ce54f59da74fb11c3024cb92dfc9fac2ef0204fef38491559cdf6fe8cca01928ed08f8b22e21b093ae74fca7555a2d43054b7e039837f6782e SHA512 16c48a4a0220dbf91d53565e312b253cb4b6d0bb5249191058459add21e302eab6b002246514d9c7a717abb79064f3dbae6126c287fd1e3136146821cf43f04f
+EBUILD flawfinder-2.0.17.ebuild 781 BLAKE2B 6d468c360c1b0cdb57a6c39806de80a2ac0b626e19d92c293532b57bd9d354642c37ea70b84742554b14f218d9fa2de2636ab9837cc82cab7b6078012f082c09 SHA512 69dcd37e29618c83c4bbad6f0a931a52216d9bcbe8f94f24deaad6ba8adad8e8c03b696c37da8a6a3ecc4ee003188969b1b911a54b9b67beba5de6a6646439cc
 MISC metadata.xml 483 BLAKE2B 28c5e9484510661e7b29519fe4311bea3cee9d5197a749c38b71b7a06363201e77b3bb34fe984175befd900ad7e8342d2694769e14d61e92b14bdbd095bb83d4 SHA512 b3cf7b35c84c7a35f140a2385c25e6a186b21c9f11f871af4295ce11de6123a71215efdcd0c4c665a8911de509b58bab5ba13c35f7e4af2909698fbf08213a7a
diff --git a/dev-util/flawfinder/flawfinder-2.0.17.ebuild b/dev-util/flawfinder/flawfinder-2.0.17.ebuild
new file mode 100644
index 000000000000..9305ed78d86a
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.17.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
+	default
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index d376bab01421..bc7e2a6b7b1e 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,3 @@
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
-DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
 EBUILD howdoi-2.0.15.ebuild 684 BLAKE2B 9f7cb5189659a41a8f1cc416557a676bdf309253390f801a43653bab3edfde6cd0f9b40452cca0943b9904fcf1951a0ea97ab31d984cbefd722c913f39d40bf8 SHA512 b3660bb4744592976f51a12f814d3c8c1d92581f20a5997a3cc582f8b5f053877fa59b9e64fd43a33dbeb9c662b6e8a84cf0ede02e12113f53290e5b14066036
-EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
deleted file mode 100644
index 7f0d6beafd7b..000000000000
--- a/dev-util/howdoi/howdoi-2.0.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/jarwizard/Manifest b/dev-util/jarwizard/Manifest
deleted file mode 100644
index 16768751687e..000000000000
--- a/dev-util/jarwizard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jarwizard_250_src.zip 169540 BLAKE2B b4fe55b2f9ef8e1ed05a2823b9a2fa5849f241b7a41f921aecb2aad43297e1d2a47fc1a33897813e8078d438b11a16b5c7242a1acbef4e08c8cb82d03ab04a5c SHA512 8d40cecd339e8e50b58c2c78a3c53b712275d95393d8ace4799b55a7f66f6e2a4bfd3348f92d6022d1d48c6edf17117c2b1bb1defc55e73fbdcf541907eeef1f
-EBUILD jarwizard-2.50.ebuild 682 BLAKE2B c948226c4489a78e68594a275e8a9f096d29543e456812685879f2b5c70bb264d36d42b4d109ce8a0aeea2f6ec771da7a50b6480b958a209b4500924a14aaba5 SHA512 b4008de8c0f28fb87e8c15452cd42110acd10f39d0ed4019f5c7889f07e7a00ca52c3dbce3931ea202843c075e758d3d48fd06875bb83dfc3dba4c61ce159538
-MISC metadata.xml 315 BLAKE2B 7f29647cc44b98eff26b0fa5b83e2b23c9090dcfd0664b39ea83d455ff11227461ce57720c32a82f6e12fa3d337edd01ecf0e415ec311c40f3064fee281f0f66 SHA512 91e4126398b25c29af33c39af19f08f2eb8069c7595dcd752b347b4db0d232e4315708d2baf92f31f6ad7805f279a96b10891b73de53c0cc9331a0e9a404f82d
diff --git a/dev-util/jarwizard/jarwizard-2.50.ebuild b/dev-util/jarwizard/jarwizard-2.50.ebuild
deleted file mode 100644
index d10d098ad575..000000000000
--- a/dev-util/jarwizard/jarwizard-2.50.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Takes the hassle out of creating executable JAR files for your Java programs"
-SRC_URI="mirror://sourceforge/jarwizard/${PN}_${PV/./}_src.zip"
-HOMEPAGE="https://sourceforge.net/projects/jarwizard/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-ant_bsfix_one nbproject/build-impl.xml
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-	java-pkg_dolauncher ${PN} --main JarWizard
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 73c8dbd3ea48..7ad841cb5336 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -3,8 +3,8 @@ DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c
 DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
 DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
 EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
-EBUILD pkgcheck-0.10.1.ebuild 1514 BLAKE2B c0f86e1bdc8c9c74babe33395234bb6c12e6bef221c8bcf8398d406441b1455bd6d671e5db7ec1a9757cfafb733e6a70c2a6e617d60ba8e533ad63a97858f810 SHA512 3da204b82c34dd3b0d8bd73c842dcc1541cdcf1c29c5a89b29d1ea73e60506e970d2520a9d45194fc303fbf5994a391483f39cb3796afdab2cf3a7ef993f65a8
+EBUILD pkgcheck-0.10.1.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
 EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
-EBUILD pkgcheck-9999.ebuild 1514 BLAKE2B c0f86e1bdc8c9c74babe33395234bb6c12e6bef221c8bcf8398d406441b1455bd6d671e5db7ec1a9757cfafb733e6a70c2a6e617d60ba8e533ad63a97858f810 SHA512 3da204b82c34dd3b0d8bd73c842dcc1541cdcf1c29c5a89b29d1ea73e60506e970d2520a9d45194fc303fbf5994a391483f39cb3796afdab2cf3a7ef993f65a8
+EBUILD pkgcheck-9999.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
index 1d0d90fc9dd7..9a255efb0571 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
 
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 1d0d90fc9dd7..9a255efb0571 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
 
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index d4ac497c397f..510732a2d189 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,3 +1,5 @@
 DIST poke-1.2.tar.gz 6772669 BLAKE2B 9b3c8c425145be7c93c32f7931f7aba04ae3704920603f8301b8af31cce49ae12c83a697e74f7cec803508bfd165b7bbb1c5a859ce95a791d291528c31b24245 SHA512 70a4b8749ca53e255df76ca32cc401ba58d5bea2ee1c01730dadfb1d76a6c286f44137805c801e0f1e520c59306568a87efe56d44175ec0510954f97b640d331
+DIST poke-1.3.tar.gz 6703563 BLAKE2B 7a1127d668b094f08d88fbbe1650a4604d91e4417e8bf7e1199757b6a829694d514493e1b71eb86fc56e894eec8f0ec2255784b76a3f3440af1f1671d851751f SHA512 74749c589daf17533807248febc54818445df193f4d25f665ab62f1c57be133c7f063da3b099b8af5544f88eecad79b10ca29d9d1ef18921035c0aa22e563773
 EBUILD poke-1.2.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
+EBUILD poke-1.3.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
 MISC metadata.xml 373 BLAKE2B 5a16b41a8e507a250ba57aa741890c395eb484af1535229199399f68d62da619298d10583fd7b8d454139765526307ab3f0486814a5ccc22f32eae413e2f4abb SHA512 a74066509b1ac23992121781cb2befa222e250467e9d54ee1cff7d5e7cf5df81d86a44b0eef3768d22c0105f8f1136843f54ef1f5111e1ed8f3659f9eba1898d
diff --git a/dev-util/poke/poke-1.3.ebuild b/dev-util/poke/poke-1.3.ebuild
new file mode 100644
index 000000000000..3683b23922d1
--- /dev/null
+++ b/dev-util/poke/poke-1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="extensible editor for structured binary data"
+HOMEPAGE="http://www.jemarch.net/poke"
+
+SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="machine-interface nls static-libs test"
+
+RESTRICT="!test? ( test )"
+
+# TODO: libnbd: not packaged in gentoo yet
+# TODO: gui: does not seem to do anything :)
+RDEPEND="
+	dev-libs/boehm-gc:=
+	sys-devel/gettext
+	sys-libs/readline:=
+	machine-interface? ( dev-libs/json-c:= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )
+"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-gui \
+		--disable-libnbd \
+		$(use_enable machine-interface mi) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 148e21e8ebef..2313111e3a1d 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,8 @@
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
 DIST radare2-5.2.1.tar.gz 8302475 BLAKE2B 2edfa30d15214ac4dac6065349c808b539619413e7a100459efd5bf74e95c2483edb1ec13de8387d3a7dcfe25a2922ee377c37f4781c374df04e63fe98910b7e SHA512 c744f5c8fff163022a7a9a913fe34dfa0dee0d9ab3b18bd4cc038c2d487dbfeba2f1523aa12a3166a2c22c45bcc71e802fae101b72fc2e6adab96b522c0de17b
+DIST radare2-5.3.0.tar.gz 8498461 BLAKE2B eabee04f347a71cefac4dbd3516cb3161b6e4f1f831285039ece81981121a058d3b39224c68afd4cea38fea2d99b23e770210ebca6b01e73c21882e80de757b5 SHA512 f9d5ffd6f39efdcd447c2bc65ad3129576292a11942c99da8d0c10217621a6d1db72baaf7badadcbbaf75c54be0439a9257de4f56d47cefdce457ffb08167ff8
 EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 EBUILD radare2-5.2.1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
+EBUILD radare2-5.3.0.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
 EBUILD radare2-9999.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
 MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
diff --git a/dev-util/radare2/radare2-5.3.0.ebuild b/dev-util/radare2/radare2-5.3.0.ebuild
new file mode 100644
index 000000000000..470b4d0d33f8
--- /dev/null
+++ b/dev-util/radare2/radare2-5.3.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="
+	dev-libs/libzip
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+	default
+}
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
+		fi
+	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 1ec6253615f3..f72bad6c7557 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,4 +1,5 @@
+AUX rizin-0.2.1-no-rzpipe.patch 432 BLAKE2B 77e959797f22ea6d32e6742651710ecb042bfa6bf00efccaedcd3d60a6f75c0bdb42128261ffe068d8cfaeb6d7abacef6ea114ffb9061ca365533a1fe2120c34 SHA512 7a03664ed99ea7f9cb214b566e2a74a0aee1ebfa643552ce90f4e7fb60e779628ba75c4cf34ffc3cc45b65d1dd8959d400a9af16bc49d7cc26f1499670ddbaa6
 DIST rizin-src-v0.2.1.tar.xz 51439132 BLAKE2B 3ce048c5e93afa43b33bb7c36e7f7a96734886a44a67339c18b36de84b6e3dd015aa49fd048815bc7cb26a39bd3c44ebd00227fdb0c3dc9d9f07ff2ff1f1948d SHA512 4d0a68971a8fe1de3860f8ee18197606f59c22d4c24f3fcce691c73b45c8fe8c356a9b411604e9c3d4e5bb01f695b6ead32cdc217134eb4ddfec76867c16c327
 DIST rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz 119214206 BLAKE2B 33916d466d77aaa0aeb6b221529a570a2bd2ad07b59b45967d75a84e3efbbc8ca3b8fff9cd88d61598b4e785ead2f8bc58eb7c1cb31007c27e497d80f36e4d2d SHA512 9b01a63ff281ac19b427e715d669e6080c4afdfd777ae762c30537c59bd2cdc2865adc1b34ccb61430b172e54995375b48bb35fd88f098b6a9839e9f3669fde4
-EBUILD rizin-0.2.1.ebuild 1940 BLAKE2B 6184cfd36d6493d157bc7ac4342f1056d6067a9e81a01289a937802e54291d6a8447ce58ca1f20571a26f8581df0597775c7e97de712d507e42779e438de716d SHA512 7752b4c408b340409d847905b19d53d1bdee062b1fc6b361666d6f2664fa3322a23755c051a90242efcde3df032f2fcad6ab5c00e9b343bcb7661d8b4c694fa8
+EBUILD rizin-0.2.1.ebuild 1993 BLAKE2B 81cc0938db42c14befb96a1b5c8733be2c3ea16360e0677cda941856854f33d303324f03c5535ae33fd596097bd77370699c32863e44904be5d30856404fa889 SHA512 442f55e61df219c96aa773f9b28910e3bfc66bc0bdcf1819df23d52796e5ad6422fe12098002161c7590728b697106f45a35518ec61917dcb968537de3970573
 MISC metadata.xml 459 BLAKE2B 90d71202d4ac6732aac13f9b1e36b485682fef7381b52b20e904c6f502bcea0a12b2001c0b74e82e0924f29ae9e3c21cc4ceaed2a1e54a2218f8e25d23d5ce20 SHA512 0ff5f7f10ee319340283ed838f371c13943b78b2b57ff2be8cdf6203d591e952a610eabf4266111a89d9dec865b7043d27a6d9ae6330940d1573733d00ecbb8f
diff --git a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
new file mode 100644
index 000000000000..3e7a6cc70c17
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
@@ -0,0 +1,14 @@
+https://github.com/rizinorg/rizin/issues/1192
+--- a/test/unit/test_rzpipe.c
++++ b/test/unit/test_rzpipe.c
+@@ -30,7 +30,9 @@ static bool test_rzpipe_404(void) {
+ }
+ 
+ static int all_tests() {
+-	mu_run_test(test_rzpipe);
++	// Disabled in Genoo, relies on `rizin` binary in $PATH:
++	//   https://github.com/rizinorg/rizin/issues/1192
++	//mu_run_test(test_rzpipe);
+ 	mu_run_test(test_rzpipe_404);
+ 	return tests_passed != tests_run;
+ }
diff --git a/dev-util/rizin/rizin-0.2.1.ebuild b/dev-util/rizin/rizin-0.2.1.ebuild
index 7f58bcca359d..08ed3c5435e2 100644
--- a/dev-util/rizin/rizin-0.2.1.ebuild
+++ b/dev-util/rizin/rizin-0.2.1.ebuild
@@ -36,6 +36,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
+PATCHES=("${FILESDIR}"/${PN}-0.2.1-no-rzpipe.patch)
+
 S="${WORKDIR}/${PN}-v${PV}"
 
 src_prepare() {
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index e6d47d5bd0d1..311191101757 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,9 +1,12 @@
+AUX 06zfscloneopts 1467 BLAKE2B e515b70b7d105470a8b32ecd8f2d88446f039424a132215bb149e7716429efc7b726630de9bda9ff0cf197a8ba777ce2f0e14da1709fd89a9f50e88713dc3b1d SHA512 4026af077ebbb2aa4e123af1cffa5125e5b420ac79a13f7c1a510bd6d57dc4e5c439470396ffdf0701ce7a4009044a415bed6a460cf829364b3c48cd71edd37f
+AUX 11gentoo 1992 BLAKE2B 61e4396196b7c6b4695567f74c6f17fe24ab0152a8e57da136ecefa16d30e3127b94c701bc9ba0b923fa0d3aa5ab87811aed64c656d0aa475a37dbb884082749 SHA512 98f549edae1326840f04058442c07fc8e2af70811393c106bea84426c51eea36378b6a863352cc0b2aab8efd8e81b0e70c4d10bdaeda5f2a17f51fbb3ca9abf3
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
+AUX schroot_prompt.sh 73 BLAKE2B d833a51c7a36ba45b672e1b7adc1e371c3641b53c74530abe7c21c4d3d590b59aef4ff86f33db5e4feef500e74aee9566cddaffba67c3798e202605c7fb90c22 SHA512 403145790845a1fcc49991c76c1bf76c5e38a6e86d8fa150690289f34660d7b02acb91e8ac24335975285437176e0d4f8d91a643a173962a9578938e7f0f4b48
 DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3 SHA512 77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10_p12.ebuild 2957 BLAKE2B a5489b17883aaaac9fc5c3f619e5a724092768ef60415907f0b70c77c262f6a5ca1e244e4facf51beef185c879203c1de584aca8e71cd721087f6f600ed6780c SHA512 c2c8e873c26f63588ad6f45b2c8a7d480021abda6ffd29226e004506bc6b813dc2785d16403f048e80cece7ea01cd4f742bc62151a533328bc744a6faa6f71d4
+EBUILD schroot-1.6.10_p12-r1.ebuild 3505 BLAKE2B 7a57b2481fe1c47486b74e82fc442c7a190b7a615ca97e945c4fa98d2e0a65b3e88e517bc56470bd64e785bc1a0306b0101f6b44d25e17d8fec32ba54b6cf32b SHA512 457fa94d6f75850aade78766982d9da76e486d6cd843a8f765dae81cc792d93dd903be53020ceb1fe7d8e701715b7f6f624ed7f302d2975380c8ead2ba0c9c14
 EBUILD schroot-1.6.10_p7-r1.ebuild 2936 BLAKE2B b285e3f9241e8ca1998bced999d9e8c60cfeef9a6705bc48af724fed626a2db1aebb66898d4342751b5e8935330b9d0cdfe18ffb88f638a37008703d79b2cf3b SHA512 490bf8a58156f74f14a8407fe5fbbacdec7c9596b0918e37753e4261d914c9712877db564ac5faaba080658844419589f9b563e0389522fb7b0d5e3501bc370e
 MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/files/06zfscloneopts b/dev-util/schroot/files/06zfscloneopts
new file mode 100644
index 000000000000..e66f0885e78f
--- /dev/null
+++ b/dev-util/schroot/files/06zfscloneopts
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright © 2020       Georgy Yakovlev <gyakovlev@gentoo.org>
+#
+# schroot is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+. "$SETUP_DATA_DIR/common-config"
+
+if [ "$CHROOT_TYPE" = "zfs-snapshot" ] && [ -n "$CHROOT_ZFS_CLONE_NAME" ]; then
+
+    if [ $STAGE = "setup-start" ]; then
+
+        if ! zfs list "$CHROOT_ZFS_CLONE_NAME" >/dev/null 2>&1; then
+            fatal "Dataset '$CHROOT_ZFS_CLONE_NAME' does not exist"
+        fi
+
+	if [ "${ZFS_CLONE_OPTIONS+set}" = "set" ]; then
+        	if [ "$VERBOSE" = "verbose" ]; then
+            		zfs set $ZFS_CLONE_OPTIONS \
+	    			"$CHROOT_ZFS_CLONE_NAME"
+        	else
+            		zfs set $ZFS_CLONE_OPTIONS \
+                		"$CHROOT_ZFS_CLONE_NAME" > /dev/null
+		fi
+        fi
+    fi
+fi
diff --git a/dev-util/schroot/files/11gentoo b/dev-util/schroot/files/11gentoo
new file mode 100644
index 000000000000..ddf2df305c68
--- /dev/null
+++ b/dev-util/schroot/files/11gentoo
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright © 2020  	Georgy Yakovlev <gyakovlev@gentoo.org>
+#
+# schroot is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+. "$SETUP_DATA_DIR/common-config"
+
+if [ "$VERBOSE" = "verbose" ]; then
+	VERBOSE_OPT="true"
+fi
+
+if [ "${PORTAGE_BASE_TMPDIR+set}" = "set" ] ; then
+	if [ "$STAGE" = "setup-start" ]; then
+		if [ ! -d "$PORTAGE_BASE_TMPDIR" ]; then
+			fatal "$PORTAGE_BASE_TMPDIR does not exist or not a directory"
+		fi
+		if [ "x$SESSION_ID" = x ]; then
+			fatal "SESSION_ID is not set"
+		fi
+		if [ ! -d "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" ]; then
+			mkdir ${VERBOSE_OPT+-v} \
+				"$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID"
+		fi
+		mkdir -p ${VERBOSE_OPT+-v} "$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+		mount --make-private -o bind ${VERBOSE_OPT+-v}\
+			"$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" \
+			"$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+
+	elif [ "$STAGE" = "setup-stop" ]; then
+		if [ "$CHROOT_SESSION_PURGE" = true ] || \
+		[ "${CHROOT_NAME/#*_master/m}" = "m" ]; then
+			umount ${VERBOSE_OPT+-v} \
+				"$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+			if [ -d "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" ]; then
+				 if [ "x$SESSION_ID" != x ]; then
+				 	rm -fr ${VERBOSE_OPT+-v} \
+						"$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID"
+				fi
+			fi
+		fi
+
+	fi
+fi
diff --git a/dev-util/schroot/files/schroot_prompt.sh b/dev-util/schroot/files/schroot_prompt.sh
new file mode 100644
index 000000000000..bd72f2ce5b83
--- /dev/null
+++ b/dev-util/schroot/files/schroot_prompt.sh
@@ -0,0 +1 @@
+[[ -f /etc/debian_chroot ]] && PS1="chr: $(< /etc/debian_chroot) ${PS1}"
diff --git a/dev-util/schroot/schroot-1.6.10_p12.ebuild b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
similarity index 84%
rename from dev-util/schroot/schroot-1.6.10_p12.ebuild
rename to dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
index d1292d3caaaf..0a4a39d4ed2f 100644
--- a/dev-util/schroot/schroot-1.6.10_p12.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
@@ -101,6 +101,24 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	# debian-stype PS1 for chroot
+	# checks for /etc/debian_chroot file, which is created by schroot
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}/schroot_prompt.sh"
+
+	# gentoo /var/tmp/portage handler
+	# e.g. portage.base.tmpdir=/var/tmp/portage in config file
+	# will use a subdirectory of hosts $PORTAGE_TMPDIR
+	exeinto /etc/schroot/setup.d
+	doexe "${FILESDIR}/11gentoo"
+
+	# support for zfs clone options.
+	# zfs.clone.options=com.sun:auto-snapshot=false
+	if use zfs; then
+		exeinto /etc/schroot/setup.d
+		doexe "${FILESDIR}/06zfscloneopts"
+	fi
+
 	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
 
 	docinto /usr/share/doc/${PF}/contrib/setup.d
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index c568094bef15..ff3efd36ff48 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,5 +1,7 @@
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-capture-3.36.0-r1.ebuild 754 BLAKE2B bab0ff01030d72f2ab0df460e5972b32cfc72a16f5e924a85575e060ff1f796ddf3fdb4f67670204988088dfe838c561888d47486cfe93aaffa2c128501857d4 SHA512 9d7cf4c5d7e569d751a097d1d71e6451b7bff42993bc88c5d0e136d3422b6e30780bfd93fdaaa5477a17df3a5da6503c162f16e6adfc0e775d8c22041125ed40
 EBUILD sysprof-capture-3.38.1-r1.ebuild 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
+EBUILD sysprof-capture-3.40.1.ebuild 802 BLAKE2B 6c7c9ec9d004736b821ebcc58f98b7500bb675f27ee456d01b8f0661d5150d2126aed5753b5a2519a689c42a6b6f799604d209dfeb72a616ea691cb6e2519cea SHA512 4ca2e26a42aaf7f422b5642d610319d222e0a3db66a85d893bf210e570d507e8ef859c3a37689b72445628087b6ba605a9063b31f7bbc21c80afef58b3f1b45f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
new file mode 100644
index 000000000000..6b494d32578f
--- /dev/null
+++ b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org meson-multilib systemd
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=dev-util/sysprof-3.34.1-r0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Denable_gtk=false
+		-Dlibsysprof=false
+		-Dwith_sysprofd=none
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=false
+		-Dlibunwind=false
+		-Denable_tools=false
+		-Denable_tests=false
+		-Denable_examples=false
+	)
+	meson_src_configure
+}
diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
index 9508cb6e95b2..42717a10494d 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1,3 +1,5 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-common-3.38.1.ebuild 494 BLAKE2B 9508543ab0484eb5ed0348dfd83f8273554f0610c2bec17727b459030044885416fb9e22c9b7c20cec762a64f5239cdbedb185f87d85c23cdf7c972f9b7755bf SHA512 95862717922174ff70179a7f150432620990a4888c928707326d607500d14dad7a40e54f2385ace9e253738618dc09ce7b987c61ee07c1b5c916bc561b45f689
+EBUILD sysprof-common-3.40.1.ebuild 501 BLAKE2B 7d7ad07960402699d823c12288f578b9eade51153c1adf6d3f5d6030cc7cf088ed323a423700bddca5b480e3f9fee1d9846a812702e293df148dd85494de7a1f SHA512 7454af2b21bf08c02bc73bf5178124be47b72e590742ffa403c238239ed8d9b5afe39271fc1f8e469d517fb68e149335fd216655bba6822b81ad7a5b03a127a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
new file mode 100644
index 000000000000..96a57b010725
--- /dev/null
+++ b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!=dev-util/sysprof-3.34.1-r0
+	!=dev-util/sysprof-capture-3.36.0-r0
+"
+
+src_install() {
+	insinto /usr/share/dbus-1/interfaces/
+	doins "${S}"/src/org.gnome.Sysprof3.Profiler.xml
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 699f41802e06..6735579b4d7a 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,3 +1,5 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-3.38.1.ebuild 2277 BLAKE2B 87bc003c5230751fd2b4d0e4e1f12aaf158a537782cd508b0bc6f41cf298e3086b9ef1db94ece81c583b30968d347f9c98a6d16b46bc91b699cac3a54844e153 SHA512 09c022e05fc883bc4a58087c6e82d086182d2f3d7df766792ebfb17a3a00b2a72112f6fda3de71942a18d6cc25dafb0f2a776ffc730a740067394ab52077c260
+EBUILD sysprof-3.40.1.ebuild 2299 BLAKE2B 8c379c6f8ba046aa15121913147d66bbd8054c216c0dfa4a2b7f172fdee8a2df486f8f5ecd819e7d9a974512d6430819c94316e3085804aa9aeaac0740d139af SHA512 7230ff104fbd2220bf9f69ebec65e2809980454c49c6487093a483dcc24edeeab7c5e8a2ac2beab973a68c59e60b0f4f6aedb2471f805a815bcc97b3ae051d66
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/sysprof-3.40.1.ebuild b/dev-util/sysprof/sysprof-3.40.1.ebuild
new file mode 100644
index 000000000000..bbcfc1400ed8
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.40.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+API_VERSION="4"
+SLOT="0/${API_VERSION}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.67.4:2
+	gtk? (
+		>=x11-libs/gtk+-3.22.0:3
+		>=dev-libs/libdazzle-3.30.0
+	)
+	dev-libs/json-glib
+	>=sys-auth/polkit-0.114
+	unwind? ( sys-libs/libunwind:= )
+	>=dev-util/sysprof-common-${PV}
+	>=dev-util/sysprof-capture-${PV}:${API_VERSION}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	# These are installed by dev-util/sysprof-capture
+	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
+	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
+	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter
+	sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die
+}
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dlibsysprof=true
+		-Dwith_sysprofd=bundled
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=true
+		$(meson_use unwind libunwind)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 0690e565ddaa..13bf3ebf84e1 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,6 +3,6 @@ AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2
 DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
 DIST valgrind-3.17.0.tar.bz2 16459075 BLAKE2B 96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c SHA512 94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f
 EBUILD valgrind-3.16.1.ebuild 3700 BLAKE2B d9cafee6c49c3055d3dae53ca9702ead5c6c6380fd7ec4954d97e00b938616c4734cad17bdbabefc7d053e7606cc7350b79b1920eff960023ec507168f24cb74 SHA512 a1fa319bbe947b54676e7603d56c42b4af808bf93149e1b3a14ca837c33b747dc07161a41833c377b948099fed8ad8bb8f2ba664a3e9c3841a0f7171f0acef00
-EBUILD valgrind-3.17.0.ebuild 3702 BLAKE2B 1c48db6fd4d7484f2a1b5237de2e6c54412c70f81faa6c4b88e128e5a97ce90eef01102cc51b050a8a2a2ee569bc2627f8d42f429c0d54308acd0debc2a45d0d SHA512 66a053b01fa785fe154046d9533f5e6550b7af58a181f50e652ddeec645ece2dcd4b2c88b4d345568f430d9c2ddebac8edfc385ba10b476c9f7dc870bfe46d0b
+EBUILD valgrind-3.17.0.ebuild 3700 BLAKE2B d9cafee6c49c3055d3dae53ca9702ead5c6c6380fd7ec4954d97e00b938616c4734cad17bdbabefc7d053e7606cc7350b79b1920eff960023ec507168f24cb74 SHA512 a1fa319bbe947b54676e7603d56c42b4af808bf93149e1b3a14ca837c33b747dc07161a41833c377b948099fed8ad8bb8f2ba664a3e9c3841a0f7171f0acef00
 EBUILD valgrind-9999.ebuild 3706 BLAKE2B cd2e4f588afd417b9c70042304e5a6db83baa2d4b1f182f5bfb7636d4455e027366c3047f7f639ede0a9cef446cadf1893b9784eaeb734692fddc55dbc6fc7d3 SHA512 c04f648a07d6cca1dd196c7523338ee295ab504d561c84ef8154391fc5e6b6a72a43b132cd3615525937609bbb917df46d79c586c6195d99da22d9a3381476f8
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.17.0.ebuild b/dev-util/valgrind/valgrind-3.17.0.ebuild
index 56f858162a01..890f41044529 100644
--- a/dev-util/valgrind/valgrind-3.17.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.17.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 52d2eb59112e..622777301cc4 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -3,6 +3,6 @@ DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4
 DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
-EBUILD vulkan-tools-1.2.179.ebuild 1881 BLAKE2B 252abfa8852cd7bc645b42ce55f0504729a3de0e3a1a39b2b816d35a0c990f979b00d852cee77223a37424f053db992d4d2a41ab325c3bf52f6da1ec05673d16 SHA512 4f64a3978ddc6a8f0984bcecb0aaa79eb410c11fe6741c80f5c712a8defbac80374ef4f183021f478de659094842ea93d6ccb3c4ce77978cdcbce601221284ea
+EBUILD vulkan-tools-1.2.179.ebuild 1886 BLAKE2B 9c2492531c87da11e3a5cdb6c9fd863ae721013392c867a0ab47f21a07b872e910d13c2c0147bb364dca8c0dca0bb59a2f31cbab9d48d7861427b2d2e43e7851 SHA512 314aa393ac36a75192062eac58ea3eeb3fbaa5d67565757db67cf30a674fa49cfe16a675d413cdcd0249d03b9e559a94a06ff46610c3cd28565f1a8bd699ff5c
 EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
index 14d7bb81d120..dd3ff96da94c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 46ebed247815..1435d04fde34 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 158fb38c198d..3a58d7de91d3 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -17,25 +17,25 @@ DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af69
 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617 SHA512 3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd
 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95 SHA512 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
 DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2890f4c9ecaaa375f985313bb8e14fe7a70c1beff3009a9102b935e4a6065019ab3b2520f09339e2a0fcdb93 SHA512 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
-DIST git-2.32.0.rc3.tar.xz 6503248 BLAKE2B f7d2d2b39c43747734a422c87eed14f29275aa7f62718b61fb8d52906680aec301760daff325953d6460085a13cda5c82f25f294d8dbf64800ec7c9b99d8fec6 SHA512 567873b78120476ea1072ce89c1370a3678796e9afe1871cbf7983c290b75d54d2c0192e44de8c265c1f24bf393adc92edfa159a7c82b000e1caa39ebd5eec5d
+DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909
 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2
 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237 SHA512 7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297
 DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e5805b0cd331b459d51a71ed913ca68d1aea6c6c69cfadbe8b6101b4d7be63c3811027a2ed42f9d2b0d3509664726b8ad78 SHA512 d243f4e3047c0e29bdd9127ff529c7fab5ebf40a4afaa04c3a9261ae398aa61c16a4413b7bf580c7f874d632b866908d92322ea0502141d811b78b7636c8d28b
-DIST git-htmldocs-2.32.0.rc3.tar.xz 1381412 BLAKE2B ee11bcc32aeab0b93fb5574c1f2ed2e1159970486477f27ab8a1a5a59f2ec0711f11dfd41ea7d8ebf28dee78bcd0b802bad62ef70ad28f5dfe5aa4dbf341d793 SHA512 919da4cf36092c7c9bca99041ff0971ed7595140997dc8134bd66eeafb989531bd42ce7a13dea6e7d2e4d7853765a12672da339026695d04b905aa23cb3845fe
+DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9
 DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd
 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
 DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd
-DIST git-manpages-2.32.0.rc3.tar.xz 491920 BLAKE2B 3952ac4635c6481c433b8ccbd3f195a86180e671fbc88cb2f73793d19c9c16d639636bc1488acbc023d3d13beb9095cd1479d8a4ccbda5f329073f9f0ef5b329 SHA512 1211a7f026cf692b24bce1a3fe82c5c4187d615715c45e880e516025fac6d19f38d370468592640bcb5498116420418a3097d9ad296c18e115e3b12086269061
+DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 EBUILD git-2.26.3.ebuild 19107 BLAKE2B 179378cc1e95801735e26890af170385d10b66987745fa222405e7b16a261b888b13b11314aed0bccbdf1f96aa522fbe941fb41f4c4fd65ca32271810e0cefe3 SHA512 0587749fb008de4ff70a238fdec702e5cd8d50946c01a1cc780445f0dd856c3856ddeb24396e810285695b161a678913739cbd8cdc7bca9bd82daf916f942ad3
 EBUILD git-2.28.1.ebuild 19115 BLAKE2B 961dd5d1a8cc9fcc93bb6edbd8be11135272e569429fff34d468e498888b1d1bc8e4cc609ad03152aa4adf2d674ca87c2dfafcddda5521638a0fb34fb8c17728 SHA512 b0f5d927f70a09ae0607f362014c62f01960cbde0f82850b59c855f5eedaa255c532d7cd009df86b288043f65073a6ddf223355562db69824dd26a3ae0260f99
 EBUILD git-2.29.3.ebuild 18172 BLAKE2B ecffedbbf6d6936c50e11a42d658270ae8830694f3ace431893d33384c5aadb6f13d9b996fb43cb50c20461d3db6b438fb870a02bed78e1be8355590cfe9eaf8 SHA512 0ae5cd383ded761461492acd67acd910cb0b46ee6ce54747b03452e4c4358baa41ba276a0574e8f9bc914a1e5eb252eccd52bae3b44de6b76e3b96b6d6e1003f
 EBUILD git-2.30.2.ebuild 18173 BLAKE2B 4429fabf567077c22a78f25430c44b5a37ae7322445b57cd22f7e95a4153f41d2b879a48b16fcf8b2855ed08d4a60c529f972e31ccb0cd03e1f9dd6b829510d7 SHA512 eaddad6c5a51f1fb8e3df432c63ed27bf418acbbe42d312a9903dd4fccc833ec9150e134cd57a78661a04ebc12a1632953c42e226df3cb8516876b21cdb6cf75
 EBUILD git-2.31.1.ebuild 18055 BLAKE2B ea16b293db77aca43fdd3f63b0a51d4c550d50a161cfc9f996597abf75c7362b84a27fb2ea1a1959505c0c65960a5a0ac88d93b197312b20da6828d9c6da091a SHA512 5f4c6ab18bfedffe5a85323cf04e424c9f7fdfbd8f3d55d7ef784f03e7d5973c602c4779ad59beff4b9f0f9d9a00fd603e0ba4a8f2bc9d7459b231a4d6c00f01
-EBUILD git-2.32.0_rc3.ebuild 18064 BLAKE2B c0b71b212216fa28e4a70629162a2a5dcebc144a2dbc85275e3cfd7f6c1bebe51577ef752abb69d72625897c7ce096b44081d4374900ca7e0ac83f74d7cb1a76 SHA512 dfcc3595b4ec0f90b31ac5e804b4f3fa50f485a0012c774f0231c1f71f6aceb78464a3fc5b743b4a325f8290182b156b86278b1626e0aa42100f5985ad357abe
+EBUILD git-2.32.0.ebuild 18064 BLAKE2B c0b71b212216fa28e4a70629162a2a5dcebc144a2dbc85275e3cfd7f6c1bebe51577ef752abb69d72625897c7ce096b44081d4374900ca7e0ac83f74d7cb1a76 SHA512 dfcc3595b4ec0f90b31ac5e804b4f3fa50f485a0012c774f0231c1f71f6aceb78464a3fc5b743b4a325f8290182b156b86278b1626e0aa42100f5985ad357abe
 EBUILD git-9999-r1.ebuild 18036 BLAKE2B 2f5763790baad0c4c27f05ac837649f9c861ed2ab4c3f84f80cbcd8f7413320aca9f0a1337e4f1f89487400ba2cc22e6cd882fbba3113ca67a53d9d9f1027e60 SHA512 1c040da8a1335a44b807b14f6b89cde15794481d2e7a05decd7693b6d1baa655b3edf15e705f02361feb661bf6a7b3be7ed24e29de814fe957cf4ba6e35fcb59
 EBUILD git-9999-r2.ebuild 18036 BLAKE2B 2f5763790baad0c4c27f05ac837649f9c861ed2ab4c3f84f80cbcd8f7413320aca9f0a1337e4f1f89487400ba2cc22e6cd882fbba3113ca67a53d9d9f1027e60 SHA512 1c040da8a1335a44b807b14f6b89cde15794481d2e7a05decd7693b6d1baa655b3edf15e705f02361feb661bf6a7b3be7ed24e29de814fe957cf4ba6e35fcb59
 EBUILD git-9999-r3.ebuild 18066 BLAKE2B ded96d874acbaf9148591d4e0718d16aad9e6c8a4686483a559498f98d399e9b965e56d87f51a3c4077f3bef8f0c541ef2e259ec8479e126c224794a42f56b2c SHA512 10e5f75804a4f61d2aad099a76f21b14eccd1b71fb060dc7e1bed5dc5ecc0750db4f0dd4d13b7f4cf500fbf22ba71802e838a245302f1d229ad27b68c60708a8
diff --git a/dev-vcs/git/git-2.32.0_rc3.ebuild b/dev-vcs/git/git-2.32.0.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.32.0_rc3.ebuild
rename to dev-vcs/git/git-2.32.0.ebuild
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 39233942042d..421cf8e975a4 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,5 +1,7 @@
+DIST hg-git-0.10.1.tar.bz2 145345 BLAKE2B 6d8b7fbc2fa8994fea8d619606f2c6f03cb16e0438e07ee566545fb23d053fae3d28cbf120170b77023f5d17fa0d38fb816d8d9e82fe4ef911a9734d791503b8 SHA512 6fffc560c95985d121c8306b7562a50b72aa24e877f97301f67dde0bd435043519cbff0e6e0635111b352a89555d974ff9567f560bb7c60d3fa6bf67f660ef7c
 DIST hg-git-0.9.0.tar.bz2 129138 BLAKE2B a3758d3ff4daae98bccb71ac5471418b191596d7605c5fe867fde230a8deaacb3097b7f5f6f34ee55ba871a850c1c6f7cb6c1e9c05e388419136aecd66b775ea SHA512 03982292f042b9b48f58eeb04413f563b35fa8be1c31ca27825db8fbf293e4dfcb4bb62b6f504d82438a11c967496fb9bbd6aff5d77ae7eefdeb7747c53fcb82
 DIST hg-git-0.9.0a1.tar.bz2 128165 BLAKE2B dfe415a26554d6de714b64aa79f771e08f2c7ac02ee42732524b85a6572003bd428ea29823774d5ea4fa0eee251629bcbc78d9421773c312925a0114e51098ff SHA512 43119bacd4bfc169c8403b3d67e14609ada454a7635c50af5db3683ccd36e1d3be2ec0896204f0850b0cb0c09ded24ae723ad3eb6ddc381553f8c2b2ff2c84a1
-EBUILD hg-git-0.9.0.ebuild 789 BLAKE2B fc287d89547d833d811db0d1c8ef60bca27f87fa83cb06b08683121a4be802f25d966f8ed9929d4fde1ea2cd45b159ac073cd706cee1b916f30d543c15cbc19e SHA512 cd9e5e417c871635da196917e93382bbea4c3f4f4cdaad8f05c604f3d2e334e993c5deb84a15b8762dddf41ebafb6dc3302bd5e8f5b234b252d9b92330b3f593
+EBUILD hg-git-0.10.1.ebuild 818 BLAKE2B a3fb018aacf852070a041484cfb1424f7c36b35222cd98561556e452f41a894c9ecb4668a6b354a4507ee317114b0301b5f00a460f0aa6147ee01f4d0dd86609 SHA512 051def295c8f70f3cea3af2656a77fe348266858eab28a61892571dbaa242f3a9499de35e4b1dbf3bce17bdf0040242c05cc4541f650d5435d4e9066174edc86
+EBUILD hg-git-0.9.0.ebuild 816 BLAKE2B 83917189f748ab8d8a3f1cea4d3f1b71a3e79d0e42d79c4318be724a45acc2c98b2207e1beaefe62fade43f04b1feee73217e1fa5e6434de46e6be926ebb5eec SHA512 dee9b5a84425aeedc48d3b41d0ea0ca1476e21aebc75b3bbefae7425212af1f406c53a538294d6231a857973228dd4b293f6b18c2254d2d41f46f87df0249829
 EBUILD hg-git-0.9.0_rc1-r1.ebuild 786 BLAKE2B d4b149d3c34d63750f2bdd3d4af23ac290e6069c9067badece26d3f1cbbb70864cb1ae533e548017c1f2f0f1cd1fa0bec0d26d0689a6325b8cd097040e3301b9 SHA512 0a98580e0b923df1ad39c1712ef8ce32b43df82cd7bfdd1cea0b7601f3cc8baf3f38c57e1308f72c79ea05eb2e6a56e2b13e27af5e8198edc214f3950730fa48
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/hg-git-0.10.1.ebuild b/dev-vcs/hg-git/hg-git-0.10.1.ebuild
new file mode 100644
index 000000000000..d65dc94f4e0e
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+MY_PV=${PV/_rc/a}
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/"
+SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-vcs/mercurial-4.3[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-vcs/hg-git/hg-git-0.9.0.ebuild b/dev-vcs/hg-git/hg-git-0.9.0.ebuild
index 90a198efd46f..029e03374969 100644
--- a/dev-vcs/hg-git/hg-git-0.9.0.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.9.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index 244c38496ff4..b51b207241dd 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,5 +1,5 @@
 DIST python-gitlab-2.5.0.tar.gz 148916 BLAKE2B f870833a01adac08b71dc402bc11ba9c1be19c920735faf04de9bfca3b1a154706da4bc0475437997e3b03d8c9a56977a6691df05b750d64a1f8b964ecd05612 SHA512 7382f9ea2388c6916f3c7e63df137d73f0fdfb3890a8bbb47e766f3476b6febecd1dcbc588445ae1af1b5f17c9a3e6ed9a931fd9fff010c2c37967eab5440824
 DIST python-gitlab-2.6.0.tar.gz 153577 BLAKE2B 4fa0206faa601061fde257988362eca962c9e20f50e5ad57d602a76618581db646f26b035d4d86b9c460ef75f241fcbcdf360419b2e62ec6f95a664ab237d7d2 SHA512 b63dd4657b44fb484d114ceddc1d67465c17560978a8e6b09a9b14634ae6d80bf864b9b4583ddfc102c27c1082f4a015958c30944a734ec635761af524956fbe
 EBUILD python-gitlab-2.5.0.ebuild 804 BLAKE2B 6f5ebdb0b2aa68916406be761995a4ef0c02ac4d62a9790f60a7a03a007c5d22a596cd937f98b1b613c48cbcfeafd640d83688760287ad63ca1fa02b90f9b72e SHA512 796675f445b95e875facf3e35d90847cd36b111e57b264df058bc5debec35a3a358840921497d467da0e7b37dc8c1f7c0b96b00fd3a45b141a77d5442a3df803
-EBUILD python-gitlab-2.6.0.ebuild 869 BLAKE2B 81cbe2002567ccf074b02aa8c4a9e770c0b5c4ee84df49bd9526730bbe35b9639133b0f11a27792b15b43553052177ee95350d529b6c174bdc1a9c9f16e0c280 SHA512 717a234093a1c15f136ddf7f58a683c4c0583d684acb06f632f8eaf78ca910692f33bbc8a6e2af5a75851cd75392dcf4fc152b48a6f4b75a6d0283011420a6c0
+EBUILD python-gitlab-2.6.0.ebuild 871 BLAKE2B 32f482401fe23f7ede34d0c356af982281ef73192f9bc0eb0e088f5be0dea91cecb5bc8f9b565765d4c57a72f28523440549c1180c03a1515ef39d7ec5352c53 SHA512 2dcfb1ca31adf2106b37a8d4844af4d3db75b5ed324985064f5a08658b460b8ac091235ce5b51c656bced170abb3f035971a26d121447d74075f477b5d6ae3ca
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
index 615fc53453b9..a622256dbf98 100644
--- a/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index 107efd3fbb4c..fc72a1240459 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,8 +1,8 @@
 DIST tig-2.5.1.tar.gz 1144666 BLAKE2B f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1e831068341a430c36418d6a412b29caa3a44e3fafb3131d93b6d8d62ade4c92dc06fe753f040957b9e64e6 SHA512 e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0
-DIST tig-2.5.2.tar.gz 1165288 BLAKE2B 8f054f2074829b0b6b5b3b0eb533dcbd86d57ace5c12b4a5dcc32c336928889f6caf680f934c8ce12c2a27a2e6b48e7d5cee634ef936cac02ddb822b5c5b825c SHA512 9ba503d69fe52ce717bac66b4f0147b4d073cf2993083c4837b2383c6b74f5f3884e98d6f701ff1a5d434f7a898774e0243010ead0561bb119a98b52f3a10179
 DIST tig-2.5.3.tar.gz 1165632 BLAKE2B 398174578b9723d7825c7162b59d2a1a92da161b3f3b8896c1d121ed36c8a0a1c52f676325b3a3fdd0cea9961c7f4234bd1ac594d9057cf6707cad22a3eda35b SHA512 2339c6c93808b6fbcda4ae29e014e7f4edda5f16df46e466d1d14a9f65dba10bff9df6363f37c369418336f362d5e38dbaf7fc4d99761997cc39722ba6132aec
+DIST tig-2.5.4.tar.gz 1167930 BLAKE2B 620dea0d5c4cd670b11e143195145dd268ba4762ce5b3e56a393bc6af6e508349c5f3581dff9f118d047ab8e7b431b64c85431f5af5719cbb9c63117394b265b SHA512 8c2c1d3aa980d3a6619501a770bb5210db445200e46939e2c122db1fd684ae9857eee4a06a8b6622d5d683457f11629522b121e0b429eec6d11dce4f4020dfb3
 EBUILD tig-2.5.1.ebuild 1290 BLAKE2B 55ac7685c1797ab2de86865e5c19f4d011ab498b23fb3f91375b7017395cf60ec66e67addf8d96ebdf09926aa0d3d94cce2d4a2513ff8fc9c93e5069699a1a76 SHA512 a6f9bb48b4b7bffaad5a8475f3f75c611c91d8d50cc9f67e8cdbf307f3c293fb4e760a36dff3c7a6919b7f4eb4c90223a64c19cf9ac698f815e4ef867d971904
-EBUILD tig-2.5.2.ebuild 1363 BLAKE2B c5cb4fc150bd302db42061346eda899787223ede2438a8dc7a62329cf1e23b6f01f914471540d9e7f4cdcc6daff22887507144069cb019c52c69aa6d8accb6c5 SHA512 a7a418f340ba17c677c672e4544d11def090f0305ce41554667c5b1433aecfed2bdbb573ec1e9781650fd3e16160c7f071bedb54e0392ffce2251171c0580757
-EBUILD tig-2.5.3.ebuild 1363 BLAKE2B c5cb4fc150bd302db42061346eda899787223ede2438a8dc7a62329cf1e23b6f01f914471540d9e7f4cdcc6daff22887507144069cb019c52c69aa6d8accb6c5 SHA512 a7a418f340ba17c677c672e4544d11def090f0305ce41554667c5b1433aecfed2bdbb573ec1e9781650fd3e16160c7f071bedb54e0392ffce2251171c0580757
+EBUILD tig-2.5.3-r1.ebuild 1281 BLAKE2B 6dc537909f6956de8fa2c6e5eea75b78ab58c391e8c8357f8eefd1ff0acec784b043d161bc0727261a22c3a8e3fb0220b21b5aa1b06070d897fdcd0c4a8c5daa SHA512 ea6c2a7c9f17feeefc1d7ecb710b05ce9836e0aef0f355a2563b911f5421a370360e9c8a48f9bff396492a835ad3f8fd4ab5a2344bf2f0ce95972f30ce4d39cf
+EBUILD tig-2.5.4.ebuild 1281 BLAKE2B 6dc537909f6956de8fa2c6e5eea75b78ab58c391e8c8357f8eefd1ff0acec784b043d161bc0727261a22c3a8e3fb0220b21b5aa1b06070d897fdcd0c4a8c5daa SHA512 ea6c2a7c9f17feeefc1d7ecb710b05ce9836e0aef0f355a2563b911f5421a370360e9c8a48f9bff396492a835ad3f8fd4ab5a2344bf2f0ce95972f30ce4d39cf
 EBUILD tig-9999.ebuild 1295 BLAKE2B 1cc93adc21d1da03403dc196674871555a68f2e5ddf59d94a320dddbb5d03f4b49c6d9255cc64b6721e1bee791b86dd42f980ae5eb116c66e93345eff2d946d8 SHA512 54f2ce9cac3858d74ca03255654eaa9310de703311a7d10cb3aa9f1df66d5e89d051a810ff47648bbd6a2cd1b0b4aa8c9f00318d64b6f83dc83da31fa4e30f41
 MISC metadata.xml 716 BLAKE2B 646f183cc6cc5110a69304f5343a0f1dcc9f42c82d8e16d0a06102b8052589d92bfffee948c78d2d4ce0ae6f29f1df38ae034c6fa160471823bb4457bcfa6603 SHA512 ae1521940d81aa080326f070b79a8a0a01b2ec1406088695e1e8462cdd78ce046131f9542c878ab5f919fa75e3c91aff0739a12511d18693ae050183db10343d
diff --git a/dev-vcs/tig/tig-2.5.3.ebuild b/dev-vcs/tig/tig-2.5.3-r1.ebuild
similarity index 93%
rename from dev-vcs/tig/tig-2.5.3.ebuild
rename to dev-vcs/tig/tig-2.5.3-r1.ebuild
index 56e1d461373b..9164067a481e 100644
--- a/dev-vcs/tig/tig-2.5.3.ebuild
+++ b/dev-vcs/tig/tig-2.5.3-r1.ebuild
@@ -58,8 +58,5 @@ src_install() {
 	dodoc doc/manual.html README.html NEWS.html
 	newbashcomp contrib/tig-completion.bash ${PN}
 
-	insinto /usr/share/zsh/site-functions
-	newins contrib/tig-completion.zsh _${PN}
-
 	dodoc contrib/*.tigrc
 }
diff --git a/dev-vcs/tig/tig-2.5.2.ebuild b/dev-vcs/tig/tig-2.5.4.ebuild
similarity index 93%
rename from dev-vcs/tig/tig-2.5.2.ebuild
rename to dev-vcs/tig/tig-2.5.4.ebuild
index 56e1d461373b..9164067a481e 100644
--- a/dev-vcs/tig/tig-2.5.2.ebuild
+++ b/dev-vcs/tig/tig-2.5.4.ebuild
@@ -58,8 +58,5 @@ src_install() {
 	dodoc doc/manual.html README.html NEWS.html
 	newbashcomp contrib/tig-completion.bash ${PN}
 
-	insinto /usr/share/zsh/site-functions
-	newins contrib/tig-completion.zsh _${PN}
-
 	dodoc contrib/*.tigrc
 }
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e36b09fecce1..9abb81426007 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 2d721ffca878..4c25ff3aef88 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -945,8 +945,6 @@ preinst_headers() {
 # see inline comments
 
 postinst_sources() {
-	local MAKELINK=0
-
 	# if we have USE=symlink, then force K_SYMLINK=1
 	use symlink && K_SYMLINK=1
 
@@ -960,14 +958,10 @@ postinst_sources() {
 
 	# if we are to forcably symlink, delete it if it already exists first.
 	if [[ ${K_SYMLINK} -gt 0 ]]; then
-		[[ -h ${EROOT%/}/usr/src/linux ]] && { rm "${EROOT%/}"/usr/src/linux || die; }
-		MAKELINK=1
-	fi
-
-	# if the link doesnt exist, lets create it
-	[[ ! -h ${EROOT%/}/usr/src/linux ]] && MAKELINK=1
+		if [[ -e ${EROOT%/}/usr/src/linux && ! -L ${EROOT%/}/usr/src/linux ]] ; then
+			die "${EROOT%/}/usr/src/linux exist and is not a symlink"
+		fi
 
-	if [[ ${MAKELINK} == 1 ]]; then
 		ln -sf linux-${KV_FULL} "${EROOT%/}"/usr/src/linux || die
 	fi
 
diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass
index 0589318ef519..ddf44f354e17 100644
--- a/eclass/lua-utils.eclass
+++ b/eclass/lua-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: lua-utils.eclass
@@ -212,7 +212,9 @@ _lua_get_library_file() {
 			die "Invalid implementation: ${impl}"
 			;;
 	esac
+
 	libdir=$($(tc-getPKG_CONFIG) --variable libdir ${impl}) || die
+	libdir="${libdir#${ESYSROOT#${SYSROOT}}}"
 
 	debug-print "${FUNCNAME}: libdir = ${libdir}, libname = ${libname}"
 	echo "${libdir}/${libname}"
@@ -274,6 +276,7 @@ _lua_export() {
 				local val
 
 				val=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD ${impl}) || die
+				val="${val#${ESYSROOT#${SYSROOT}}}"
 
 				export LUA_CMOD_DIR=${val}
 				debug-print "${FUNCNAME}: LUA_CMOD_DIR = ${LUA_CMOD_DIR}"
@@ -282,6 +285,7 @@ _lua_export() {
 				local val
 
 				val=$($(tc-getPKG_CONFIG) --variable includedir ${impl}) || die
+				val="${val#${ESYSROOT#${SYSROOT}}}"
 
 				export LUA_INCLUDE_DIR=${val}
 				debug-print "${FUNCNAME}: LUA_INCLUDE_DIR = ${LUA_INCLUDE_DIR}"
@@ -298,6 +302,7 @@ _lua_export() {
 				local val
 
 				val=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD ${impl}) || die
+				val="${val#${ESYSROOT#${SYSROOT}}}"
 
 				export LUA_LMOD_DIR=${val}
 				debug-print "${FUNCNAME}: LUA_LMOD_DIR = ${LUA_LMOD_DIR}"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 368353482f79..df04490461e3 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 b5ad5cd8249b..2f3724443551 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -2,6 +2,6 @@ AUX gnuchess-6.2.8-cve-2021-30184.patch 1949 BLAKE2B e40c05ab4e2d459685ffdd6ad0d
 DIST gnuchess-6.2.7.tar.gz 802863 BLAKE2B 2fea825cdf0e629b3c2e9965d16f432edff81ceac8e7fbfd99b7be93f7281f813b10b91a62b3823acbf8967af538b04d2d87f93abde4a580e659e1fbdc5966e9 SHA512 1ed9e9344fbfc8e78504290a44e2710acab53f211c4349cafb7b64cc9a1fa923fbef4b4cbe3dd96438049b1da21415db3eb81fe663a94551c30105207086e343
 DIST gnuchess-6.2.8.tar.gz 804080 BLAKE2B 7079c07ae7cd2f225c428a7bf14d53eec394382508544994918b87db35d5cbdeb9cf42a11f5bc2f9c0c7b778384d6cdb9aad4490bc9cfd40a513fc2e36cbdd67 SHA512 9146ee727c1eb8002eb3b1e762d71876b512eff0799eafec7019d5312766fe2bd6655c622e66f86e92f80d2f3666e48158a1245b42c30bd3221a8b379689ecdd
 EBUILD gnuchess-6.2.7.ebuild 379 BLAKE2B 40744e6f5027920c0b3b9689f8eef8343fa152ff3af013772389aa7bcb04563364a00579b71e345da527ae3f6393a5520d543f7da7d870ab02b558a0afa7b3c0 SHA512 ad55b40e15bce4b2d77f29d64582b76412a99f82e1224e58efa805285889de13abf545196ed6c88342db943a1a5bef9d339bd2449c007d2be2562a341e46b1fb
-EBUILD gnuchess-6.2.8-r1.ebuild 453 BLAKE2B 494038e9b9b8082a566186004eb5fd0fae01b79e66f8c3de1cb933d5e90e01fd069397eca59ece3938a8596a5090ea6988979ee2c62a4967678730ca863e51e3 SHA512 fb81ac3e4922b274cf82ed01f69af4085dff7d4dfa6d5f396011dc255b8dd4e6435560a6c914f689f59e16d0dd012315b064be2d0c0407d883472d3d505443ce
+EBUILD gnuchess-6.2.8-r1.ebuild 450 BLAKE2B 519362e18f8a442f7ba7026f134a0830e09a0c1179b2129bd9ec4670a8a500ec5c4a78327466640f3a992e258633494695b66ba29c9416aaaff200f4bb1c3959 SHA512 f0e27e2caa92c0e6e3c81dc61630bc149885d9d9c919eb77a35bbb57e0bf0476202423c9c2326635ecf7c52688ec8103212b4710576307123274e39f6991e491
 EBUILD gnuchess-6.2.8.ebuild 385 BLAKE2B e1afa7629659877190c8a0b1e06abe8b79eb85a9f9c510128298258bf65ed92e9f37010cc06934a4716a5fff24e977defdaf1385012f7a38a570cf07f1fac1bd SHA512 97639646920219246b1e733ea9930af989054267a3ef15c81ff2237419701bc1845e7ac118b479c8c38a80261b434a3a0b40bab6037a68df18cdba3da115727f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild b/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
index af4c32879a82..1c78b6b397c9 100644
--- a/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cve-2021-30184.patch  # bug 780855
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 37a69d24ffb7..7dd9bdc9649d 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 37c9cb44bd99..4487aa8d6d42 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,4 +1,6 @@
 AUX openmsx-16.0-libsdl-joystick-fix.patch 2101 BLAKE2B b2381fe41d014106f87a11ccc8f5f301bf033d4ff281a11280b4b8459cf62f81c29a2d07220466ab7cb59005f14157857f3ff566e1f00ddfc104ba68b199dfd5 SHA512 f2aa3b1e69879db9a315e6485db67382228827caa2d362f9f1843a76741d2bb6f909ed05664d88608c01910914e3c40d2e5600a78b276111e242f51145e3c9cb
 DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
+DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
 EBUILD openmsx-16.0-r1.ebuild 2940 BLAKE2B 63a22b96330eb87055d2910d910aa5ee31f30354a3aa87ad290572975b77401613eb18e9986ca3e2456fb4c15b0ad2922215968eb0c65fdf7767fe64742068ce SHA512 46be0450204bb95639a0822f6bf90824c8b728ceae2c67e79731da1b52f6a82ca0c62fe8fe41ef3a0dcf4bc71535e54c46d09976d90d12d18efe14713814dab6
+EBUILD openmsx-17.0.ebuild 2882 BLAKE2B 2aa8a567b5080dd487b9c7c69138df9acf2e3523fe57a57d5cfa74a7659028d1d8eba3aaa04696f941865c8878f175b8bc8249dda1dc5884b61a959c6dc12834 SHA512 4ce326368598aa63b83eb8da63f6f4f5250f4b8c5ba2bc078e4c2fbaaa26a14b9b261885e729c1f16d152fb66ec37c9a4fc36e5200acbde404c9659e824aa896
 MISC metadata.xml 441 BLAKE2B bf3b3c54e5f7f516be2e3a275aa4bf7bccd83a868fae021f2d7d0c7b4fe007708d3e45c2c47ed6b0b02ddf7fc84f770c739e16c53d1e7ca17107511b9c2f83ac SHA512 240545c7c338a6b69134a851ee14f3657e2463fe5f6bc47ddba64beb3dc3b037146e81d10a712fc5addbe54507e2269a2b7bd58a2f0d6133cd4fe5327f266c4c
diff --git a/games-emulation/openmsx/openmsx-17.0.ebuild b/games-emulation/openmsx/openmsx-17.0.ebuild
new file mode 100644
index 000000000000..e64f1d8a6d6c
--- /dev/null
+++ b/games-emulation/openmsx/openmsx-17.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit desktop flag-o-matic python-any-r1 readme.gentoo-r1 toolchain-funcs xdg
+
+DESCRIPTION="MSX emulator that aims for perfection"
+HOMEPAGE="https://openmsx.org/"
+SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+joystick"
+
+RDEPEND="dev-lang/tcl:0=
+	media-libs/alsa-lib
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick=,sound,video]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	>=media-libs/glew-1.3.2:0=
+	sys-libs/zlib
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+DOC_CONTENTS="
+If you want to if you want to emulate real MSX systems and not
+only the free C-BIOS machines, put the system ROMs in one of
+the following directories: /usr/share/${PN}/systemroms
+or ~/.openMSX/share/systemroms
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^LDFLAGS:=/d' \
+		-e '/LINK_FLAGS_PREFIX/d' \
+		-e '/LINK_FLAGS+=/s/-s//' \
+		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
+		build/main.mk \
+		|| die
+	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
+	sed -i -e 's/GPL.txt//' doc/node.mk || die
+
+	# Build system only configured to use bundled version - but not from the
+	# directory it's distributed in
+	cp "${S}/Contrib/catch2/catch.hpp" "${S}/src/unittest" || die
+}
+
+src_configure() {
+	tc-export CXX
+
+	# Doesn't compile without this, and build system doesn't consistently add
+	# it properly for all compilers
+	append-cxxflags '-std=c++17'
+
+	default
+}
+
+src_compile() {
+	emake \
+		CXXFLAGS="${CXXFLAGS}" \
+		INSTALL_SHARE_DIR="${EPREFIX}/usr/share/${PN}" \
+		V=1
+}
+
+src_test() {
+	# To get tests, we need to build with OPENMSX_FLAVOUR=unittest and then the
+	# build is stored in a directory of the pattern
+	# ${WORKDIR}/derived/*-unittest/. This is separate from the actual build,
+	# stored in ${WORKDIR}/derived/*-opt. The unittest binary and the workdir
+	# binary are in each of these directories under their `bin` directories.
+	emake \
+		V=1 \
+		CXXFLAGS="${CXXFLAGS}" \
+		OPENMSX_FLAVOUR=unittest
+
+	# There will only ever be one *-unittest directory
+	"${S}"/derived/*-unittest/bin/openmsx || die
+}
+
+src_install() {
+	# To guarantee installing the proper binary in case tests were built,
+	# specify the default OPENMSX_FLAVOUR
+	emake \
+		V=1 \
+		INSTALL_BINARY_DIR="${ED}/usr/bin" \
+		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
+		INSTALL_DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		OPENMSX_FLAVOUR=opt \
+		install
+
+	einstalldocs
+	readme.gentoo_create_doc
+
+	for i in 16 32 48 64 128 256 ; do
+		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
+	done
+	make_desktop_entry "${PN}" "openMSX"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 596690f6e45c..c5b311bbf0c3 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 c0122ec3bc3c..d0f28295e5b8 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -8,6 +8,6 @@ AUX openmw-0.46.0-recastnavigation.patch 988 BLAKE2B 3d9dd71a02070268fe21006fda2
 AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9def640457bcc8ce9df842e4423e8fe9634f7069a820602710fe4315d06801159aff53520843f92155865d294234f4712fed7 SHA512 fb156f963aa103fc04b515faec0ef536e47da78da9ee5fbc2cc4ccaa51d382a229d3ee8a07b007d34442200834a9aba41489cea85e90c73f9acc6943e2274079
 DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
 DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
-EBUILD openmw-0.46.0.ebuild 4271 BLAKE2B 266aa3ea0493528004925f517259426ea49fc4c1dc65dd061af105311e24c8c9e3946a2051a6a51ede62fb04d7c7788f2627fdd0143ef729871114386a58ab36 SHA512 bd9eb1cb1fcb3cc886a25a324199ef8140da9b485f4871a968921c98f502dc7ab417a605f8b9ec8d34620d704f571300d0fb91cfbed0deb207598ea584e73033
+EBUILD openmw-0.46.0-r1.ebuild 4277 BLAKE2B f6416dd5c4bab80f5b53e6b3b1154a2c8951ca5fcd298d0f7075357716f74eec90d35058d1a0982e0a8a54896771fff5e376437bdad5818322e712046c7c73b4 SHA512 c9d57f03500ba4e8d4c4a03b6a47bddc570e705e0e899626271ac70d25138860050b40d3843be68049a80ef7086d82a5a5abb1ebc3cbd12cfc2ab7ef9d4a1ab7
 EBUILD openmw-9999.ebuild 3722 BLAKE2B 22b5f1ae5910526a369e8e12a42f99df6ae4c07aac965eed34fac152a41069c6ba2a2673c5852aff806ad76ead799f33874bb3c0726df45d13147d5176b3ed79 SHA512 f6cb2ba05beca13214e1389571e5e70d6d2292cf4b1940d85a4a0f206882c5ecebe46c709aef6fe48375cc35ad0133a92896b07e045673a2126a7ccb7e0bf1a2
 MISC metadata.xml 1453 BLAKE2B b8731f5073cc74dbe2b17b776227e19c226a9bc3087996263d689771f8bcb8ceed06ef81b3a28dc693532f36e57a028fae2adc18b32dcf22bb6115f686643e63 SHA512 ead1390d762da49cb57fc978a59cde9ba1c77fb4a539c69250c98adf2ea836e1b231a939a4e0b1a88b7cbe804ebc7973a91e85f14cb701a97c983728b4bf8b0a
diff --git a/games-engines/openmw/openmw-0.46.0.ebuild b/games-engines/openmw/openmw-0.46.0-r1.ebuild
similarity index 97%
rename from games-engines/openmw/openmw-0.46.0.ebuild
rename to games-engines/openmw/openmw-0.46.0-r1.ebuild
index 9b4a6bfa4e9d..673fcc9aaa33 100644
--- a/games-engines/openmw/openmw-0.46.0.ebuild
+++ b/games-engines/openmw/openmw-0.46.0-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	media-video/ffmpeg:=
 	>=sci-physics/bullet-2.86:=[-double-precision]
 	virtual/opengl
-	osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
+	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
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 53e10d3a3145..4aaca619486b 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 8b32102cdc69..d8dc3e3678b1 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,4 +1,5 @@
-AUX quakeforge-0.7.2-gentoo.patch 1365 BLAKE2B 486c303505940d78b982b92848b04532a77cf2a5896d1cb26b9cf4dc013dca03aea0686102e42a30f7c4038819859c69f01890f55632c0d5af1102cf91d23f86 SHA512 521ba870e7b04e98c4d5507f661b0bfe7f18dc3901b671aed8c03c7691466e4e67f382d0fe05545eabff3ae684b8ed39e6681b4179348682f9adeb3eab177d9d
-DIST quakeforge-0.7.2.tar.bz2 2887823 BLAKE2B 27526b0e5491cc9a052f70c387c46b0d5518c0d63264f799cac81e471a87b978c9edcf22f4a68db25b8c05b7b51371504459e8ba5de450719e92aae712940cc7 SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55
-EBUILD quakeforge-0.7.2-r1.ebuild 3100 BLAKE2B 16c34ae2ad3e0b827ec82d5fccf993b312a4819296d0c0714c8ac8f974bad0abb217389f346c926f88787bff21fedcfaa4872c8116de808e3da2a13ff3fc996f SHA512 92b942153f275b9e0a0b300dee691ba42af0bb5e5dbd304bd45a5fc35c95e83d68983d08499d33d3bc619468944a828ce24f421be5b277e53e9d24a7c3280ac1
-MISC metadata.xml 1685 BLAKE2B f2ee32565cd97551e6cd22200d0ce2332a014b774511b172dc1e2b486a27e417af441f1f944b8325bf23dc7363e46a01fa6b51237353f8964e98dd5836357cb3 SHA512 caf9d7549c8e5d801f8d626b8a4c2528735a13fa2c721f4b9d5c9ae74ae15ee55c22f165d3027fcfed8309d6bf1face5dea9ebbb1b8624d679658c6768d77bc0
+AUX quakeforge-0.7.2_p20210601-png-stub.patch 230 BLAKE2B fb1185bcbb377186bcacff8156dd4f5724882057b75af0cc42745471fa68fc30b672f589465d05603ded336b5370f9220aa6fb23546923317ca512056f5a0077 SHA512 cd5e88b23042a6462996d88034770211a59018e9ea81a498bbe4e5abd2aa4c01847c607bcd9670f6e1748bef1c4508668ed2b6f3b3b1690b392e9f9a9c93660e
+AUX quakeforge-0.7.2_p20210601-skipped-tests.patch 473 BLAKE2B a5ee046cd5b351741afe1953ddfc039df415d46d6d4f3085555466d052b0b61f58ce2684c8ea3b94817e754a12f5a423b0c98951daaa998970a89f89230a9952 SHA512 8d2f0b5f78b56e564fbf7b8602ded77f2403b0ce19d43c981e5f71d9fa7555529953447241effa209609480822e8a30e69a53b66b53618391887658435dd82aa
+DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
+EBUILD quakeforge-0.7.2_p20210601.ebuild 4879 BLAKE2B dd2ce56a125af5b069e16e159fb9d6a3c413263983d4ce1a730f6e2a53979d9247b5d1b8f953a53ddb7711e7c09853000632aefd121c74340f8ef03621c6ae8c SHA512 17da66fdac3ced92859908bc52878594661970e0fb03492ca720008c54f1a81e068f92a642b8b0b8749b65c76438799b92e6095102b4c6354784d1857da7bd59
+MISC metadata.xml 1814 BLAKE2B 88bcd7f96f83c035c1f84ec910895f7a197d5d29ac4d4c10b40baae21ecf37143a771c3f74deec60a906a6c36cf29ae2a2260362b6a891c216e1a2f40774e2d8 SHA512 c87273afde2a0776677b4c2b524eda78590311c70351101c0e6cc3c341fad95ad0c7636ac31822959722e55eb64d976c9bb777fc7a931ef946d31bf8a0826919
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch b/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
deleted file mode 100644
index 38fb0c187689..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/nq/source/Makefile.am	2012-11-18 16:57:56.658388682 +0100
-+++ b/nq/source/Makefile.am	2012-11-18 16:58:11.470268607 +0100
-@@ -138,7 +138,7 @@
- nq_x11_SOURCES= 	sys_unix.c
- nq_x11_LDADD=		$(nq_x11_libs) \
- 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
--			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS)
-+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) -ldl
- nq_x11_LDFLAGS= 	$(common_ldflags)
- nq_x11_DEPENDENCIES=	$(nq_x11_libs)
- 
---- a/qw/source/Makefile.am	2012-11-18 17:10:59.148172332 +0100
-+++ b/qw/source/Makefile.am	2012-11-18 17:11:55.866876762 +0100
-@@ -168,7 +168,7 @@
- qw_client_x11_SOURCES=	cl_sys_unix.c
- qw_client_x11_LDADD= $(qw_client_x11_libs) \
- 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
--			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS)
-+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) -ldl
- qw_client_x11_LDFLAGS=	$(common_ldflags)
- qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
- 
---- a/tools/qwaq/Makefile.am	2012-11-18 17:15:16.024714317 +0100
-+++ b/tools/qwaq/Makefile.am	2012-11-18 17:15:41.955749660 +0100
-@@ -38,7 +38,7 @@
- qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
- qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
- 				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
--				$(X_EXTRA_LIBS) $(X_SHM_LIB)
-+				$(X_EXTRA_LIBS) $(X_SHM_LIB) -ldl
- qwaq_x11_LDFLAGS=
- qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
- 
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
new file mode 100644
index 000000000000..d32fab57b7e1
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
@@ -0,0 +1,9 @@
+Fix stub definition for USE=-png
+https://github.com/quakeforge/quakeforge/issues/14
+--- a/libs/image/png.c
++++ b/libs/image/png.c
+@@ -320,3 +320,3 @@
+ VISIBLE tex_t *
+-LoadPNG (QFile *infile)
++LoadPNG (QFile *infile, int load)
+ {
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
new file mode 100644
index 000000000000..5b25af47ac26
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
@@ -0,0 +1,15 @@
+These are only failing at high precision and
+should not affect normal usage.
+  quat/simd: fails with -mavx
+      sebvf: random failure, sometimes pass
+--- a/libs/util/test/Makemodule.am
++++ b/libs/util/test/Makemodule.am
+@@ -15,8 +15,5 @@
+ 	libs/util/test/test-qfs \
+-	libs/util/test/test-quat \
+ 	libs/util/test/test-seb \
+-	libs/util/test/test-sebvf \
+ 	libs/util/test/test-seg \
+ 	libs/util/test/test-set \
+-	libs/util/test/test-simd \
+ 	libs/util/test/test-txtbuffer \
diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index bd3de0628e47..a5c31dd9bfe4 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -30,10 +30,11 @@ features, and improving the OpenGL renderer. And QuakeForge is still the
 most portable source tree based on the id Software code.
 </longdescription>
 	<use>
-		<flag name="wildmidi">enable libWildMidi support</flag>
-		<flag name="xdg">enable XDG support</flag>
+		<flag name="client">Build Normal and QuakeWorld clients alongside the servers</flag>
+		<flag name="wildmidi">Use <pkg>media-sound/wildmidi</pkg> for midi support</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">quakeforge/quakeforge</remote-id>
 		<remote-id type="sourceforge">quake</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
deleted file mode 100644
index df5368e0a3a6..000000000000
--- a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic autotools
-
-DESCRIPTION="New 3d engine based off of id Softwares's Quake and QuakeWorld game engine"
-HOMEPAGE="http://www.quakeforge.net/"
-SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdinstall debug dga fbcon flac ipv6 ncurses oss png sdl vorbis wildmidi X xdg xv zlib"
-RESTRICT="userpriv"
-
-RDEPEND="
-	media-libs/libsamplerate
-	net-misc/curl
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	dga? ( x11-libs/libXxf86dga )
-	flac? ( media-libs/flac )
-	ncurses? ( sys-libs/ncurses:0 )
-	png? ( media-libs/libpng:0 )
-	sdl? ( media-libs/libsdl[video] )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wildmidi? ( media-sound/wildmidi )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-	)
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	cdinstall? ( games-fps/quake1-data )
-	>=sys-devel/bison-2.6
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	append-cflags -std=gnu89 # build with gcc5 (bug #570392)
-}
-
-src_configure() {
-	local debugopts
-	use debug \
-		&& debugopts="--enable-debug --disable-optimize --enable-profile" \
-		|| debugopts="--disable-debug --disable-profile"
-
-	local clients=${QF_CLIENTS}
-	use fbcon && clients="${clients},fbdev"
-	use sdl && clients="${clients},sdl"
-	use X && clients="${clients},x11"
-	[ "${clients:0:1}" == "," ] && clients=${clients:1}
-
-	local servers=${QF_SERVERS:-master,nq,qw,qtv}
-
-	local tools=${QF_TOOLS:-all}
-
-	econf \
-		--enable-dependency-tracking \
-		$(use_enable ncurses curses) \
-		$(use_enable vorbis) \
-		$(use_enable png) \
-		$(use_enable zlib) \
-		$(use_with ipv6) \
-		$(use_with fbcon fbdev) \
-		$(use_with X x) \
-		$(use_enable xv vidmode) \
-		$(use_enable dga) \
-		$(use_enable sdl) \
-		--disable-xmms \
-		$(use_enable alsa) \
-		$(use_enable flac) \
-		$(use_enable oss) \
-		$(use_enable xdg) \
-		$(use_enable wildmidi) \
-		--enable-sound \
-		--disable-optimize \
-		--disable-Werror \
-		--without-svga \
-		${debugopts} \
-		--with-global-cfg=/etc/quakeforge.conf \
-		--with-sharepath=/usr/share/quake1 \
-		--with-clients=${clients} \
-		--with-servers=${servers} \
-		--with-tools=${tools}
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc ChangeLog NEWS TODO
-}
-
-pkg_postinst() {
-	# same warning used in quake1 / quakeforge / nprquake-sdl
-	echo
-	elog "Before you can play, you must make sure"
-	elog "${PN} can find your Quake .pak files"
-	elog
-	elog "You have 2 choices to do this"
-	elog "1 Copy pak*.pak files to /usr/share/quake1/id1"
-	elog "2 Symlink pak*.pak files in /usr/share/quake1/id1"
-	elog
-	elog "Example:"
-	elog "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
-	elog "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak /usr/share/quake1/id1/pak0.pak"
-	elog
-	elog "You only need pak0.pak to play the demo version,"
-	elog "the others are needed for registered version"
-}
diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
new file mode 100644
index 000000000000..504324b8b2b3
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+MY_COMMIT="53b553e89234306dc0111b107308fb42998e522b"
+
+DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
+HOMEPAGE="http://www.quakeforge.net/"
+SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +client custom-cflags debug doc flac ipv6 jack ncurses oss png sdl vorbis wildmidi zlib"
+
+RDEPEND="
+	client? (
+		media-libs/libsamplerate
+		net-misc/curl
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		alsa? ( media-libs/alsa-lib )
+		flac? ( media-libs/flac )
+		jack? ( virtual/jack )
+		sdl? ( media-libs/libsdl[sound] )
+		vorbis? ( media-libs/libvorbis )
+		wildmidi? ( media-sound/wildmidi )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	client? (
+		virtual/opengl
+		x11-base/xorg-proto
+	)"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/transfig
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-png-stub.patch
+	"${FILESDIR}"/${P}-skipped-tests.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > .tarball-version || die
+
+	eautoreconf
+}
+
+src_configure() {
+	if ! use custom-cflags; then
+		# package does a lot of fragile micro-optimizations
+		strip-flags
+
+		# nq-x11 segfaults starting a new game with -O2+ and gcc11
+		# https://github.com/quakeforge/quakeforge/issues/12
+		tc-is-gcc && [[ $(gcc-major-version) -ge 11 ]] && replace-flags '-O[2-9]*' -Os
+	fi
+
+	append-ldflags -Wl,-z,noexecstack
+
+	qf_client() {
+		echo $(usex client $(use_enable ${1}) --disable-${1})
+	}
+
+	local econfargs=(
+		$(qf_client alsa)
+		$(qf_client flac)
+		$(qf_client jack)
+		$(qf_client oss)
+		$(qf_client sdl)
+		$(qf_client vorbis)
+		# vulkan is work-in-progress and currently needs <=vulkan-headers-1.2.169
+		# https://github.com/quakeforge/quakeforge/issues/13
+		--disable-vulkan # $(qf_client vulkan)
+		$(qf_client wildmidi)
+		$(use_enable client sound)
+		$(use_enable client vidmode)
+		$(use_enable debug)
+		$(use_enable ncurses curses)
+		$(use_enable png)
+		$(use_enable zlib)
+		$(use_with client x)
+		$(use_with ipv6)
+		--disable-Werror
+		--disable-dga
+		--disable-static
+		--enable-xdg
+		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
+		--with-clients=$(usex client x11 '')
+		--with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
+		--with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
+		--with-sharepath="${EPREFIX}"/usr/share/quake1
+	)
+
+	# Jack audio is special (need a different method to enable), and an
+	# issue prevents it from being usable without another audio output.
+	# https://github.com/quakeforge/quakeforge/issues/16
+	# Given hopefully temporary, not relying on REQUIRED_USE.
+	use alsa || use oss || use sdl || econfargs+=( --enable-oss )
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doxygen/html/. )
+
+	emake -j1 DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -delete || die
+
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Before you can play (using nq-x11 or qw-client-x11), you must ensure
+that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
+at one of these locations with lowercase filenames:
+	- '~/.local/share/${PN}/id1/pak0.pak'
+	- '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
+
+You can add them yourself or use either of:
+	- games-fps/quake1-data: install from a Quake CD-ROM
+	- games-fps/quake1-demodata: pak0.pak only (limited demo)
+
+Key binds notes:
+	Defaults ('imt_mod' table) expect you to set key binds manually in:
+	- '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
+	For the in-game bind menu to be usable ('imt_0' table), bring up the
+	console with backtick \`, and run 'imt imt_0' (only needed once).
+	A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
+
+Audio/Video notes:
+	Can add settings in:
+	- '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
+	Examples:
+	- set vid_width 800
+	- set vid_height 600
+	- set snd_output sdl (or alsa, oss)
+	- setrom vid_render gl (or sw for software rendering)
+	- setrom snd_render default (specially set jack here for JACK audio)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
+		elog "Migration may be needed for ${PN}'s home paths, now using:"
+		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
+		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
+		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
+	fi
+}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 47a0bbd3075e..b038dbafb4f5 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
index b1c2a7446007..12532abceb88 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1,3 +1,3 @@
-DIST wtf-20210130.tar.gz 30840 BLAKE2B 7f959b98495a302d736064d75b63f0847c59b128320b5761efa2b9e13f80e5204e64dfb50c612081b21e5ff00c2782e5a949eb514dc4e5c0d7036ac46918d9e2 SHA512 6cd71f3e5d8a2b40509634717f977cfe1f1b366acb1bfd7a942942af1e8e639ee3ad192a5e4a9d7dd668010dea0172b5966bc2f1667bc497a92773b09c99b973
-EBUILD wtf-20210130.ebuild 622 BLAKE2B dd732822d4c7c68a1d58dfc2ffff643c5fbeff4c3582a80987c38b89298eb5246ab0f63e9cabcad37e1b31be8886ccd0c4e41dc71d463e8be7ce39d3dd4bb2a1 SHA512 1ee907620c4d9f6ba2608e7549460cfeac93b6e653ba5f6ec6d634c680c6074ea21aff8a334e05c573621ae8d9997c6653d4f2751ab28f9fb456c40e9fb23b1f
+DIST wtf-20210416.tar.gz 30867 BLAKE2B 106e6637bcbbbe30d19f5ae9718032c769ebf21c2f394b32f12e5799401b7a94b3f5029a45afea38b76c7e39df558e03b8dbd86cf5f1823ef53ac3ddd10df77d SHA512 9473759b1cae2750d85201938084e44abf1a061c1c12a0275aad0bf7ba47f5702e799802bcff8716c9b82d740123bbacb0ed335666983295c9a5792a1148a3ea
+EBUILD wtf-20210416.ebuild 622 BLAKE2B dd732822d4c7c68a1d58dfc2ffff643c5fbeff4c3582a80987c38b89298eb5246ab0f63e9cabcad37e1b31be8886ccd0c4e41dc71d463e8be7ce39d3dd4bb2a1 SHA512 1ee907620c4d9f6ba2608e7549460cfeac93b6e653ba5f6ec6d634c680c6074ea21aff8a334e05c573621ae8d9997c6653d4f2751ab28f9fb456c40e9fb23b1f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/wtf/wtf-20210130.ebuild b/games-misc/wtf/wtf-20210416.ebuild
similarity index 100%
rename from games-misc/wtf/wtf-20210130.ebuild
rename to games-misc/wtf/wtf-20210416.ebuild
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index f1f644fb47db..02b8b6e4a4ee 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index b84674b54146..7edba3f7fe79 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,3 +1,5 @@
 DIST hitori-3.36.0.tar.xz 166404 BLAKE2B 851653744c8fcd200576e93753fa3c4a5a166caf7a6efd8048f5755f3a5b096b1387db73a6e39bc4a87815a2c0f39e71cacd95d0ca9940b3a0fb734cb95f36ed SHA512 fab2f1475895e26ac540c6302902c72b4e1bf68935fd88b216e3be37990d8dc2791b15e84d9eac69d1abd43ac01e40cbe238acabbdd686bf7abb96eb59b90265
+DIST hitori-3.38.2.tar.xz 204992 BLAKE2B 271e7c7c09a0a9cf496783bf19cfc9bfb60a7a94b1addce704e0ee57b9a9d730e6fc96750dc2eb0e14cae2b0d5d8abc7474fe28029b94f0c7d195cdcbf7155da SHA512 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
 EBUILD hitori-3.36.0.ebuild 702 BLAKE2B aaadc16dff772c34c21cceb09e2d9576856b8142705662c22da13c00ba5e0bf14d6708596a53ddbbf5d6d7cd876cbc1bdfc8190175bb00d1521dcf1e318781b6 SHA512 b7c44694a9c7a765e5bc00f5da60a58d6c73e07f62200c62c2f10c14d375c524eaa23e8ed00d7329dac7a05029a709fcd6de316846171795d98f4881da8427c2
+EBUILD hitori-3.38.2.ebuild 704 BLAKE2B b5fdb69ecc171dc02b99228f8de0675addfe5f272907383359e61214097891c8230b2ce567669423062e97cba42dc6a26be365882d78e555da9db883d2ead78e SHA512 f6dc91b81412d6d46a67591ef40b3f8cd8de44ea2aa9d42aff208753862d723d7763dab27c9589a867e1927ffdc8bcce29d770d08ec8bf5e2242566996f93061
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.38.2.ebuild b/games-puzzle/hitori/hitori-3.38.2.ebuild
new file mode 100644
index 000000000000..dac7645c4182
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.38.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 54015f423885..950349e1d4c7 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1,4 +1,4 @@
 AUX nudoku-2.1.0-ncurses-link.patch 927 BLAKE2B 6a1a5c40a5d3730684eefcc5298eb6ce676c1b5df380d6d9c6453aec9a2066d89ad876a39f95678d27e00281776a3d7e81cb4b9b2719c7f82e1f2f4fd357a3bc SHA512 a93051295845a7abd7a61b74c7f718f8c59f1b7bbb70015ec3db72d1b6bb08370ab63428611ccea1d9396321e54447d8117dedb3c411e4912e801efbc1921746
 DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
-EBUILD nudoku-2.1.0.ebuild 666 BLAKE2B 3bf79bf9a9a79c82a1290917f2c41fd710e1952f866d2691034b2b859ff4140d15f7c1b6f1e34c596ac7b601dce24d7b2907f306c015d2a761e4555128bf52dc SHA512 16623d1a4ef0d45b9c45d66f0bb5503fc71abad51b1a5286c13022717ddb2311aa5dae866f227b074bf7cfc6ab7c979dcc28d81a03015500e608bba65e59793e
+EBUILD nudoku-2.1.0.ebuild 655 BLAKE2B d774320d88895741c67dfaa1440f8f62d0068d712f34b287ae346d9e9e5067d1cb31cccfdc31fc184216064c4892f972589b92daab45944b7c9daf8f5d23b389 SHA512 f8981d38845de5ab71abfd730372362624ea406297fefeaf3ec50d2540541f0fd443543af998ff25dd83082fc343d3f4531db88b6bd9ec098d03f67ef46372b4
 MISC metadata.xml 245 BLAKE2B 8fb3a3f2774de770fb66ef326ffa556ccb999f87ee12603b1491c67ac6576d70894f70122c1ebacf82338d8908884aee6b8a908487f742aee61281096ce8f06c SHA512 c085edc6403259d8375f348dbb0f80c6a7cfc49e05e6266c458d0dd9e9e4c680583f73f8dda5badfd5be648640956dc4fa55d4dff39447582edd7d30a487cc4b
diff --git a/games-puzzle/nudoku/nudoku-2.1.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
index 199f09b2bb1b..4ba0f1598188 100644
--- a/games-puzzle/nudoku/nudoku-2.1.0.ebuild
+++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 DESCRIPTION="ncurses based sudoku game"
-HOMEPAGE="https://jubalh.github.io/nudoku"
+HOMEPAGE="https://jubalh.github.io/nudoku/"
 SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cairo"
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 20a9d82be0e2..ae4aa152cbcd 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
-AUX pathological-1.1.3-build-r1.patch 294 BLAKE2B ca608731e0e25134f2ce66d8336e73fceb9a4201199a770857e6a5e8235ef387ab2bd9f7fb27f9434c8042131d09fb49eec39582d59bca3661a4ab489d181159 SHA512 ae7ba9c82cc51232b69fe5756ca5ae17d816c395b091f43c344f86439b3e08bdf2c4bcb9272f2b4e47ab1756432a9455c25c94dfe914ab2d2e5bfde99839483a
+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-r2.ebuild 2390 BLAKE2B c657f646d794914c0cbb30d2cac00ba1c0bd6c0c81459bf6b138e9ac374966192f01e76930882dee76127882f9284b31a9115fce3e1e1b1455e0e4699b06359b SHA512 c87ae5bd9acd952b5ee6275c7fdab2a357386c3c052348fa98fe12ab2d94ce428393bf7cc046a35c2ea374044a6dd6ed6541867210cb88c49404be87d4683fb4
+EBUILD pathological-1.1.3_p16-r3.ebuild 1680 BLAKE2B 3dbc7ff5690ebb63b60a2b888b86fb204ea7188af81a3db9acf3c23cfdfcc1490c79d3474ad4f044bf7e98295346d5ad2077904608675eb3169188d853ef3548 SHA512 556796261f70f0a868a6d05b5fa9d6c3bc74395739771f3520c1ced91e3b5d9cb330b3661bd968329277ac5ecf98003a38d0cf80a864c88ead05d04581efebf8
 MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
deleted file mode 100644
index 48038df00036..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.old	2019-12-25 20:55:37.932303932 +0100
-+++ b/Makefile	2019-12-25 20:55:58.584530808 +0100
-@@ -4,9 +4,6 @@
- 
- all: write-highscores docs
- 
--write-highscores: write-highscores.c
--	gcc -s -o write-highscores write-highscores.c
--
- docs: html/wheel.png
- html/wheel.png:
- 	./makehtml
diff --git a/games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch b/games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch
new file mode 100644
index 000000000000..525f30438e17
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3_p16-pygame2-compat.patch
@@ -0,0 +1,68 @@
+These are integers and use of "is" with pygame-2 ignores input events.
+
+https://bugs.gentoo.org/794211
+
+See also: pygame-2.0.1/buildconfig/pygame-stubs/constants.pyi
+--- a/pathological.py
++++ b/pathological.py
+@@ -133,3 +133,3 @@
+ 	if colorkey is not None:
+-		if colorkey is -1:
++		if colorkey == -1:
+ 			colorkey = image.get_at((0,0))
+@@ -1395,6 +1395,6 @@
+ 			for event in pygame.event.get():
+-				if event.type is QUIT:
++				if event.type == QUIT:
+ 					return -4
+-				elif event.type is KEYDOWN:
+-					if event.key is K_ESCAPE: return -3
++				elif event.type == KEYDOWN:
++					if event.key == K_ESCAPE: return -3
+ 					elif event.key == ord('n'): return 2
+@@ -1419,3 +1419,3 @@
+ 
+-				elif event.type is MOUSEBUTTONDOWN:
++				elif event.type == MOUSEBUTTONDOWN:
+ 					if self.paused:
+@@ -1713,5 +1713,5 @@
+ 			for event in pygame.event.get():
+-				if event.type is QUIT:
++				if event.type == QUIT:
+ 					return -2
+-				elif event.type is KEYDOWN:
++				elif event.type == KEYDOWN:
+ 					if event.key == K_ESCAPE: return -1
+@@ -1744,3 +1744,3 @@
+ 					return 1
+-				elif event.type is MOUSEBUTTONDOWN:
++				elif event.type == MOUSEBUTTONDOWN:
+ 					return 1
+@@ -1799,5 +1799,5 @@
+ 		for event in pygame.event.get():
+-			if event.type is QUIT:
++			if event.type == QUIT:
+ 				return None
+-			elif event.type is KEYUP:
++			elif event.type == KEYUP:
+ 				if event.key == K_LSHIFT:
+@@ -1806,3 +1806,3 @@
+ 					shift_state &= ~KMOD_RSHIFT
+-			elif event.type is KEYDOWN:
++			elif event.type == KEYDOWN:
+ 				if event.key == K_LSHIFT:
+@@ -1994,3 +1994,3 @@
+ 			for event in pygame.event.get():
+-				if event.type is QUIT:
++				if event.type == QUIT:
+ 					if self.curpage == 1:
+@@ -1999,3 +1999,3 @@
+ 					return -2
+-				elif event.type is KEYDOWN:
++				elif event.type == KEYDOWN:
+ 					if event.key == K_F2:
+@@ -2032,3 +2032,3 @@
+ 					continue
+-				elif event.type is MOUSEBUTTONDOWN:
++				elif event.type == MOUSEBUTTONDOWN:
+ 					if self.curpage == 1:
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild
deleted file mode 100644
index 9a41e9a28b0f..000000000000
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit desktop python-single-r1 toolchain-funcs
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: locks up at start with >=pygame-2 (debian uses pygame-1, fix needed)
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]
-		<dev-python/pygame-2[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	doc? ( media-libs/netpbm )
-"
-
-S="${WORKDIR}/${P/_p*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack ./${PN}.6.gz
-}
-
-src_prepare() {
-	default
-
-	# Debian fixes
-	# We don't face this bug, this way we skip needing to convert the
-	# files at build time
-	sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
-
-	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
-		eapply -p1 "${WORKDIR}/debian/patches/${p}"
-	done
-
-	# Fix prestripped files
-	eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
-
-	if use doc ; then
-		sed -i -e '5,$ s/=/ /g' makehtml || die
-	else
-		echo "#!/bin/sh" > makehtml
-	fi
-
-	sed -i \
-		-e "s:/usr/share/games:/usr/share:" \
-		-e "s:exec:exec ${EPYTHON}:" \
-		${PN} || die
-
-	sed -i \
-		-e 's:\xa9:(C):' \
-		-e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
-		${PN}.py || die
-
-	python_fix_shebang ${PN}.py
-
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe write-highscores
-
-	insinto /usr/share/${PN}
-	doins -r circuits graphics music sounds ${PN}.py
-
-	insinto /var/games/
-	doins ${PN}_scores
-	fperms 660 /var/games/${PN}_scores
-
-	doman ${PN}.6
-	use doc && local HTML_DOCS=( html/. )
-	einstalldocs
-	dodoc changelog
-
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} Pathological ${PN}
-
-	# remove some unneeded resource files
-	rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		echo
-		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
-		elog "no background music will be played."
-		echo
-	fi
-
-}
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
new file mode 100644
index 000000000000..dc1f36d2d15d
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit desktop optfeature python-single-r1
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="https://pathological.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/pathological/${MY_P}.tar.gz
+	mirror://debian/pool/main/p/pathological/${MY_P/-/_}-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	media-libs/sdl2-image[jpeg,png]
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( media-libs/netpbm[png] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pygame2-compat.patch
+)
+
+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))
+	debian=(${debian[@]/60_use_ogg_music.patch/})
+	PATCHES+=("${debian[@]/#/${WORKDIR}/debian/patches/}")
+
+	default
+
+	sed -e "s|^cd .*/|cd ${EPREFIX}/usr/share/|" \
+		-e "s|^exec|exec ${EPYTHON}|" \
+		-i ${PN} || die
+
+	gzip -d ${PN}.6.gz || die
+	rm graphics/*.xcf || die
+}
+
+src_compile() {
+	use doc && emake docs
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6
+
+	insinto /usr/share/${PN}
+	doins -r circuits graphics music sounds ${PN}.py
+
+	doicon ${PN}.xpm
+	domenu "${WORKDIR}"/debian/${PN}.desktop
+
+	use doc && local HTML_DOCS=( html/. )
+	dodoc changelog
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "background music support" "media-libs/sdl2-mixer[mod]"
+}
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
index 9edccff11199..34e780884315 100644
--- a/games-puzzle/pauker/Manifest
+++ b/games-puzzle/pauker/Manifest
@@ -1,4 +1,4 @@
 AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
 DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8-r1.ebuild 1704 BLAKE2B 51df59fb8de90a8cb03f93fbbae9e60ecc68b076eae4bab2b1a3695b716296fb1ac2828382d2ea7d8a6c553e19a588c30d240a7b373499bf9d8451f1f2dc3203 SHA512 056bfe6a4fdf2490f02a5b1681a5173b34933b29aeb8abc24e89ba4d972933e549486c10aab32f929b9058ee4f9716a7840e309de953c09a6f99a4100a6f7da2
+EBUILD pauker-1.8-r2.ebuild 1705 BLAKE2B a8f2a0f8d68cffdeaa41c6e580d4b7532cefdcca603fe5c8fdb41a962c11c14135c5a70517a2c980026843cb408514c9002788d3be6be0ddb1213736f733795e SHA512 4e3b8ae469c18bb5c126d37c415590d6ed0a1ac63b3ca810d3805da937f7503ae59383c89f163df34e05376d76ae5d4c62248aaae6e1c80ad64ba57af9a55180
 MISC metadata.xml 329 BLAKE2B ac3b4fc371bc34aec1c68eccb0be370cc51c1dffb14fa0b13c5e50aa3476a5e557686a10922379026eccc8d61e60133bc199c9746484cd6a5ff588dcdfe61f67 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203
diff --git a/games-puzzle/pauker/pauker-1.8-r1.ebuild b/games-puzzle/pauker/pauker-1.8-r2.ebuild
similarity index 95%
rename from games-puzzle/pauker/pauker-1.8-r1.ebuild
rename to games-puzzle/pauker/pauker-1.8-r2.ebuild
index 62c31d7abb45..d99c4293362c 100644
--- a/games-puzzle/pauker/pauker-1.8-r1.ebuild
+++ b/games-puzzle/pauker/pauker-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,10 +22,10 @@ COMMON_DEP="
 	dev-java/swing-layout:1
 "
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5
+	>=virtual/jre-1.8:*
 "
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.8:*
 	app-arch/unzip
 "
 
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 9c3e74fc495b..3329f72ddfe9 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/freedroid/Manifest b/games-rpg/freedroid/Manifest
index 505b0ebe770c..2ed9106d170c 100644
--- a/games-rpg/freedroid/Manifest
+++ b/games-rpg/freedroid/Manifest
@@ -1,4 +1,3 @@
-AUX freedroid-1.0.2-format.patch 762 BLAKE2B ec8021ac592995cfa5bfde3e134e432b67d74980c9bbdf733ad9938ce9d11e665e2e21695400cc7ff333d65561420917e6e8c15bd807fdb887524c67c3d9d242 SHA512 cc2a49a22bfd8e574ee466ef837e1c4a32e7529a6275c0abab507e46291c63abbf641975fc08297f63b4a6204c4436a18b053231aeaed0ee40ed86b01217cf47
-DIST freedroid-1.0.2.tar.gz 4819173 BLAKE2B 9548cc350010eff47ca13b8b4fd6b1082f16e1fe41bad5c2359aecd7834ef22b27adc90d1d33564edc63a592ffa6934224a0ee16784cf736b98fcb56d287229a SHA512 cfafa4af86a2007fcf761b51e6c7dcc6dc40f4513057413901fede41b7a436b9c8cf7c3e5c29130e5410fab640ffbdc8100043a442555e862acffe9f33086be1
-EBUILD freedroid-1.0.2-r1.ebuild 841 BLAKE2B f7e5c35d2aed93408c84fe25345ee88e02ff155163ed378f25de4334f546efc437749004f20cfb732bddfaf8077d4785e6c335d15ebf4afbf14da5bbc06bc848 SHA512 43ca7bdbdde0e3284d3e76bc7af73002675b1d5d73be26c562c3322ce7a1464f0a04ff3b3bbb577a530e82c613e276bed99a0d1df79dc66d9a8e7ee90c54eb6b
-MISC metadata.xml 332 BLAKE2B ef2f4517b0f8c02b4e6703dc065c71280ad5b06e03293977118662f2a754ec15d4a1c18980ae945018e7315bf387a49f100e7b5a48d3391f9bd8f617d8f8f3a7 SHA512 4fe0371b423de98a48fb21ec25d0fc34e393ce7c2f497e815c2f991f65507b2762b1cb68c87742bd2f3714a063828d8764ea2a815e33cba086b102d5ad672932
+DIST freedroid-1.2.1.tar.gz 5875869 BLAKE2B fab7dfb16e421394b9b0564a29a2e438152cd3d8a5527e3581823edec174986df473040d58c705765ba50b4b73105a348d39f9e61bb0721bb742c70838cdef34 SHA512 4de2174935e432f6dc4fa3a0fb5efff9bed59ba25593c7860edbddbaea77875a490c3f1e11042b57f0bb72158a3a28e111bf53bb0d10bbf051f67717d4547913
+EBUILD freedroid-1.2.1.ebuild 911 BLAKE2B 307a38b27b8f38f066b87b62f955894937c19445e6e6ea58e39965957a5b96205c7c43060cfca72a2c5e06e600bb0d880ea66f6e1d1fc98ba7bb64ea73d029c9 SHA512 ebb8beb26d977352da193bdd61dd7e67e78d66e7c75eef483664dc7af9bea4bc37f3ca80d6f9db90e2b3ce1f6b3f83f6883bd42209407f3939a545c46189ab5a
+MISC metadata.xml 401 BLAKE2B b3f730ff3b4fef3cf815013a642d49f986c6538ffac7a82a39454762c5316a114b02f691b6fa8a3c166d42f0104c821c3e3b5f95e5caf1e1aa02a8f2ffc73a36 SHA512 8bd1e8e181eb30268797acf3c0800026af7f2bd5483c1b7b80e2ee93ec536c5911978d8189a7c9773868611eb2ab69fd64377a2106600e7311cbe5f352cf4953
diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
deleted file mode 100644
index 4dbf96bda3f0..000000000000
--- a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/init.c	2015-10-24 17:37:24.431514375 +0200
-+++ b/src/init.c	2015-10-24 17:37:43.057157826 +0200
-@@ -554,13 +554,13 @@
- 	   * following gnu-coding standards for command line interfaces */
- 	case 'v':
- 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
--	  printf (copyright);
-+	  printf ("%s", copyright);
- 	  exit (0);
- 	  break;
- 
- 	case 'h':
- 	case '?':
--	  printf (usage_string);
-+	  printf ("%s", usage_string);
- 	  exit (0);
- 	  break;
- 
---- a/src/misc.c	2015-10-24 17:37:54.368941282 +0200
-+++ b/src/misc.c	2015-10-24 17:38:10.202638172 +0200
-@@ -889,7 +889,7 @@
-   if (db_level <= debug_level)
-     {
-       vsnprintf (buffer, 5000, fmt, args);
--      fprintf (stderr, buffer);
-+      fprintf (stderr, "%s", buffer);
-       fflush (stderr);
-     }
- 
diff --git a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild b/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
deleted file mode 100644
index e6eb377ac6db..000000000000
--- a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Freedroid - a Paradroid clone"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod,vorbis]
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	default
-	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
-	rm -rf "${D}/usr/share/${PN}/"{freedroid.6,mac-osx} || die
-	newicon graphics/paraicon.bmp ${PN}.bmp
-	make_desktop_entry freedroid Freedroid /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-rpg/freedroid/freedroid-1.2.1.ebuild b/games-rpg/freedroid/freedroid-1.2.1.ebuild
new file mode 100644
index 000000000000..abc1f4b7f8a6
--- /dev/null
+++ b/games-rpg/freedroid/freedroid-1.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="The original Freedroid, a clone of the C64 classic Paradroid"
+HOMEPAGE="https://github.com/ReinhardPrix/FreedroidClassic"
+SRC_URI="https://github.com/ReinhardPrix/FreedroidClassic/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FreedroidClassic-release-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod,vorbis]"
+DEPEND="
+	${RDEPEND}
+	media-libs/libpng
+	media-libs/libvorbis
+	sys-libs/zlib
+	virtual/jpeg"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newicon graphics/paraicon_48x48.png ${PN}.png
+	make_desktop_entry ${PN} Freedroid ${PN} "Game;"
+}
diff --git a/games-rpg/freedroid/metadata.xml b/games-rpg/freedroid/metadata.xml
index ca95edad2177..7a7b755b7520 100644
--- a/games-rpg/freedroid/metadata.xml
+++ b/games-rpg/freedroid/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">ReinhardPrix/FreedroidClassic</remote-id>
 		<remote-id type="sourceforge">freedroid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f8576f1e5646..c074a7d6840b 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2c43df92e460..66a4ba0597cb 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,3 @@
 DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221
-EBUILD freeciv-2.6.4.ebuild 4743 BLAKE2B 617ad28e21a810514396044c77668f18f6dc2443001ffc7e62392399e3c573fc15d869daf7e18fcaa4198f261f9decf0facd4455b857a231e680cd56a9f3006a SHA512 a1961db7bc8027c1484963504c0d7a3adf9c2d3ed1e30c582379df1c55aa9074adfd9b580802f3ce35f56df953d4cd3565cd9eb52aa2cebdd7af42ec059e6717
+EBUILD freeciv-2.6.4.ebuild 4861 BLAKE2B c385708a6bba1ab946bebf957e96195ad15c9e4658a6362e287adaaa67bc781c069990a410aa41d78138025b9fea7cd7b7f3776c407dee78de4c1bb3e8088266 SHA512 b8753fd5ab8da3eddcc929c31e897a68691e85a1109bd8b07de6feeb0011aeab21ef2e9975b82cdf4563382148d2290fffdf823b675915a4ef49a46ff62e0b51
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/freeciv-2.6.4.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index 93312c18dcb0..93e090d0ab52 100644
--- a/games-strategy/freeciv/freeciv-2.6.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+LUA_COMPAT=( lua5-3 )
+
 MY_PV="${PV/_beta/-beta}"
 MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
-inherit desktop flag-o-matic qmake-utils xdg
+inherit desktop flag-o-matic lua-single qmake-utils xdg
 
 DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
@@ -20,6 +22,8 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
 
+REQUIRED_USE="system-lua? ( ${LUA_REQUIRED_USE} )"
+
 RDEPEND="
 	app-arch/bzip2
 	app-arch/xz-utils
@@ -56,7 +60,7 @@ RDEPEND="
 		)
 	)
 	readline? ( sys-libs/readline:0= )
-	system-lua? ( >=dev-lang/lua-5.3:= )
+	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
 	!dedicated? ( x11-base/xorg-proto )
@@ -74,6 +78,8 @@ pkg_setup() {
 		ewarn "Disabling server USE flag will make it impossible to start local"
 		ewarn "games, but you will still be able to join multiplayer games."
 	fi
+
+	use system-lua && lua-single_pkg_setup
 }
 
 src_prepare() {
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 5365c448eab2..bd74d127cce0 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 68fac058fc4c..b821343b93e9 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,6 +7,6 @@ DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85
 DIST gnome-shell-40.1-r1-patchset.tar.xz 4328 BLAKE2B f26eec7cb7ab5e30b574a77cb3a6ccd251da6b33d540d05bc06c5547000631f751f9d35699d0d74ffab8e2ceafa5a66fac3067a0d511ec8e9292ced1bf626d66 SHA512 e5ce08f1fb986c5a8262651449d9444084e5968af02eaed5259d7c4600735e4a41bf8938600c70a000d1298d6a1f7c689bb08bf4943f91c5affd7f2c0ea7f227
 DIST gnome-shell-40.1.tar.xz 1876776 BLAKE2B 9facbf60759faf4d598cf423147d6385e50a324e75b0ce4e540b4b0c6e51c2ad611f70ac8e0f19d25f47d0ee250504fe7fb430d6f50aacb9ef758648ca7a2e78 SHA512 48b2800ef500b5a5102c974d8ab718946406653803942b063100c813bd4bda9ae3e1b3492872fd8158c0e44c95f6582174101fb852613ff047602efed83b6d37
 EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 6d2fe47bf102ba967ba1bcd5490f673033882e067ee6fda7ffc1c6482b5e6359f53af3337263c506d0e3e5270abb92306f5391cce713c10abaa0c09099a06899 SHA512 6e613f41d24bd0152ba4582b87afabd6ac17060d7c13462b975ff6ae8d8dab39a8c8e76a8740d0d02568f47b431360814328780f8e10937c2ce3180c446fde12
-EBUILD gnome-shell-40.1-r1.ebuild 6467 BLAKE2B 00ef1092c88ec0a9ed7f0370bbfc641d0f64a38fabc81577bc7ba9abec14e976661c837a9ddc34d912d6c0d06c53bd62d685a35cc1e52c87c79a1debcfff797e SHA512 8416dd8c74cdaa8dce5c8290b4ac5e9d865127a444ad351fca882849b3589cb376dc8d09ee94c8d96186a583245b08ec14df67640ac432f1ffa85529068c21e8
+EBUILD gnome-shell-40.1-r1.ebuild 6466 BLAKE2B 2ee6d01fc52f9adad14433761f5761834a2a94d107331edf7b1911e2e9f25c87abc4a1df7f79fd0bcada57c60cf1ca33f1789eca2e5f5fc3df34ee09743af172 SHA512 31437bbac951e5708c01627f403b2fe42ad20ea0bd21ef966cfe03ec620dd06e273e9e9e1018d1061fe66947eaf73caeaebca0897fb3ef97a944d4d484d0478c
 EBUILD gnome-shell-40.1.ebuild 6369 BLAKE2B c781a12a575b15d3aaf293e1629e40331cd259b256c486270bfc1d4e246b4d778c8c3a1f47858a02c2e49ddd2a4818a17c32f035254b81160fc54c97858fa71c SHA512 d998c3799050fdb4d33b37d4428a34a457405d5aff8da2b36d68012bb14b3e2f41437e9212b6a1e9a991221e04bad9e8dea67ffb4e83e2f5f48702f5e6dc9ef5
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
index a017a04ebf81..0e94000fae35 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index ecd892befbbd..8e5e3d59f19d 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,7 +2,9 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.50.5.tar.xz 18958716 BLAKE2B 36ca7b9316f0384dfa0063035fe3b57adc9c0a94757b81662e0e80ff19c2388d872353ba2047c8402fd586e4d3614a88e2ba29502bd16c55d8a336238954aaaa SHA512 d1d653031f20a393ba7ae56e3187244cb8e96bfa14f888b07338b80c8d947112c421a88bc57f62eaa6c8b705dde1277a7b56c7cdf602b46c1516309dd4011b56
 DIST librsvg-2.50.6.tar.xz 22225624 BLAKE2B d2822758456758ee818717db60b9136c31efa675f4c6ac94202e90a503b63aee736f995e8d23a72f50fe3b941953591d690cf99a65ddf7295e50b244186d242b SHA512 67f771c6aeaf70bc63f053ee6821e6eae545581c5381fbd3c3cd70c9f06fb2b14b584e9933108d0698abbca59c88fb0dd05d7a09925a727dfa58960b7d4f3396
+DIST librsvg-2.50.7.tar.xz 22224148 BLAKE2B 323d8125d73c9e72fefe7a868783f16332fb9e047963ccc0c36af280dc5ca4e1f6df3eee8b28b2380140634f51c1acf5b71fc496dd584ed9abf6ca3ebbb9f4c7 SHA512 064df9440802088f4414ffb70e5115809028858065739443444e5eaf6f809da47c697d31f9423e3ce9efcdeea02ff41ec39f5acf5882f2d35f433b7565be3c16
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
 EBUILD librsvg-2.50.5.ebuild 2589 BLAKE2B 4b332cd6a04c97908a61a30d18591eb3e1b7e6901637abf9aea07b93b6da06f7f6df33bcc3e3a0663a48355271779643382d9065784a3356d2ea535bb5e87cb3 SHA512 bebb2c340fa684c2d0f86d140e919423a89a787ddc3256e28ef49a5a150f1836534348bb9d1da4521760b8532e537f50f4107dc6b509063fe00787c2a1586fc5
 EBUILD librsvg-2.50.6.ebuild 2577 BLAKE2B d1f7f58b9d597ec468632c9317dd98d049f25828f701322a97ff7da5d48b29010543291c95b69d28cbbbf5dd5abf74faef01ed99cbcf7b038806e6db358be7ab SHA512 a2f73a752c007ee1e29f75b8dff78c0526ed3a724cb6be025dccf72d4dadb65680e7c8fca97f496c9676e2e03719529bacb37a0580412804ed77d0618e6103c6
+EBUILD librsvg-2.50.7.ebuild 2582 BLAKE2B 0a45357eb90576f482bc83e48d9fa5dc84b6bb5899a7a2c100632e1c20969fe9be4add91e3ab80f74aafa604154a785b3d97436d04a6653009e3123df9b6d782 SHA512 b8fbed9ce13920924d37cd2994104a6519624dc225c4b61f07c4cd34766d38bd7555173b12fc769140a49ebbb44e01645ea0611bc17d73535faed95188befe88
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.7.ebuild b/gnome-base/librsvg/librsvg-2.50.7.ebuild
new file mode 100644
index 000000000000..c7db8abca83c
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.50.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION=0.46
+
+inherit gnome2 multilib-minimal rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}
+	>=virtual/rust-1.40[${MULTILIB_USEDEP}]
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--disable-debug
+		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# Set the rust target, which can differ from CHOST
+			RUST_TARGET="$(rust_abi)"
+			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+			cross_compiling=yes
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 0d691d800db0..418def0ace00 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,7 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 DIST nautilus-40.1.tar.xz 3252276 BLAKE2B 6123fcc933f94ca405f7590ef446af0472f4ec10f5188ae3aaf9cb38a0cb1905a7cfbd69c47c5f1b3258bf915006184caeafa2e10035f0068e758a615c328609 SHA512 6421ce0c30c6f3a406a9c100b4a62e01276b10b6cdf05c9aa862a0ece89c7d231e8d3630aecfb8a1e6b40d62849c80c6c91b3f6b6663251466aa8865e60dbfc1
+DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
 EBUILD nautilus-40.1.ebuild 2886 BLAKE2B 2f4ecda4e5bfa58ba383b15baae3541d72712b8d8dd88b7f45938ea25b44d139201f7bc3879399d7b9b848c3d4bee2665df8c1b4976bdcfc719fed126ae2a62b SHA512 80c2f534d7e1382ee5c769e1f26c70655259f193384793a981a90328b6f7638ad5127e47d7fffc0c5a5571e51999eee9bf478d6befd771dce285c5a321c7fda3
+EBUILD nautilus-40.2.ebuild 2889 BLAKE2B 0edeffffb617513572020afbc9c7f30621c9ef9652a494730d60f8b8f92b04d38c65bb539ba3db3fc809ab34a75ab8cc2d63a04745dff4a736942ed8440a11b1 SHA512 7e9df161c2ae2ec26bbd836b13f1045b516ebc228084ccbfdd6170cef84f45181cd7ac413dba029a374edce0b7983ce4c972391a32dff59c2cfc97c696e99167
 MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c
diff --git a/gnome-base/nautilus/nautilus-40.2.ebuild b/gnome-base/nautilus/nautilus-40.2.ebuild
new file mode 100644
index 000000000000..aacf13686936
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-40.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.67.1:2
+	>=media-libs/gexiv2-0.10.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.3.0
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=gui-libs/libhandy-1.1.90:1
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dlibportal=false
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index de3ce959abe4..7677440ac589 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 396096ac2578..98af7bef6b4f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,7 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.40.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d
+DIST evolution-data-server-3.40.2.tar.xz 4625240 BLAKE2B f7c966e0e092ce46157e55d1a096e5ce69ae5103c0d777f262b62cac4185bec88c4cf84b9da4927cd8e008310f09bedcc017cb4ec39e4c90b3a36c1444b3507c SHA512 495e264cc92b31e6bb76b205641f4c030e82a010f0cf58f712d5c05b5a06f0a60c5b83b31f95ececf9e553f2e816bb9bab2df54cd9982a81eb2bb7f936016639
 EBUILD evolution-data-server-3.40.1.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
+EBUILD evolution-data-server-3.40.2.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild
new file mode 100644
index 000000000000..02f51c3698ce
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]"
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.58:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.16:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.28.0:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_src_prepare
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index a469e53eaa59..594c0ecbe2d5 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,5 @@
 DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99
+DIST evolution-ews-3.40.2.tar.xz 673592 BLAKE2B 0b11b77c729102ecc0602abde323817782b9d56939a708bf9a506f2dc2d9d0edb43f7607e0a970db3144965aa669691d2041d99841d70ac604feece721e11979 SHA512 a42f8ee092aa1fdfff07729bb1c3d0f80a25f6073f07135f0fecb8f431cd5273c2afd292752457515b0be71f106025d413948a97f2a4d3d43b049989dc296175
 EBUILD evolution-ews-3.40.1.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
+EBUILD evolution-ews-3.40.2.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/uhttpmock )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 7b3174586ed8..0f0ef537338c 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-boxes-40.1.tar.xz 1696528 BLAKE2B 7a593d535d2a6f0b0750c542a86a8210ac697fe8340f44830134c840d3a7500a6f6ecbbf901d6f37273f3354342b68cb1bdaf4cd7a5a98fc3047ee2ca5cc8b6a SHA512 a035454f3bdecc75222b27b6c1bf9807b21b9b3846300f2afafa3f30d4069b32a258e4d82f38cfeb407b21bd40d84031f57ddd63322dd6ba576c9795f355f33d
+DIST gnome-boxes-40.2.tar.xz 1697352 BLAKE2B 07f9fbad526bea4239a6eac3a3a26a53d30daab938158c4904b5ae674cf64cb2dd0fc6de073c41fc023c66df0328bc02dccf994ef09af597f117914c11bedefb SHA512 22f4a66bb60b47ae7c5ca7fb6f60eddf16a1ad209aa4541f05f732d815a2ac9f2fdac9f6d87cd5cf44d402d0f0d114466efbf129b22fea7b9b054e1b3c3ac145
 EBUILD gnome-boxes-40.1.ebuild 3883 BLAKE2B 078f3a13009bcc8a5b82097812d5c6426c43552f1668e81eb8cf7cb5e51fb72fd82b5f03d70fbcacc0a4031b1a2e73672a52d6d45f579d3f2c80d03541d4fb83 SHA512 b74a8cb8dd12ac1654d0f84ccf976b498d68f90f3a60545fef7c50c3e33ae36402ce9d5e3682cb0ea84155dc3d7e5137423d2f7d9c675deb13b77f139024b939
+EBUILD gnome-boxes-40.2.ebuild 3884 BLAKE2B d9321b6bfec5b631ebd52e1bd318fd58ceae6753c5119f9d9dbfeb5c8bbc96509fc8dfcfedcb4d2641de18420a72d288817dd8b541289f39142a2be661603564 SHA512 1740b1ec84b0d53783463a5c3ffce68a42b17aa5546e8b2a00cc0f219bfea60644dba9e489a9b12924a07c2666805405a21bba6a9d172981cb792be3cfb98d06
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild
new file mode 100644
index 000000000000..2078408e917a
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	x11-libs/gtksourceview:4
+	>=sys-libs/libosinfo-1.7.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=gui-libs/libhandy-1.0.0:1=
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( >=net-misc/freerdp-2.0.0:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index e27889cc7eb1..2d7de445a795 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-40.1.tar.xz 553592 BLAKE2B 83517f9fc23d3b61f4b9ee824e7a95d0b002b61a6e8afc68805dd28b947347b9d68751e4ad9ce5a92287e3973f19a99e5daa3ad6829eae961988b56d9349f6b7 SHA512 f04db5da5ceb5518766d57ddf14eb0c3de19c499ba00a0f426f4059cf53b064529c2e317198d92f45f400d6f4ae2d34d0fde4dc60293a480584a199d2d3a3a5a
-EBUILD gnome-calendar-40.1.ebuild 1151 BLAKE2B d5f2a06f532763a4d35e03b55e5f91ec793d3f38f48a577bbe40675955ac41d48b7e3e9dffe90346fbc30c34ad4389d5c2c0dedf40a7de74b4c098b33b15f96c SHA512 f5fd61dd41338dfe0fe9b144bd06af5db9478588bf0af5ce5c82d568c69a3c521820bb594238b70fe1f5a564a4c8049e2762fdad9aa95d22da54dd2a9f4630c7
+DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
+EBUILD gnome-calendar-40.1.ebuild 1158 BLAKE2B 3b410dcfe3fa532437b76c03fecbf1fe0d0d35603b19fb6b0e16de0bd58f8977caa6f329aee12544dadd9d5179b0870f14dec6db2d3faa8e06c39c6315c1d191 SHA512 b59b169f1c59647b7f14986ecf47acfa9d3a58f341b98219f035176201b378abe05841216291ed1b9d97c0b925562ecb5eee4a3b15ff8dae2b8a18d5b5fd3ffb
+EBUILD gnome-calendar-40.2.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
index ec92dd3fcfdf..3b44fd1d02ec 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
 DEPEND="
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
new file mode 100644
index 000000000000..ac5e1d4c4c46
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+	net-libs/libsoup:2.4
+	>=dev-libs/libdazzle-3.33.1
+	>=gui-libs/libhandy-1.0.0:1=
+	>=dev-libs/glib-2.67.5:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=dev-libs/libgweather-40.0:=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index c09124641de9..a84eed143844 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-characters-40.0.tar.xz 195664 BLAKE2B dc14f80654acb2b00b48ebc0a76d6d9f1236cf9b2d95f2a5fb6e4eee197359f3efadfe6c53eed66746e57d5cde2701967731fcd99e4d24695170937b69cf229e SHA512 cefc4b62b20351739510c901661e94217df4bd6a5b6a2c2f439b80ac31adfd6ba90098bbc9a3169c501d8ada9b54ee615c83ceade2639af440e86e29bce7ee8e
-EBUILD gnome-characters-40.0.ebuild 830 BLAKE2B eea129b0d7bf12cd736dd923addae15b967d093e7025acfe30e475be00f65414a0ba06259eb0518e24ba7997d16df844a2f133c5faa08f939ef8b1dd6c7f23f4 SHA512 253f507b93b5657bf6d7933839686d300229c474991028a7f53117ca84c2675e16f712d83e0a16fd9a6da0ab60c860fe7229070a42e687733f01fb8ea0431ea7
+EBUILD gnome-characters-40.0.ebuild 837 BLAKE2B 530e25e6eb97d9e44a0245c8e95c4afdbf5dbb478bae92fea21d52c3fb91af0be1ebc5f363b461ca4dbefc5f500c709e3e3b5018e5051e75b6b9b214fea14c2a SHA512 5fe89365cbf7f5ccf22ce1c5f2f9cee0b735aa4e1dd9b1fb8402ce044243e6a73a8a31b43b5c6be5e1d8687b8339a3f0422ccaff2f6a5df0b0ab2ef1dc9d2342
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
index 37a15a0b4058..ad852bf83560 100644
--- a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
index f199a5e909c9..e520acfe7923 100644
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -2,5 +2,5 @@ AUX gnome-integration-spotify-command-line-parsing.patch 357 BLAKE2B b1e823c8477
 AUX gnome-integration-spotify-correct-interface.patch 797 BLAKE2B fab74ff1202d47b60acb4350fe542116d9eae8abc4efff748713f6026e8adebb33a48ff89f76375510951f27a9c1c93a8bf9dbf6c6403a0d8745b660a027f0e7 SHA512 d875db53ea7eae23a1280534278ac17fd12a75673162029a86d9b232bd6cc27ea71287f5d904a0fa9328b2716d3e115675a72e5729748491ee1482ff0522f9b2
 AUX gnome-integration-spotify-use-glib.patch 1209 BLAKE2B 1cc5ca0d145dd73d2ad78b43d291034ee291e1974b110291560c8d952afe0e2170f205f78bb477a06bc0153583a0cc2bc02150701baa170b8466825665730bad SHA512 daaa2ba1f3484946c916e1cac821d9d09b54c2ca1da0cdbd0db58d6b576d54a68cdb285d9e424fa070ebf1074f32a4cf43305741314ae49026eaa9bf2fde6a37
 DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r2.ebuild 1283 BLAKE2B c325ab9144a0858188d3b11f5f2685d2679e50f11ea4339aa0ae98180de2a587af95127e26d58bac2c5ed21949a232adfc289af06eff6965aa6da0b5ee4ba4f2 SHA512 2920b7230673fabd509473e0ec23046ef910e8735f3df18245edeb85eda7930521925680c4548e9f714d12a5646d198aa452549d7adf025213e3349e42c1254a
+EBUILD gnome-integration-spotify-20140907-r2.ebuild 1293 BLAKE2B cbe4c59cd511a986d8d31919703020f95b650619030d63f5d6d32be01bcc69c76ee57626276239118d9d51fa50175eb5a4e531526f995b46da1f05296ceaa341 SHA512 15f6b9d9541ff7d59de203d9a245f54b58daa7fc1db5cb1a7f2e53df452c42c5626a2a2fa274922ab88ac755c681d9cfd296114097974f5c490813e204f15406
 MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
index 049a2479a33b..5e822f8ad79e 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 inherit gnome2-utils python-r1
 
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 7337b43e1804..05a029110f72 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extension-bing-wallpaper-32.tar.gz 4186897 BLAKE2B 2d8d119ef61c426be5e1ad3070fa038fe34f1cedf706a748a9943eaa2ef9bb0ce75a8df99abad38d48fd8f25ae532ae9dd425ca00d7165c06b177580cbed89a3 SHA512 c72473df4b5882ee5964c74fa42d270097526337230e538c1fcfc6e7bee5ab492857ca0f48e019ba7cd3ce6808b22c7751333275dd074b057fa4e09030afb609
+DIST gnome-shell-extension-bing-wallpaper-33.tar.gz 4218373 BLAKE2B e5f7c9845a20eded7dfa56865ce145751b88f92c5c0c89bf305e863aa03e1ea8e305355d34833387a60b26e75aafa4739ddf4a13dac871835d604bade2f8ce5e SHA512 8de4f4a721cd8ca905212a9ebb3e4d26d90832353fca7641eb240ebe12f3fa4cd10acf257823a4a986b18b98216786daf46f3570dd87f2f17e6bfdd6507a687f
 EBUILD gnome-shell-extension-bing-wallpaper-32.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
+EBUILD gnome-shell-extension-bing-wallpaper-33.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild
new file mode 100644
index 000000000000..c31bdf512404
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
+HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
+SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.28
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
+extension_uuid="BingWallpaper@ineffable-gmail.com"
+
+src_install() {
+	einstalldocs
+	rm -f README.md LICENSE || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/Manifest b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
new file mode 100644
index 000000000000..f1badc98daa7
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz 1018667 BLAKE2B d09becddcab7f24b8efcdb8a6c3b9a121de1654d54c792865e28a08412feeb58d3bbd7698811b840eb7873d3ca7854469f96d1b43bc806b2b3e680b2493beffe SHA512 72cb8a71560d97c92a44d988e8eb0293012565d4eea7b49d6d83be6b844f182db22c7c9d41e68ea3fd272ef7f8b88d97afbce3f867e899e162032507be082a40
+EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild 1366 BLAKE2B 3a693d9bbe2bc3898950a695d19d5fe5a3d4f520f91d559cf1cfb5613bd529f774f169eaf2383a9bc37a5387928dd7345daca1bb52a91006825d8a21961139ca SHA512 d5898912558ca91df564886faba346e27ac76e99a19292516906d1991f3b70fd5de50978561f5f8b07472866599c1fe779ba8e463deb825f1dfa6b5b36d1d27d
+MISC metadata.xml 352 BLAKE2B f4da02dd27aea654c318c70d46b78655eb52554425b3a5ce137228860514177376419deac645ab945e5ea98fb386e8619e1dc29f801f3c0667e413763d58e5f6 SHA512 187cfbf61182c405799d32555c76759b25168f3806e2b0b48ab497b879f99fce89cd6cb988bb22c263a8ab551eba42ba57535371c7006c3ee05b2fdbe55818eb
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
new file mode 100644
index 000000000000..3a9c7f3ff47a
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils optfeature
+
+EGIT_COMMIT="f7cbe060e8d293bfe3b0b759032a85773b542645"
+
+DESCRIPTION="Keyboard-driven layer for GNOME Shell with tiling support"
+HOMEPAGE="https://github.com/pop-os/shell"
+SRC_URI="https://github.com/pop-os/shell/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40.1
+"
+
+DEPEND=""
+BDEPEND="dev-lang/typescript"
+
+S="${WORKDIR}/shell-${EGIT_COMMIT}"
+
+src_install() {
+	default
+
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/org.gnome.shell.extensions.pop-shell.gschema.xml
+
+	exeinto /usr/lib/pop-shell/scripts
+	doexe scripts/configure.sh
+
+	insinto /usr/share/gnome-control-center/keybindings
+	doins keybindings/*.xml
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	gnome2_schemas_update
+
+	echo
+	einfo "To configure keybindings run /usr/lib/pop-shell/scripts/configure.sh"
+	echo
+
+	optfeature gnome-extra/gnome-shell-extensions "better tiling via native-window-placement"
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	gnome2_schemas_update
+}
diff --git a/dev-python/pytest-testmon/metadata.xml b/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
similarity index 65%
rename from dev-python/pytest-testmon/metadata.xml
rename to gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
index fcec7c1b8e6f..89f0ba8679cb 100644
--- a/dev-python/pytest-testmon/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">pytest-testmon</remote-id>
+		<remote-id type="github">pop-os/shell</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 9d18cc67c013..7f93ab4fc8c4 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,9 +1,3 @@
-DIST gnome-software-3.34.2.tar.xz 5945736 BLAKE2B 89e7e0a606a832aedbfa32024f201e71b3edb3c8df527efea1be72236b4bfb86901f3af689b10bf706f9c4f16e6badc00080a1244ce30eb09dfd1dad5833e8cf SHA512 4deb09530fbeeadd54e69d03ef4cecaef47c6766bce0ec5230bb090d27e54664577a227416933b6ec4780249f4565e51202a25517fba5dd040fd895bd3a26397
-DIST gnome-software-3.36.1.tar.xz 8277796 BLAKE2B bf3d5f3f67b211cfd4af87ae500691085ab83aed9f85e211972d408a1bfa5d7c6de162acc2088bf9ba9323369e73dba27a06b2491745ef2ceb04943e4acbf72d SHA512 7d0e8c16192bbbc8f166db137dbd2e6ff9e85f7d3d37f63f41211ba3838e392bd87a8d9bf09d31b43f6d21e1a099ecdeff9114ae27fae40d563671f0bcbe50d4
-DIST gnome-software-40.0.tar.xz 3087252 BLAKE2B 4b834113c0770a3acfbcf21b5db3d6da57a885e6b235c3328947f218f28daf70c6f636253283dd77d0c4a1fc59f8ac66a140412694a61352147c13c27e7a76af SHA512 052c520ab25af4257bb978aaa9e1c7a555f8d24dbd782d9f12f3c3def22e65588d3c76d16e4b3dc26f034a762c2ee3e773026b158d468e9e169369dc3d156a2a
-DIST gnome-software-40.1.tar.xz 3093832 BLAKE2B 0da79bd28f8db55816543490518dce880878a7619d05d789d4ab1795728025e9eb5ec4ad330018bfae036d3cc79b712178bea9e219b357bb231ee898eb0e1744 SHA512 ae805d01896d761dd82a21dedbfafba7e8ffd2d98e99da4548d846aafdf07f9a26dfa2e083ac2dda576f8b1db05bb3f26642d3a6558da86921450049870767fe
-EBUILD gnome-software-3.34.2.ebuild 2575 BLAKE2B a3f3577b57b71d05e902ab9b9ef9fc036abe6af0c77508fd04f8b918be16a0d9fd0aeb6d050202cf97f30d01ba52dbf42d430d37760b714bff81276bca52e155 SHA512 cc26a7d5fdde91d32e878cceb9d04811809dcee768519a271d0b950fd6806c2f10c501a403c78b8ca6e1b5e4013978ceb18d63ad74894866e4a3d546ddcbef6e
-EBUILD gnome-software-3.36.1.ebuild 2839 BLAKE2B d98fbd6f2300d6fb96c26b0f2dd06abed0610d982136ac571d245ff1560d3e306f638ef015d5bbe190ce696f1e815ed6108c05a2daba6358c0a137ce78d5b8da SHA512 ab945043f956b40f1131b96a4adb6942b5383086ac81cf37171950de5e81e27d5b409b00e07cf116d9d4578a46484d7ea2be2b486cbb4c248a7373e368c0029f
-EBUILD gnome-software-40.0.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
-EBUILD gnome-software-40.1.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
+DIST gnome-software-40.2.tar.xz 3093012 BLAKE2B 0d51e7e752b9399f79c2fc16ea12b99bb58a486fe050e38a8fd606a2afd9db32d67d14b4ed50d21da163238b30fac20f93f8947b165d8ae611c27057dd572d34 SHA512 ded29be4c59130a4016d43d3e18a67c8cf3fec4761a7a57c067bf075a6f1da5b7726000172e2303ba129b3b5cb8bd22ebfad8fbf0e3248285a4864350f3a1679
+EBUILD gnome-software-40.2.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
 MISC metadata.xml 657 BLAKE2B 964e35ceecdb7cb6299ca103520f1c0b67859bbc2a020994f5b9a58d9b48c0457787fc3b73d756074d36b33aa445f266cfc7ce953959378da020c2000c581575 SHA512 436225bf3076aa82432b72103209ad101824d20d3e37be6225a627c15e1cd1e52697b91c77021f83e4009d06e057e8e97dfc05860122764a82e59b356c282bc1
diff --git a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
deleted file mode 100644
index 1aee954135f9..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware gnome gtk-doc packagekit spell udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.14:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		-Dflatpak=false
-		-Drpm_ostree=false
-		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
-		-Dodrs=false
-		-Dwebapps=true
-		$(meson_use udev gudev)
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Dmogwai=false #TODO?
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild b/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
deleted file mode 100644
index 1f902741dd20..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware gnome gtk-doc packagekit spell udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.14:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_use gnome gnome_desktop) # Honoring of GNOME date format settings. TODO: Really may need gsettings-desktop-schemas, not gnome-desktop - https://gitlab.gnome.org/GNOME/gnome-software/-/issues/945
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		-Dflatpak=false
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dodrs=false
-		$(meson_use udev gudev)
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-40.1.ebuild b/gnome-extra/gnome-software/gnome-software-40.1.ebuild
deleted file mode 100644
index c81ec02d2b52..000000000000
--- a/gnome-extra/gnome-software/gnome-software-40.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc packagekit spell sysprof udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libhandy-1.0.2:1=
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	flatpak? (
-		>=sys-apps/flatpak-1.0.4
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dodrs=false
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-40.0.ebuild b/gnome-extra/gnome-software/gnome-software-40.2.ebuild
similarity index 100%
rename from gnome-extra/gnome-software/gnome-software-40.0.ebuild
rename to gnome-extra/gnome-software/gnome-software-40.2.ebuild
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index fd1120917025..ce6e65c6df3b 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-weather-40.0.tar.xz 938732 BLAKE2B bc46da61e9620278f5abc7964b869520da85837739923618b2ade114c8561fc6125e7dca2f2aef5715fec7dfa0561c693f75278d050900cb948f8d1ea42f58ba SHA512 c4560c1a1535a0c2889c8cd934926217a7caceb1b646fa4bb961c7cbde38b9b545a567f24fb81e47c61a2ac3e456a5432e8979591eb5a169fe5849bbd99d6333
-EBUILD gnome-weather-40.0.ebuild 1364 BLAKE2B efab2f425bca519fee370586a78e3b743eb849f210f52365cf2b7f4f1ff2435ef8a8309e022c64b535f753d9f12f0cf2f83fc4ce042257a5219c56770578d68d SHA512 6074f6b1fc33b676b57a75a9bf09a2d8832ffc4afe812a66355f0c6b582abdbf7f4b4b68691ec93036d9a006a69b97c14d6eb7f5fe0fc9274ba9a5759e0529cc
+EBUILD gnome-weather-40.0.ebuild 1371 BLAKE2B e602d5fd95238b9a88deaf4ce43e3f9de71c76042dce1e6345970549e0de1b68565d96dc637090253e1f83794b65778d30599306d273c5d4e3c2526092e0d306 SHA512 9777853eca87d926a23c0456b04e36e6b264cb4879a999520ebd1076e839a88532011cc2a8b1a2870b503f7014f20c2f8fb955d63e0a7a328f05edd11dfc7e85
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
index 72bdad82ee27..0302c9bd140a 100644
--- a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 98e961c4b804..593a95829233 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,3 +1,5 @@
 DIST sushi-3.38.0.tar.xz 76500 BLAKE2B 6d4fb4d80fdec2e96d5cf91bfe6f0d859154e45f6bcd4677eae0e4c8bdcb20380e1cabcc6621e0bcdcc590a668798775bdb464b22298fe954c3d290d202c36c7 SHA512 c8d0dd7d9cf9d28496c6c4ac5f327bcf605994f189c476fe891d42c0c225d0368311baf06d7d6092805f729908491590bf719a9822513f96e2afe17e8ab962bd
+DIST sushi-3.38.1.tar.xz 79384 BLAKE2B 7306d375f85cc491fa8819e6857b1d61d158149045069002ed7a9c0f08c021ce0e9ed5ee751404a507dfdffdfa99895288f9c9601001818b4d1bc987f94bd823 SHA512 b999e6892314875725bd4029163ae58813b46f0e5c59e58b62fc4491d611b48fc39459f6c5b5e1a7d75d792cfeb66681f4d3a7057e8cde8f5c3364a2312e0be7
 EBUILD sushi-3.38.0.ebuild 1317 BLAKE2B 51fd57444270d1f6b3399c463b0dabded9d65d987f03fbf5f99c5928dd150882b59e3b2d181d9c4a413bd16dfa0cf648122fd7fb10336d46e9704427ec904415 SHA512 c78410c074abdb857b3aa5850fee943e123677b0ad52d4d85e12fcb88b6ddb59e63632a56d8d59cb577f76ebdc15917850208e805c2defe540928712c57b56a5
+EBUILD sushi-3.38.1.ebuild 1319 BLAKE2B 9d5e227dc819172e1716d4f2c2371131581fa44c62f630496700e8917f5f56e83df2aedb1dea2925bcfdea9b07c5d2dad58b1b5f4909b799d4e4b72ccc5e5ac7 SHA512 a92e2ab5d6dc273b3a91ac4fabf14180fcc8772419c5ebfe7ae27441204211e7ab64c9f732fb35101e15d4815219848e56b0f9ccf26fa2142736ebef93653897
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.38.1.ebuild b/gnome-extra/sushi/sushi-3.38.1.ebuild
new file mode 100644
index 000000000000..16d80f3ec463
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.38.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+IUSE="office wayland +X"
+REQUIRED_USE="|| ( wayland X )"
+
+# Optional app-office/libreoffice support (OOo to pdf and then preview)
+DEPEND="
+	media-libs/libepoxy
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
+	>=dev-libs/glib-2.29.14:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
+	>=x11-libs/gtksourceview-4.0.3:4[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	>=dev-libs/gobject-introspection-1.54:=
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+	>=dev-libs/gjs-1.40
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/nautilus-3.1.90
+	office? ( app-office/libreoffice )
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure \
+		$(meson_feature wayland) \
+		$(meson_feature X X11)
+}
+
+src_compile() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	meson_src_compile
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index bd3cd2a5b4f7..3671cef6291e 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-40.0.tar.xz 660148 BLAKE2B 3f53c568358a4325ffe36fbd3df71c39f638e1757f9a684d6d67b252463be867b66e9f20c115df3053becffe9baf5f9bf44aec32cf7aef1887ee3a8eb4c93b4c SHA512 50ada34e76bc3b14940e7ccae368ef60802b8baf354ac0784260fd4408dcecaedf08697f249226e3236a54b487b86d7e00bffea6845adde42285f10d2a8f8e4d
+DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
 EBUILD yelp-xsl-40.0.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
+EBUILD yelp-xsl-40.2.ebuild 568 BLAKE2B b7e4b907e7e42511eb66e10556de94e8f5a86d8fb10204df85685f4714433aed0787c558b92e887c21d6bc54a2e8885e884f73b83f0bed300858688fd9f3ef63 SHA512 362bc0f94b18cd918a69df358281f7eb2a309e6f8a088c87d8d58728cf9f07d59582d9e946c07039be4fcd60878bc17775d4402bdbfa3190165bd5212a710a5e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
new file mode 100644
index 000000000000..fb0b0cda287d
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/itstool-1.2.0
+	>=sys-devel/gettext-0.19.8
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 0feca2852f24..2130f5232316 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-40.0.tar.xz 1526456 BLAKE2B de76ce11775b2940a5590a72a0f9f821a3b083810087c65f870cfaf4d6bb0a34653025d87b28d01e11ce5e3dbd7bca8331c62d701d8c050938756c53797198d0 SHA512 efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590
+DIST yelp-40.2.tar.xz 1527112 BLAKE2B e588b533cd3b59c200904a54bdb2e1ecea620e447ddbae3645252f134fd0f92fb920b512ff7d27d213307b6bc5bec333faafab291af872681813f710de03a587 SHA512 adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c
 EBUILD yelp-40.0.ebuild 1214 BLAKE2B e4124caf8f33cd19ef9c0f926909b284618f9239614bfb2e5cd11003698a7db76fae13ba33753838a609c1c8640663fd582e3baffc6bc218b4787211cb604f37 SHA512 74c0a8c23930ff82c0d6d6be556a199f5ac6acd310f8b2832cd631c732433a1b9c83fe44494757741777087ec20f608bd84137160738321f198a3a2f1f44c2e2
+EBUILD yelp-40.2.ebuild 1208 BLAKE2B 4161f42721caf7f10f9f98af2b8f4021c57723b66b9a92f62171c6fbd37be9e98e962210498342f5642f7a9beb6029fbcef7a0f0f113affc2633a0953ae38eea SHA512 749383ebd2412a9adc0bca4e562a2e4c3a678f6a73ad5da823c9b9acbb0b39c1ccf560696f1cdac8f45094f521a76d672ea1679c0524a4bb4ae086e73363d60d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-40.2.ebuild b/gnome-extra/yelp/yelp-40.2.ebuild
new file mode 100644
index 000000000000..ddb5e4d5603f
--- /dev/null
+++ b/gnome-extra/yelp/yelp-40.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 3049e7654e3b..fb143f0a6e6c 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 0ddad7f0fd4e..547b403e889e 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,6 +1,6 @@
 DIST mako-1.4.1.tar.gz 49442 BLAKE2B aa242d905d33dcfd2e30317a65d3826ba43ad344e93d1f41ed8b28f75310f724ed0eb5ae163f97a441ae07a4bb3465aa01f974cd95f97ba981a907fb761ad3d4 SHA512 25b0f59645c1815d8bdba42cedd6f56163ff663cd801a534c4c725c99e9a8cc28aef1d2c899d30cca06f0c6ddfa4a8e6efa01e5e98091347bcfc80d596f16d43
 DIST mako-1.5.tar.gz 57077 BLAKE2B 0ad931ce6408774f029855d0d98bd9444ff246f2ee82dcaa59774caddc9aaa7d632a7584eaaa4439eafd17b72935eada8400fe93e1ec7f9c23b3860049b55269 SHA512 64bb78d391bf07259a62a4045103803c8e108ac2da2fe8a413b09a0e8c2ac9c82eea1ae9576db41f7088476099fc2071543c99d3a52a35f72f5dbb537bba8c47
 EBUILD mako-1.4.1.ebuild 927 BLAKE2B 8aaed18fb7d3c37d7f4cb34fb7902c7e43d4209ca0997df37e6d9f48fb8e72ee13b15365e2057434db3cdfaa7c06355912cf28fc812c4ecc9c8bdd74f1cf6e2f SHA512 d81e45a91be47805af2bb0bd8e328c7ea4fbe6908a1ba2055e11cc15b3eaaafbf42a18793c026a24bcca78cf4c7d92f47302a558c1442ae6b20b1fbe08e87ab3
-EBUILD mako-1.5.ebuild 922 BLAKE2B 4594d6294715e7674d0a2100a045c0616df00164bc5e474c6e4095c351dd71b5eee5841ef6de939decc76e69bce26c22b6cb633365203a846509bcbdfbc33eca SHA512 5b12b15f73a15a5e49187213055111bbc7a380d52775eba804d7b5408f285b6bc6716bec71fb600a4db3e862caad58a714630b5c6c058e0c5ded81097b263bdc
+EBUILD mako-1.5.ebuild 919 BLAKE2B 3ca3b4a24ed058ea975349ad72c600bff71f3deba313afd5bae31a9f13d699d5760a2403edd26c314af9e6d314ddc4b1cee13ad5371ad0d23e6ba771c7d0d210 SHA512 16ed6b509ef76ae67e767ac356a417166579bbbc8b166f0e0199fc7ad37da9dfdd404025aef95ca89102b82ff39c7077a2ce810d5aab73b5217220b9cd78ce3a
 EBUILD mako-9999.ebuild 922 BLAKE2B d6cf730dc689cef6170179b99120b6f5ab5e2a51936688e4052de88f1bfe53299cb4e229287a0db52f173628350631bbc6a4d79d34b0c30ef7e8b587eca32287 SHA512 ba858ca07c748cbd7e89168fb56c4ad97eab3d654f393612242bd8e7203e89028ec65d4e44942ec802a82ea2d15a51ef27a94458c8c0d18ff16277ee0bef092b
 MISC metadata.xml 528 BLAKE2B 2a1f63fe346e4777797fb6a08bc2656ab68e390a9132637b0979222e6236496c4190ff0d916b6c65d9a453791a9a3e5320f521f65e3bbd159644a9d790c67078 SHA512 e042a39ed2e11c10a363d4e1d34813c17cf3dcd4c1bce1299f5692a81bd6a374e82f0d00cc6d0e02b910581f64f11dc768e8d36214954057387a835efdba0ad2
diff --git a/gui-apps/mako/mako-1.5.ebuild b/gui-apps/mako/mako-1.5.ebuild
index ce59067b0376..81df72cd9577 100644
--- a/gui-apps/mako/mako-1.5.ebuild
+++ b/gui-apps/mako/mako-1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b2aa4d3f1a67..938cf1686ffb 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index 9f12ed071398..d4b67c602dcb 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,6 +1,8 @@
 DIST xdg-desktop-portal-wlr-0.2.0.tar.gz 22260 BLAKE2B a1f3a8244b985874a0b663b311157bc2e2098b8c50b6e3688c89d1c7bf7c454048b359ad42b97edb2faae7b232cd5b6843c07098c07e1f97ede507995d214271 SHA512 9b01919b380510389710c005901810ac6fa00299f2b35a37fa949aab361438ab08c30fc95b88e1805dcea7e97ebe2d19111693f82eee545864077347d2659ca9
 DIST xdg-desktop-portal-wlr-0.3.0.tar.gz 29340 BLAKE2B 848e3cb969a6d9f9cfcbb25336bd66bf75e2ae01fc5ba637950bb202399c2344f14cbc7a65c5940678bc4ca02134cee26ee425b88a91d050c6833c6098d34fd6 SHA512 2b01fab18296cb95cf659ff5a74ed6bf1482c033fdb274904bf2c3ea736dd3c8cb2e82f0662439a88f81ae86cc2fca2fbc3c1a9c72267ba126571973a7662e3d
+DIST xdg-desktop-portal-wlr-0.4.0.tar.gz 30776 BLAKE2B c4a6c07f57cc7cf16f16de43571bf9a281e647bcb1216da5a82e9c40d7a8344e78380b08a215a252011c9da8f97294aacc844d999095f4117ea26d17ff9ffec6 SHA512 544dea4601ce8aa8649d15b7c249aa5b0099fa5a6aec1b7a1433439265acede9ac442092da53080c36b372dd0ef5aaa15747b13a56f4a648e1c00ed3c2435e19
 EBUILD xdg-desktop-portal-wlr-0.2.0.ebuild 995 BLAKE2B 3378be82b18f265074ee9e5e6137e88b72b75b7d1cfba215d79a864d671f63254971ee087114870c67961d4cae378e570080c5dd9f8b5cf50bb11afcef351001 SHA512 75970f99d7affbf6af083eab700e8e838e4e4426f125126c4caff77e2239b18c69812ebefb54283717231fa03567a97b582fe4df36006cc771b18ca9df83c11a
 EBUILD xdg-desktop-portal-wlr-0.3.0.ebuild 1016 BLAKE2B c4f0c87b1f64a5d969d263798fcf1eaf6fbf470b46d654590e30f5578f581022ae987c6762942b086879f176905876ffa0913f288a2f585de2437d235fe9bb60 SHA512 9658e32936251dd2fed71e949fe7f54490c094a0eb1219506ac6584d45d33707f68e82e511716e2b01e34376ecb3f937ca12fe11d3ca680550d9f6f994651cd4
-EBUILD xdg-desktop-portal-wlr-9999.ebuild 1016 BLAKE2B c4f0c87b1f64a5d969d263798fcf1eaf6fbf470b46d654590e30f5578f581022ae987c6762942b086879f176905876ffa0913f288a2f585de2437d235fe9bb60 SHA512 9658e32936251dd2fed71e949fe7f54490c094a0eb1219506ac6584d45d33707f68e82e511716e2b01e34376ecb3f937ca12fe11d3ca680550d9f6f994651cd4
+EBUILD xdg-desktop-portal-wlr-0.4.0.ebuild 1011 BLAKE2B 9d45d47f0fd84784799da0ceb8fc2df83bb693ab892696989291cd83a5f07d2f5317500d6842722eeb26177aef961655c79bcdebfd533f62f871c86cf8562ca1 SHA512 3a54802faad39b26497b424396347982cafc55b40ad9c927766df591141f6dd9fc4c0f48057d344e7fd54a16a5e16bba130ba80211020e5996a062434325051c
+EBUILD xdg-desktop-portal-wlr-9999.ebuild 1011 BLAKE2B 9d45d47f0fd84784799da0ceb8fc2df83bb693ab892696989291cd83a5f07d2f5317500d6842722eeb26177aef961655c79bcdebfd533f62f871c86cf8562ca1 SHA512 3a54802faad39b26497b424396347982cafc55b40ad9c927766df591141f6dd9fc4c0f48057d344e7fd54a16a5e16bba130ba80211020e5996a062434325051c
 MISC metadata.xml 347 BLAKE2B acd0b0dd1010eab7fcb18925c58a2f41a53704327e1b2419f2fba11b5f2c84eca044b7c1998fd16744c91e58d8cfaaa0c3e7758a892ba380774ea3132a7a4d92 SHA512 6cc79a37a31c38f1b3ab61124b5489fd0b9bfb5852eff1cc21b2285c2c7a83fcca129c9dd04c491cc33e5bcd6d3798e20d791a440d8612841315249eb29ca591
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
new file mode 100644
index 000000000000..8642e22e21e1
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="xdg-desktop-portal backend for wlroots"
+HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/9999"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.2:=
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.14:=
+	elogind? ( >=sys-auth/elogind-237 )
+	systemd? ( >=sys-apps/systemd-237 )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	>=media-video/pipewire-0.3.2:=
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.50.0
+	dev-libs/inih:0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
index e5d42ca22778..8642e22e21e1 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 	>=media-video/pipewire-0.3.2:=
 	>=dev-libs/wayland-protocols-1.14
 	>=dev-util/meson-0.50.0
-	dev-libs/iniparser:0
+	dev-libs/inih:0
 	virtual/pkgconfig
 "
 
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 5b1e58d152b1..3a787236d7c4 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index c765df8b44c6..05e9e6a54cfb 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -2,7 +2,7 @@ AUX kate-20.08.3-fix-filetree_model_test.patch 909 BLAKE2B ffa7ea62388751d4d173a
 AUX kate-21.04.0-implicit-dep.patch 2160 BLAKE2B e184cbf456f45e15904e17213813c935b548d1fba6cff98b162dcc4619d0ba166ae1db0c726a637c2b41bd95ebfe75d114259b5d7bcceccdf09141532e893d78 SHA512 23d56228dfdbcb419ec6ecc3353659efdc604f0786ce0ddff6dddb63a990a7086a7d6d777e038567fdbf049c14013d77fdd99f1b01022627a235ce597ca05140
 DIST kate-20.12.3.tar.xz 5949012 BLAKE2B e35c4da5426772286abe54156babc0de09fbdf8fb5c7505714637ad427e3a694fd541ca7b17e99ebab22f9a19f2a8893d34098cb625fd0e1c0f0b6b920acd62f SHA512 545ec2a48ea6ec737011602b20ac2f60a0f9db0a5e55e0b232f9fd7c10b7e3f54d2a346be7e6341537758a3f8f94868c4083a6d2d10b572568f5c56c9d3aee9c
 DIST kate-21.04.1.tar.xz 7184404 BLAKE2B e6dbeb9c12d1eaac2cfbf344f39a5fcf991857ef9e6a1c14e476e5d03ce3c3315e2b29f58e9b725a2479a84470cd76c93f0dfd655720af752ca9c694f4c94e59 SHA512 402595ab5cf20779883d49d76874851b5a1833943356d53cbdcba16e391a6221d31b4ef77f2089df91c9eae9b94248023f101a63b53a13691e7bc651534af8b0
-EBUILD kate-20.12.3-r1.ebuild 3228 BLAKE2B ccdeee907cae5cbededf52c1c0603a513fc6d8f8488d8810ae490b570ca1d430915d8ff79afbade968d97d40f8e02ca058e7ff61760fd6ac020545abc76690ed SHA512 6aa89ca64257b9848cd0e9480e04560b774f8b2a06526df1447ba260193a22b991ee18db5794f7f0fb5c54f5d7fad568b4e6bca3ba68a42df8faaed4f9552094
+EBUILD kate-20.12.3-r1.ebuild 3225 BLAKE2B f4daee96e9978f4abcee811be4d81c15286d932a34546a81ad5798d8dff97fbf79a32ffe425b64a92fffce7a50c5090113bc396bd16bb1483c63322a99be900b SHA512 b312987952acc72bfbb482d9a96b268e341da40d62602cf18cf77be98375984ec7d1827635d1c92bce984cc8a688182ce37d965e0a3b1344150a3482209b9813
 EBUILD kate-20.12.3.ebuild 3128 BLAKE2B 5e1db5f2ddca47bf3e64d992393be284dd988410fb7d998010dd84918c16d0e5b2b2952fff62c0968d5431401b72b04e75b4bde001a926f1564e8d88af4704ed SHA512 50a1c8da58bce2c306ccd80a01258d935e5e7c4e40160d89ee64a58739f7260131906300563796025f405b61a4a69b51e93e3d4a6c41bda211829389add8d9e4
 EBUILD kate-21.04.1.ebuild 3169 BLAKE2B 2c79b353e83b2e03a74ffe3488d9782d1d254eb4f6f730e8c6fc0a6e22d088d1017ad958c6235ba45dba0aa1e6b83d927d4d00d46d6f05130ed4a3bdab63fedf SHA512 74221844e82996cda415b7f418e7b0e91bebcf9aae9911128e7625ab162e76c1957ae9b775d10bb5dd67be9ec0922079357a1b6077660f09f2ddc998f0a767bb
 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7
diff --git a/kde-apps/kate/kate-20.12.3-r1.ebuild b/kde-apps/kate/kate-20.12.3-r1.ebuild
index 4a46d148ac61..c5bdb9c1d5ee 100644
--- a/kde-apps/kate/kate-20.12.3-r1.ebuild
+++ b/kde-apps/kate/kate-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry"
 
 # only addons/externaltools depends on kiconthemes, too small for USE
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 257b21cb005f..f017e3e4e490 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,7 +1,7 @@
 AUX kio-extras-20.12.3-thumbnail-check-shm-size.patch 1945 BLAKE2B 07318d918a264d62023d7058e718b2a30ec3e8f937a2f7b278ca1c0200485b843249ea0a26eed8f785a544bed5a021e3c5fbaa72030dc65dadcd0cd5b9bc2de6 SHA512 dc7183cfda0fbad5e3d9ddd5a1535e261f8137b313e8485badac4c5a3b1a4af20b7b6b468f0d5864045bc753b171f899a8c70c2b20dad25655dee6c19c34a785
 DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
 DIST kio-extras-21.04.1.tar.xz 646820 BLAKE2B 9c66e42fc1f1212fcdfd3d03b1d68fcd11b46afc9b854006c95dbe96dce22fb33b297c9cc3d660fcacd460b0b91e44233abb973baa54397636657fcc8ca9791a SHA512 59f13650d906024e3ccf088022fafc49d3b958f9fe5043e627e051aed19a0ffc48f0f728bd5e3cd1959524511dd8ae7a9c8a68ea3fd09fa16f2ccb88395316bd
-EBUILD kio-extras-20.12.3-r1.ebuild 2704 BLAKE2B 23bd7caef421b9ad042c6ac8a8743a38fb3ab59b1b74dbd87afc254cc16f4360df0ed24f4e48a9bbbc90546174940fd591842c09aa4e758f725907d8c8b9a462 SHA512 90c9252479757f329bb9035f61560c0b2f8231c92231a581f06eb29d39c12c4229f348677b1ba0fbdd3438cffd8bb2f3e2426dd488adb50e7febf21a27441bac
+EBUILD kio-extras-20.12.3-r1.ebuild 2701 BLAKE2B f9e5ac55c51b8d9e8c098efdd379c3f9501ccbe7b752be1ed3b152d7c31c7dec239374e43747a20b8662ae3523ff5d75e24cbe859bb9c4fee9f46712843258b1 SHA512 c13f91a704042b8c81a749793667a0317986a6412d04135d7aa4a29845169cd92f407c72d06305f67341d7ed1c6dd609ae9b7b37b6a2ead23b18338b5deae349
 EBUILD kio-extras-20.12.3.ebuild 2621 BLAKE2B 5244624842b9b083e2a5b874f705bb4712a91f2247f8511986a9877bb2646b499aaf609d77ce1b8c08701276d1ce9d6f3d0ced1004631ba54b7b714739636377 SHA512 f5bcb699e5c7700115d9363177dcd4e3314d545ea6b41f5f3c04e7bf92bf9d57c30a792d9ea85470e181e3840cc9d8a6a699a33929e00a9e4a5817993630b9c7
 EBUILD kio-extras-21.04.1-r1.ebuild 2718 BLAKE2B f6ff0758a42a063f56ced6be5ded87c15b41ecf88c4652261288561371a5cc8be6c70e42e7dc7d1e5d4c8046f93a5cca2ab029d5c7636b0ef48952d507171d67 SHA512 ed274b4a3b796e5b1be6a2b6dfca30c35298d2a4f6fbbdf332ceb0eb0b88910922566a3c6e088ca38a71881bbf8679abf24b2cee04833dc22f0b5ff1a5ec14fb
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
index 1ca9d48fb3ae..34c6ad6aeba4 100644
--- a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 0686f144e733..398831bf29cd 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,7 +1,8 @@
-AUX konqueror-21.04.1-use-new-QComboBox-signal.patch 3328 BLAKE2B 3e4ed3fab89a3a707a302a1142c96042bcd694385fe36f89cb89da8860000ff958d81ff0d25c9931c7979e90bb33a5a3a00455c2e3b877ec145000dffaf73e19 SHA512 3c6f30af0ac0a9b0a7e5d46c3c30e95f08d217e81acacd267d91ab17a09d8b2b48ab0eb774097dd3dd5a64e553b2ae7f582693fbb73599ee12f3790650da2918
+AUX konqueror-20.12.3-use-new-QComboBox-signal.patch 3328 BLAKE2B 3e4ed3fab89a3a707a302a1142c96042bcd694385fe36f89cb89da8860000ff958d81ff0d25c9931c7979e90bb33a5a3a00455c2e3b877ec145000dffaf73e19 SHA512 3c6f30af0ac0a9b0a7e5d46c3c30e95f08d217e81acacd267d91ab17a09d8b2b48ab0eb774097dd3dd5a64e553b2ae7f582693fbb73599ee12f3790650da2918
 DIST konqueror-20.12.3.tar.xz 7241896 BLAKE2B 0fd3e4fffe57cbd56bd953901617fee15d264ba4d4c709d2866ee01516cb00d15a2888e8e174592245a35f58fa5c4b7c10391c450506a23a4851e72dd2a3c4fc SHA512 38008dbecd9a22ff9658cb6b72092245b408288388b4c3f8077cc958d0a1dd5be62f24e05f3802eb5aed718ea7d5f902e3c6e15a52846661e3ffdd41c0fc7370
 DIST konqueror-21.04.1.tar.xz 7256176 BLAKE2B 86a2549bf4cfde87a67f516ea0c02670961b994e5aa0507796c01f63632b23a9ec106acdba3904fdb737d7692ae94b96d1fb05e4a718fbeaff302279d57065a3 SHA512 8e0b1875e3391335c489c170928f3b428673d98a0ef6c377d81283b4351ee6958b51dfcd27a3c4618cfcc8d8267ac8014a1e5a9dd1507dfe20a311b408bc3ca7
+EBUILD konqueror-20.12.3-r1.ebuild 2526 BLAKE2B ec322c053681a3c83e14ca7f8537fa5f6548cff4f2240778a2ae9d3dc1aa84468dde2c06b5d3b3eb7af7f3616e53fd2652cc266c7cbe9f0117a36c896dc1c05d SHA512 dd4320a4b8d74d0473b614533d64b7f1c78dab9cddf9fc8b385e3e00d23f844dc5426af026085091ca84f1e2d407afe5253e428c9e5da65acd07d7f99189bfdd
 EBUILD konqueror-20.12.3.ebuild 2446 BLAKE2B 5095f794fe957e220bc9551cbbdc2dadc36a101ba041493a8e02a5c1c8516e77faaf44956d4cd3d417e84eae0b2ca1ee8ee2dbab53c5b4e1dbb4de939d973290 SHA512 ab5e776f45d971f536c8b0ada2c2889627c33a83063b30ac745a5feaf73b782ba5160977054e21b5cf30cfab46031ad183b8d3a1c6eb5d2a82ad57cd8537ed31
-EBUILD konqueror-21.04.1-r1.ebuild 2529 BLAKE2B 08ce4d64025c5cd189b98f6062a5041f3b9e8d1fc9861fc764d2e0c9cf8710f43a74a424f9132e67b78981c5d1f8c2fdff477f7f37808ab0035bf99245e645b2 SHA512 2b79b1a9c942495b85bbd2bcd6b73b79dca8319003e9644c6f859927db51223d0bab09c97781ed589e3262a8763216ec75805ec3ae7e232fb0d650b5cad06d9f
+EBUILD konqueror-21.04.1-r1.ebuild 2538 BLAKE2B efa04d4c8218520c6a235c5744e26bba2eca8109b87de009f345102d7870b2d2a99060ab6d6d4d987b0a9f99438344d8bde13565a927b4844130da9ba4c9fd8e SHA512 13eb2b3802a35e80b3efe1850402add172009951a4e5b979f68e204e5436ab91ea69da34fe0c8a754dfc8062ff2886008f55e328dd559d5143430c0686bea675
 EBUILD konqueror-21.04.1.ebuild 2449 BLAKE2B bae852f2debc23fab2a84f6f6d2ae141aa144e8a85155fe7d5962ab6c9b7f94fad84f26b37c087c5c8772f7940f4dc9c4325711664dc4d9ff786cf0586d4b95e SHA512 7a0cee39f999ae616b5293e6794fe2e88da695a8d738dc24a876c461f070daf3308485cd66fb97a46c0e22110f4620b1ed31db7c0a02ed328e0e5b69d392ba74
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch b/kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch
similarity index 100%
rename from kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
rename to kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch
diff --git a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
new file mode 100644
index 000000000000..485920585e09
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.75.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic ecm kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/konqueror/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE="activities speech X"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	kde-apps/kfind:5
+	kde-plasma/kde-cli-tools:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-use-new-QComboBox-signal.patch" ) # KDE-bug 437161
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	ecm_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+		optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+		optfeature "SVG support" kde-apps/svg:${SLOT}
+		optfeature "Java support on webpages" virtual/jre
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
index 8cbc1bfb9318..06ac23b4e1e9 100644
--- a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="${COMMON_DEPEND}
 	kde-plasma/kde-cli-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-use-new-QComboBox-signal.patch" ) # KDE-bug 437161
+PATCHES=( "${FILESDIR}/${PN}-20.12.3-use-new-QComboBox-signal.patch" ) # KDE-bug 437161
 
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index f65d6a753498..88bbeb94fcbf 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -2,7 +2,7 @@ AUX spectacle-20.12.3-implicit-dep.patch 1182 BLAKE2B 960532ea3a502c685904ec408c
 AUX spectacle-21.04.0-implicit-dep.patch 1179 BLAKE2B 62bd639d12a32b6faea613608160ada4854dc780b999e7b98204eea36b82f3e001097cb9c22d08056cd5765e43139daa9c02b7c74d79e745aac0d3021b5ce85b SHA512 d2257372821524a471ad75617df2f631a73f7b9a09e59adf1775d60fd0bcff393df16382a5fa9b109a7ffa8ca5684639ee565304a99b854272f8ab28570dbdaa
 DIST spectacle-20.12.3.tar.xz 1170540 BLAKE2B 865c4f7a2b8a3edf727f551c64ce35847a880023773b72531ea324addf5f0ac327261a87e35cdea6ec1f7eb4b75d2f8b86c3d1b7fc7719959623653ebe542a93 SHA512 4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc
 DIST spectacle-21.04.1.tar.xz 1168624 BLAKE2B ceb6ca521aecd85965370f44e54605293934574a6780f81ece183b6bb9fd1401ae59bcb3f8f9b6a87c16aec9d9f73738526518804de4a24e828e46cddca82ba7 SHA512 eb85035c2bae3427139b95c583a1a1c7d05c4db0360d0276af62d9abb2a74799ba6a80aeb6a9b6b36902123f20378504ecfb66fc7f0fb03abc7cbeb9f130d52d
-EBUILD spectacle-20.12.3-r1.ebuild 2076 BLAKE2B 735a485cf400326c4d0aa2196e5124e5062ab02b3b931d53ad876d8372dd0fed9fec783a1d037ec1bce4244948ef5c435daa5d39f2e42ed8da9b6eaa5290a65f SHA512 3d2084a33c7c6a71ea3d9147ffae875b2944092509d2cfbeefca415f2f4be6deaed503a43525ee2e922e82e756e9f9475ef02f16f45922acf46bd3dd0466ae51
+EBUILD spectacle-20.12.3-r1.ebuild 2073 BLAKE2B 505e238d82c9c7f7f771323c84125adeea52304a3a04ffc1dfe0d9a5e1e9b78e6cf75c1992c8c8f47aee1019517e61f48b2a9c2511838850a2c43ab8887e2beb SHA512 4a19ab0200c248a33142e42bc86879b9289658b6a05fe34f8eac8a4fb2a485dbfed7c625dc223a53bd3c5e6ad1e67ded49216069be27a52e57002cf917c014af
 EBUILD spectacle-20.12.3.ebuild 1973 BLAKE2B bb82e52273d70c066893ccce83b314f855f04420a813e906e1dd20ece0c9d3b14fdd75ddfaa52808ddee6d893c30fa97829f9aab3e2a7c592d83703499867105 SHA512 3c36ecb46a7ab14028ccf1c240225da42751d96a415875ba56d5aa0da4ff2daaa09b85c5b34e558136624e2a8d05bdafa081cb76ee02fa1c044a2bd87acec69b
 EBUILD spectacle-21.04.1.ebuild 2083 BLAKE2B 87e4773b60f7e8711e34aeaa3b3000661658649d4bcf1c86543fcb55ec66d5d1ccbb479b911da317769f6f6b5feee660db012c8eed1bd8d02452786b9ad3984d SHA512 6d7d782a9ecbc714ad4ad361e525782762e4a2a61b495c554fc8524248346a07ae93265e3756c2e158c714b1534eca74fada0cc5362e0fcde996bb4d46473272
 MISC metadata.xml 558 BLAKE2B 304071c16927d1f17fb0b30c3bc71ac9cf707a9cb06816957a8382b3eaac9083d3456b142bc3e0dc745588f14641e461c20b13840258997c85b84bbdaa5659e8 SHA512 0cc62fa4faa18491636dd37eea421cfc880e8997101420e15a876e070c6c14369063f6785d1f0474b3d79fc42860455fe4ffcb90db9f7a61e0492500d19aaa44
diff --git a/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
index cf416d9e8263..6006adfb0de8 100644
--- a/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
 
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+annotate kipi share"
 
 # TODO: Qt5Svg leaking from media-libs/kimageannotator
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 226f6cac9eec..d079d4def3d4 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index e6b4b3c15895..360eee873beb 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.80.0.tar.xz 66216 BLAKE2B 2b9c890dfc9bc74ee2de73af1ccec35f92d51c456387da6cb9b8406fffacb0fa06388b014449214b87d139abca6936ba224784ab62a3ef77730c9f55471434e3 SHA512 70cecfe60ce396a4cdbfa4b2d133076897912ae32a5494dfaea6f777e51f5be79b240d18d2e6b4f71f8dc4ff0f18d43243c711629c6913b8512aed0ba6b3f051
 DIST attica-5.82.0.tar.xz 66220 BLAKE2B 22ee6014cae294cf772eabd874fe1afb493ad1ac92a1f511cbe6912dbbc4f81a684989a285d388d6a1dc5f7180d6930e839a5ba05c1e81b306ee69e572f6fb2b SHA512 8569ec110679bc026f98cf98ef79aba44279821f10f6153f0054c7a75806921683a83317bc1873896f5bba23679eb4fbe50b50ea43b22813dd2b203e84bf44d2
 EBUILD attica-5.80.0.ebuild 467 BLAKE2B 8f78d72bc7d8287883a0a74d584cac14c342d014596086859c9bd2310ada604ce27ffd5f0cf2370d4cb683ecffd7fc100f1a8c645bdb6b72e5f56c5ef9a4be81 SHA512 501b4bca7f7b50110e25250178f9b7dc08205798eac70c8b78751bfb5915bae99dd15740e2655cc3157e9b92977a333bec517b22e8e531daaed49c180cea09fd
-EBUILD attica-5.82.0.ebuild 470 BLAKE2B a81b640ce9bbcaf07d6891bde7f4dc62ca75248c0397dbd42d1404e1403e543bc4ef92778c786186f7989ca4389acc89da6ee612eaabe82b67c2021369d5e423 SHA512 91bc31720d60f7a8c8bb952c8195638aec58a1dc475954f8e1a7706dce8b73d6f17d07c0d485ee12bfa3fb444b1e2c7fa6a5be4dd81e6f28fa2f6039a18be711
+EBUILD attica-5.82.0.ebuild 467 BLAKE2B 8f78d72bc7d8287883a0a74d584cac14c342d014596086859c9bd2310ada604ce27ffd5f0cf2370d4cb683ecffd7fc100f1a8c645bdb6b72e5f56c5ef9a4be81 SHA512 501b4bca7f7b50110e25250178f9b7dc08205798eac70c8b78751bfb5915bae99dd15740e2655cc3157e9b92977a333bec517b22e8e531daaed49c180cea09fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.82.0.ebuild b/kde-frameworks/attica/attica-5.82.0.ebuild
index a05e53578cc4..a080e3b49c6f 100644
--- a/kde-frameworks/attica/attica-5.82.0.ebuild
+++ b/kde-frameworks/attica/attica-5.82.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing access to Open Collaboration Services"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 9b8c459de187..4dfbc637c3ca 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -2,5 +2,5 @@ AUX baloo-5.80.0-update-filename-terms-moving-file.patch 1187 BLAKE2B 9cd26aa380
 DIST baloo-5.80.0.tar.xz 288452 BLAKE2B 0de1a6d356438b18845df034f3e6a7d891b9c4ac988a7b8075702d0e669c46aad87bf094a13172e56d5e3992e06e37eb231357a64a99e7a8af0db4bf335500c9 SHA512 e7431f78609d42de61a23478067f28168cd3e2a032543fd3d4d5fc444396d73a0d9f67b39d4602d80bad814d6e1af071327261b8b22cb5d9966a375d328b3759
 DIST baloo-5.82.0.tar.xz 291468 BLAKE2B abf25e14f5cca320c89a909bf4fe1d483b7e4ba1b77bce8ac12152b242af28a525179605078ed11f4c4f3e5abea338dfb510992d02748bf9a746eade1d1c7160 SHA512 aed73f3c67f3c7331706fa121c0fbc062b4619adf8ebe65fdb4edbd033f6c4bdaca17f8c00fc3eb3f4159af1cd5bf89c144bbf87d87e9ef60d5b682dabe059db
 EBUILD baloo-5.80.0-r1.ebuild 981 BLAKE2B 6caf21d48d47f57380e4c1da6c3a5914ee7a4c98a3802a7404a6509866ee4266ceb3fc1054dd85b47fd88af680efc16800c6dac8ebbe0d0579f98d0904a1682a SHA512 dd723c57f18201bc28b3bae3f62ddc2fd78b7631895bf2ac6e39cb54715590103804c3ff1d945e3ba7fb9a9d3d3712e3a13b6fbd71f7de677bb569b5d9913eaf
-EBUILD baloo-5.82.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
+EBUILD baloo-5.82.0.ebuild 890 BLAKE2B 62db950b70933b74eb5580d0b3ecff4f7abc9411f3c5d835ae0055ef61a2b2c9c0c26958788ee834359520c068a95d0fd2e07a824852b62798adec0028c55f2c SHA512 31f145bf2ef03289eb9c6db7109114e06a82c9f1f43e468db0f5bd1f70a6ee069ed9acda85c2ab7bc6184d701c2588310776e7e2f0e0c042aca1c58c3af4ce3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.82.0.ebuild b/kde-frameworks/baloo/baloo-5.82.0.ebuild
index 245f2f64562f..abf1a63e7684 100644
--- a/kde-frameworks/baloo/baloo-5.82.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for searching and managing metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 25b658245703..2e5d166bbe7e 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.80.0.tar.xz 101996 BLAKE2B 6feeb0c38bcc1b380322d2019ade4afb7a601ea2743cd7879b13894db6fcd17ce85817ede0b87a6639abd090e0627f51218548df3caac43f1374c792fa4ae59f SHA512 6624d90b10bb742178c2da073a5a34eee534d29f0c068721961fca4f25e38c28723340009c0ecdc071999cc5f1a801b971dcf0f8297c2895beda40c53b59aab9
 DIST bluez-qt-5.82.0.tar.xz 101788 BLAKE2B b9e67c22a8c3c6e8756fb140622d5847c52dbc536ffe4cbba6811af7a49996abb3613dc2fe481dea98c16badca9a560d9636653dd180dfea6256cb4b6e298ddf SHA512 defb301f7095730e183e63d267fa774dd6466b8d62eee2377d4f1d8a77393a848caf7f401c778b3ae7fcbaf1b0c408fff365e2a13d109120e07ddbd2735dc3e8
 EBUILD bluez-qt-5.80.0.ebuild 678 BLAKE2B 526dbd4248cdca726126cb5197a190be1590ba4b08cc5f519d83dca1f088cc5d152e0c2fbd5bbd68547d66e9c4dc3bc982439cc095406f79729523377a480467 SHA512 e94d087e0f794aa71a3e0b8de2c19e0c75610cffd8ce876c81fd3504944e2fe326e1511bcc45aa9bae1bacb3a778ecf4fb8d198dedb6c8d6a385928b1779a97b
-EBUILD bluez-qt-5.82.0.ebuild 681 BLAKE2B 97e954e047764ac249bb1bcef0b4f8068e8c26d08bc87a1b00e61d7e5bdd0391156b1669b9528289e66aac8774887988ee21aa72e27cb98fdc312fcac802ee41 SHA512 9b40d1adf6cfa24aa340a05c571caf41823721b35e6897f52b90b89e8979527d795db411e7cfa787a20658ce73a1918d043f5a235764f527312877f0bfe695a3
+EBUILD bluez-qt-5.82.0.ebuild 678 BLAKE2B 526dbd4248cdca726126cb5197a190be1590ba4b08cc5f519d83dca1f088cc5d152e0c2fbd5bbd68547d66e9c4dc3bc982439cc095406f79729523377a480467 SHA512 e94d087e0f794aa71a3e0b8de2c19e0c75610cffd8ce876c81fd3504944e2fe326e1511bcc45aa9bae1bacb3a778ecf4fb8d198dedb6c8d6a385928b1779a97b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
index a55ee208fcbb..35e86fa8244a 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org udev
 
 DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index befad135bbc5..2fdb0a259f11 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.80.0.tar.xz 2021500 BLAKE2B 02f11fc061cdc09e7679add6776f64f62598856a7d98af673cacdb41e8870d68ecfbb8c533d4d9358b09bc3dfe2384c66a4ab436b92d6b6a52aa2e0866ab269d SHA512 c94f40505aba24c150b739d745c821bd909a12330a7b011c36c52d0c492f4608304c46cfeb72f4ba741e6a260dc7b2742f1c8276aa129d3f5577248fb4eea1fd
 DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
 EBUILD breeze-icons-rcc-5.80.0.ebuild 684 BLAKE2B f8359446ac87a9f80ea95a49c917ee410ac7fc544d98599c5a0af5083d48fbb9ff7499218c481af54149085bf1701cb91c924bb2cdba0578e7178dc1667a9816 SHA512 454a2435d4e8c1f1bbc0b0670de02d088a922e87bc7c8f5f75ca023133edf5be9f799466b98d1e6f988b347cbebd8009724e3890afeb036a28afdd1ea75a5855
-EBUILD breeze-icons-rcc-5.82.0.ebuild 916 BLAKE2B 83cb6f2b9a716abf57880df70ffa914e04504ccf73c115df2f8c92ffc7ef179df94d17bf4daafaa31940b5e61962392ca904f6ba823b3b70841e0f47fdd37ad5 SHA512 eda7fdc253c3aa568cfa991df9287d43f392a1c5577fa179e16c88a937599bde90dca44a5d7e82aaa6c3df63c2053f294113f49ca3e21bd6e4524fb874cf3874
+EBUILD breeze-icons-rcc-5.82.0.ebuild 913 BLAKE2B 9739ee627ca8f9101b1a5590c4b1b3a4644cfa5519cdd7c3f47255e0021b12762e3dfa4f9a8241db7a3f03d8987add2e7a56fcb1427a4e39647b48d34e709602 SHA512 cd06fb2d82b7e02af22bc568201cd00b66d61b4c96760436cdcd6f4f99267848a57ba7238bfaab9a9cd1138f112640581c4a2ec9ab0558f2508feffd97215a28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
index cd06b9328b08..d410c4771dae 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit cmake kde.org python-any-r1
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT+=" !test? ( test )"
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 41673f33d1d9..f07ff8cc158e 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.80.0.tar.xz 2021500 BLAKE2B 02f11fc061cdc09e7679add6776f64f62598856a7d98af673cacdb41e8870d68ecfbb8c533d4d9358b09bc3dfe2384c66a4ab436b92d6b6a52aa2e0866ab269d SHA512 c94f40505aba24c150b739d745c821bd909a12330a7b011c36c52d0c492f4608304c46cfeb72f4ba741e6a260dc7b2742f1c8276aa129d3f5577248fb4eea1fd
 DIST breeze-icons-5.82.0.tar.xz 2035608 BLAKE2B 1646f4587b449315be5d9245f93e15915450ad07459474954b752876d3b2d6dda03aac371a80d16f98a636ee1ab8a07149cf616e9cd0b8ef66dd4c835f022beb SHA512 bec29bfc1b70f3e99dd4a622b5cf7b403517c9c5e91107b7fc3d845cef2a6413c57b0270a0510ff56a2b50a125b1bca339c85906eae7037db226cc895aac5bfa
 EBUILD breeze-icons-5.80.0.ebuild 714 BLAKE2B ad062e3867a4c91661c665b0393b4e304cb76bb846d90077c933370efc50f1677abe2b24c34b3c38ce667f84c14f4c2048b983a5be0f5b8c06a87cc7ecfdbb1d SHA512 ad52fe978233682e5aef75082279360e985512e8e40c9f87ce119d8beff419fe56e5bcf66b100fdef7111ee6eee3d8c36e332952c8e91fb2d93b0a717c788880
-EBUILD breeze-icons-5.82.0.ebuild 947 BLAKE2B ea10e1047348287b13b1166194b06e266ce80959fe35c9289666f490107ce850450470432872ecc196ec7498346d99a082063c57cfdf3710200951ad621f6f15 SHA512 fe75e1aff5031a99cb5af2e63ea7b8ec5c8fb939403cbb2e991a3a4e7c052a578c44da6610ef3d70e6d18d63e1099fdb11ef051219737006db33d3cc4c07b732
+EBUILD breeze-icons-5.82.0.ebuild 944 BLAKE2B ac823981285ea8eb82d7b2a1076067105a6dea6cdaec6fa6613dc3be8eb353a42180ad580cf9e70a64fe7fbfb59da094ab26cd4efe6ff1c45f7e4dc2647ebe5c SHA512 3b922b6249f61ede2374423cde87b6571d74ea8003e73dd280b8935a58cc23c50cf189303a8fc65ed9ba1b3d5b4f7ba78df9c05bf7fce831176c78ab8affbdb5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
index 5665d1bc4822..8921f1f69c70 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit cmake kde.org python-any-r1 xdg-utils
 DESCRIPTION="Breeze SVG icon theme"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT+=" !test? ( test )"
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 74914bb057d4..3e3ca0a5dfc2 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -5,5 +5,5 @@ AUX extra-cmake-modules-5.82.0-sphinx-4.patch 2959 BLAKE2B 1edd0052595551e33b231
 DIST extra-cmake-modules-5.80.0.tar.xz 357412 BLAKE2B 1a564eac42bce7001b2840a052596456970e81810d07c091e47161933f906a66d20560a7d031f08660acd48c5db2d32c5512579b243dc4c0c803142cac4bb0bc SHA512 d07dcb31f8142c99270c234679cc0ab4dd13acd61e505a3623b7e2c811250acfb9f260cf355d8264bb1924a2aa61ed12fd3b5b431a4f619e33e3c7d53f2f7f68
 DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
 EBUILD extra-cmake-modules-5.80.0.ebuild 1813 BLAKE2B 091838f815968e4b53533f519de46878fb25b8432edd1a0702c813be02bf08cf6daafce21434d4d8c8c04edbb24532fb1583cb08619f98c5833925b3f7a0498c SHA512 47b39b65949b2025d4992b46c1326e8305549a2768d6bbe709df0575982f3b1731df4c26a04cd9e0473465d6f15dffae98abc0510151ff7bab1c2362e2b7b58c
-EBUILD extra-cmake-modules-5.82.0.ebuild 2019 BLAKE2B 2e13af98aba11913f53b215eb6fcc9431b872ccdd30a1eed040d7d9af487cbf3d8602a48fec1500af1364c122b661ccb12995e07df252a7ac430276da9fcb26f SHA512 eb8aaa04e5bc9c685ea59a24811ccc1ab42ffd2bc292cb0f1904d7c56e24efa96a3bac42da96f5ffaf54068f99e0be36ea565419c7ccb7b7fe32507baa2647b0
+EBUILD extra-cmake-modules-5.82.0.ebuild 2014 BLAKE2B be99e95ae4343cb94f1b7ff1805b19e52bdd122be61050de990189345dcae561b4ddd1d15e6b61aee751206bc9bf55d7635717773887e3cce551997d22046a9f SHA512 4532518bbc890485c1970436a215e4d268fec3b0d6cd251fca2a29a5b16e7b61bfa0ec07db01a85f877aa0f8c3af525ded37bccf5cdb0fce450884e9af4520b7
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
index 41f98627db4f..8d8b8249034a 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 RESTRICT+=" !test? ( test )"
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 7853d4f2f2b3..465eb16ed3e8 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.80.0.tar.xz 1755248 BLAKE2B 55aecf28bc801ed72689bb340c28b1ee1374a913d98750a1380f91a36f6fcbe5f1e8690dffb74eb9fc642c578b5d6ca68937bfc95a52bdf7febaebe32d793ce9 SHA512 3e54729281d5fde4d18eaf7ebe18c6c17d1bb40e336ba0d91ac04aefd65800208efbcca4438a3be3f408860467c80bdf8b16b021c9892fec8f4ee55a13813ee2
 DIST frameworkintegration-5.82.0.tar.xz 1755828 BLAKE2B 18c056daf8db8e06995d3f0b6985f9aabb05e8a4e7323635faf92701f04dbf135cf63221fe739504d2ccd7718dd02a6718ab7fa7ba84b86cb37394ff878b6e3f SHA512 5865e560789c50829c5648365db58497d0da141d1699f396ca431740e6f919ef68c89e2cb98ac1f320cdb07fae098de683b17c920f79a2b459ffd874935b6e77
 EBUILD frameworkintegration-5.80.0.ebuild 991 BLAKE2B a2504a4055a05297517cb5ff6335d97d05fd77f811b49beb7e13cc917593e068ae061d17f1a3d383fe6115062622fd44bc719128ca9d2cc4808eeaea80c894d2 SHA512 0f3288378838ab2dc3c0dfe880343f132aa54f2f52a0aae6b23fa50181e609f0e381897aecf8e5b5256b9f307fbd5901f5e2f96421158f642b224c06e1731aeb
-EBUILD frameworkintegration-5.82.0.ebuild 994 BLAKE2B c5af19730aa8f772d3fd4235c1b100a0470efad3fa2514e5acb920c671d11657e226b3c7938082fa356d86fe58ca732002a13ab7ac36c7810ceb96c8d8c56119 SHA512 4bac1d77b8b1797debb25dc0e2761d1bad5d0800800024f2e89bebb55a8735a4151a2657b631d56d4e41360127cde7271ac8b9660e8018989a884303c9f73845
+EBUILD frameworkintegration-5.82.0.ebuild 991 BLAKE2B a2504a4055a05297517cb5ff6335d97d05fd77f811b49beb7e13cc917593e068ae061d17f1a3d383fe6115062622fd44bc719128ca9d2cc4808eeaea80c894d2 SHA512 0f3288378838ab2dc3c0dfe880343f132aa54f2f52a0aae6b23fa50181e609f0e381897aecf8e5b5256b9f307fbd5901f5e2f96421158f642b224c06e1731aeb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
index 8fbf5abdb53b..eae353b9bea1 100644
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running Plasma environment
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index f11d05ad2050..6ec48b33621c 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.80.0.tar.xz 81992 BLAKE2B 97998de9ce3ad101a2b565c22141ef777aa6758b42baea4138cfa34808c09147e1c0366c5e6ae046aca0d2327ff7e36d53b1eef9983a1d17d0f063a4ef6c4b02 SHA512 93ecac735b42509a7a186b43293f569e35d020dc9c152d4c89a096b77b194080db3fb9ecf0fbf4878f265b7893a3f18017fb3fc691e14cf76de256c93ebcdb22
 DIST kactivities-stats-5.82.0.tar.xz 81740 BLAKE2B e9cccc36e88a743f7a9b47c8b03ca5be980075346820be8108ca8f0f612e2468d379729be063318a1c3edf15afd3bf56b691b65ad1492e6ba07f64cfc703a02e SHA512 0dd6bed082318a40afc94f0f525cb9c8cd6f9066a4bc38389d23f3dfcc8ed46929e4150660b3c2eaa37241fdbedd10e6b4d472e8d649664dc9acf68b002f206d
 EBUILD kactivities-stats-5.80.0.ebuild 516 BLAKE2B 9687fa6ba5dd88b7ac77f8dac14a0b2df5e55c1024ce9f699e0fe56e247d12420de472d2437f4c5e5c7d80425e380ef49593f4028d57d5fd41c12538b200e2fc SHA512 44d50161ea7699159cc19d16a4b9921d01fcd144361357d6194befc45bd2a4b5aefe0eae3d47113866438fad30f58d3cad3f1c9538647d064180c2fb2b266960
-EBUILD kactivities-stats-5.82.0.ebuild 519 BLAKE2B c8a3482ac37061ff25c45000acc3e49ba1b65ff1352b642c678dd56db148c50b9cad6f586bd1c3b556dc29f4b048619e5cb512c86d7db55e143539ff360b7134 SHA512 0a62ed1b71727977dc01f40c605de404008c41e9574315c2deb7d9307809b6466fa8a24ff081090ca04f7835ccaa0cc460f16f542f4a499d1fa29751aae248bd
+EBUILD kactivities-stats-5.82.0.ebuild 516 BLAKE2B 9687fa6ba5dd88b7ac77f8dac14a0b2df5e55c1024ce9f699e0fe56e247d12420de472d2437f4c5e5c7d80425e380ef49593f4028d57d5fd41c12538b200e2fc SHA512 44d50161ea7699159cc19d16a4b9921d01fcd144361357d6194befc45bd2a4b5aefe0eae3d47113866438fad30f58d3cad3f1c9538647d064180c2fb2b266960
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
index 0888d85d34a2..ae6fce28519e 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 6bd6b017206c..695351071b80 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.80.0.tar.xz 71404 BLAKE2B 01f0cda51ee2cece075aebef195e1df006d02cecfb3d404e14a43f6108711c27e5f0c06e16be1ec3339d43e14c2f8a53e7e3c4ce95c3cab6221c45710530ad3e SHA512 8cd5cc69f72db198b97a33947f3c9d15d3798ef42478babe18013057c74e398b0e2b49177270155d410d80e2163da450aeb88a24027281395b0682f93a54f042
 DIST kactivities-5.82.0.tar.xz 71356 BLAKE2B c83b384f4aed32554dfd96951a9efc22cd8cd6c644a674b8d492e571ebf261201be78ac2834722f12fb43822ff17741054e7153c279a8ea7bdf6318cecef20bd SHA512 f1da5447405e53a4c7d11c0ff14ee80c725f07df929ba6b4380239675e2efef21bb2e6e0d028146ad621440b01f76314549779a3f7a79e639537fa7bb8e96729
 EBUILD kactivities-5.80.0.ebuild 679 BLAKE2B e6c029912ce02949bc0a49ba1683f8657aa2c02b8fd450ed4a3f401a504351aa382c5be34a5da3d71ad706dba09f260d8535152e4d7007198899d39a347e3133 SHA512 a25f1e454e5df018b65eef4434c51fe67be4e9c37890c75ebd977dca603c8f83af42efe43397be8cc963808d875d4dc5d2f923b5ef7f9fec0e6fb3a4d0e51667
-EBUILD kactivities-5.82.0.ebuild 682 BLAKE2B 059ef1d8789f7554277bd0433932dcbba3bf94b38376d97a45c2680e5084a02643c0cab5957e465b73c8bf61b5b106f86439725c683471331645df42a14622e5 SHA512 be7ded73eb965ede309d30aa6e73b33d3eef261ffb747a13de8f1e616a66efed5842cd2be4bae5070c9435911da3d6263e5fe71e049b1597933ab49fc555304d
+EBUILD kactivities-5.82.0.ebuild 679 BLAKE2B e6c029912ce02949bc0a49ba1683f8657aa2c02b8fd450ed4a3f401a504351aa382c5be34a5da3d71ad706dba09f260d8535152e4d7007198899d39a347e3133 SHA512 a25f1e454e5df018b65eef4434c51fe67be4e9c37890c75ebd977dca603c8f83af42efe43397be8cc963808d875d4dc5d2f923b5ef7f9fec0e6fb3a4d0e51667
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.82.0.ebuild b/kde-frameworks/kactivities/kactivities-5.82.0.ebuild
index 8c56185f55b6..6456476b3466 100644
--- a/kde-frameworks/kactivities/kactivities-5.82.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for working with KDE activities"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 07b76343c035..24937e565029 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.80.0.tar.xz 194180 BLAKE2B 2952c4f0064721a599648d498cc5815ea40270bd311e6d030390d0b160941cd59d58d86eb167974635938aeeac70f775f86fc9e4d3edbcc9e37d668ab8035b1a SHA512 71940b713e5686165091871e051f327a439494cf0d361f0db5ce765f38512a1b36895b9db3f81829efb7d56e0d589b6269ca6d820da196a6a712f06e1945b14c
 DIST kapidox-5.82.0.tar.xz 194608 BLAKE2B 3f45c5d23a3b939ba2d7249358344ce8db7458bad7017aa40ad97ce2bbf626bcbc9a3adda18b87f8f5f37e5378bb98762accb779523932e9e388aa6b8eea1f64 SHA512 4f69a497878a6a6f0271e7d073a0be80d7c43be2c90bc14accc6d861d0e569131ea9543f81949f2b54765aa2ff6c6bc0e3f6339a4dcc1f875a01adac54e547f9
 EBUILD kapidox-5.80.0.ebuild 592 BLAKE2B 61b9609b43e761b1aef0662a7d85e651602214a4de298c3bcf724b672cbbafc8bf3f67cb8cc05935acf269c26eee6bc12ab59e48815b1517e366e4a0538d40c7 SHA512 350eae7cbac429e5de6d4fd816b2604254bc470a2795e69cfead22228dbe5647f28ecc7906543e9254f3acdc42877bbc67fee7149a248edad24127d8bb895046
-EBUILD kapidox-5.82.0.ebuild 595 BLAKE2B 4ea93dac4b18d4caf2af475a6b3642e446272230195f85efdaab6ebab779097344741960296eee6db7282c29f1081a05653f262ab02ec2b8e722c33c100840fd SHA512 19a09adc3e6936331229b04a0702501fea06c12115e61b10100befe28f30868364b00dd08a169fac1c9735b5e805d2c249c983c049c633360eba10b2d6054c9d
+EBUILD kapidox-5.82.0.ebuild 592 BLAKE2B 61b9609b43e761b1aef0662a7d85e651602214a4de298c3bcf724b672cbbafc8bf3f67cb8cc05935acf269c26eee6bc12ab59e48815b1517e366e4a0538d40c7 SHA512 350eae7cbac429e5de6d4fd816b2604254bc470a2795e69cfead22228dbe5647f28ecc7906543e9254f3acdc42877bbc67fee7149a248edad24127d8bb895046
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.82.0.ebuild b/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
index b4a7e1a58e7e..60c324d932a0 100644
--- a/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 1856a093e925..5703e3debafd 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.80.0.tar.xz 983724 BLAKE2B f4b6a61e3e910ca5f7978c355ca1827d5c27ebe7223cdd3563d19c7f07d8887530bb36040f0c9883a3961a2989a71497364c6c9225db0e00bd289e0fbd21ee6a SHA512 84a679a9515b2df989d4331307eb52a236d6e33ecc029e0c76732abcd709d7d4d026bde77b2b22a624b7e5fbd54d202574b858e37a3f7fbb0605830f812a61b8
 DIST karchive-5.82.0.tar.xz 984872 BLAKE2B 1a8e6b758479a4ff5f1be774b6deede551d9a306bf8a3fef845ff6a1532fc84d36aa9697f6de7455746410f233c70072ec49d729e20eae2baab529cc1d3ea9af SHA512 7b735b3f1c325bf8dc9044fc9644fdaa3442baeae16831ea79cf84f7da0d5cb7757e2201d8cb73f18a831c49f079b87c75c8387a53c236386e4da47437884183
 EBUILD karchive-5.80.0.ebuild 379 BLAKE2B a6b514e790be7c5b06843bcd7b4173994d5e7ce65cbce321b4d72b699e8c699d4d3f891d1b9e21e52ebc088ffef02e5a7a0d53e12c91cf42f958299918acbebe SHA512 39c9747836d485cb06cfbf6f1118f918db07016f92e49e25d19991eb43db279556984b1867611ea285e027666761a1552c42b58eb54dcca0726cb69e6155d2fc
-EBUILD karchive-5.82.0.ebuild 630 BLAKE2B fbc4fcbc6847024201657c04f1b037a67f968e42e4410585a757cf47f0144184930253f136d3c786113b63b2074917b7c0c794a5936e3434d8942ce075086a88 SHA512 a0ddfa8f3d77f4679937bb7cb5da28c16e6eb676b728764668e47297b445884b8c575f99b6c618b0aa5885de3afdc0a067a54bd34b4d8d80f36700dcc4bedbbb
+EBUILD karchive-5.82.0.ebuild 627 BLAKE2B 3a6b934d17a552a48aa12f75fded100ea4e69a7bed0d91a652858748addcbdca8dd2673dc15f081c08f44e6e29a93938fe765237aefffa432041682c172cf79c SHA512 33d172edd8080203e26897dfaae28f8177ae9a01a77cd1038fbaf935d05a5a5873c786b74f9e4e64acb468e0e8802617b73913c6c34b86d53e1c36c1b7d8eed7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.82.0.ebuild b/kde-frameworks/karchive/karchive-5.82.0.ebuild
index 77a707c97948..353068a75fbf 100644
--- a/kde-frameworks/karchive/karchive-5.82.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.82.0.ebuild
@@ -7,7 +7,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+zstd"
 
 DEPEND="
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index db7f14aecc71..db4a261339f8 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.80.0.tar.xz 87928 BLAKE2B 9383f10901223ab983c1ec7ef63d75447ad15a159694b9c333efe7911fea472c58aec93d123ac65f029b839bfafe8d559162aef8bfb6707cfc2f2397879b4cb0 SHA512 17ab01527a3204b32b1e628ca3882e27c4d4deb988381f8857ca4b51e80d136fa39faaf90cc28ca670ab8174bf757a961b6cbe6e87cc70a141968a1d1d94e983
 DIST kauth-5.82.0.tar.xz 88396 BLAKE2B 1c99917b26f9738b876385276251b7bb616a35bdc82bf581aabba693a0846b8fd615e960dc95829e6a19b158299117988aef10ba965ca16135cbd51c2f4891a5 SHA512 ff69853dbdfee9b22431ee495c07875430015ee706357acdcdfc93b3deca7a373eecf40d30977de97253f044a4dad7548b2ad55c84583b92587a77be285e3ed8
 EBUILD kauth-5.80.0.ebuild 976 BLAKE2B 67f13a3de6a40a0ba2c1d5f25a476f071d1ef405b1c621db5e82ddd33a25b02bbadcd52eeff4a5b409afaa35029d2e69b285682850d703cc63f482905de2ae02 SHA512 f1e5cd1a9ad562926cf51a288910c52133a4a0dac463a597e6d1be207518d97b8bdd6a7fd07fcdee7b8566d9b7a847a5c2a0d2ad744906846c8bec01c30d3f41
-EBUILD kauth-5.82.0.ebuild 979 BLAKE2B beefff0c49ba09f5932ae70c09f60a7d39174d08ffd08a19b1648d1d17e7581391e8ba1ee3bbb69cf7fe2ef2444816a50d2e25aea72655c3375f9094a49962c7 SHA512 0e5b71b97dd594857aba7c800accbae2bb4c14db199a5558cc64ddf502d03c44324479832a849585284691b7fb29d710af6310e938b7de318b108afdf9e4c400
+EBUILD kauth-5.82.0.ebuild 976 BLAKE2B 67f13a3de6a40a0ba2c1d5f25a476f071d1ef405b1c621db5e82ddd33a25b02bbadcd52eeff4a5b409afaa35029d2e69b285682850d703cc63f482905de2ae02 SHA512 f1e5cd1a9ad562926cf51a288910c52133a4a0dac463a597e6d1be207518d97b8bdd6a7fd07fcdee7b8566d9b7a847a5c2a0d2ad744906846c8bec01c30d3f41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.82.0.ebuild b/kde-frameworks/kauth/kauth-5.82.0.ebuild
index b87b08b797b7..1d351fb7f603 100644
--- a/kde-frameworks/kauth/kauth-5.82.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to let applications perform actions as a privileged user"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls +policykit"
 
 BDEPEND="
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 196579698456..21814eb31699 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.80.0.tar.xz 126264 BLAKE2B bf6ac0571293bdb5814395df7ab7ab9bca15f44978de045fff2d6af551d68e1715b1b44ecc4c183b5a7ae319bc44c06f9beb13570a4128fa23b29e9457f29b9a SHA512 c555fffaf850d93779b00aa9b5398e3286d02fe7a93844cb7b89cfce5ca8e5a694a6619daee734104bebbbb8ac5f5ceb97f2e778e476d3b0a4cdf030cd35f40b
 DIST kbookmarks-5.82.0.tar.xz 126800 BLAKE2B df1aa0b34b1fcc21a481995001ab563ebafdca67d307d1f610033aa364899bfb9dbf5a9aad4d4eea4bc5a8a4e93c5afcc45dc1efb78dbd79d7cd4125ec8749af SHA512 aa1ad09e63eee22eb5aeb094b9d2986f6a700038c790023878d7a6a6fd6e9e2f0af0092f576d1e1e6b2413219c3461f1bbe3347afb19e3be8e9a081443aa5872
 EBUILD kbookmarks-5.80.0.ebuild 816 BLAKE2B a8510d3a04540677a424587a54b04a1cb7b6aa76e274be3440e4bb3db0f7f0c95cee4b007597816525a63445b94a2d969575ebe954a478f028d3d328cfdc68ce SHA512 a3f717d91be236e7cac89252af268e7ccae1e605f2d75cbc20a09e9d4aae23d9d3d98d3129ea6239a03862ae5af3353888fe82375db2bd089f50caa62151a070
-EBUILD kbookmarks-5.82.0.ebuild 819 BLAKE2B 451a47e5980134eb8197a5a70b3ae72c3968400feb280e6b6f41623a66941e3d7eaa46b6d9e0c77def8993a42300d7cd214796523decc98bf13bddcc00cc33b7 SHA512 7d2c1d054fa8de771717bac46e175dd5fa7edf67799fecc3191c334996d0c98071182c9ef63f9fc70ccdf29f39545f1e60ab2c1d3fba8275676f66b2717b6e01
+EBUILD kbookmarks-5.82.0.ebuild 816 BLAKE2B a8510d3a04540677a424587a54b04a1cb7b6aa76e274be3440e4bb3db0f7f0c95cee4b007597816525a63445b94a2d969575ebe954a478f028d3d328cfdc68ce SHA512 a3f717d91be236e7cac89252af268e7ccae1e605f2d75cbc20a09e9d4aae23d9d3d98d3129ea6239a03862ae5af3353888fe82375db2bd089f50caa62151a070
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
index 8d622a20ed1f..ad414332afcf 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index f814c84c9386..372981dc8c73 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalendarcore-5.80.0.tar.xz 259748 BLAKE2B 7eb9e5f6c20e42c1cbe0de675c95585a0af0c0c7b5f6e75fe153db3daf14110bad29ddfea8efc594841d7782fbe19ae896dd3b0a5e58f4ec0eb0c00608e3c6fd SHA512 701167bd708a817f6478fc7059c46b1c5138903effc7925248c108484e5f66f72fb1f2088cb82ef94d4c13671b7a8dfbfba5b2006f89d338a8ba22f95f10be0b
 DIST kcalendarcore-5.82.0.tar.xz 254996 BLAKE2B 255728d2ce6036bbb35a2acb077a1cca23420d3d60584179a27ea2d801b9191d7696b4322fb41023420993a69dac5649f43fb4a52c708f9b48aa732719297c5a SHA512 26d76b20faebe36b9e5a9e234364fb5e8cda1c3c519ce5e3fbd0d9e36657348010dfc7ef4865fcc3326978aa88847f5d5304d3dcccbfd0d728c568b2e149214b
 EBUILD kcalendarcore-5.80.0.ebuild 519 BLAKE2B 312d74f10c1b727824b483aca478d2b63c89da0f842fe5159fda852a28e2e1c441bef5f1e593d8d27fd718e9478573727132c465228ec46056474a6dd0d0949a SHA512 dadcbb83a4c6c65bccddaf5777b532e36b94d0dcab281655cbc82b8175cb443d71bce69f356d989c0266f3ccca7971ab5dd2ce9e72858d6ebfea0d6e4b452a37
-EBUILD kcalendarcore-5.82.0.ebuild 522 BLAKE2B 17416540f8b97f14cd4b753e189ec3201af9952dab59bd1f4a2d3fcd0d1c6bb78da2bc06c4507055bf4de746909f6e3b4097c0c237974d785b1e0376ec8b4155 SHA512 f06bd9859378078de5bf4280c1d4564e3e2560acc95247bcbe59d419c53bf73026eecbe33cff9166a00baceeca46ec82aff55d674d00836eb365ebe1285d29d3
+EBUILD kcalendarcore-5.82.0.ebuild 519 BLAKE2B 312d74f10c1b727824b483aca478d2b63c89da0f842fe5159fda852a28e2e1c441bef5f1e593d8d27fd718e9478573727132c465228ec46056474a6dd0d0949a SHA512 dadcbb83a4c6c65bccddaf5777b532e36b94d0dcab281655cbc82b8175cb443d71bce69f356d989c0266f3ccca7971ab5dd2ce9e72858d6ebfea0d6e4b452a37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
index ab621edd1b5b..f446b084d89b 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for interfacing with calendars"
 LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 33c67ecfffb0..fd4806502f22 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.80.0.tar.xz 258676 BLAKE2B fff7d18db29d1344e8ee522f27b474ee97c42b926aab841e8f4dddd3ea6ea2002f5347bd9841177fd053167aa4d20f40b083b70550567782c955fcd4d056767f SHA512 eed69f85032bd0e9c3211b0aca82932586ca443801cca268afa7dc3a27f703803ea9dd356f60107ca2b83daac36046752470092739837c9aa2c40c02335a8ee3
 DIST kcmutils-5.82.0.tar.xz 160816 BLAKE2B fd75c8e42c7df2c05048ece51e19d4a27358871c56b6df3c086b4ea2fd83e3be758a9e370bd9b4956da18ffe9025044bea91da3a1a3fc4a9e65894d976a3585f SHA512 709294fbbbaabf31384753651a320069e6779d101dbbec94ba09ae95146344989e854cab5fdd39510c300e026f113a156fe43d3b2fa57191851c95709a1997e4
 EBUILD kcmutils-5.80.0.ebuild 942 BLAKE2B 9e675a08a2915e5dc9d7fbdeee09887976466822123502f6217f02ffbb3c3f0ce2b5eda35973665b1ec8768d5ac9c28c5b6361b67a78d5e12b8191e81fdc1ef9 SHA512 8e8d0012f1dd4a48530e5ec1e156f50535ed146cf93d2b22f2484c17b7e1c97390198e853017f548f5b0b23aabb8dbeb0d7a0f269432d6a4e8798bd2d45b3a7e
-EBUILD kcmutils-5.82.0.ebuild 945 BLAKE2B 2255da3af0b64f164110cc55a0adc987c9f20f7a342c0dddc5f74ff19d272d1dadcefc76ba14ce364e934feef86e4041c9ee631a148f760a906de031c9d7b33c SHA512 95ca781a1b06a5f2c5c59b3b25f5dbabb4100188ad5d1e3c9430dca1b84e1cdb5cbbd8896b8fcd9a12b266dbf877ad192dd75f11a42f06a44a0e470fae55772c
+EBUILD kcmutils-5.82.0.ebuild 942 BLAKE2B 9e675a08a2915e5dc9d7fbdeee09887976466822123502f6217f02ffbb3c3f0ce2b5eda35973665b1ec8768d5ac9c28c5b6361b67a78d5e12b8191e81fdc1ef9 SHA512 8e8d0012f1dd4a48530e5ec1e156f50535ed146cf93d2b22f2484c17b7e1c97390198e853017f548f5b0b23aabb8dbeb0d7a0f269432d6a4e8798bd2d45b3a7e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
index 20ca3e07e7f9..4cca4dbf2ade 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to work with KDE System Settings modules"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 129240e42deb..42bad61b5763 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.80.0.tar.xz 229456 BLAKE2B a4221041df4e544376c17707f0e8fc3d0a6437b5efdf54c345af5bd9bba3a2ace2500594127ef851ad1330bfbbeafb533a8f6045132a0e184918cf230176db5d SHA512 27e367d12c995d96908ab0e956a6fba766374dc26c720ea97303cfa5a1e1b644076c5d68487a35ec8300204e556460d74a55be78239a073e1b3b72cebd153919
 DIST kcodecs-5.82.0.tar.xz 230560 BLAKE2B 53494862c07e1df594c0c2f2e7ec295c763635c6e1203111d797195a0cd0a7d4f76d152945971051a136971c3b072744cc08b913e40534fd64d568e6748c95f9 SHA512 fd331cd1ead5dba016f1c94429bc4fbfc5268563341e93d418e856340c63fc7b7e72fb6aeac6ade0de209235c52e8d16118351825000e9d8b47491a55124ecfc
 EBUILD kcodecs-5.80.0.ebuild 503 BLAKE2B e675498cfdd749b0d31f089d92b8ecafe9d150c6272aceb26659235b46902d1388bc6119920db18a75dbb9e73a6b2fe511bc7bb4afff74ce813857f2fdd14688 SHA512 d1151d164ca3229ea7efe3f8737e77b62afcec02b0bc4839c0ca81708fdaafe7634d9637ac0d1c4e58d28480fa29c799f3bef07f36adcc47574e75c3b9d3778d
-EBUILD kcodecs-5.82.0.ebuild 506 BLAKE2B d143a4d5730393f9806c190b03f2705e32d25b8c85c5ef8584f9ff6f98c6fbe2f043d25cffbefb856384601180f5bf72aa807e3e8dd765d01c1b14c180d361e1 SHA512 217540f607e4077b14cfe96046d3550b80507fec5982d05da51c6a4a9b9ef22fd9cdcccdea0c8385fb185f6ab1de1781cfa3bf922c120768e181011505bcbfc6
+EBUILD kcodecs-5.82.0.ebuild 503 BLAKE2B e675498cfdd749b0d31f089d92b8ecafe9d150c6272aceb26659235b46902d1388bc6119920db18a75dbb9e73a6b2fe511bc7bb4afff74ce813857f2fdd14688 SHA512 d1151d164ca3229ea7efe3f8737e77b62afcec02b0bc4839c0ca81708fdaafe7634d9637ac0d1c4e58d28480fa29c799f3bef07f36adcc47574e75c3b9d3778d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
index 151dde78056a..e782ea72b2de 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for manipulating strings using various encodings"
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index f915c73f0185..9146c40983be 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.80.0.tar.xz 121488 BLAKE2B 8ab2146ab0d76e54cd348297091826d6ecd2622a08595784d4c8fef6d3f4f8d676a49decd0f7a59bfdd9e714eea6be5675003d71652809a82e5d30e54b261885 SHA512 7e0d9764c646f2b68b18d122a20a36c1d67aa4cda80f6c2e7091727ac328ec9c62d9851fcf93f2d80336b7dbe886b7087a5a0c1e3fb9a71c348e4e03c2345897
 DIST kcompletion-5.82.0.tar.xz 122088 BLAKE2B ce534393489d6ab980d3c093ef39b3d2341734e147231e6f22c5316091bafd40ef343432128926ec18e25ec8d3843018fa582bd2dc7475bb3c260e42452cc949 SHA512 19b76a46d09005ed5ab5b66ca48403f4bb0baade2b2f937ad6afdf5ef92adf7c94330502adc3aae29bb88fc5848469580319cbf4bba4bfa128537f4541fd9d24
 EBUILD kcompletion-5.80.0.ebuild 736 BLAKE2B 9d3f8e265ff6b0ebb54db1a29cb0364c5e3db88a3efc32cef097224a699cce2396f7cf6ae434ef43ba237f1ef6a4194b839518dde5bfb0e67ee3ddaf3b2828d8 SHA512 e4f6ed827d51a258fda55f3ca01fd7bbd59f014f4d67c6a436fb9191841eb09f00ed57727356b37a266020ed9dfe4bdbde96b245b787419f687208617b39996d
-EBUILD kcompletion-5.82.0.ebuild 739 BLAKE2B de81fa95342f9ec44346e644c5a28ac49a1ba4f3c985a722711448d9f7217378d6d8ec24ef7e05ab8ac362a947f20b8fe6c5e4c0c180e27e044f68d9fef1856f SHA512 5218e8ff88a5fd346e7d161951ad7525304e546b3044c810c7b12a85e3207309212bdd17dda428d15bfc154ca0707353404f8ded60218d9520ecc81450190439
+EBUILD kcompletion-5.82.0.ebuild 736 BLAKE2B 9d3f8e265ff6b0ebb54db1a29cb0364c5e3db88a3efc32cef097224a699cce2396f7cf6ae434ef43ba237f1ef6a4194b839518dde5bfb0e67ee3ddaf3b2828d8 SHA512 e4f6ed827d51a258fda55f3ca01fd7bbd59f014f4d67c6a436fb9191841eb09f00ed57727356b37a266020ed9dfe4bdbde96b245b787419f687208617b39996d
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
index a0fa08fde404..eb367056a0e8 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 574b40589b0b..e069b21cfe8a 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.80.0.tar.xz 267500 BLAKE2B 007b6256fecf5dccb9aac51433e6af90390da515c57d999e349e6633c270b7d7420eedf944d7862537701cc22cc08cb656adde2bd8659b425970b82ca5caa396 SHA512 5836dded113c0e4365e9e48d56cb745e9de57dc025c0376b692151dccbe6c864f2e4a60bee02b8a171e2fbd4816adf18b6eb1b611125c379a91b0b7dc7d7e115
 DIST kconfig-5.82.0.tar.xz 268416 BLAKE2B c59d435f2e562f218b0b6080c862758c6c271aad4ae76ad000e722b7f2edd0b40cdc4e9f64d5128c6f7f2c0028fcb5d4ae35c696b511a7593651a34c4b1528a6 SHA512 8989bcd1dabc2ad795aa464a7bf7ff2e4e2a4c56a5e7828906e00852eb5fc2946e89a4fa7df691f8c5e1940d0b171c02729bdab5ce9f7d6ecc0d3d1880e2ee4a
 EBUILD kconfig-5.80.0.ebuild 784 BLAKE2B 4e75c1eaff14c56d5c811dc656b46a0e5132cc37fcf3e4da5cb971024cd71d1018c1d5de00008500fecb9c06c3e05e78675917a9fbcb009b894972f5b412aa4f SHA512 18fa973182ad7c6a924ce61133eae2e82be63746c87667cbc463a8e9067b3a4566a36d1828245b554073193fe2ca27cd3d560a31a5751fd42e4441e4a179f45e
-EBUILD kconfig-5.82.0.ebuild 787 BLAKE2B 3f091ffe5050a87210e3c2168ea132a496e839edd24ef175a6dcf01a63c212140728767340c8fa6c68d6d43b87f45f45bb9badbe491a77e97fa53acc0d5a97e5 SHA512 2c256ba4fbc769faf1e8afc6bf8795bfe53721c4801d1bb0bcd8e6bb13a8acbedd3c1070a385e8c327dd3d99a842d70ed03be19e69e3753a0089a0c406f8b1b7
+EBUILD kconfig-5.82.0.ebuild 784 BLAKE2B 4e75c1eaff14c56d5c811dc656b46a0e5132cc37fcf3e4da5cb971024cd71d1018c1d5de00008500fecb9c06c3e05e78675917a9fbcb009b894972f5b412aa4f SHA512 18fa973182ad7c6a924ce61133eae2e82be63746c87667cbc463a8e9067b3a4566a36d1828245b554073193fe2ca27cd3d560a31a5751fd42e4441e4a179f45e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.82.0.ebuild b/kde-frameworks/kconfig/kconfig-5.82.0.ebuild
index c03101c447be..f2ff3c6bfaf2 100644
--- a/kde-frameworks/kconfig/kconfig-5.82.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for reading and writing configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="dbus nls"
 
 # bug 560086
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 692685e21d0a..cad1d06a41cd 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.80.0.tar.xz 389484 BLAKE2B 0e1a442d2c5499fa88e20c0da451f28eeaf6121d8c93a7573583937542b4361ab8096bc2edfa187c0c89f2942e134cecf2814579803332508398e2d252b7f93a SHA512 f482d86ce3b893c4c0dce6fb6db005759bdfbb794114e636ff63a2a7db762e2ddaf2f53c0363561a4581967a6177b0ae077febd020d46bfc32211fab5725fa3d
 DIST kconfigwidgets-5.82.0.tar.xz 401320 BLAKE2B c117777cef4ff0627577b6b7b3fe4b18b8a0ded1b233888953f56beca6c7bf2675382e1d5f6e05e64a4eabb793dbe2e0b3f1b56296606da76a0d54e15cf2e530 SHA512 309b6e2591ae88a454bd6dee4cff5e1eca3dbb36ca4b7b02081602fbd6b4bfe06a99d2afa6eb931fa927759f2c32e315b3c548746207673751e9753de651a6cf
 EBUILD kconfigwidgets-5.80.0.ebuild 995 BLAKE2B ddf99d30177e1647b034405da45eb35dcf2e5f2e817698486bcfa1300b8759ce50a5341e7df0de434326f81a36e457775a5edb895bdb001a9efacf4d9dbe0e28 SHA512 1fc6567450d96a4837439d4f48bef9552c7af90498f04af51a0dc26e696df2d5f81d0d0f55e805007a5d81c7356d58d0a82694a19650bcdca4f02dac21bb36eb
-EBUILD kconfigwidgets-5.82.0.ebuild 998 BLAKE2B 70de99e00521dbd866f7c4e67f1a7edf513a03b567cebd2790c6d2cf374e390eceba6b6493dce2caed87c555a1e2ebd391a280352f8961ebfac90ed26ec3c7e7 SHA512 97f1a8c0f8ce7c10ac887499a673c52032804e3787ee82c014ae4e1fb99217e30852c64144cf086e46bdd2f1e9c055eee360c76fbbfddadd98b9a6e63c99065b
+EBUILD kconfigwidgets-5.82.0.ebuild 995 BLAKE2B ddf99d30177e1647b034405da45eb35dcf2e5f2e817698486bcfa1300b8759ce50a5341e7df0de434326f81a36e457775a5edb895bdb001a9efacf4d9dbe0e28 SHA512 1fc6567450d96a4837439d4f48bef9552c7af90498f04af51a0dc26e696df2d5f81d0d0f55e805007a5d81c7356d58d0a82694a19650bcdca4f02dac21bb36eb
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
index 704b573a1c8d..289879e3b037 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing an assortment of configuration-related widgets"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index e00c252931cc..c183b35fbc04 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-5.80.0.tar.xz 542984 BLAKE2B 7a6e8b818f072299d06069f3126076af262822268625b73bff1cf1a384991e62f801e1cc504087f37a9062d6ce6a348420d05476a625d180f6b084e1ceeaf332 SHA512 d68c4f04bc2e642689ea8076819d4844c2d1c5ac086c3d785717b33ae659354cf6351760f3f00605f945f471a426222af54f525c094d9a6da79f49ce09dfff0d
 DIST kcontacts-5.82.0.tar.xz 543960 BLAKE2B 48deb0a593825fafbd850f0345ff052d4809970706b18355388c077cdbd0f66d63f951bc8d063df82495822a6754b02531dfc676c100217f882d29f837045a75 SHA512 05cde28d3b9c83054d004fe6fa9d439358fd95ae3b739089a08b37a3b44e1b3119242de64c5e5155bda9df9ad5736a2629385c1b1c39326fbd9e3fa6a1984e6f
 EBUILD kcontacts-5.80.0.ebuild 745 BLAKE2B 6445aa6c21ee852d9a54f33014f3e938174c7df3cc3822da5c38b3af337768b8b57644e00f735200300defd28317cb3af3cb0f0b994caf62ba1e04c14f0badee SHA512 3294c0bc9b658bc4e8b7856fb11c7fd2dab9794b81b6c6687cf77589698a20bfaf0cd7c96263e837097ca8a4e3588362e387c2d373e09cd5f9879c1a15da6da5
-EBUILD kcontacts-5.82.0.ebuild 748 BLAKE2B bceb8beeecd125dee53a4acb5bf1b90f6c0e854a56b615cae134bfed166276d024f0f44c97457b0a22c5c0360217f95d33ba2a3588018ae92907caf920c206fc SHA512 b207dc665058c7e5949b52095a6c212cec5449da9fa40065709e7537488f9f3991ae31e35d45353e2e4e3d2dea7f63f93d4df8fb313c2e2dfab15b1384f5e67b
+EBUILD kcontacts-5.82.0.ebuild 745 BLAKE2B 6445aa6c21ee852d9a54f33014f3e938174c7df3cc3822da5c38b3af337768b8b57644e00f735200300defd28317cb3af3cb0f0b994caf62ba1e04c14f0badee SHA512 3294c0bc9b658bc4e8b7856fb11c7fd2dab9794b81b6c6687cf77589698a20bfaf0cd7c96263e837097ca8a4e3588362e387c2d373e09cd5f9879c1a15da6da5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
index 9c7352d00bb1..36692b8d727b 100644
--- a/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
+++ b/kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Address book API based on KDE Frameworks"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index e52126f734ac..dfe5086eb249 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.80.0.tar.xz 410980 BLAKE2B 2af44b2b99120a7875aafb22acbcdbfd8b377c99ebea5e50053efcc9a736eda98684ea610f38180eca3e1ed3404e50779ad5ecba02d3b2cb79a9d4f05d1d896f SHA512 38e4784eb344402d31cd0be0af4f3d514d5b4b2713e781abce5896f3fef35852dad6a59e3965a25639d042ad90ca527a6e79a312ffc210594d501b5c52ee7d1c
 DIST kcoreaddons-5.82.0.tar.xz 414272 BLAKE2B a24534a5f3ba900c6e77afcbb6218fa02f093c58283f228f8b41272ab82eca214f2b080356facaa2a800f63ee80f048c7e20d9e22bc2d7d2604a7fe9d2c93d3b SHA512 25e320e6d9a436091491572cf8623a0abaf3abc7d5edde44403701471fc0315b6ad5d09a44b93de023298ffeb9c14366de23c08f43abc51c87c87f9258a652a7
 EBUILD kcoreaddons-5.80.0.ebuild 994 BLAKE2B 20b7d96ee69de24e9933ea7f5be9b8a3a0a03d272812ba7d68894f06c99bc65e58f2a2269029b2dea45dc4c631f6b0abf7f731d89fb2eb1f0610b3705d1249f9 SHA512 5d4b933c79d1ef784621772a6c150d8b1adf2f8560d12c1fc654e871b2ca31348def8c51e643a367e7eb9aad7d8e6c6ecc095132f1867aee607a06b834a3270e
-EBUILD kcoreaddons-5.82.0.ebuild 997 BLAKE2B c6d9516dfda5a2d6cc3f0d6b2599f6ba548c05796fb198d0e940161aae16e9dee26e48efcf112cb1985cea74fecc9bb9eee2c23cd235e8bd67268067baef0715 SHA512 1bc0ca46c2a0c0f1ace5039c9f9360c7a970991350495f80c7efb3c57e85aff88ba6f2e5225c5756621b6661e3cdf4245df104a000161bcfc57444511c453b01
+EBUILD kcoreaddons-5.82.0.ebuild 994 BLAKE2B 20b7d96ee69de24e9933ea7f5be9b8a3a0a03d272812ba7d68894f06c99bc65e58f2a2269029b2dea45dc4c631f6b0abf7f731d89fb2eb1f0610b3705d1249f9 SHA512 5d4b933c79d1ef784621772a6c150d8b1adf2f8560d12c1fc654e871b2ca31348def8c51e643a367e7eb9aad7d8e6c6ecc095132f1867aee607a06b834a3270e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
index 9c9ffd88ffe1..7bc686743a95 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org xdg-utils
 
 DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="fam nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 729d0181aa5f..8b57c3cfd255 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.80.0.tar.xz 22320 BLAKE2B d7c5ce91c1a99c34624b7af6686a388813f7769ea28f25ca067bc3c91f0c1ae2727e308095ac6a0ac00b7579543c46fd96b81cec9d5cdd6b4b73efc424c4b0e8 SHA512 e56219a3d9f8beddb992e61c9f01160b9f71f692856840674577f11fb262d335b2f622b0a8463b95e1e72295a3ec81f4b590f0b54219fd9689676a1dca4eb807
 DIST kcrash-5.82.0.tar.xz 24696 BLAKE2B e13388661d3661216df8900875e86d7ad71352c229e9cc4be78d11469cefcecc51cc11aa95badb12e2dcba22eba22533b959ca3ab8317c205a06e3f5e906b203 SHA512 9cec96ef82f9628fbbbe0fd4e0687c094f7a1b1385e6ba6807f1dd49c9f8d19a29497b29b31bd9a86c59f498d76d54bdcbfafa86a480ccfb29dcd488eee22340
 EBUILD kcrash-5.80.0.ebuild 703 BLAKE2B cafed6e0316a42a4d673203090624da89442e9139dca5209f7c5ea81024364ab827102635c842727479a11d5dfee5b04e2b336986f1b1c7cd71ccdeeffaeb75b SHA512 1ce9a48e80d71f4221b7b1031845191159e20022ffa48d7be3fcb77634b07bf83c143f648be98507daac0fc20d490f2b9a1ef771d326c5c35744ae33c8a2ff0d
-EBUILD kcrash-5.82.0.ebuild 706 BLAKE2B 3660fa498fa3ec8a0cd88b47a6e9b293ba73bc8ec81541d344767c8c52a9924499cceec00b6c4b031938c091342624630c288056dd870c1381aad1a837abaa8c SHA512 7ba5690eaa4a50272dd0fb32908479583b3c616bbaa2be8287a03ff8a887492b76e1c48f7f139d55887009c61c640fa6021fe9759042b5097f889fa6d40dcf0b
+EBUILD kcrash-5.82.0.ebuild 703 BLAKE2B cafed6e0316a42a4d673203090624da89442e9139dca5209f7c5ea81024364ab827102635c842727479a11d5dfee5b04e2b336986f1b1c7cd71ccdeeffaeb75b SHA512 1ce9a48e80d71f4221b7b1031845191159e20022ffa48d7be3fcb77634b07bf83c143f648be98507daac0fc20d490f2b9a1ef771d326c5c35744ae33c8a2ff0d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.82.0.ebuild b/kde-frameworks/kcrash/kcrash-5.82.0.ebuild
index c9026f018d6a..beb50af40504 100644
--- a/kde-frameworks/kcrash/kcrash-5.82.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for intercepting and handling application crashes"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 # requires running kde environment
diff --git a/kde-frameworks/kdav/Manifest b/kde-frameworks/kdav/Manifest
index 0e9cb5e7ca76..2af094beb404 100644
--- a/kde-frameworks/kdav/Manifest
+++ b/kde-frameworks/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-5.80.0.tar.xz 59824 BLAKE2B 7e24d3b15ed973042b995acb2308f38d69820dcc86b22e2d277b561b38a3d1ca705865d6471a0b5d6c53db7752726458e9487d1fb83ec65df52f03624ca32e90 SHA512 9f572d40b8a71e588c6a9773ca5615250e6517477c33594ca8ccc78a177d2fca8eaca6224dfcdc2f972d0205b50093d238d3c6f55ea39a7d823bf797d21a8e80
 DIST kdav-5.82.0.tar.xz 60180 BLAKE2B f4860970f75588ea69f032912d9f105fa8f204b36a0ba48e7cf57246c48ce612d66f7f1bcf0cc773dd699e6cc475c139ed450767a79afdea92e6f4de9036419a SHA512 84882e4c4debc2cecd7c206e84b7534bd23fcbd28abf8e1438c8ed06faacdd3312e955dcb5233cb38f1cba4d4fa88cdec9f2ba0e7bc13af3bb07ac999efcfeb2
 EBUILD kdav-5.80.0.ebuild 793 BLAKE2B 2e9fc6c1d995789aa2ef5fe73fb1fb6ceb27044b6a293452e760c2c75547df2b3607c8be97b9ca8243a83269f03cd3a5ae544e5a43045179337bc846b6bffe3b SHA512 f3395947d8137791fd358dd998d214f471baab7c55ae5b99a60bc0d07fbbbdbb3a8d4bf5a13a12fe6169e7b0b4d5d8020194155d3cf1b1d04522c1f7a65aeb4f
-EBUILD kdav-5.82.0.ebuild 796 BLAKE2B 593681bca49d55833957a242c3b6b95bdb5ce1ac9e5db86cd9c49b79ebb4ac17d918f3836b28127e8a92a605625cb289766cb4d5027ca2390ad3feb525cc7f51 SHA512 014521431002306a34aff85cc6381f8374016b8526c6ae1e6267bc3b3fce6290569f791338e93bca497903b94f8b9e799869dab43a7cb5ba3c984cd1131ed47d
+EBUILD kdav-5.82.0.ebuild 793 BLAKE2B 2e9fc6c1d995789aa2ef5fe73fb1fb6ceb27044b6a293452e760c2c75547df2b3607c8be97b9ca8243a83269f03cd3a5ae544e5a43045179337bc846b6bffe3b SHA512 f3395947d8137791fd358dd998d214f471baab7c55ae5b99a60bc0d07fbbbdbb3a8d4bf5a13a12fe6169e7b0b4d5d8020194155d3cf1b1d04522c1f7a65aeb4f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdav/kdav-5.82.0.ebuild b/kde-frameworks/kdav/kdav-5.82.0.ebuild
index 925ae2c1cb33..0cbd15e85055 100644
--- a/kde-frameworks/kdav/kdav-5.82.0.ebuild
+++ b/kde-frameworks/kdav/kdav-5.82.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="DAV protocol implemention with KJobs"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 7fe09891e8ca..dafe750c05fa 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.80.0.tar.xz 42596 BLAKE2B c9511ba386cb803ff9dc09e4474500eac4c31d3625d00fedcd8473eac19e7669e7c670e8dd9b421b855b550f6ddc224defb5822836d2f8fa5bbd94f8cdd2ef05 SHA512 87d3a75cde0ff9f759654bb8ec99762ae18f0d5d3dbd941987a871583811b141d9020dd0c5b25ea2f05c2b9ef521edc8423548c0587aea69c2e4fab9d423160b
 DIST kdbusaddons-5.82.0.tar.xz 42792 BLAKE2B 7b20072c93b1149d31f3bbc020de124a05ae96bdd6affa6a77d46ea69f5ac1b458851f97115dbd6ce18e12773e39c240daa2035056496a431849a51a096383e9 SHA512 a0ece70b7f79a5d391244d145d8167c0bbeba5f99db48b513f187638aff6af3f150a75b84d8534ea7b381d858dd743bf73884286bb2ab951d4f6e1675d319fa4
 EBUILD kdbusaddons-5.80.0.ebuild 668 BLAKE2B 7802e88fef0b0956b3310d8087745fe6edb807ae43b39b41a95c0708902395dbd931c31d585f2ec6af0df04c775104653ffcf258a1d42aaad3b8498c6407c174 SHA512 ca8079b269c13f0db05dcd3cec53be6c0790c2c8597ea15a6ab620fd6638aca47d669b0842528e3ea7807f5f682f5d6da49b0097c3a0190267c5dbaf6e45a597
-EBUILD kdbusaddons-5.82.0.ebuild 671 BLAKE2B dd9cf4b09439608d04ab25abadb1361d43d3763d99e5c92555911ab4eb38cbf7270876e4d7ab3b1cfaa52b3676525c74e2bcb2b0b996c12fa6bd84ae6b4cf0c1 SHA512 f88d3aebc963432662d8b9a4e96136f90d29d731cd60e1a14e375d9c0d9e060413d6c0ab4d135ed9045b7e0e538a48065337c8cc97fb91a1c07eff8b1ca14113
+EBUILD kdbusaddons-5.82.0.ebuild 668 BLAKE2B 7802e88fef0b0956b3310d8087745fe6edb807ae43b39b41a95c0708902395dbd931c31d585f2ec6af0df04c775104653ffcf258a1d42aaad3b8498c6407c174 SHA512 ca8079b269c13f0db05dcd3cec53be6c0790c2c8597ea15a6ab620fd6638aca47d669b0842528e3ea7807f5f682f5d6da49b0097c3a0190267c5dbaf6e45a597
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
index 6b5380dc9482..d6b709bbfbbb 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for registering services and applications per freedesktop standards"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index eddfacdebcda..d22fc040302d 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.80.0.tar.xz 185132 BLAKE2B 049e696d2387db07fa496ae35050d6a1448f4a9b20bf3ef9e5a040068838376545202a777c993fc93c8fa91081cc9ced89d73d16ee113f498e0d818464abb8f8 SHA512 e3db516267474acab8967464eb7ec7ff0ce93614efd708d76d9df5273d31cc104e6ec3a4dd8115d86ffc357e85a27afb797c5842d489ae93636d9a1f16d9915a
 DIST kdeclarative-5.82.0.tar.xz 186252 BLAKE2B e5b4c22e14cca01614d1bc5556bda00e1ffbcf2b1b1b3277d96a12b380b627a5df4151ad443b5301eeed568bbe1852ef29e3a47f2dc4bc3c037b449441cf8542 SHA512 48ea28aac41cb6d5d15488b80e5cf7abc18b774fe35d22dc14d030b22e56b3b9bd116a44a0e7c44adf9fd26d0d4cd73782a6aa187f35375ffbbbf08374cb5658
 EBUILD kdeclarative-5.80.0.ebuild 937 BLAKE2B ed63fa3a76fee5a004b5258c290c2565b02ebb9d95b4f23132d0517dcbd98d5bd9a6bf048b58d5ce05c5a33b3ce7674258a203650dad821d5fda65637f5a5b15 SHA512 d00ff0be2eb91e7805a1f19153c556c546babcf7bd911931ada1a7565d02659401e66c015144416a8a29739455ce2f0b5c1a085695bc4cf39eafea2932b14972
-EBUILD kdeclarative-5.82.0.ebuild 940 BLAKE2B de437d8206c35e7d03035505e761c877a7ffeeb9f355952d7652d71380b33bf2a92630ba19beaba7c9bbdf27a4e51d79e5d038315d4429bae64bb4067153966f SHA512 b9cc92e4e271ecdb81b4ec772b043f53c2cf8f38bc38e5d9c03b8750a52a780575938cc82fbe91dae41c83988e79d80903a760393270dd22969211d688614a7d
+EBUILD kdeclarative-5.82.0.ebuild 937 BLAKE2B ed63fa3a76fee5a004b5258c290c2565b02ebb9d95b4f23132d0517dcbd98d5bd9a6bf048b58d5ce05c5a33b3ce7674258a203650dad821d5fda65637f5a5b15 SHA512 d00ff0be2eb91e7805a1f19153c556c546babcf7bd911931ada1a7565d02659401e66c015144416a8a29739455ce2f0b5c1a085695bc4cf39eafea2932b14972
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
index 34815c54112f..33e27c78cac8 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing integration of QML and KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 015d56e796ca..441e67f0c7a2 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
 DIST kded-5.80.0.tar.xz 36860 BLAKE2B f72d05825a8615bc85d1c8a87b0e9eb5a69d91b491b1c9a5445f6ccec9e3a1f064e1415b6aee582564140c352b1e6db0d36249d993ea657ab3128465e63089b0 SHA512 f900ce58172930e3cf6ddbb842312737140f17ce3548d49c8181370c0e3932440e23fcaf4a08068b818e6e1d61f5519a2cc1bd5967f5cf46a10ba6d7ee5d8e30
 DIST kded-5.82.0.tar.xz 36964 BLAKE2B bbc92bde53caaca442808c154bf7bb88c3edca9b979c597ea08a0a0901b40d67004e2f45acec663b22e318e547c86397a99c8c895a374b73d066c2ff67b3f868 SHA512 10ef292186d652a519aae01681934f70f820ff4c480f9ed9868f7dfaf9dba016e035b565b220fb5d3ef89dae5180088ed3a93d0682c54ba27978b53df00c2755
 EBUILD kded-5.80.0.ebuild 835 BLAKE2B 0d655e09cb0e6c4547d5fd7b0d211791cff4829b5235d55e0d96db024ea6ed1fe183fc214fbbe5970f101c4cd151bdb0c164507d422aba83ea34b26074311b78 SHA512 e70cd69797d06fda8f88f6c42700c57b23d3e706b26f20715cd97d9c498f0b0404935a0bdc97ec34706cfdeb44a26c62b8f70462695091d4093bf26182d1e377
-EBUILD kded-5.82.0.ebuild 838 BLAKE2B 25a30c31ee7b2ffc1456db077be4399866a3d32b8ff2240523ea78358ba2e2e2f558b165fdb2ec099f634b25a8438dc4a2673f6b4ee69793c86dec2c4d9c89a0 SHA512 955b8280d99ab886cc4ca9a6aa27b33997f034b8d70441de40b393b285054d551380787ca8bec8596448053ba05fd5f7815cb07a6f173825910e0c7fe1417fde
+EBUILD kded-5.82.0.ebuild 835 BLAKE2B 0d655e09cb0e6c4547d5fd7b0d211791cff4829b5235d55e0d96db024ea6ed1fe183fc214fbbe5970f101c4cd151bdb0c164507d422aba83ea34b26074311b78 SHA512 e70cd69797d06fda8f88f6c42700c57b23d3e706b26f20715cd97d9c498f0b0404935a0bdc97ec34706cfdeb44a26c62b8f70462695091d4093bf26182d1e377
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kded/kded-5.82.0.ebuild b/kde-frameworks/kded/kded-5.82.0.ebuild
index 9ab73b764aaf..5b72774094fc 100644
--- a/kde-frameworks/kded/kded-5.82.0.ebuild
+++ b/kde-frameworks/kded/kded-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Central daemon of KDE workspaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+man"
 
 BDEPEND="
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index f93d275d7d8e..a398648eef6e 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -4,5 +4,5 @@ AUX kdelibs4support-5.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e
 DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09
 DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
 EBUILD kdelibs4support-5.80.0.ebuild 2469 BLAKE2B 3401aa1e114112e87631206e1bff32f699e2d7ad3a2f32d9b643098311b333823956a30e7218043bef1b02c020c85870c689915d41a9892431de31a027940f8e SHA512 cd5a5eefc19aa139ea80487982bd4fae87a42e863a09c07db577af4199d6acf594b4caf9c86fcf65b3a88a93f9c0ed7d7e0dc0fe3656508077eaee5078829f4a
-EBUILD kdelibs4support-5.82.0.ebuild 2488 BLAKE2B 2b487246830473e7617a0c2a8735892f447f53da7425ac1f1957907b2885a3bb2fe7541a6a9a052b34bc36ef1f0d027c0f608c03a6e4482a324ecd89d2a76473 SHA512 e4b12fa86af0eeac4b1f05a6d54611f4870d98d373f8a7ef486233ae722944f30885c3f255bdf6b262b54e4c414c2e2b2f1954f440b3bbde92f173a523856ab3
+EBUILD kdelibs4support-5.82.0.ebuild 2485 BLAKE2B 8f115b67bc325848a02b6ffd565d602b99f0984e471290608bb5a91606d2dd023bdb92b6b1d736ea2a1c3c25968f86037be1261c70176d9b1435bca86ecc2e53 SHA512 d3e280bd5505080bdf67124ca410ccddb61d6abcbd839314525af06fbf478e9d44d7b89b89c38ecb7896eade4c028dd35fe5b645ed73efd90b9c6781ad6d387f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
index 8cf2a1aa39dd..ac93c4e494ce 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 2322a5696787..816c8d72edb9 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.80.0.tar.xz 52188 BLAKE2B 25369db6566eafa917b5eedd9e74f54aee294f6f366c44c59684acda14194703db5fdd0abbe251beff9815a428a41ab183a9f2a9d28589fbb40a731332d02707 SHA512 b5ccbb6827a18c2f8b370d64405825a4c533fac120e56a99a6d90bd01d563606ae625f2048e27fd19756d51175ecf163468349f7587540401abd5d002a7c8a6e
 DIST kdesu-5.82.0.tar.xz 52236 BLAKE2B e674b6e7779cbe858828d17a8e72e14570007776461d3da99cd86adf92380fa5a95bfc394436f8e900e2fd90052b35c6a68b91c2e12e9c8cd835483c7f2b6262 SHA512 6d4cbbc783959d093f59221dc0cf7862f30444878a32475976519b443713e8ea1f154c8a62f7cf4468e807ebd983afb037211d5641335822037bad04501552ae
 EBUILD kdesu-5.80.0.ebuild 659 BLAKE2B 228857930114463ee93ab0d5a3d1ff704c5f67812f11a9903a0110392a15efcc405f9cc0d3f2d7c7e7c741feacd8feccf469b619630bfb2ad9ccd5269d9e54ec SHA512 f0570452a998fb6164315ae9f1ccac06af2bbc434ac2e38d6967e86090b3fce5c2715ddace47e799dcc5f694c1528b4dd7ece048136227b43f4b0c9d122b62ed
-EBUILD kdesu-5.82.0.ebuild 662 BLAKE2B 2eab4ef7a181a40dd672b6db7603608c4308acfcb317afd0ebe54954b38f589b59aee073265f914e52fa1dc0614de304d88b75e81e9188ff865e4f8578e38b0e SHA512 74effa213f71ca96300278a7589b06610cadb3533f2486aea1f342a9ac53b0db14e130e6afb49292edb977e7b0cc831be9b0814a7bf5cab63a293d0ae17a004c
+EBUILD kdesu-5.82.0.ebuild 659 BLAKE2B 228857930114463ee93ab0d5a3d1ff704c5f67812f11a9903a0110392a15efcc405f9cc0d3f2d7c7e7c741feacd8feccf469b619630bfb2ad9ccd5269d9e54ec SHA512 f0570452a998fb6164315ae9f1ccac06af2bbc434ac2e38d6967e86090b3fce5c2715ddace47e799dcc5f694c1528b4dd7ece048136227b43f4b0c9d122b62ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.82.0.ebuild b/kde-frameworks/kdesu/kdesu-5.82.0.ebuild
index f80367b7e219..efdf8a265ca7 100644
--- a/kde-frameworks/kdesu/kdesu-5.82.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework to handle super user actions"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index e5f4ab76f804..70eb4082c55c 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.80.0.tar.xz 57968 BLAKE2B 311270d202946c06ba505baa831141c841f7169f8622233e9004bc83aadfe8e5148681d8b05e8561b7ba42f3c3bb6ef90772a57191d9cb6eb40d861d73495862 SHA512 8f458a7a0e7c9fd7d7b55a79b5ecfa4484cb442564985e0c4a660b2d551d772bd177dbba7999f71a1401ab58b9ce4922090afadd31347a1282419f90a78a41d9
 DIST kdnssd-5.82.0.tar.xz 58296 BLAKE2B 3a7b2d48724fd9982ab74f9bbfcf48dc465082753fa1375d73fae3b53121dcc994ef45777ff01bf27b4f691c0e84d40cf7715ef5d5fc4cb511f6a6983b400cce SHA512 fb365bcf77f81f75a8a2fc62154fec9ef16df30e0efc40d89936532b197d43fe9708f889caef9297946f9c2dc4e44ecef0d8cc30f2e1a847d2b745b2b5dd0e9e
 EBUILD kdnssd-5.80.0.ebuild 644 BLAKE2B 427d6828558bfa5a7507855b3f5b6ac73a90ca32d1960f5bcf10b9940388ba718af99572594c705183a4d387aab5a773b431a7d9020ecc6c6c25ca61ddebb687 SHA512 ea782e6c32f494c9133cfce5dbb5361d7bfd110eb4a8e23237556e1e16f8c426c3aa99825ca9e4cec76caf842bd299ab64583db558eeffc36df19b712ee0131d
-EBUILD kdnssd-5.82.0.ebuild 647 BLAKE2B ab47ce98b067f0ebda141c82bb89e999630d9519aaaa78da05d0b72d4e2e22527caa61ba8d24d3cdea70b0ae92d3b15d71c5d0d1631fc7312b8ab1cc4638d144 SHA512 fe89ec0c6d35a178631334ee753350c83b47e42efcca1801d33709b054f659ee419e9ab749812531b67312da8f329c93333129ecca41cc954e1eaa1d53be65fa
+EBUILD kdnssd-5.82.0.ebuild 644 BLAKE2B 427d6828558bfa5a7507855b3f5b6ac73a90ca32d1960f5bcf10b9940388ba718af99572594c705183a4d387aab5a773b431a7d9020ecc6c6c25ca61ddebb687 SHA512 ea782e6c32f494c9133cfce5dbb5361d7bfd110eb4a8e23237556e1e16f8c426c3aa99825ca9e4cec76caf842bd299ab64583db558eeffc36df19b712ee0131d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
index 57dc346bb8ab..827c3e56131e 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for network service discovery using Zeroconf"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls zeroconf"
 
 BDEPEND="
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 73ab62815b18..dcfbdf396dd5 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -2,5 +2,5 @@ AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d
 DIST kdoctools-5.80.0.tar.xz 438652 BLAKE2B bf470a436d279bd19e90ba5482be8a16dad2cfcedbe8a8e967cea38eeeabb1c36beda03f40cbf9967cba60021fd7d5915a44c1581e424179d57c869990e07103 SHA512 17448f08528af1537987f336b8a00249f631909bb7060d31639ec8937a4cd105d3d35c8872d37651d628ce55484d87dff188e365e290fa1321f869d0ef4f2ee7
 DIST kdoctools-5.82.0.tar.xz 437024 BLAKE2B 6e51452eef36a28af3adae497906ab02429ac57361bf598b347dca7ae0f9df33b7af0ef4c7ecaa5cde1f1021e9a44633013014d2d5a893f319bd8085b732eb65 SHA512 5255b78f1a51a9e2adeb1c6fe113c6555f50eb8af04d3d78c3942f924c071c11c1598245793c68c97eaa3bd1f299b8f9fe7f190da5b720ab7930ed53070f58d3
 EBUILD kdoctools-5.80.0.ebuild 869 BLAKE2B 37d94fdc143f12080efaa1fc9ed40ea16c369658742329ff3181748f709c9349befd7124db939b25eb764a7443e1aadd71cbe191e0c01ab85ca30c82999ad8d6 SHA512 b85f8267a233075dd38066ba9939ea98279b33989e8e287b08fbf260023455f8adf260cf86ca50d55955f726f334d98e812fa2b2836a4db1a2b6977a5ffa5e7a
-EBUILD kdoctools-5.82.0.ebuild 872 BLAKE2B 28ee4d24bfc73f12b48055b459f179906ccb453f18437c9eab2634fe8bf3329657bfb1f0041d08a2b80320e3bf7c5f3cd9836213e687fedc1ebb09e52ee5b17d SHA512 16b61b4e362111d915c0ea91b280fd8ab5a7abee36aa6d002f12f4a692d2ef00a2ec4936ee19780f7da9b4028953c8b56e121d8f3b672b21f5174cf1b646cb18
+EBUILD kdoctools-5.82.0.ebuild 869 BLAKE2B 37d94fdc143f12080efaa1fc9ed40ea16c369658742329ff3181748f709c9349befd7124db939b25eb764a7443e1aadd71cbe191e0c01ab85ca30c82999ad8d6 SHA512 b85f8267a233075dd38066ba9939ea98279b33989e8e287b08fbf260023455f8adf260cf86ca50d55955f726f334d98e812fa2b2836a4db1a2b6977a5ffa5e7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
index 3b3ac23b5f35..9718a54d230d 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 2cb0cfb32007..50a7f65b4e88 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.80.0.tar.xz 1697816 BLAKE2B 744e890baf4ce5339ca29a932e23ba7b8933fd626c8e7dc4a14a703f8e83e9db64f5db8e26aefadc2eb5217cc6ae4e429be853b49b0e087df1a9e1ed6f941696 SHA512 1fe07740d3869748c3fa384fbfe480b6ecdbf9ca5e9c089b6fd11b14cea854eec677f0aece9f15fc4e96bc4b90e7a7bb9fa5b80bf938c009ef2b7f0267d03b37
 DIST kemoticons-5.82.0.tar.xz 1698472 BLAKE2B fc5f8401a4b5482126a9b054f1fe6107c2da759df0a4ea960cc4a139d9ce8dcc22e6b94aff64780d7b7cf049d68b67b799011f3d999b07ce2f1e065e6d6612e3 SHA512 c3c3813613891e23db9b5605de6dcfdf3e5f973e162d27d37e907b60d49bfc3ba99743534d3749dad6a67217e44220fcf52c880563da82dc465eb10536ea40d7
 EBUILD kemoticons-5.80.0.ebuild 665 BLAKE2B a6ced1dc1d62fc0498b3b8eb1bfd3d4c20eb2e92ab99b50d9d7d7333bb6164fc538ef98a813bcfa052e3ec19e37712de4a8ceaad31ac9cd9134090cba0b79ea9 SHA512 4b307dd2a1e49baa683631e071e24f3c4f846a9a6e3a346354e38fb295e90652b4e390e4f9cfe8ade5932dd9e3cd7d83fb5a7f1c2d092de4858cec197563616d
-EBUILD kemoticons-5.82.0.ebuild 668 BLAKE2B d567b4b7cf7e860243cc1cf6e19532167e720f7a1927fa9492651aaa04f06e3c81cae659c6e8e5eab8a630e2ce2f09732d35120b719d9de1d8f1999e88a0eb98 SHA512 1eaa0939e21d7be266c8f4a06985d119474a5939e8201ce18d52e80fcb1409af3b5af9a5f462dd8a6148f7c45fe02120b8212931e07692703009b012dfe21204
+EBUILD kemoticons-5.82.0.ebuild 665 BLAKE2B a6ced1dc1d62fc0498b3b8eb1bfd3d4c20eb2e92ab99b50d9d7d7333bb6164fc538ef98a813bcfa052e3ec19e37712de4a8ceaad31ac9cd9134090cba0b79ea9 SHA512 4b307dd2a1e49baa683631e071e24f3c4f846a9a6e3a346354e38fb295e90652b4e390e4f9cfe8ade5932dd9e3cd7d83fb5a7f1c2d092de4858cec197563616d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
index 6c6f658b72cf..b5495b48b170 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for converting text emoticons to graphical representations"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running kde environment
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index cf1565c345cb..ce80bcad46ac 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
 DIST kfilemetadata-5.80.0.tar.xz 425304 BLAKE2B ac759d5643243639aacd2be0aa3ef4f35c3e1d6f4ae993a4868e3369445a8a3a597e6266f8a75ae83c489261bae26a2dc8eec622595fd197052cebf3e2896b49 SHA512 968bdc8e367d257c8352f7154721bea3c2102aac7f2e238384f44fcb4922aa40035352067a273f0473f8b119b813a771f04e7f494f6f955d2d988c202dcc9ae9
 DIST kfilemetadata-5.82.0.tar.xz 425540 BLAKE2B d9102aaca3c49fb81bdbef517ba1a6040d0653ce1fd517ce61854b221b8abffbc49c69ad38b98cfc47877f02d7885b9560834cc55b5e03ae2d05eaee51906a12 SHA512 7bd70ae0c2d49d2a9d312dd79dc9268862efefeb48042d0fd8a8e11daf75cc67b6dbeb28fcee7c3f87517476f6eabbd3d4e9a1c61440f62cee0ef93c165cfae5
 EBUILD kfilemetadata-5.80.0.ebuild 1570 BLAKE2B 5adfe5cb24cc7a501c75679f50a78ce9ee40c6912d314a49935a97d866595e315d8fccf766617ecc55ff59cf923e545b0c564ce15c1b97b5f3410e6934a840f7 SHA512 ee057dd831b8cb15f26f24d1728afff6528ad347d7b6bf1443f44a1024e576bf4fd665775b0af030bb0e1164d9a441eacb951b30bbf189d78a6606adddf358eb
-EBUILD kfilemetadata-5.82.0.ebuild 1573 BLAKE2B d06543390c197db075488f1d02fc202aec4e892dabd0987e624386918fbe9794648d903769e8b60c152bbc7e1399f10a09118782a375508bfc92ad4c58b91ba4 SHA512 8107e1d5c83ef7fc1325ead6e445bf09083abfb2129ce687a893d9a0a65037fe830280b2922caf69a90e57ea0af1335ffbe4e18ed84f9411febd95fa619b319a
+EBUILD kfilemetadata-5.82.0.ebuild 1570 BLAKE2B a13ca1c0e412caaa88522f8d57d109e3be404b47fd3bb2095541c09db7c27bc9670722200459a5d4619c5e9d070553eb747c1cf28a1fc91f0f1f391b851c49c7 SHA512 7be89f4609812a090833a884ca467b0ac02560846bbd995bb6dbf6b8e4519172094373f96cda7285e416ac28e9b57fc797bd10224e27c21af0daff77ed340879
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
index d1c43269f1fa..44f0a06500cc 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org optfeature python-any-r1
 
 DESCRIPTION="Library for extracting file metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="epub exif ffmpeg kernel_linux office pdf taglib"
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 418d40cfebaa..5e2d1cebb6e4 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -3,5 +3,5 @@ AUX kglobalaccel-5.82.0-revert-prevent-activate-w-o-plasma.patch 7552 BLAKE2B 37
 DIST kglobalaccel-5.80.0.tar.xz 87360 BLAKE2B f05027f4aeb71ba17b42bfe3214222737df4689e72e7eaa2e848d891e4934acead92051a21ce49313513050d4e3b01148576ca0ab58c609670fc88e7bedc15cb SHA512 6e12d3926f1b44425747bfca3eea21986cfe57ce032a2f691a2ab6b12556feec15cceea4b2b6c21bbdc9ecb6af11e9fb64489d60d9e95f4443b0a74ebab551af
 DIST kglobalaccel-5.82.0.tar.xz 87932 BLAKE2B feed60b09b01da373b3a6b989ca465b93a67d1ba84ce45c503805e6cb49af1b7ce99afa1921414e9a616d344f95366e0e4822b58f41ea73222dacfcc448a588c SHA512 c6f757628ca8123183b1ead08fbf326bf8b6d5b97e4dc65c33a2c158103aa7915617d423692ee417059bd08a299546b7cdd373b31dbfd80f2498193da7b5aaf7
 EBUILD kglobalaccel-5.80.0-r1.ebuild 855 BLAKE2B 8772c8ecb5ab37f6d51417f8722e6186e97a086cbb4ffb29db568d06516508acc16e62571a25f8d65bf0966ebe52d02c995539453e383a31c1b06cc0c064da8b SHA512 13c333282bb973e21a7cc381bf593c8beebd746870fc4c641b088bc2f4daa3e24a523999d4742ba66fa13c9919cc24e1103ffe1457745876a0a6f10ec279db68
-EBUILD kglobalaccel-5.82.0-r1.ebuild 926 BLAKE2B 71c1e4f00a7aa6d1e4a12ad841dd4baad6546f4a6b8860649a5afd5201efa3305a28b5d28a2d36db61b2e7147519d071faea19f1766e30738dc40cce13f4f954 SHA512 9cef7f7825749d3bee612a5427e0c7bc0c11326ec1de4c813c993c60894fa6fc493e1dc2e11243241c470cb280f01092b77eca15d8dd335a29a1f61b2a1be41d
+EBUILD kglobalaccel-5.82.0-r1.ebuild 923 BLAKE2B 70334606890e0d5f0725335e7e2bf47fa7a4f4cfc726861c6f05d3d90ea957bba3556841ba9431c81ae0901598c4738be8fa8109f666c6d19ab9f458b99d5d9a SHA512 dc744dd22f8330c36bd0adee7a898c8cbd272e4c6f9f032af8cb873c518f58735af321ba097e62152908e4117f7de8c75f6b6c384bbd93183f55989512bd6605
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
index a8a3e30dd7ed..5cf9c27bbefb 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework to handle global shortcuts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index c8211066549f..c06e43b455f4 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.80.0.tar.xz 58832 BLAKE2B d22aa03b84a199d9eb6f05aece22916aa0a020b6c98cc9862cfe57e4ce2dd87abc39b3e92d32f55d6b654e07083ed5186e8f3835a2566de27e52f6253cb5318b SHA512 97e4311afcdc5af6ea8dcdcce40d4c0a5c2e4a767556a7e2fac671d7691472873f526539f3c0c754da6d04987c0e180e1c0461ab747c3f0e486a5f613fa11d7b
 DIST kguiaddons-5.82.0.tar.xz 59020 BLAKE2B 7954f85a013b0ea5a69f524a7a8e4f715aae3a6e526c9f574e8d185bb3d840fc16a7556424c9183b51782007f39df2470d2f511ab9fb486ac61da245b7df1970 SHA512 8713b2036371240e92503e4be51bdd16a354bc08f1831fe242f64841945ce99e1c1e3a62d367f1c07c4769768d724341733c6f1360985e215bfd3a85d2574ca6
 EBUILD kguiaddons-5.80.0.ebuild 716 BLAKE2B 3eed4ebb6872636ae2b7248e91d63466ad1837a4a1488fc7fb565b314955771e321e4aacb25c4542f4f62c659a4a04df6d71dbb52764e2a896e8af8f341b9847 SHA512 89a81624f19b2bef5a41123b283b91e75854ce67f43eaaa930b67aca87dd4311690c609d08519198a9456605f75fa12384e9a907a4cbe75c39a0cf6897af3594
-EBUILD kguiaddons-5.82.0.ebuild 719 BLAKE2B 4d842123e7322a20f309f0a79579e4c8dd30c0527751e5185285aafe8f2c7b2beb563d3741a9ba4857b4f1a7349f01101c45f0c47c78bcc931d023b2aca13ab4 SHA512 b50da9d4d8b9c475f5daf1cc109f14b0fc48f6b0e810856943a4e2ab0f2722eaf3f152a57a0c61e5b5e800b43a40d5fde19658e13a8af95cf07befc8e255f16c
+EBUILD kguiaddons-5.82.0.ebuild 716 BLAKE2B 3eed4ebb6872636ae2b7248e91d63466ad1837a4a1488fc7fb565b314955771e321e4aacb25c4542f4f62c659a4a04df6d71dbb52764e2a896e8af8f341b9847 SHA512 89a81624f19b2bef5a41123b283b91e75854ce67f43eaaa930b67aca87dd4311690c609d08519198a9456605f75fa12384e9a907a4cbe75c39a0cf6897af3594
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
index fbdfcada5f5d..7d5fb2750491 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing assorted high-level user interface components"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland"
 
 RDEPEND="
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 15dfeab0a46d..d0ec2e0317b7 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-5.80.0.tar.xz 225916 BLAKE2B 8f839f9ac529325707ae35090a593ccca524e37ae21067a59e30f00593f8ece89293de7e67b0e70a14ecee37fb05b444d21782ac7d298bb7096cfd17e4686622 SHA512 aa7665fe4d64255cb06835f7867e70978bd14ceed7c0ecd21375e889584eb5794d85af08d4756b25ca9cd8c9a7f4ab50c20ecdcbfc8200290796bc8248d7cdc2
 DIST kholidays-5.82.0.tar.xz 226732 BLAKE2B 76a1f0adbe3a558b2cf6aac7782795fad869423cb42e70fe5f8dabbc1d5aa0b5a6e5036d7fd68b8bbf6fffc63e095a471a72afd9501c328f2a7878e20e53996e SHA512 902065bc4d1ea733d24adf349bc895020eb49ec1d3f98c3e8ef4a59e3d0c968e998081c7ff1a18466201372c6f51fa9ae251e747da1b959f696975c886a42306
 EBUILD kholidays-5.80.0.ebuild 649 BLAKE2B aed1acf368fb5c61658d05f09969aa6a7febe5f63e2e5465fa3eac327dd3f3c762ea7dfd41d6fc0729b87af8dd07bd715115ab72a034b2887528fec6cda1a5e0 SHA512 3f202fcbbaae11ad03dc19da4f50353bebfcea1549bff5cf8bc7e745fbeef65f6c54a53d3ebe1689f757134720604f1113496a65f6620537de9168cb8413c54f
-EBUILD kholidays-5.82.0.ebuild 652 BLAKE2B 79235f2845ccf108cee0a6c6a3353ad41efb349b6741de44f947a03393e0c6fa8ccf562aa0bc7f0b99bcf9417b954f91ed36fd46e51f540471d2185328ec5b6b SHA512 7c79dc99c7ef1c97884773f0b8a427f2610d47f3edb808a173f46ca6bf4297fcf108251292e24f74e02746a944762e73611e57b4d9de52eab8e5ea7ceaf3aa67
+EBUILD kholidays-5.82.0.ebuild 649 BLAKE2B aed1acf368fb5c61658d05f09969aa6a7febe5f63e2e5465fa3eac327dd3f3c762ea7dfd41d6fc0729b87af8dd07bd715115ab72a034b2887528fec6cda1a5e0 SHA512 3f202fcbbaae11ad03dc19da4f50353bebfcea1549bff5cf8bc7e745fbeef65f6c54a53d3ebe1689f757134720604f1113496a65f6620537de9168cb8413c54f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.82.0.ebuild b/kde-frameworks/kholidays/kholidays-5.82.0.ebuild
index fb3d3ebf8123..989fcd276531 100644
--- a/kde-frameworks/kholidays/kholidays-5.82.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 6c811c5ed9fa..82ec37198260 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.80.0.tar.xz 2089848 BLAKE2B 7d049fa81cd8c3a155d8a8f8a18926e857e583867a6258bb3f46d75ffe4c2894b6291988ae95afac93d2a4bc3e7469a687db7633daba7652b3a9b397417dc5c6 SHA512 3d3881376e03cc21306f13178e6aad3458460f87b61747eb2abb2d94a58b28fd5c52bc10b33a8bcf0c2ad02d62ea464c4c88ed0ffeb0ecb7df59b77c8fd2aba3
 DIST khtml-5.82.0.tar.xz 2093168 BLAKE2B e4cbcd5e187d8ba563090097d362ed6138575da93ce3c25796e1112b3a39c135ffd53d4dbd7302a9482069111bdc01291027a9ea6253ace972b19983db5b6386 SHA512 8aa3c615cc13deee3e4859f84636fd1cd18190b0a99849a6782b0a106a1a8808061258e055158cbd3dc15d5842ce3cc82fca8eff2fbd1634807744a0f7288cc0
 EBUILD khtml-5.80.0.ebuild 1753 BLAKE2B 12ec33b0e6075a9974b9f154f9f8e2f94b79a3ccb6ae59e0bacf2e589df8db6fdbec1b4c5feb757a9fc07feb08ad0982f162a8612fee04d5d8579336e722a384 SHA512 c653efc2d0c78aad650f43dc7291a3602e4ec6369bbaeee3c17a88b59e2a650a597a3af82d0c34de20123398d6975a52e51caf6aa6bc114dfe9424d49a60e603
-EBUILD khtml-5.82.0.ebuild 1756 BLAKE2B 26e5cd361a48c15782ce4f84ca380d27b3bc9dd4bc7570bf5543a4d735bd8be4c52442455bbb1a03cbba26403d5cefc6c1576926ccddee99007f3525b0e96bde SHA512 75e3adbb1f9be48803ee543007da3d4ab9cb5f02e6d3a9dc8ceac98cca3ad2c1b86a7ed3d36acef527d835089738c2a347a26ef8a55622eb5a9b9616258c7b77
+EBUILD khtml-5.82.0.ebuild 1753 BLAKE2B 12ec33b0e6075a9974b9f154f9f8e2f94b79a3ccb6ae59e0bacf2e589df8db6fdbec1b4c5feb757a9fc07feb08ad0982f162a8612fee04d5d8579336e722a384 SHA512 c653efc2d0c78aad650f43dc7291a3602e4ec6369bbaeee3c17a88b59e2a650a597a3af82d0c34de20123398d6975a52e51caf6aa6bc114dfe9424d49a60e603
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.82.0.ebuild b/kde-frameworks/khtml/khtml-5.82.0.ebuild
index 59dac9b04cbd..5b47c7524567 100644
--- a/kde-frameworks/khtml/khtml-5.82.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 9bf461aa9000..9a0a8413a789 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -2,5 +2,5 @@ AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da
 DIST ki18n-5.80.0.tar.xz 591016 BLAKE2B 9b116740c592c37c2f50e26e8912fd046c0909524e6ed38a754c5b4e689feb9a7796aad6d9f1949d54a98a0f4ffcff2ad64a4f60d2fee7b2203c42f6a69b5a3c SHA512 0ba5b71c40f98c77792d73fd15a97e59cfb3d7f33da5d49a48621dbeed36a893c914b61e179c6f457ac552a91ebead55f59d70266ed02e6cac270e9936cd2494
 DIST ki18n-5.82.0.tar.xz 590552 BLAKE2B 628acb64959fa4b38ddc44c586218d1841b03dca2ed11d72ba235bd9868b50f63f95e46847783af14ff465f9f89fa8c63526631dc648b1f9baa6a02130ae9e28 SHA512 a0f84494897d5c614923581bb3df016ba8801b7404b933c7cf85b158be96baa0cc87199a4798a694654fa80ad8204085a2fb6da8e6f930156071261b213894eb
 EBUILD ki18n-5.80.0.ebuild 830 BLAKE2B 55079c55f82023379a95b90e7d67a81b0ee25aaf4d245cf991eb8e348a22d800e4d9f68967acf2f3c0494dcd731feef9c91df43e7f28734303cca81cd2b1d321 SHA512 bd857919feca313d3e4d2503ef7d9eb1691aac53345b865079207cfb7f889f74e4a29f6a18a7dbdc86021a817c3744f94fd116bdae84bfc7b73b7e0fc77eb9d3
-EBUILD ki18n-5.82.0.ebuild 833 BLAKE2B f96ea5aa5a5f9081b4823a6a75e4eb688634f5fb915d37832544e6df3a15a8c92b9940d88ed912ad1bf899c87609f14ec4978180a7c9f0a8d6d8708df50780e3 SHA512 e6c0fa64d7ed3b26d13e9bd5467d53f9b82178609a3ef5c2c87797dba775068dc4265c2fc0b57a64949dbe022e3bc040874a9b65e0180e2a7b3947efad58ed67
+EBUILD ki18n-5.82.0.ebuild 830 BLAKE2B a0e385cdfa4e9f8f6b48cdc7aed245a66fa4894bd2b62790aa85c1ebd171118913ce4b019cc632c0a4d713136e9e87fa5e7526510832c75e79041b07ef8e5e33 SHA512 35c401841a829a5bd1150bf18a062562789487dbd4fc5b1ba265ab277e8ddb169a0bea96c1cb07724ff28f2fdc5ab1547c7e0e83b5f902ec5122d4d8ebe1512a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.82.0.ebuild b/kde-frameworks/ki18n/ki18n-5.82.0.ebuild
index c163b404f540..022390944984 100644
--- a/kde-frameworks/ki18n/ki18n-5.82.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 439afbf2bc40..e37d95ef6f91 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -4,5 +4,5 @@ AUX kiconthemes-5.80.0-revert-private-header-to-avoid-extern.patch 2788 BLAKE2B
 DIST kiconthemes-5.80.0.tar.xz 222692 BLAKE2B 6728b4f32298ee256059fc52df0581dad434bca292c5cbdc50099a0b7d1671a9409722592cd55bcc2a1fef91412fce729a8dcf1b931db04f7ab0c10a3867b03a SHA512 bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8
 DIST kiconthemes-5.82.0.tar.xz 222884 BLAKE2B fd7404f50ec503e853d25fff6b61d55a133a26f7fec9a2a4b50da15d721ef9a2ca116b2307a6eeed7316693a68ca053f0d955d0417b19e0aa79bc6a6eaf64c25 SHA512 b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb
 EBUILD kiconthemes-5.80.0-r1.ebuild 994 BLAKE2B f4195411144541a43d9204b7c79b03b160fb901b9609d12956dafe7c43f5c71a746bb83bc4c6c2582b6cdfc244163d872afd36fa9bdd8b401250e4b9e571801f SHA512 7e206f03cd49b7e3a297f4dd323f60e6f3e9113d4e87f4a52b72362a8cd0456d696fea85f837dab1d9cdc51be215c861b3f4ae4bcfff58542fb8f7c10c28ca16
-EBUILD kiconthemes-5.82.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498
+EBUILD kiconthemes-5.82.0.ebuild 799 BLAKE2B 3ed7ff52370ce3a320b23c240bc6e02db4916e7d8c0db81db6eca07d497238200c618fc3c03b3c9877b5a3fae2a3c8d8b70ba635f47a8bd587701488b5eb9fbc SHA512 b5e7cb72ea8ab37e90ab3e684cef4f1f5c6879b735fa1ed48aba1499e8cabf772024dbee20dae5d3440adb8608fb3e4755c8973fcdb7194485a48da442f81ea9
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
index c189858f25fa..70c837abb197 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for icon theming and configuration"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index a0ca2df859a5..3a03ab14bcc0 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.80.0.tar.xz 26152 BLAKE2B 486250ac2b6c7582eb454b5ac402f3e8df114beae1b7b3d63d4541b68561693745881046add16d8bfa3fa6c7161b3e1b701508a0e89e1f509fd41bcff60ae19d SHA512 0725747f3012d73ac1b0196a31723393b77b3655bd214ee96cb6e350a81c9c68c418deb3632c159eb29c06b2a0ecf4a7c3f172975637d503f9f7dc576423615f
 DIST kidletime-5.82.0.tar.xz 26040 BLAKE2B b5e7ee686c9ffaefc0f321bfff15f0ee633b04ba07753702d2f76ebb069704fd9c5042904e726e617754432df6caacd305b0c4095178b71077801089a76f29dc SHA512 35cb528aeaf0d28ace354eff8f65812bbc8fc7f0b8b01ac93b8317de6267d93d1e1808ddb5b136c0ec9980544f27518cea2c3c577dd8252be05b8fdecb396f39
 EBUILD kidletime-5.80.0.ebuild 886 BLAKE2B 15a4a32f10e7b0ec9de64b29864026dff278e64fff781e8e834d9c56bd6ef8aa3703a00b7cbc214344f86bd50ead3962a532a98fe8d492c5f5b40decfef9ec8b SHA512 ce66fa00abdc5628dcee591a2e4b971086cae3df93a303af31089d302313629639c63e2999bcb912138eeb5ddfb5e59aedd0f575b526e83ebc3f716d3205efa2
-EBUILD kidletime-5.82.0.ebuild 858 BLAKE2B 6cae8f05bcf63679df0f985946dd3bf75128f5575e3de690d20545e2af7878f1aeb0e9c2bc7b12727c1c12f6efd6def864d244f084c8c193fe611a9e4efa9ced SHA512 2b6b724ac641386cf6079b1cfaa987be92f59505408880d084c776943853734b0bac84e119d12302b2d64f5741ace87d1ab7ce3924e6f1d98dfacf8be8240aef
+EBUILD kidletime-5.82.0.ebuild 855 BLAKE2B a9d7f8cd29c4ea71e71e9b74c0b51bd36da0da2123c3388c98bcb59c65c2b338e6964cc11060ba0a91ba8b6bb010b663cff76990c36b77d2dc9a649cbcde745b SHA512 afed3764af89fff78b5972eeb385faec8903068fc771c6d1f251c8ef2417e31b557d38f0be6f73710c5bf41c2fc9a9125af51c0c8dab6b530348e891454b40da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.82.0.ebuild b/kde-frameworks/kidletime/kidletime-5.82.0.ebuild
index cd9479b80aab..92c08daf1e9a 100644
--- a/kde-frameworks/kidletime/kidletime-5.82.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for detection and notification of device idle time"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X xscreensaver"
 
 REQUIRED_USE="xscreensaver? ( X )"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index d24600617865..46d3c2af3633 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.80.0.tar.xz 590368 BLAKE2B 18e9783bf8ed1c6171efda273cc0d05d7b7a60a38933a7c003d4155f36a13eb1ed53ec3b8923a9560c597545940108542aa13ec7d5fc13b02c6088a837097215 SHA512 07669deb80af6ed3055f34ca5ef82583deeafde4a7d2591dd479fa10db48e39007e82cf70645363b742c7f90c73d6d3f5cfcfed7e5cd80ca8856e4d0aa9e9d39
 DIST kimageformats-5.82.0.tar.xz 590128 BLAKE2B 2136a68dd1c7a9dd6c07da180d228ceafdeeb6c7bc35af66e53709c33e9bef40c4bc37a78243c29ae8041d1f92b365c809de34fa134ba66494dd50fad1f4ae81 SHA512 7f24763602a47eb580685164ae0ca2d074859eabed449c41ec28385a5cc9d2dc0ef348809e98452a320268fde37e1569e324c75b3de3908b7070a78749cdf56a
 EBUILD kimageformats-5.80.0.ebuild 935 BLAKE2B fa9b82a438b5868785f25051545bdec9b67c9b547755e06b8fb7463cd5197ba5d0a4d12ef7a1d67f01870aa6ee3121dbfde2addac825cc46871c8e0750efc5a0 SHA512 dc20e7b6ce16e5cfde67bddf141571a50d9f52ad617b2b242472cf37e0717e17599e9968a166c1f12457fcba33f5c59422a47bc3933c3095c8e71b4e6e8f1821
-EBUILD kimageformats-5.82.0.ebuild 938 BLAKE2B 7df746cbb85e119c1128a6a967328c055323cdbd616c87775d36298099f38e1eda8fce8f734c350f7fb92153258539b6e801889d99d05d766ed8bcd90c77594f SHA512 7e8ec30bc0688fc8db618dcb6cf7247628b91718cbc28be7e8679f16e1fcbb090b421c77e48d9843b72301e14c10d32b9550d2976ce22194533dcff660574ff1
+EBUILD kimageformats-5.82.0.ebuild 935 BLAKE2B fa9b82a438b5868785f25051545bdec9b67c9b547755e06b8fb7463cd5197ba5d0a4d12ef7a1d67f01870aa6ee3121dbfde2addac825cc46871c8e0750efc5a0 SHA512 dc20e7b6ce16e5cfde67bddf141571a50d9f52ad617b2b242472cf37e0717e17599e9968a166c1f12457fcba33f5c59422a47bc3933c3095c8e71b4e6e8f1821
 MISC metadata.xml 445 BLAKE2B 9e064019f9686ca2c961e427717c51f741a60cf1d470fa582ce9f1b9fb10146c2e4a5491b6c57de0b23d892ac8a2b0799a1afc5b9a5230d6b1722f3c4b41bd9a SHA512 18cd0bceb33980ba86628488b78b2dfab4a55f2bb05b2b7108b39339b4d9b144c2c5420cef06ec10df245cc71987b178ef72eedf32ef6fbb19013d0dbc341203
diff --git a/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
index 1e0b558caa85..d77bef9a633d 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="avif eps heif openexr"
 
 DEPEND="
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index a09ffec59780..ae2175a91b7c 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.80.0.tar.xz 121088 BLAKE2B 5a130f604ff55301672ad35c205ea044d379648b46c03e4440b7756996df327217065af0fdfc85bee23e2b4d9f75f3fd4c3e08aa49459662cdd09b1d7c2a538f SHA512 27f1bd4ef231a70acb8e32ff1cb9133c522fbcf960890cfbcd0c35ff41978a320c48236ca755b1c603f091e98596486fb37748f4109697b58315aabe1572733c
 DIST kinit-5.82.0.tar.xz 121448 BLAKE2B 1c38e31d9ab2231a808edbb713629d91d1068263a56426303428e20b066256381030278cebc30fb45234df92bcf30fef40ad2a3a2e4066f643ce172f6c701862 SHA512 7c6dc83d1ea10a8271fe23a45a7e5bfc7e67a7f9c25914386d65157f253c98fc518aba4a4cd7d724d1684097e3e94e866e18165debe0717e7917572436fe3af2
 EBUILD kinit-5.80.0.ebuild 1134 BLAKE2B 4e157916a91ed39ad8fc9bf70af2187cdd9b66fa7645cd716f2d3b68bb990b813480d3d94cf656de9ed876c447683b8b5c11755ee8aaa2c3d86932e043ee2084 SHA512 1e4fc8c805b841b5c108be00bf7c7e5526635a1fe25fdc46073dfb9b484c093414248366c96d2d18fd2d58ff389a1201c2c028034778e128307b803d50a6f27e
-EBUILD kinit-5.82.0.ebuild 1137 BLAKE2B 4c84b12d5d6366bcd58fb0479f93b944e606a802c38f2e61c23bc68752f1d7502412b908e00cf87542561c5f73142980c87ffe357b74f3a6af150c12a8821059 SHA512 dbadd05fc5380e874e19583c9192696882edb3066ee0b374813fe2ecb104908743a7b4fb55f83d14c702c1aea317f04aaa36ffe77348a0fa4813089b6983deb9
+EBUILD kinit-5.82.0.ebuild 1134 BLAKE2B 4e157916a91ed39ad8fc9bf70af2187cdd9b66fa7645cd716f2d3b68bb990b813480d3d94cf656de9ed876c447683b8b5c11755ee8aaa2c3d86932e043ee2084 SHA512 1e4fc8c805b841b5c108be00bf7c7e5526635a1fe25fdc46073dfb9b484c093414248366c96d2d18fd2d58ff389a1201c2c028034778e128307b803d50a6f27e
 MISC metadata.xml 358 BLAKE2B 2871358d649b4403a258b3941a6e20f5c464b418ffc8becdba2fbd9c7602e5c91942cd80d71c44984b03df7854b8ef2bca177f45686100b485dc0e05da143c3f SHA512 922ead94840c490bf035c540176e321228f5d047067996f01108e443a8bcaa34d9cdce9270573a2cf0eab6d9cf32ee57e91dbd4b220774e810dc3f4c4c85d891
diff --git a/kde-frameworks/kinit/kinit-5.82.0.ebuild b/kde-frameworks/kinit/kinit-5.82.0.ebuild
index fa069ce12404..c387cd4a13ba 100644
--- a/kde-frameworks/kinit/kinit-5.82.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.82.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+caps +man X"
 
 BDEPEND="
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c2805aa90502..411bf2ca276d 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -13,5 +13,5 @@ AUX kio-5.82.0-no-useragent-kcm.patch 3751 BLAKE2B 09ea333db392f0b35a531ff6921f4
 DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213
 DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 EBUILD kio-5.80.1-r2.ebuild 2614 BLAKE2B 4ef207fb64570f85403458b350e7ceb31fefe8d0f22dc09ee567e97c2bc3a1c0ac0c13b1050b2ab949b1b2036bbacdce0ad1050477c202799043720dff8fea96 SHA512 533a59b34d618f3ebff2a12de264c1bf2734b5f3149cc787bc3fc950b2af659422153db77883c381a6aa782e0819399d88b8641769766c747d1c46c8dc91267e
-EBUILD kio-5.82.0-r2.ebuild 2936 BLAKE2B e8e993531ff2e384c869c484907601e8daf7d11f0fb98d1f1da042dd069159d0980fc3ce396d3beca90424cad07fc9fcff770a33fffd0941a4b3b6592c35a8a0 SHA512 145cf889944de5bd82592301ccd6541c9085c0451780e24df223b89825b97c2661f10ce203015f6d0a52ba0719c99d19df5b45717f018758ef07f987773d14eb
+EBUILD kio-5.82.0-r2.ebuild 2933 BLAKE2B 0a5403e19ca99bfd4aca781fe39db28da02d1cd83717aebed1ca51d245ac49e57ee0fa4ca60c98ee675b331ef7947a2768728dfe6e5a5bc78c27a52a0b07d58b SHA512 e7172bcc1813bca6f08486db2af8dd33a3de5ebb2dd46ccaf137c74b34a4ab74237cc1dd7a13aa732667353f70020aa1b8a6977318537a08901849edb165bea3
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
index 79d4c76e5a5f..74aef058f24f 100644
--- a/kde-frameworks/kio/kio-5.82.0-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index a67219662bd5..00a9b0dce5a3 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -2,5 +2,5 @@ AUX kirigami-5.80.0-fix-crash-in-SizeGroup.patch 1285 BLAKE2B aba017ffe7ecbad6e6
 DIST kirigami2-5.80.0.tar.xz 310608 BLAKE2B 3e3ad3190306ffc955c17ed783d6d231f7b5d37314bbc6a8a215c22d2cd0a13564b914ca7c482ad60dd1e54336f1af5833a6af7881d94cf584753007d7052ac5 SHA512 d40e95a4f5376eb16d45193c32d96a777e5045fbfdd3dbe4902edb561b6709dde8ab2e2c905042bc76b6a641575a05a876a0204090b0c705bdac9d8631b67971
 DIST kirigami2-5.82.0.tar.xz 315952 BLAKE2B 470199ae252029e7abf78b1d3853f72635bd0a68a306695d2ba2a88ed2114e129a1b496cbc6084da17e9d39f5bff7c44fe0a72636f22654aad582b658484aa8f SHA512 d2a72879bca7151dfe07e55089bf61c8f3157ed78357b894a7834a05c78ee790b55afc2633e491b358b8b6c86ba73a000f17c7b224c88e19711a065debf0102e
 EBUILD kirigami-5.80.0-r1.ebuild 1055 BLAKE2B c2735fe93ef85962307a7bbdc39e16ec692b99dd24758418b82dd70c032914a3f7d2ec8cdd7da1f375e297c1cd45694588123d774c899155795c2954a362c6f2 SHA512 3535f0f27146781ef88f35f68db256b6df96b5cf9f74b18d6195639d33fe150e45a288ffd4debe152fefe902c373c83d2dc0cadc5cc0323d6611859561daef30
-EBUILD kirigami-5.82.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
+EBUILD kirigami-5.82.0.ebuild 975 BLAKE2B 14cf5456ee43bc83a9d5a3fe832f0fa1689484d635bf31c1cd43aec1164675a2ca2e005cc30007f39308691749ec132577bf3eaf55b220c0f6ee68af58cb5928 SHA512 e6ae1c47d36ec8351caed8ed168aeeeac91fcd5e2ad23ad1f197a1563c5c38bfa6b07bf3065a7b437f11ee987a9b5c81c72c4ccaf09223417cf6479783d8d515
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.82.0.ebuild b/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
index 22c5683da45e..3ac8f14e2561 100644
--- a/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
 EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires package to already be installed
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 433074fb9daf..4044216ae65c 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.80.0.tar.xz 402920 BLAKE2B 05e8cc29f4f7214c24f8bc8de38499eaa95cb806b81eb0aea1fbbb8aedb433607c3af725c526bfc80deb5461264eca35fd3a08f618c7d3179121e319883c777d SHA512 5cbbe75c977cbb8be78175bd51eb5f770309ce833e941fc6f217f9782be6c61255f340b2c4a0d89035522d280b54fc1b1b913e9cb0101cc17bbd37bd4e012a22
 DIST kitemmodels-5.82.0.tar.xz 403080 BLAKE2B 722bb9df4bc8743d1f64c99735b9b97a7326dd4fb8ed51d1e220f8b584cc211ee5f7d75c7735156e8223450acc1f78e5ef10b87f295947b7130fdd861510bf62 SHA512 a28862e46658be6d3f7b8115151088fc5febcb804e115d541a0514f12cfe0019ce4b5108643290db817a06b19e613c99ce68cbc32ee7ea90c906dcac8b392d6c
 EBUILD kitemmodels-5.80.0.ebuild 686 BLAKE2B 7a03e55fc99c72e185c9286f7fd2707b7008adb44ba6139d33cd3b0a23237f90672b3ec0b8c0e4e8e52b286ebe236d1ff31a628816efb19dcae6ac3ad91787ec SHA512 c66ab8a142495a1ddf61e67836a9a6bf31fac6557b5e39e31222a27b34ced6e9ce854b802335a0ceb982a8a2b50c5ec07e0ae0989cff6daa6ba06dd85d33c31f
-EBUILD kitemmodels-5.82.0.ebuild 689 BLAKE2B a59384e558c8c7470bfd7dfa3fc26a65174ad65860a5fdaa7ae01d67eb215381b9795129d157d35bc6c3d4106c61f8c1ee467abe00ff1194c64c132929003e38 SHA512 07584ee138c49324c2e12685fa0fe8ea810c86c9a5aed856d087f2fdacedd808c98021f1cead22fc5d4dc5efa07b8a185af3eeba315a5753a43d7bbe084c9e55
+EBUILD kitemmodels-5.82.0.ebuild 686 BLAKE2B 7a03e55fc99c72e185c9286f7fd2707b7008adb44ba6139d33cd3b0a23237f90672b3ec0b8c0e4e8e52b286ebe236d1ff31a628816efb19dcae6ac3ad91787ec SHA512 c66ab8a142495a1ddf61e67836a9a6bf31fac6557b5e39e31222a27b34ced6e9ce854b802335a0ceb982a8a2b50c5ec07e0ae0989cff6daa6ba06dd85d33c31f
 MISC metadata.xml 345 BLAKE2B 6ebc0f7092b99e24519fae9baf08d02fbf70a5a648e5110e2bb55fbe37156dc13250e297c6094eee7f5030297b6371af4f7642a2b95002b8f9e2241b4a1b3770 SHA512 5c37c8e0f442b14c74035c501da0b02b9c40ac09d031a098decdf463b0bd5e77c54542aadad406ed07d7860626e668882933dea7c7a9696c922bfa5e0ba4c52a
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
index 94e4faaea807..95dab1f51e88 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="qml"
 
 RDEPEND="
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index fd6c2e1af26e..80ff44457205 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.80.0.tar.xz 74884 BLAKE2B 5be886c8a9d7c90ca9726ed035deb5d5cc235bc4c27d998083e3da882aed22ec345f1e33a0d895ac9989966baa7849452f05db1acf848ab207b5c44b2dd2d67c SHA512 8fbee9fdb37bb3647420e73cb609c57614c8515423b098e70060d5a0a6d7744b0e78df802540fcd0bc0b676b3304a36b988ac2a60931b7f42703243499917785
 DIST kitemviews-5.82.0.tar.xz 74908 BLAKE2B 0419be4239e07260606a8592a55bb16d4477d2a4f7b53aed5c50a872c6e32c35d62a550de5664cbd332f2d3be7b7f11dc6f50d983294b50649c8d5c9704e0054 SHA512 5b2d343331a99418e3f6030d5732d998149670c7d7075de3c0c7431b1855ef75ecd192838a8d2d5d10119eb4cfc397b0bcefff48dd11974cbd332d05bbb5799b
 EBUILD kitemviews-5.80.0.ebuild 616 BLAKE2B 56ecba2d309de88d951f2cd390b852cb9d4dedce7990c1a80231101a7e8001674be3de1dac2e7802b16e8eb66d90afe4343c3f5527ca573a001a5aea8b35302e SHA512 a5dc98c5a5e893d0b7009046fd4e43efa9e04eccd52b7d22fe7c25a40b124777119f275fb66e2998f2a74f4a1fbce7af4b642b705c4cb0685857a96abf278a69
-EBUILD kitemviews-5.82.0.ebuild 619 BLAKE2B c0856097769aed31b0f21c47d737e7fa5d730b3664de3f86e6b0ded0e29bfe6e770853a3523cc45d86fdb5cbbd9d7a8150ff1e74da9c7b2dcb287191605f3510 SHA512 9f887ab873d9b1cd67e3478fa97563906f58b9326ba357b74d58d231de85eaaf10a3cebfda240f41722619d9c354d2c4f7ed913ccf2a28feb31ff9141b701366
+EBUILD kitemviews-5.82.0.ebuild 616 BLAKE2B 56ecba2d309de88d951f2cd390b852cb9d4dedce7990c1a80231101a7e8001674be3de1dac2e7802b16e8eb66d90afe4343c3f5527ca573a001a5aea8b35302e SHA512 a5dc98c5a5e893d0b7009046fd4e43efa9e04eccd52b7d22fe7c25a40b124777119f275fb66e2998f2a74f4a1fbce7af4b642b705c4cb0685857a96abf278a69
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
index b8205a752558..8a74f854b712 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing additional widgets for item models"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index eda8204c482d..94261b77700e 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.80.0.tar.xz 93100 BLAKE2B c821b04b142265fe0b76d21c19b0191aa279ec4323bc65b4b0d2602398e68c52c7b4430f527aff19f636c20b8084f44cdef45b1a5994f64ea737a550d7186195 SHA512 93cf5931acbc9eb8ed39323b9fd2e01ed46aa8c89ffb4468935434ef1ee3b62713fb3f2a599baf2d2b88c0a128f5b99070f17e722d2c678e4e29b7e1df888a3c
 DIST kjobwidgets-5.82.0.tar.xz 95628 BLAKE2B dc4cc0332f54c3f44034ac0534dfb60c655e4a089cac9cba97472cb3c345bd0617b13ebe0f152ecfdcd438965088fe45cbbe8e83d2c6017c90fca0181e052e96 SHA512 9fb0d2ababee7824772748e6755641910fe0fcbf0ab91ceb5cc326af12b0b9a5d853c84ca226ca0ce476132acaaf5cacc626ffa820ed04fc1a05ea4f68f0f454
 EBUILD kjobwidgets-5.80.0.ebuild 842 BLAKE2B 76e3d634c96289fddedb6507911426a7df340bda2797a2a542eaa1e1950a57495a66528ac5e0507269826766cc3bbc407a6a1f5df24d15a964aadef9b40d9558 SHA512 cb0093d89b82f258d9f5d2f1d25c1c816c92970f39e67315549ce4983150e3f488d9837b7589ddf6c52e7995e90cc9f1d44bfe689b38a79489cf5f0c86b48e5a
-EBUILD kjobwidgets-5.82.0.ebuild 845 BLAKE2B 1fb1fcf19a08ee54fdc84305036ae3c4362347be2b88f073041f27894fef0b47d1147a974944ff4ff89fad3d70d9ea4cc4431f17aa25a21e246bd5719117c1ae SHA512 773562c410ef2820d3124a3440e41e364f664a81130ad037e5135970a62f29636282e1ceba57033d34789cce23244db0a42321de12c6d59c76a3ebe73453bfee
+EBUILD kjobwidgets-5.82.0.ebuild 842 BLAKE2B 76e3d634c96289fddedb6507911426a7df340bda2797a2a542eaa1e1950a57495a66528ac5e0507269826766cc3bbc407a6a1f5df24d15a964aadef9b40d9558 SHA512 cb0093d89b82f258d9f5d2f1d25c1c816c92970f39e67315549ce4983150e3f488d9837b7589ddf6c52e7995e90cc9f1d44bfe689b38a79489cf5f0c86b48e5a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
index 1dc58354abcb..8066922646a1 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 BDEPEND="
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index cc8344b9015e..eca5603aa02a 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.80.0.tar.xz 337980 BLAKE2B aa0a721e088746d45baa42492bc876fe415aa829f92d0402d9c3db48859d4415efa3dd61629e0703d6b033833b0c4195007fc34446cd5028abac5d61b663a7a3 SHA512 faf419dc9209d4ff7e15d9c807c7d4c9ae1b877d8d4ff9b32a0ceec7fa55438ce25e8758f84d934d368f1101b09bd5fcc3ecc1b19e50df3211be5c5bb9f81915
 DIST kjs-5.82.0.tar.xz 337880 BLAKE2B 304acd60f22c3ee3cacabe1794369540dd43473464fe42c7cb3c2e498a3ed6780eab1f75823393efbc9658a06d3b19e718e0ea3d39463acec9b778162c56d214 SHA512 9ac3f70b09d309fe11026964607aa102d1b6264ad19c8618993fc533ad13dd367772886c56da26d980cef1aa1b80d228a8822340be582cb2a150352d64efaef8
 EBUILD kjs-5.80.0.ebuild 399 BLAKE2B 1eaba452d35a4287ea14bd7b23f6328f3df7f5e007726180e42a5b02b489bcce95713e38d934b9202b6fc7fd83c182b75b1b57c82782c16c83e355d2eae2634c SHA512 817cc1494caedbcf00550c5c27e614680ee0e77d7c60b2633856cf003ef84b66a4cbf769dcc032a4fd6b2a2026f0fef254d75baa6b86d8fd2133896de8b810f5
-EBUILD kjs-5.82.0.ebuild 402 BLAKE2B c47ecfc67500b2ef08bfa75b6fea9df6635133c0c5109361b6449a0e4fc264d17351a209a0ec8778e3b981609b51db0a97224619a88a2b89ebe19074cf782ca1 SHA512 c6ab116a2a4416c6cbb089e9423e6c8c9429416d21a64ad4709729c4d1c9e0231b94539c8a0ca9168f1572ab93bb0d04b78ebd27c1cdd23841a4c33b9b485bc7
+EBUILD kjs-5.82.0.ebuild 399 BLAKE2B 1eaba452d35a4287ea14bd7b23f6328f3df7f5e007726180e42a5b02b489bcce95713e38d934b9202b6fc7fd83c182b75b1b57c82782c16c83e355d2eae2634c SHA512 817cc1494caedbcf00550c5c27e614680ee0e77d7c60b2633856cf003ef84b66a4cbf769dcc032a4fd6b2a2026f0fef254d75baa6b86d8fd2133896de8b810f5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.82.0.ebuild b/kde-frameworks/kjs/kjs-5.82.0.ebuild
index 103b7d178deb..71b10b8c004a 100644
--- a/kde-frameworks/kjs/kjs-5.82.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="ECMAScipt compatible parser and engine"
 LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index b212dcec6752..4b28c40fd84e 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
 DIST knewstuff-5.80.0.tar.xz 1162316 BLAKE2B b6ceb6106577b52c49ac34f87a8443dd899460e32bcdcd4cc56c5f786c0e7bdfd871e1157da215cc9b7b0dfca8bb29abab6fa212e6ff30b29dc930b5a4c4b4fc SHA512 bd0c601bcfda8f4674392010c863871e511abd97c1e2971ac93bb902e2bf2e5eb925d2b64119473a182944fe91fee3d1e5a7ebe23edc58aad20e2d04a190bc3c
 DIST knewstuff-5.82.0.tar.xz 1167420 BLAKE2B d35ad76c4780b79cb40b7920febfcab665bb071e26fde98710435ff7cac92454c0f07a76d7b42d2c786aa793be97ecb3f92954052a1f3e43e34d316c021d6b10 SHA512 50377c16447dac2f55e025a320c51b86142dec7109c33a9e46415c5acc4d8d234ad49f7cc25f3f29f65d37408a6a780df1dfe279b151d109d601f9504d9f7408
 EBUILD knewstuff-5.80.0.ebuild 1094 BLAKE2B 02f94784c66eef324537836dd38ad2009333ad5bb02ae1dba414e5c83f69c8daa18ae6a1791b045181b984303a216a48bb4eeee13729ce57c8cddb3b79ce5ce7 SHA512 fad266c06544f42f99f0d1c188de141e98a497b3e8788827655c8d52db68e847814d46d024f66e2ec5502c51ea4c560444e5e3f7327bb19eedbdf9ad44e4903d
-EBUILD knewstuff-5.82.0.ebuild 1097 BLAKE2B ea2639151e18d9d2b136a6db78174354e2d1dd65296ad53b3a389a2143015581acc5c9d0afa465f3b6c53f152ea06c900e2507db18a90d91482ca6ab1368eba3 SHA512 b6e931da813b9d2a3186e4ce09c13da7282817be0cef30f5d4483ed406be62661bd45920f7d157192051f026745a3c8832f74a98a6b3101366f37f69635a9fdd
+EBUILD knewstuff-5.82.0.ebuild 1094 BLAKE2B 02f94784c66eef324537836dd38ad2009333ad5bb02ae1dba414e5c83f69c8daa18ae6a1791b045181b984303a216a48bb4eeee13729ce57c8cddb3b79ce5ce7 SHA512 fad266c06544f42f99f0d1c188de141e98a497b3e8788827655c8d52db68e847814d46d024f66e2ec5502c51ea4c560444e5e3f7327bb19eedbdf9ad44e4903d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
index b8deb66ae70c..17a45a1c2f2f 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for downloading and sharing additional application data"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index ed5c4dab26f3..27c32909f8c8 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.80.0.tar.xz 121360 BLAKE2B fdbd56642d51d670af17b54e59d264fd687940d2788ebf88ac9718917ae947c89a8a41fd412f4426afcd5d386b5cbaf9a5ef93c6bb1b14824f112da83edab0c9 SHA512 b3130de9b2eee251dc56e9814e4deb7f9cd6d166e234e3f4f6d1328024152a961776d18b20d9e9bc20af3ed590a2673c5de4b8fa3c2f6d0cb91259c96c1c0a16
 DIST knotifications-5.82.0.tar.xz 123864 BLAKE2B b798fcd8c7f493b518a2a5d405c18ae028fa187e4a744de087bc3087e2491007e93c1e814b2e0491e0d0996aa06e3fcb239b1646baa77d3a5003afe9ba33594d SHA512 5b90e641adbadfd31ee44344361d964cb35deb93cccd2de1199c633986c08ce7e8321cfb73a50d99a954c2652a9a78c9c07d0026fcea115bc5dbe4e5898aaa12
 EBUILD knotifications-5.80.0.ebuild 1144 BLAKE2B b2277def6cdb291e1a6e5cfd7bb4ee7c18ac342630e843a24c6ccd4c86eac2c28816ddef3b95c93915284ac607073d2cb8427abdc33f85f4c3683888499eb70e SHA512 267fde926dee2d9c567b9ed9fb26190956e464bc2f666833926afeff89ffc4faba9cd13157d8696b4d3cf16ed595317604d42d40e923a212aedf1977ff6c0d53
-EBUILD knotifications-5.82.0.ebuild 1147 BLAKE2B 40a8aceb0128687d864d538bceb5040eec3c67ee895f5c655aed681456ae19b0df61a5fd9eca6dbfa6c5ba9ecf1af8e98e2a8dca8daa2335a566015f0b44de18 SHA512 df15ccec223d60fd79c70fb78e10c557f5842ccfa79ffb058b70c6898adb45d0bbe1859eab2e01c36848f3496e63d1aa4a86c95586640272fe423d912adb1679
+EBUILD knotifications-5.82.0.ebuild 1144 BLAKE2B b2277def6cdb291e1a6e5cfd7bb4ee7c18ac342630e843a24c6ccd4c86eac2c28816ddef3b95c93915284ac607073d2cb8427abdc33f85f4c3683888499eb70e SHA512 267fde926dee2d9c567b9ed9fb26190956e464bc2f666833926afeff89ffc4faba9cd13157d8696b4d3cf16ed595317604d42d40e923a212aedf1977ff6c0d53
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.82.0.ebuild b/kde-frameworks/knotifications/knotifications-5.82.0.ebuild
index 09e8bd9e45f8..4dcb31da40d9 100644
--- a/kde-frameworks/knotifications/knotifications-5.82.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="dbus nls phonon speech X"
 
 BDEPEND="
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index edbc06ebf6f1..0a1b8f93c098 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.80.0.tar.xz 84444 BLAKE2B fdfb0d5687601bac7c97b56d648bb4e32d0d1b556d62069bbbf0e08833a6f1c2bb6e1b4b79484f2088038d7d5df2533dbbe01941d12f102c25de4a48385f2236 SHA512 405feb77947ed27376f72221c89ec153e95798367e2e10774501109e4eaf2fcb40402f49435b9781c992cd6e562097f20840c9f30d36d32f84367499fcd32d5f
 DIST knotifyconfig-5.82.0.tar.xz 84692 BLAKE2B 44d8cc0bb1caa2115fc54af5f8a042d29baebf4ca595576a81e01e24a2141b6077ca938a6d00252701d813f10b2aaa4ccbd9e4600ed9448e8a18a628cce84966 SHA512 d214d8019179c079a22f4076bb985f1528292c467cce36a18e2457a4051264f915f48a35ea2b508b900fded020bf20c8d3e784149e9be7993a80a027a70871e3
 EBUILD knotifyconfig-5.80.0.ebuild 768 BLAKE2B ee48866fcd791abee06fff79971f03aa3fbea7037b4089acf9e1bf14a2bb5954200810542665185d44ac0be686808b26ff58943cbb7dee2d3e09ceee331c567a SHA512 ffa99af357dbac4b5966320ed633b52c4ba4e5ae20ac54908f8874022a165118b2e1986a8beca775715ca4b7e3fd640d72e5bf43aabbc8c50495591f4aa553f5
-EBUILD knotifyconfig-5.82.0.ebuild 771 BLAKE2B bcbc14f8c4875da84eab6bec75bf86f886ce58274c89989c310f90bb3c249de72d7d1ac3616a5dd8f0e5309d76557e8fb8bdb0a495468622adc8c72e2cebf657 SHA512 47086a427c5c6968b07e0cb22b4a17c27860fd8228385041c9ec348b8beb3a497acdf30a311bfd8a90899d32ce07bfd28045dbf831385425a791aca4c5f4272f
+EBUILD knotifyconfig-5.82.0.ebuild 768 BLAKE2B ee48866fcd791abee06fff79971f03aa3fbea7037b4089acf9e1bf14a2bb5954200810542665185d44ac0be686808b26ff58943cbb7dee2d3e09ceee331c567a SHA512 ffa99af357dbac4b5966320ed633b52c4ba4e5ae20ac54908f8874022a165118b2e1986a8beca775715ca4b7e3fd640d72e5bf43aabbc8c50495591f4aa553f5
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
index 80cca1ceeaad..f510d52b1527 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for configuring desktop notifications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="phonon"
 
 DEPEND="
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 320a2dcab9bd..dcd38b26196a 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.80.0.tar.xz 141148 BLAKE2B ce51bb6e0f06d081b2331b7e451fb51197d1a9f969c441e68f44e65a18d0aba938aa3fa9454f834343a885907695f4779b1b63045bd2bf961c792787daff8a45 SHA512 f8768f4b8d037166e7fd4a6e7bc171d23a82b63b26f391e1cb37b259b5090d1a6b1b0b96662d61a5ec374117f575bce6808a9da77b54c9971dd9259bf7c7c5b1
 DIST kpackage-5.82.0.tar.xz 137892 BLAKE2B 292ffdaa8271f63b178304e85ce53f8dd35ff2f46bd5c2b9828a6610c2939918d51d02d29cd2dd799c7fd77c02c3ac23ce7015c2d41b63cc3ed23833958643c8 SHA512 9d8a168b48903d4b5c68ffa0709fd0cfea1e08376c1c0b1ef820ad13f6399a1792be724eeef18a27402f18c62494c864fe4dac17e9932a1ee3a5bb4de50f5fed
 EBUILD kpackage-5.80.0.ebuild 755 BLAKE2B 931b2b74ce3752e68a1fc2078ce08b873b8fe53edbe1a8617b4f97d26932978f73f0767fc4d36b6d058437437a0a7fd5e4037860cf20307a3bce94ef967b461f SHA512 a91d2a68180e48aeafebab3c9cbd108130390efade8aad7dd6872ccf0d6a474e3cdd29f55507f3a17227bafe5aa0a2183bb7e70051bc0cf3074ffa2333adb8db
-EBUILD kpackage-5.82.0.ebuild 758 BLAKE2B 7b28c138ee6d612233938964ed627e77d4ae6ee2f3a9790a2dbb40701aba1ee4b874372208df04aa059ae8a797c4d4e1694a883f9300715f7a6d268fe6e0d6a6 SHA512 695b1a661f90ebe316bdc01b1daf80bd869aa3d064f8f4a1f5838f55f6c94e21fb79d8f69fd6608bd0fdd01e373867171978601c93c81aa37896c44f9b22d8b8
+EBUILD kpackage-5.82.0.ebuild 755 BLAKE2B 931b2b74ce3752e68a1fc2078ce08b873b8fe53edbe1a8617b4f97d26932978f73f0767fc4d36b6d058437437a0a7fd5e4037860cf20307a3bce94ef967b461f SHA512 a91d2a68180e48aeafebab3c9cbd108130390efade8aad7dd6872ccf0d6a474e3cdd29f55507f3a17227bafe5aa0a2183bb7e70051bc0cf3074ffa2333adb8db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpackage/kpackage-5.82.0.ebuild b/kde-frameworks/kpackage/kpackage-5.82.0.ebuild
index aad1329598d7..9125d296dcf9 100644
--- a/kde-frameworks/kpackage/kpackage-5.82.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework to install and load packages of non binary content"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="man"
 
 BDEPEND="
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 13e17064f333..2c67272e8f41 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.80.0.tar.xz 191824 BLAKE2B 18fd22fa61db1eba98d74959ffcb99aab26a581c38cb4e5d696575bc31a3e5a7ed3c8a46ea16c17b3ad29a846b334ce7ce196dd86e70adc78db1bcdb193f44e2 SHA512 5954636d179062948a02659b6baea8ce7f47122c9b07420a4bed495867167ddddc642fccd985375c5fa846432a98872ad2fca6b90db162e277c76559aa1cc8a8
 DIST kparts-5.82.0.tar.xz 192240 BLAKE2B d46b407479c4e3a11a91bf990da14e914008ee6cd51d9fc3f67a89a33811af6201226a1f8971129cf0d3fa5189a8bf45810c2e24bdb6cca3c261465afc0380b7 SHA512 865cb26623b8e3dbf2fff7bff7e7dd0334d5cac487635a4aa88a69fbbb1a4eda2fa67208f6cd4bd3496188af4fe256558b737604202fe30a749a06671c078eba
 EBUILD kparts-5.80.0.ebuild 837 BLAKE2B 2832ac7b369554597f57ae134ead71cbf461b1f372fa08409edac05bfd459ed1436ef60e4bb5a01a3eac063b34ffbdefcb747046b7532aebbf3c0cea17fa4bdb SHA512 299a813285bab1e3a415dfdad4ec7495f05cddea78e0619cc68ecfcee58af545a9cc202fb252de59427aba87e7f62f2abb6828ac12c36e036fe391c520ed3bdd
-EBUILD kparts-5.82.0.ebuild 840 BLAKE2B d68b1a2458d4cde6693bfa232efc0eeaa29d58e6bd9e21164b203364429c07bfa61d04c0fe81b3ca6ec67229875d6968ab1a24e8ce906af577492bb51ab18597 SHA512 74350910d8e1ddde7d58102f11371bf06e497c3d7d4261ec5d32fec78b7d640dcaccc9bbf80accbb69617767d8e8a237503aafd80b8560c947abb135808989c4
+EBUILD kparts-5.82.0.ebuild 837 BLAKE2B 2832ac7b369554597f57ae134ead71cbf461b1f372fa08409edac05bfd459ed1436ef60e4bb5a01a3eac063b34ffbdefcb747046b7532aebbf3c0cea17fa4bdb SHA512 299a813285bab1e3a415dfdad4ec7495f05cddea78e0619cc68ecfcee58af545a9cc202fb252de59427aba87e7f62f2abb6828ac12c36e036fe391c520ed3bdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.82.0.ebuild b/kde-frameworks/kparts/kparts-5.82.0.ebuild
index e8709a311e1d..86a80033b9ab 100644
--- a/kde-frameworks/kparts/kparts-5.82.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing elaborate user-interface components"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index b5752baf9e58..18879ed33396 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.80.0.tar.xz 61664 BLAKE2B 1e32e011e460a38d0948877e98d2304388faef4e463cbf51fea4b2b1987fbd1e6b68a0881f0f86af14298bab973c625ddf35017d510c5acaa70e496f13e40467 SHA512 d5ffc7bf5ac2028a3f53fdd92b164e6203a3529f5bf5f867a63eb39dc583559f9acf7c75b1d01f3b67f3719f8f0b5ca3cb1a2299c5d5a9cadd844e86b46c08d1
 DIST kpeople-5.82.0.tar.xz 61728 BLAKE2B 5e5abc67b4d918696ce274327b23674d018958cf9eea0e2489918c052891aacc9265172bfb18a88ebb34f6a0b653f6659ba4bf4c27548e1ccf6b99d9c63c2b49 SHA512 3437ae1685427f5b9ca98f75fa2822b68d1ce5cc902810530844e5cdc01fcf3a027d495a5457f31d8b3838622c425fd835df1b4293fdf53ebc0fc34f869bc44a
 EBUILD kpeople-5.80.0.ebuild 870 BLAKE2B af799ebafddacce944132fa911ca1507f05b5da997646e7952adab6330bedaaa2282418d507fabfb5a90c25c4aa061088dc88f8fc669645855037b17de595f75 SHA512 b0520afaff6d39302e7ae7b115599532f4b669b83dcfc87e1663d4e2460f42672aa2304682335cd2146699dd6e583254a430902d628198ac5114d63320b32d07
-EBUILD kpeople-5.82.0.ebuild 873 BLAKE2B 1b5837fefb6670a84d2ff0a0db95cdbf2bdcb7cdd03509f073c0db8a2866c1959e0b92ca2fd9c9554cf5875d76aa1cf84c6e118bee94e926b4564adde50f463e SHA512 f947ade8281c73862a937d9a7cf1545cb2646d742fca46a3435e4afb2db481fcbc28e738139da6e3a0992930f2117bb8b44b49ea6b6586cfe2a89b32a031f324
+EBUILD kpeople-5.82.0.ebuild 870 BLAKE2B af799ebafddacce944132fa911ca1507f05b5da997646e7952adab6330bedaaa2282418d507fabfb5a90c25c4aa061088dc88f8fc669645855037b17de595f75 SHA512 b0520afaff6d39302e7ae7b115599532f4b669b83dcfc87e1663d4e2460f42672aa2304682335cd2146699dd6e583254a430902d628198ac5114d63320b32d07
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.82.0.ebuild b/kde-frameworks/kpeople/kpeople-5.82.0.ebuild
index e90e2cd8501a..411cd9654dbc 100644
--- a/kde-frameworks/kpeople/kpeople-5.82.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.82.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE contact person abstraction library"
 HOMEPAGE="https://invent.kde.org/frameworks/kpeople"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 13996f5c7d7c..461094255c5b 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.80.0.tar.xz 31100 BLAKE2B 34e24ffbd2cffe8074e834923ecd304c5873ce79f436dad8a31f66cbc59e201c35982103751dd8fc351c6133c6dbd03e8987a5daf96b8b8aa6a453360bf7a345 SHA512 d04d35c44439da9df37e046f09b75908bd9f965fba18941b803543dbe3111f6884cf4a7377461016ec60d1f47c08e84fa994e2784fc135867d74e0b0d3edd2cf
 DIST kplotting-5.82.0.tar.xz 31220 BLAKE2B c7eb39d8a8846c6c230a98cba83613d4468b9a62fe1014fa240fb56021d6cef0122d1bf7df5cfd727f5693f495d0942d04ca0e43bc609283a9da1ca94cb63d55 SHA512 8e33b37e61708e637d4064187ab4acf7f8dda846eaf970efc78138590c600c0a7fa320110138e396dc91c6134ce4a1675aa6d4b199a2a385596fb1185d428a75
 EBUILD kplotting-5.80.0.ebuild 437 BLAKE2B a97e60e6e0362bd7e6b818f17cc6c760f646766e251008e241022503cf3648ca50a073a9c57e8bba3cb2ab34c8ced13590d05dbf08df45f80dd66b96b764c9d8 SHA512 58cbaa40154b01d58d88314c62eb170020c5c55163e81b330a04a2e926e4d37bc804887eef89f46ab8c73e09567e6d3b4de5a013ef6a35930790d3f79cdb02ad
-EBUILD kplotting-5.82.0.ebuild 440 BLAKE2B fc28799f842c5c68d4cadeeb01d3a4f0ff1175915f91ec2eccd7c796bac539e7becb9823b2779ff58d31a16a3d0db8eda03f6470661b29deb9284c655fc28a57 SHA512 74afec5b09559fff8dbe02f09b90c132876970b549a3aeccf336e1242f8f400f35b822b6548830a0d3567495b6c3052f045e898bc2356975ab54c901d6504170
+EBUILD kplotting-5.82.0.ebuild 437 BLAKE2B a97e60e6e0362bd7e6b818f17cc6c760f646766e251008e241022503cf3648ca50a073a9c57e8bba3cb2ab34c8ced13590d05dbf08df45f80dd66b96b764c9d8 SHA512 58cbaa40154b01d58d88314c62eb170020c5c55163e81b330a04a2e926e4d37bc804887eef89f46ab8c73e09567e6d3b4de5a013ef6a35930790d3f79cdb02ad
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kplotting/kplotting-5.82.0.ebuild b/kde-frameworks/kplotting/kplotting-5.82.0.ebuild
index 71388c7ee73d..0345005da1ac 100644
--- a/kde-frameworks/kplotting/kplotting-5.82.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing easy data-plotting functions"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 7e8800a01fdd..501bff65008f 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.80.0.tar.xz 56224 BLAKE2B 0e0e6a2a56154b8d59f88503e0a0b7e091c4f9e89a6464726a0f12890c6faa981bc32e2377d4a6eb2c70aa6bcdc0dc310738649670857ff7d122d479bd2f4eef SHA512 406b3170d80bb7a3213e8ed940c517eb97227ea442bfc4175886f0c90c031b2593695973411dc993174d1af0719c3a4365c0f74f2dcede538433dc3081ff3af1
 DIST kpty-5.82.0.tar.xz 56348 BLAKE2B 954dbb443c9f7eb43abb9aa414c77867dbb831b767eb2c8d985cdd4eb0dc003ab3338282bca5ce547e2b84e5a714cb27aa8771653b27111cc303bada78bebcc8 SHA512 9515443671c2030646dfa628555b3e131ad8ff018aa73fe7e0168e352968cbab6111f8e00a47cb7c26ca3807da2e502de19505d44da84750ca46a834bb7a3193
 EBUILD kpty-5.80.0.ebuild 550 BLAKE2B dcd8ed024d7f784859f592a6ae8d7c38246867cbd6b61e6c040e3b4bf534ad1257bae719c8a3e0b89a315b32063db38a08105c57ef9c39c87fa243416109e2ce SHA512 324d33ddfe86d1ab187fae50e22d2ac7cc7db31f7eb17b106f4b19d0e387f04ddfbfa4ff0fb0822ebfdfe4aa8284da966ceacdff3a1dc7e573e1deda5a6ac6ca
-EBUILD kpty-5.82.0.ebuild 553 BLAKE2B 4754f87aaf2ea51cd1188fe2485bac9876d6a443d634810e253493ee79bf2a7d16542d299699d9f4c9340cfcabfbb3654b818666a57ac1c389148f1683a165b5 SHA512 53bb54924e672e8f1ce763cf3fc9090296c48c7b70fc3e4b57b530d3b67beca4d0c5c32ced920df86b7aea0c0dac1ec9fca3d9303b8f7d591c45b871a99948f2
+EBUILD kpty-5.82.0.ebuild 550 BLAKE2B dcd8ed024d7f784859f592a6ae8d7c38246867cbd6b61e6c040e3b4bf534ad1257bae719c8a3e0b89a315b32063db38a08105c57ef9c39c87fa243416109e2ce SHA512 324d33ddfe86d1ab187fae50e22d2ac7cc7db31f7eb17b106f4b19d0e387f04ddfbfa4ff0fb0822ebfdfe4aa8284da966ceacdff3a1dc7e573e1deda5a6ac6ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.82.0.ebuild b/kde-frameworks/kpty/kpty-5.82.0.ebuild
index 57656f492184..99a462280456 100644
--- a/kde-frameworks/kpty/kpty-5.82.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.82.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for pseudo terminal devices and running child processes"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index c851cef92813..68003f3074cd 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kquickcharts-5.80.0.tar.xz 101224 BLAKE2B 1efd17ad8ab283497a294e3403ad4b929cce94fa1d7e6055cf00a3081a42eecfbe44b064f2a44db52e42df7332cdc033da51d4437030646f816763d3f79fa000 SHA512 d4183b29e031a03bd7a42a0b97f78995be60340a841b7900f3839dcb375d48801cd61ef534d3bedc27081ff925467b8881a09caf3f66994a3737da74e4393831
 DIST kquickcharts-5.82.0.tar.xz 105832 BLAKE2B 00bd1f5ff89e11758607a9b6c2705d4c670107b18eb5ac67522b1f5a6ba5f4b5897b86582ad6ea5f2a1e9245efdf52614a6ee418ff0c2ff8a0499de5211bfe49 SHA512 978e9644d62a3bc7c9e5fddbc7ce67551941a2429804d93a5745584c28555a748f7804287162e31217082bb9e9391d2d86bb50eda209f93da15cb4b5c93ed583
 EBUILD kquickcharts-5.80.0.ebuild 798 BLAKE2B adbcc2d8f29109e0735d678252909944ab4d7fa8a978a9ccfaf490272f1b79171d2ccdbb28eaf8ae647e52de336248efd96e8d4ef312edc3f2cdabca953ce5eb SHA512 875acb51f6aefe6ea3abe0ff1a9b5a4895d80ad84bcb13084823ee4a1af2e0297f4ac2536567780bb543d809e5b7d6e2d157ceec148b13744d8154a09ae1dfe7
-EBUILD kquickcharts-5.82.0.ebuild 801 BLAKE2B 9bd352bad29b06afb8a4e130ab1269cb5272ab00ca1d4f28424000532323ad275ac47e7c4aa82e8203d05f4b690d3b75c72126f2691fb3ccf4a7642e4feae4c8 SHA512 c65d5f54705e51e5a9a692c0ed6dc32fa7cb14b314c55c807068a3761afeddfdc38b48851c35f8bcafa3c0722a0b4c39a6a7d0d9e36ea81569dcfb2449c7b076
+EBUILD kquickcharts-5.82.0.ebuild 798 BLAKE2B adbcc2d8f29109e0735d678252909944ab4d7fa8a978a9ccfaf490272f1b79171d2ccdbb28eaf8ae647e52de336248efd96e8d4ef312edc3f2cdabca953ce5eb SHA512 875acb51f6aefe6ea3abe0ff1a9b5a4895d80ad84bcb13084823ee4a1af2e0297f4ac2536567780bb543d809e5b7d6e2d157ceec148b13744d8154a09ae1dfe7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
index 6d75dca5d2aa..ad2c6d999f5c 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="QtQuick plugin providing high-performance charts"
 HOMEPAGE="https://invent.kde.org/frameworks/kquickcharts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index ddd814f91195..84ffe8533dd4 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.80.0.tar.xz 128768 BLAKE2B ac906bca9eac1899f77d70a39920b22007d5da08719f47f0a242f2cc0d2b0e9fe48c6a43b45ddcdf4e053126b6392df9013f3ef6734f0a5418e86fe6edc3bbe1 SHA512 73afba0c159f93e6ff231075e4c43e077cf37bc74b2e7eb451a038f3767a3436ac649eb5df7e86c65d4c10d2a6c31b417506384bdf2ee479640f31923539bf84
 DIST kross-5.82.0.tar.xz 128940 BLAKE2B 38006266d918ea9800c91e3a5149d97850d3b7d2b3b31f272c88400b8973442db3a84f0637fda13dd4086df9b7abaf5e3443c6dcc1da31d23e5ecbec7ec55e41 SHA512 ac3b30bc49e4be321c2171dc8229df7df2f7980d4eb47af11141bf51ced4602c1ab81a8150612f02d09c33226bb98cc278451b5c1d4c10f465035f1fceb12ebe
 EBUILD kross-5.80.0.ebuild 859 BLAKE2B 5d864e7393539dbc4cb95d5e5541ef1e9f951e0805f0adedb92f8b09f563190e7739ed84b3edd4b54f6471938a0ce1559cf09cbda7146c755e48c845c62bb384 SHA512 7524fb90c6b1bf7c04bc57a895ad6e808e8dda7787dad8914ae526d8442ebf45b5cb5d9d856c868d93e1b719e0141d860f8cd5fa99863f7b2dac8f842698bc2c
-EBUILD kross-5.82.0.ebuild 862 BLAKE2B 3520fbb25fea611af96ec1ff481be967cd42b336f3e9c7778535d250a00c514e254579badb9ac9cba88e6be647f5a955914a1712546fcd8aff57890111dd17ab SHA512 9a4ec2e03cff5bcbe9124a63012bbaaa5e044de36501942130419401407aaee1a43da761ac53dabefdb3f2479e19ea1a7265d93bcc08bbf30278a9fb3e51dcf2
+EBUILD kross-5.82.0.ebuild 859 BLAKE2B 5d864e7393539dbc4cb95d5e5541ef1e9f951e0805f0adedb92f8b09f563190e7739ed84b3edd4b54f6471938a0ce1559cf09cbda7146c755e48c845c62bb384 SHA512 7524fb90c6b1bf7c04bc57a895ad6e808e8dda7787dad8914ae526d8442ebf45b5cb5d9d856c868d93e1b719e0141d860f8cd5fa99863f7b2dac8f842698bc2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.82.0.ebuild b/kde-frameworks/kross/kross-5.82.0.ebuild
index 91bc4177afa8..b8cc49f551c6 100644
--- a/kde-frameworks/kross/kross-5.82.0.ebuild
+++ b/kde-frameworks/kross/kross-5.82.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for embedding scripting into applications"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 0d852891d36f..ff02c804049e 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.80.0.tar.xz 74620 BLAKE2B 9c82f676300fa6bcb85ae2b14055f82b1f06c1c80f11a78fb01085989263992e44fb8c743e14991d94653d0df956239ce77eeb51c81734d391de93bea8c165fb SHA512 71cc43ec6f52993c9a9d5fb6d736734af45b141fef50675a7825a1d03edadc4edfeecd52b5e229aa387a6bd28078cb887d63ecfc259f7b44c1aca1ecfd929d28
 DIST krunner-5.82.0.tar.xz 76916 BLAKE2B f846383458b46bf655a2a2b08fea099eff910aceac90306bea1f3af1b1370d2d59169ee4ff0e68c6ab0186c35b336b4a807f56cd8374f89b16c5319ddba459f9 SHA512 a4430196d32d850f9498027df251a65dcf3fcb161a7005926a9ec3de429bd03487e72fda342a6a588c4e5972ee55baf21e53433d68408ccab1b0b99b5c2980da
 EBUILD krunner-5.80.0.ebuild 1080 BLAKE2B cbeee82b27499bec448b904f5d65ff0729b7a7c632bff088931b76930a93d863a8c9c307faa9237f3f632df9c9422fa9ddee716a90525bbd59ba4ca042d8adab SHA512 f432bca30e658766fd4cac83fe984b9dcb2c25f3411b3d1eb7d0d7f6db9f1cd3073f75cbfcc7ad7c2b24393d71339b3bc0088b84133c9c1fedfb3637ef8c08cd
-EBUILD krunner-5.82.0.ebuild 1150 BLAKE2B c5bcaa025c32f205054cb6d14da87c595ec1a26b0b381433102f65d6db9bffb5e1876727ee30b76ab2b15f00ffe55256ce1d7ba410c0287756df220d975aa0f0 SHA512 041d437a988026ea9219c8937f3b3ffb10ced7f224246fc25fc0cf0a721e90c11d12fbd97b0e24743a9d1cb24b5d3a235a8f32e699f8edaf6c29750a8d9eb8cb
+EBUILD krunner-5.82.0.ebuild 1147 BLAKE2B 5449bc1fe1bd46e405fea98ad3b3a57519fa9972e543bd71dc9019699b14d66262103f05ba9ee3f44f30437fb10bc82f8bd9bd07e3454af52c723a3947f5c2c9 SHA512 41466ea5bd1758d83f28bab1cede8318aa32310799b710ce1882f48ad37e00715a6eb8d0b1eb20ee6b04359f9c9e44de986e684440946aa66c58524a587a3f5a
 MISC metadata.xml 345 BLAKE2B 98483681a50512c1e37b502d7114c6f44e40d3c66ff33d858e4dd111cc0f6f4eef30fd51faae0b6fde2b3392ddab79a11d2eb20b904d0d309cb598c7bf6c874e SHA512 6fc972e21befa52a3fa494c63fd423def69d798b7d422bcfcbc142a1fb3f96b2e425700ada34f29cf78b69c81ebf27d51d180dad67c33aaf4942cd647d34008c
diff --git a/kde-frameworks/krunner/krunner-5.82.0.ebuild b/kde-frameworks/krunner/krunner-5.82.0.ebuild
index 9b94a1daf9ae..d41a223d9e66 100644
--- a/kde-frameworks/krunner/krunner-5.82.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for providing different actions given a string query"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="activities"
 
 DEPEND="
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 1ff85e07079e..0988f3bda61e 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.80.0.tar.xz 260900 BLAKE2B f1092669f6b7402eec71db9038ec57ab39d68d950165e6e7d60b009602bef357bae866f49cd98b644f9c81afada00ef5f7f758300179d4c8ddfe0e7fd7e55680 SHA512 28f612d1bbaefa15a7241395aed249fbb6b9c467e8aa3ae8ca8691463fc93b10a83da45056ef3057c2eaece01b10d14a56b6c1fd6842162ac32fd1f8c85331d0
 DIST kservice-5.82.0.tar.xz 261932 BLAKE2B 42b95ecca3c5a4f14578491fb1460dbeab4b866b94ab6b26d53aadd059b9190642e5914a926d2faa559a95a50e03751c5717be813254e839a27b4310adff63fd SHA512 6294beeb19773d7b58a23f01e9c9c281c4b2cf8eade19d0de6537ea295ad595ec79a22cb1d3049cb79bfa5eb43fc1e80037227217a6dae212b9e5234b3c9aa5f
 EBUILD kservice-5.80.0.ebuild 1044 BLAKE2B 56eb8947b452481f7b78e0a6aefb61ebcff58d9a0acbff0ea28194db5e532af87c4e356c6adf3a174c1036f78dfa92e8b0a54e0fbdcdcc7d22052d7a59173e38 SHA512 b1f6c1cff5a58fbbcd1a9091e0fc3a46df37883795c1d0e48f2b8bc8d6c9bf1669500ed99cddeb84acc1469a2efe3f6d5a8eeff391d472754b04106a6c66a790
-EBUILD kservice-5.82.0.ebuild 1047 BLAKE2B 0e3fce9ba2808178fcdb43dff85ecaf3d49af08ef1f087039398992c4ec5f6fa24d8ab9e7e65201aebfc398f988a8617e7e7aad5b1851871f4843567b7f3503c SHA512 2ba15265d9284b03f2f2e189fd6c144b568dd0eb909921d49c4922a39c952d0502fdd20c84de9c692b6eca912a42821ff862e582fcb15688f179cdaa9c152954
+EBUILD kservice-5.82.0.ebuild 1044 BLAKE2B 56eb8947b452481f7b78e0a6aefb61ebcff58d9a0acbff0ea28194db5e532af87c4e356c6adf3a174c1036f78dfa92e8b0a54e0fbdcdcc7d22052d7a59173e38 SHA512 b1f6c1cff5a58fbbcd1a9091e0fc3a46df37883795c1d0e48f2b8bc8d6c9bf1669500ed99cddeb84acc1469a2efe3f6d5a8eeff391d472754b04106a6c66a790
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kservice/kservice-5.82.0.ebuild b/kde-frameworks/kservice/kservice-5.82.0.ebuild
index b70e6261a0bd..2791759ea341 100644
--- a/kde-frameworks/kservice/kservice-5.82.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Advanced plugin and service introspection"
 
 LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+man"
 
 # requires running kde environment
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 34062c8225e8..b37db34d7392 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -2,5 +2,5 @@ AUX ktexteditor-5.80.0-fix-minimap-location-highlighting.patch 1484 BLAKE2B a13f
 DIST ktexteditor-5.80.0.tar.xz 2375112 BLAKE2B d052677f8a3b81b39f95958f48b7fc899a1c6591c327a852dfbe40269062a2876cf199f7679712ce1d612b2bc13f8e79f0379ca0600c1d5e2ecf12ed3d03620b SHA512 c6065e3e4c0f2bb59dd043109b3fbc2282e82b3d023011fe726693728257e6d9061cbd07fc23e97de5a73bfac9832b5065c0bbdd8be3f5d187788f6957753820
 DIST ktexteditor-5.82.0.tar.xz 2341712 BLAKE2B cab63977dd8d2e8e9c2b766a9b0563cc98f0b25e2f39f2b598f9b8162ce2e12a3ac41cb74cd6f9cd9509f5987d47d27c9ee3114579ce260837d84bb06b7ae683 SHA512 1459ba61ed4a4b603cd984449a217230914818e32c318a92232957cc83d5e70f2a55bf150ca946252c696e019c24dee5b852ca5046c9914f3fff1c6906487bdf
 EBUILD ktexteditor-5.80.0-r1.ebuild 1679 BLAKE2B 4efef95a4bf7c67a19f5035c5acf6a08d02b880230ce1c3ca4d4fd0e30f7ea05230429255c3e04c10ac345f89adfc52400db0cfde88637bbe853738c74ed22c6 SHA512 6356d0fac35d39499caf7a5e288e1c48a4574ba2273d5f8a49fe1ae397718712f4f08ce9637c2e89db567a7678cf079e258dc571b9378cf636485bd09d3e4038
-EBUILD ktexteditor-5.82.0.ebuild 1592 BLAKE2B c2b4551edc0e46384671f89b9bfae953298a13144afeed767d7df9b2150ae7654b7c05164c73dd1b1cefc3376a4c599155ca818322d3a2b07520d45c9fa84c5d SHA512 f65679b98514c6939fd78749d362620a7ec24809ee08d46ab3839cac2b351e6a4d664e4768fa8b4533a995e313b255f57c432c4f662705c3b678fc2e0e8f62d0
+EBUILD ktexteditor-5.82.0.ebuild 1589 BLAKE2B f0543e75d291de2b1d5eba8391fe5c1cd1a5e51172f76dd7b1605dbc1f42a16caf2d7ef4d7f7e7f89ffcb5eb006740a17447849af1417524c1495266c12be445 SHA512 a91c2874dc968fe7ac310d84294bb122cddc5b71d894fe4f58cab31c8762571c604c3944f6bd7c9e1bedb96d8538df8e8618858350046a51b34d177aed707482
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
index 9212f04f8f4b..d359a855ff24 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework providing a full text editor component"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+editorconfig git"
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 0312b6e7406c..f7f491e5f113 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.80.0.tar.xz 325772 BLAKE2B 59723c843df16c555d9897651622cb4117f1b070da98a53ca47684cda5e494a2ffe5d21b7fd87f867298453d56c3661beab294cf0a3763db4a6f8e6a540a9dbe SHA512 38ffbf83eb40b9756e2393ec30670d524462f212fc15b0615b2ef9cdc046ca17f30cefa904bda2fa630fe94fd1e771a76e50abd9bbb5c84ace171544520e5266
 DIST ktextwidgets-5.82.0.tar.xz 326288 BLAKE2B 917b1c91a29462dce779b1ae569731ba1c9f810d01009608f71149e13523ec0f1d94582a03cd9fbdaeb159be8abc002193240bba34ee67614e9572578cfa69b9 SHA512 7156ef721c9d9eadd66aa72a2f0da4538a009e14f0058169a95c1ad1c9c19f4120975e2cefc2fb0e20e435ee46dc59cbeb83231fd29bbc7bb815aa59a929e9bb
 EBUILD ktextwidgets-5.80.0.ebuild 955 BLAKE2B c48b371d1165a1361601045d53d71fce0f42aa3d8e60cbd504eb462950f525d1fccdf2064bd24fffe3e64304cbd6bb30e215ad7390ce60dcee9cf797bd1ac6d5 SHA512 2f4dfca698597f239aade5ef57232cbffc01ea146e39867813a1c4391ec7beec12407199250ba3257d09d2f7400da7eac5ee2d9cdbb53143fe5be25c0f0599fa
-EBUILD ktextwidgets-5.82.0.ebuild 958 BLAKE2B 7e1e90ce616ad15f6a390b581c16527489013a2815efd926aaffe4e1442d459dcc1d1d9a3b8bebfc4d55149c860ea95d4f67a4916c7ec2b87e9488de7d366729 SHA512 ca4566c88d5ee9fb20d76ed0b342de3fa8d228b0f4637d4508c96d4617857c0f21b69ced62d75cad40ed2a3973cb0e6b3ce419fcc9aecead48925e071e29ae7d
+EBUILD ktextwidgets-5.82.0.ebuild 955 BLAKE2B c48b371d1165a1361601045d53d71fce0f42aa3d8e60cbd504eb462950f525d1fccdf2064bd24fffe3e64304cbd6bb30e215ad7390ce60dcee9cf797bd1ac6d5 SHA512 2f4dfca698597f239aade5ef57232cbffc01ea146e39867813a1c4391ec7beec12407199250ba3257d09d2f7400da7eac5ee2d9cdbb53143fe5be25c0f0599fa
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
index 0fdd8d60135b..69b72fe6fefb 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index ba89d981a555..aff2d5f9cd25 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
 DIST kunitconversion-5.80.0.tar.xz 860568 BLAKE2B 5d7136fbfe18a6e500460b1f62a6c93c0048a7fadaddd80700c5d46c6be18ed86ccffcebfdab65056d6448fb3ab2d82d2aebe9ba21ac9cc7489f9f25f35972d0 SHA512 ad2509c262a6f60f0eaec9c2d77105302623dc602cb44b2c3d15b0cf3186c37a24d65e18def72857d69b26eb6684f7a6d033e0e87adfd05b0a4ebc7dd0b58a81
 DIST kunitconversion-5.82.0.tar.xz 869936 BLAKE2B 7812dac12f9e854c1178ff72efd13cba0d36d55c0046898ceebb4dbbce6a8244824bf4453a240661cda83e87e60630268c723abc57d6e86b960eea8ceda83255 SHA512 735684240372b9dc7a37205af92172be164a71537b96c810bf64dd46123748901a079202aef394b2624ccfe5aff2ac69e9380e5715c57089739eb59fbd48a527
 EBUILD kunitconversion-5.80.0.ebuild 524 BLAKE2B 3f0bfebc97827dd3837e58d05f44c9b8dbe61ebfd276fa8c4c5921037016d8b6188e4d49cc3fd91ff421a0a3326650f86cd5f47a758e198fc5b0f4a52e9548b5 SHA512 c1f6d3a23f8f60c6c1df3cf609e0544f6f918abb3792578b732c3384d58fcf65c52b2aeefd1cb8d6fa1b735f1bf5ad76b2e346117b002bcbb09ae23f906720bf
-EBUILD kunitconversion-5.82.0.ebuild 527 BLAKE2B 1a014a291da9eed81208dfff2c41e57381319a12200d68096450f981756f816eadf8a6fa817f3deae1c3538fd0688522517fc63c592a2dd68d84aefbe3be242e SHA512 9218c4bf86c9f71160768a284cc0404b827a417aa258f9d688b88648ca61dcb829f6b7007e879adfbbe59dc8e42fb785b123863ca29810b5f41ef66e9dd33256
+EBUILD kunitconversion-5.82.0.ebuild 524 BLAKE2B 3f0bfebc97827dd3837e58d05f44c9b8dbe61ebfd276fa8c4c5921037016d8b6188e4d49cc3fd91ff421a0a3326650f86cd5f47a758e198fc5b0f4a52e9548b5 SHA512 c1f6d3a23f8f60c6c1df3cf609e0544f6f918abb3792578b732c3384d58fcf65c52b2aeefd1cb8d6fa1b735f1bf5ad76b2e346117b002bcbb09ae23f906720bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
index 75a1cfd68b78..486447ddd799 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for converting units"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 1ae63e5e892e..c5bd78be4cf9 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.80.0.tar.xz 300100 BLAKE2B 3f192acc7c432cb426dbfe9d83a409ca7da5974451ce185ec583761695b104f6a95414e43fe56d69fcbaf0d3f777b46b9700b1678fe72d509d0116064a49e3b6 SHA512 e815210f7c0911e849b0242ba239e4f5a2c95dc39af5a03cfb68abea1b2be26c81aa474678749064179cf6311f2710cc94c634e3acfc1ca6661789bd6ba4d33f
 DIST kwallet-5.82.0.tar.xz 300944 BLAKE2B d15119772389a2b422bdc5564d5dd14012eab47ea1767dab0f439db842debd26632a6eb764a33ceb68f0851bbd3ff8bf5101729b8fea1eba6be675608b9cd769 SHA512 b23d0d9229df9060dd71d9ac81247f70bf246f00f6bc0026074be4964532f5e0986c49414d11affbcd88d89de761486e2f3ea2fcb6d023723285e14af85a06cb
 EBUILD kwallet-5.80.0.ebuild 1377 BLAKE2B 4591ceed9c3bec2b1cc8af2b6be232388d332ea1050e02789bcdb3a6c294179a9d3c083fee5e0fa0985c9ce82774d689fcd0e5468fefbf6f7a647a43199b3cfa SHA512 50cf50205f79d0da8e700bfa942a0ae80d634e229222b328af32f59a975ea37f98b7d4432268f2fc30dd98a7d35fb5f28133803b63523cd68f9d256ec79af82b
-EBUILD kwallet-5.82.0.ebuild 1380 BLAKE2B 41aa23c1078e4ba44924770d985fc01f2e786f24ec463d5905b38f4c9ff9e7f6a504022b838bdcac5760fc49bf5c5077e5c97853358913620b3c1a5bb35fe4a0 SHA512 75043725335e63678fc28dd54d98794602e71fa7d00d788f20360dc10fa84e940a0f09f0059ed99ad8805da8e59402a20dc08d8afa04b136c86a0e45e0e49756
+EBUILD kwallet-5.82.0.ebuild 1377 BLAKE2B 4591ceed9c3bec2b1cc8af2b6be232388d332ea1050e02789bcdb3a6c294179a9d3c083fee5e0fa0985c9ce82774d689fcd0e5468fefbf6f7a647a43199b3cfa SHA512 50cf50205f79d0da8e700bfa942a0ae80d634e229222b328af32f59a975ea37f98b7d4432268f2fc30dd98a7d35fb5f28133803b63523cd68f9d256ec79af82b
 MISC metadata.xml 379 BLAKE2B 884224c9038659c39bd91c3a2a3b8707fc8ea50887fcf08c31f432a2f5d8b013bd8b466685332bfc72220aa6bae689fd4f02200b04d8d4de370c2a77aeea2ab9 SHA512 bf6ad732349402a6b60b88366e62e620fb6601c44d962a12b35125760161150e6bc53535f55ab675a0a9bc048c4bdb4ee1e8e3f6cba5e4d8ecef165c6a90c820
diff --git a/kde-frameworks/kwallet/kwallet-5.82.0.ebuild b/kde-frameworks/kwallet/kwallet-5.82.0.ebuild
index 6958775bab35..81aad34ddefb 100644
--- a/kde-frameworks/kwallet/kwallet-5.82.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org optfeature
 DESCRIPTION="Framework providing desktop-wide storage for passwords"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gpg +man"
 
 BDEPEND="
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 9e60a2de3c7b..1bf2746af524 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.80.0.tar.xz 344740 BLAKE2B b373b27c696f6a0d13ab466f6281322b9d6e12982ffd321f055b2be2a6ae8b48807b7fb20171688ce32d93653762801e1e5169acfd438c228c022e12d903e84d SHA512 d681e7910a27c76925745dd508cc553a2ddb0b7cda9af150dbd59de3b69a19082e672c586b9e4de1da3fd8027f3aa8d85f36444a20db2604c76d7e407f269789
 DIST kwayland-5.82.0.tar.xz 346464 BLAKE2B 59b0e28b2a9984c923c211cd169b4abf9d7c969ae1de31db3e08c0bd2a127b19e652c6666b20ee49d73c9d2736929a45a2124353fd19b320be9256e2f87a6252 SHA512 80cddfdcef545315987d27167ab2ed35b76b9b02e2310913b7c27cbcf27671b1f1f66b8dbb8dee82d42bd2e4fdbd5853109783e76da7ec794f6eebfbef9cf020
 EBUILD kwayland-5.80.0.ebuild 717 BLAKE2B 3d0101c5704c77f737682376ff83ac6ff5af2006401dcca58d97c7cce8afc44e0db8eb787bcbf84cad16ecdaba08d34d1ec556548fa5cb757b4f97feca8f8c77 SHA512 a8950b0ee60a16a944e57058f1867f4536abcdd784c69ca1ac57022b3d06eeacdb55aa1f284c9903042031026d7fd07153135494b4ff04a4ae43d852a9fa612e
-EBUILD kwayland-5.82.0.ebuild 767 BLAKE2B 6a390ce9e8e8ae01c8d7157224ced0d2b6d0036465175b501ab3aa16e0e6420b3b5ed81799ceabdc72f3222470ea99f11d64a988fe5d522e4db8af1996170871 SHA512 5c1a0ce39f904d6c737a8b1496b0062c89bfcc89d3894b29a6441f42408463e0584e78699f809694f175d28ad717f8e9be3cfd483d426d132e0b22ece0c1f383
+EBUILD kwayland-5.82.0.ebuild 764 BLAKE2B f5ca1ecbdbdb23975f337dd58b86b6d8740ff9453e62881ad27d3f9a3859a771c94de027ff2deb9f495cc47593887f0751b19e3ba4206753728f6b888f22ddd1 SHA512 91880d5bbde65e9875e948d8a2b5507a4cffd27f2cb9c5b995eb0f7b93d49b4bdb403a9fd632e6f57925903916a13c371afdfaa84ebd4aad26154931a8ac193f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.82.0.ebuild b/kde-frameworks/kwayland/kwayland-5.82.0.ebuild
index 733ed1d5eef8..b4573abfa084 100644
--- a/kde-frameworks/kwayland/kwayland-5.82.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.82.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 645ba5b5931b..4902a3c17cc6 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.80.0.tar.xz 2367736 BLAKE2B 3c1d41223bfccded39068665fd45743df6c93f3d28f1524620005a1c3f60842fd0c592abc248054d199808f26b18ba16ffb7706ec536e9860877fef6c8cb0712 SHA512 b89ffcb86f791684e2e0ad06901cec5b235d639e423ad7b43b32fe59fd3a808ba2b6afeff2a7009bd9e03d9297b3fe8e4c04794048ff2da4539baccdbfddb8b4
 DIST kwidgetsaddons-5.82.0.tar.xz 2375140 BLAKE2B 044a1af35ce5f756c49b849f0b56e024e709643967142f1d9634ccaed882e1973c5f41c2794470563cbaceae8f7b6a72fb9c89a85005dc723e09a668af0c2fa9 SHA512 6535353c931edd6b0d8bae70fb67e3f6b2bf365d143424a7df4b63de9e174e9b9da705ed17e64f497923909a9d7eba0282d934a9c7abe2b80675b3652d1bf9fd
 EBUILD kwidgetsaddons-5.80.0.ebuild 751 BLAKE2B 21207bcab17507caaa5ddb02836ec6df4b31dd4e38a4460bda574e897dcf0bb7fdfc5760c6e28410defb96d0fe11a0cf123300da36c9434d2929fce5df739c1c SHA512 e031ca7dd9fc35c9dd855a6fb5da62d13da7cb170fadd36893180d49e71a382ec3c632f7d11533f84d7786f871280ea793d926b686600e170e0d9f3565b1228c
-EBUILD kwidgetsaddons-5.82.0.ebuild 754 BLAKE2B 0d060205423c532f6157a5b14fbf0fa6ebeacc3f7e2dc304b1d08785955c25657324d8fe258bc0e408525bcdf082b0939695d1b78e6ef8e9f1da447711950900 SHA512 c78faa9121e1a6348947af4a56f21c6e6e0308ff59081ee56d8f9a9afb7ad9d96527f02ffc5d3cbb9a86e3db1f1727041735c18145348299222162ddf94ce5dc
+EBUILD kwidgetsaddons-5.82.0.ebuild 751 BLAKE2B 21207bcab17507caaa5ddb02836ec6df4b31dd4e38a4460bda574e897dcf0bb7fdfc5760c6e28410defb96d0fe11a0cf123300da36c9434d2929fce5df739c1c SHA512 e031ca7dd9fc35c9dd855a6fb5da62d13da7cb170fadd36893180d49e71a382ec3c632f7d11533f84d7786f871280ea793d926b686600e170e0d9f3565b1228c
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
index e5034aa3abcc..eae453dc0ed0 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index bf9bf2c536c1..2ee5005ce2a8 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -2,5 +2,5 @@ AUX kwindowsystem-5.82.0-no-qtwidgets.patch 2499 BLAKE2B 30602fa8fec92647cf92abc
 DIST kwindowsystem-5.80.0.tar.xz 177340 BLAKE2B 9f659368706e0b849285758f103478078f15057170397bde3aa6ab0bc27390e4eee5d7e94900302be204c5e672618b48197581cf8459b0796a2dd92ee17e8e91 SHA512 a2e928568ca4ba7e5ae904888e273c8f3e7c57661b8a32246e22330426fa2db55535b96ec7b4e74681090f15f227586d282f3f077e44bdc3e0a86c9514f6151f
 DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
 EBUILD kwindowsystem-5.80.0.ebuild 809 BLAKE2B 6e614387bb5e67bdd0cf2013a70560c094fa30ab882a9434eb11382a42201760e16f5af8ce17b42a6fb9532d8dba3f7c04d425b4e18ab640392cf6ccf13389e9 SHA512 080211e701b45e31c88b2b9f816747d2da79338d358e78ada30e584be2411120e750670253a9a112892029d71352dde0af1c5776fc5b17452f1b4a03e2ff27ce
-EBUILD kwindowsystem-5.82.0.ebuild 925 BLAKE2B ac7ffe3d337d7dda0e146b5b17192d2fd71e8d2ea734d597123d680295bb92816523a5f78febce72a6d9b3afdef88d0665b0e5811e0b9a8baf4b8154ac09dac8 SHA512 956c9d40fee44f59ff42bf9a1a275b590a1197c30431f7fe4f31870a68202e846e90f90f1f1f0c31c35293df7ba6519fc1ccc6a258370ae3f347914b604af103
+EBUILD kwindowsystem-5.82.0.ebuild 922 BLAKE2B 627b7d7260383ff83a7b778599d5c6559a43232ad3d45fb4d77ad60906db764b9a8252c7672c223c06005f6b7e4ec7acef986933452ce9153980f18a4c43054a SHA512 2dc1aff1b888ba35badfce72009989dc08f82baae45294a2a6c6da830119485f786f2397e8094ff1a919876fe8a67ba10014c1e736fce023e8c2f2226b4258bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
index c75dbd19a52f..06682e5d7cd8 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls X"
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index d5abc39a2b2a..409f6241cffa 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.80.0.tar.xz 861784 BLAKE2B e2a3673594806100e416206cf108fe1cab5c0647f2b68eede7608dc0fb886852587f4e6aed8d25f7ccd97fcbe5eaf9ad313a52a36ace5eace7f6a0df0fb7ac82 SHA512 ae19b33329c3c371d1cc94c83ebdae5f02b95e0e3562fed915a4f7185c7d9c639b0a0d8afaef8cb06598d1c44c48595b3f7d7a0a10c8a0c555a8d5d923361a16
 DIST kxmlgui-5.82.0.tar.xz 863880 BLAKE2B 045ed589d52ac901aa128d4f3e8eb2bd2f9b09ce22e6a7e28dbc34d208a6c00167c94e5514f47acce640d18f86f37adeeac79a25dc148eb58c038fddc9fcd59a SHA512 2ed59fa53876005f326e323e153d44d3144c9d49bcccf5aea68f5d743a79b505526286b6307e193878541c5cc8260220ca0a9a169b18d0b0df4720aa8541d0f4
 EBUILD kxmlgui-5.80.0.ebuild 1282 BLAKE2B b70ebf07b32922e3305161543dffa76c619b596b9a98dca886f286519561d293fc4479459934a81533779cfbb6decd6c11147e7ffde9632d9bbf8b9b6e957491 SHA512 5b0b2f1b60f784947253b08a929a155777948130082af735811c2412574e6cfc2665fca6ff3063e8805368c55494e64675ebcccbb46aaa13ff23638cbacecc4a
-EBUILD kxmlgui-5.82.0.ebuild 1285 BLAKE2B 9e08e818264e5f23502b2df9562cce838fa1f0ce8dcc07712eed24f5a1e8b884596bee891d0ec9377ed10f4b9a05c6798e1d109def42297c2be9178022f31303 SHA512 8a5d113c1e29eb30083b8d53bc6feaf51238c4a89674afdee23fc0c4a857dd3ce2d06f1cff975f99228718006319c5890b402abbf9a7de2c272cf23a4ecbda78
+EBUILD kxmlgui-5.82.0.ebuild 1282 BLAKE2B b70ebf07b32922e3305161543dffa76c619b596b9a98dca886f286519561d293fc4479459934a81533779cfbb6decd6c11147e7ffde9632d9bbf8b9b6e957491 SHA512 5b0b2f1b60f784947253b08a929a155777948130082af735811c2412574e6cfc2665fca6ff3063e8805368c55494e64675ebcccbb46aaa13ff23638cbacecc4a
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
index 45acc6a3678e..76de3d89245b 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2+"
 IUSE=""
 
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 5c179bedcc51..9f93ca45b9c4 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.80.0.tar.xz 112348 BLAKE2B a6101bc598dd6ac9ba71022658444c80c69d042c77455cc4513d1aea11c0219b3b26b398ac249d35964f06074283d31948aae864b2d762b796ad38a3a88cc635 SHA512 a3cef63558040995ac80dfab7bb6714f03c8aa66c1b4c011333a67d35d9e969ad43c09f97bb522b859313ab4cbae3415da91cf9505bdd6ebac4357aa4369c671
 DIST modemmanager-qt-5.82.0.tar.xz 112524 BLAKE2B 1569dd2defb8b99b41d3ce8c94e010a8274e04012dc72b442e13761d287a1ed6f3e281ab0f03659f1d034fe6e79c70bd6ff3c07c7a4189fbc4d154fea122a1ae SHA512 129b1618f9bb5a59c79a7a202e297c3dc6f90829c2e4841a0cd2ac15440fed19ea78ce16d2ae3b012fe02db568d337210bafcda183db9cb8a1dba0d087f16ee2
 EBUILD modemmanager-qt-5.80.0.ebuild 466 BLAKE2B 26bf07c44b1d2e8d42bac5f58ad8d3257376eae6fa3d93bb87d78f8a3e2c7aafb7dc7a2ffc24c654fb4d105650847a3b4e1529cfa7ecee0c9f72185977ef5a2a SHA512 bc73ff5231ccddc78992d4d2389628fc3f50555d69694ed761cc43de87f8721f5aafb1272a00e6c74b7af4e9fff0bc969fc30f0f8f07f9f09cf418935fc0423e
-EBUILD modemmanager-qt-5.82.0.ebuild 469 BLAKE2B 222dda89dcdf348936f8e5a5acf1253f27c3e06cdd3fb2d18e9446b683c44cbffae23bc26ba68dbe60d2517784a75522b70c0834ac78075887444fe4c861442f SHA512 ab23ce00bbe30ac77765ebfe455b277ece07cbc38ee9302df39609df5ea6dfc6813b613caaba1b85433d8b1954da76b9d2424e136611835282d06f9eb8fa77d8
+EBUILD modemmanager-qt-5.82.0.ebuild 466 BLAKE2B 26bf07c44b1d2e8d42bac5f58ad8d3257376eae6fa3d93bb87d78f8a3e2c7aafb7dc7a2ffc24c654fb4d105650847a3b4e1529cfa7ecee0c9f72185977ef5a2a SHA512 bc73ff5231ccddc78992d4d2389628fc3f50555d69694ed761cc43de87f8721f5aafb1272a00e6c74b7af4e9fff0bc969fc30f0f8f07f9f09cf418935fc0423e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
index 921f6471f11b..263e589dad7d 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="ModemManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running environment
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 1d13f958c25a..02dae9fb4732 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.80.0.tar.xz 195064 BLAKE2B 553a62fdea48c1d11b0a12174cf901d4dbf5441efc9138d1a0b93645934b14fd134922d60a3f95aa9c6019306627c2b8bca1ae8a7b2063b6d394e5a1412844ef SHA512 df36c15cf19a3a77785ac5c231de91f64b1380df2f84b3553bd0869f245a22c1bff0418485a1b1e22aabd19c7dd2e73e193530d60950d599a08762abf9f22e2d
 DIST networkmanager-qt-5.82.0.tar.xz 195688 BLAKE2B fbda99af246ed652f39c48bed432b934ba3aeeda7c7009c238464e2f0c586a226343dac3bdc1612c970766b3801ae0e03492dad7c73325d0254437f27d428cf3 SHA512 07d3d0e5a9f526ecea5942f5d16aa97c3ee8ab3f2481cabc01a9132e85c92a3dd1a3da744accf413d8239dbca1fce3d1ae022ffafea620f9212bda2a8fce00fe
 EBUILD networkmanager-qt-5.80.0.ebuild 651 BLAKE2B db20b2cefb809e8f759a2643e15bd1e665dab4a60b3759db61a5461deb3db027cdd7c1a6566b5e7b22d0606d50503b1246a84fb1f1eed0858a0b2bd9c38b8014 SHA512 0cac1b4354ff95c8adbcbf405a88a9ecf48fe197b7558ded9a4c718c895225dc4f22a947889488f1ad18ec870b615b6091bb51f0b23e760e3283f084042245ed
-EBUILD networkmanager-qt-5.82.0.ebuild 654 BLAKE2B a01139df3b79d6c1f168326d529cd22e25688fada5fbcfe6d92f92a815c23acf4259971d19b215d464e24b7df1cdd4f4e0097ba2c71bacb1463fbfe475ce17a5 SHA512 a0c4078af169efbcd4c4175b3c6dfddb45c7918d2f0418de8a486309158c68ad2e43211beaedc944c4cc01afcabbd31b072b652436a24287417aa5b8ff8a0086
+EBUILD networkmanager-qt-5.82.0.ebuild 651 BLAKE2B db20b2cefb809e8f759a2643e15bd1e665dab4a60b3759db61a5461deb3db027cdd7c1a6566b5e7b22d0606d50503b1246a84fb1f1eed0858a0b2bd9c38b8014 SHA512 0cac1b4354ff95c8adbcbf405a88a9ecf48fe197b7558ded9a4c718c895225dc4f22a947889488f1ad18ec870b615b6091bb51f0b23e760e3283f084042245ed
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
index 23b69f5bf65c..e976e0530640 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 DESCRIPTION="NetworkManager bindings for Qt"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="teamd"
 
 BDEPEND="
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index e8d912f64d15..56ebfada8c2d 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.80.0.tar.xz 236044748 BLAKE2B 1efe1890e207726e1b85c17e1c6815df9d444d027d7729b57e0da2dfe15565015c7f5fe806253541c0c07f142e85578217122c4ff2ea285a0a6a8d64226585c1 SHA512 00b88c76e7c9627011a6971dade33aade5ad3ff2aa6c4298ff52221307da90d47aaabf8360a1bfd178d6016d5fc7ee69cbe1f10f4392bd14ffd075ab6dccfbe6
 DIST oxygen-icons5-5.82.0.tar.xz 234613000 BLAKE2B 49c25988ccfa1a00a68c55a51b20d3052f1206a74f9ea12534243d106326471ce8219a7bb1c7abb30f1c8994bbd098753107570beb8e7f1f058eba91fabfb609 SHA512 b35ba0bea0fe88f8ef65b7ed7e56157ff4d34ebc516e0009a2bd9969bfe477a6150484f5a8987a9ee5866d27c21f92efd0eaf9673b537a6b92732b3af8133bb9
 EBUILD oxygen-icons-5.80.0.ebuild 688 BLAKE2B 8cb46b48972acff4ba7504e694c526c2c382546ab916d9c7dd475e8e353ab571feabc0d1629df3158f00d07da16bc8a1d8d41f14659ce69ed6e31756e977f58e SHA512 6ce6daeaa08970b337f2d514b0b472e2aeb39713b29a60d4647969972eb394bf6496d5a8b59c6784f76ec26548a7d352eadec54cd5b7d6ef6d7087979ed1f59c
-EBUILD oxygen-icons-5.82.0.ebuild 691 BLAKE2B 0ec80fdede0b27db6a87707b385a6cf12e9f44953961f39d945cf819c64be05cd8b3c57c58b88d358f27d34f9c9fb4eaaa514698567ced1c58dc77cad0acbd32 SHA512 eca98e944f5720848123c71e2825a014dcd448da03dc761689b79c46fa5ff53f462ba203d1b055cf60da5581c77ef8b5ca4cb1a595f1ec0a2d3bea3e3e26f760
+EBUILD oxygen-icons-5.82.0.ebuild 688 BLAKE2B 8cb46b48972acff4ba7504e694c526c2c382546ab916d9c7dd475e8e353ab571feabc0d1629df3158f00d07da16bc8a1d8d41f14659ce69ed6e31756e977f58e SHA512 6ce6daeaa08970b337f2d514b0b472e2aeb39713b29a60d4647969972eb394bf6496d5a8b59c6784f76ec26548a7d352eadec54cd5b7d6ef6d7087979ed1f59c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
index af70e891002e..08d9f3a5e249 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit cmake kde.org xdg-utils
 DESCRIPTION="Oxygen SVG icon theme"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RESTRICT+=" !test? ( test )"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 633ff35dfdee..55cc9f99e312 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -2,5 +2,5 @@ DIST plasma-5.82.0-plasma-transparency.patch.xz 3552 BLAKE2B 8e9f1bc91b2d8ae623f
 DIST plasma-framework-5.80.0.tar.xz 3157460 BLAKE2B 46042d7f0809f866d867aae9ebc7590c1ce04c30a3396c81913a5c890aea96d0766b48018799a77a546ab3b3b96baa8b0eb80e86032dabdf67d686814e312e91 SHA512 6a0920a3a0e97b3775dbd3d5fe4ffa32bd978db73fc52008f3effebbdb54d27b048ff758140238d25823864111aef404d1604854d204b54440bd4c52c14df7c2
 DIST plasma-framework-5.82.0.tar.xz 3160744 BLAKE2B b0e8ebf51fa41b7ea2f3290b157d30fbf2cf2bf5fdf867c7601ece615d8f2ad93b87976f7b093bc7909e1286021db8d1ec5971cbc8b361888450a9e6a9bd64d7 SHA512 e973d1b2683a88f370587a8dba71b1f3ff8a5e23127dbe4c30161fb827b6e3c83e7eb0a6860478d160c6fa69bef9fde0f16f0a8d315672df433ac9d7157b8ea9
 EBUILD plasma-5.80.0.ebuild 1870 BLAKE2B e6fc11d48ce9c832d36338b132a8a79fd91bec14db14ad472d538547404926c57d133255d0a2ee1d1ce7b61ad2e63ffc5caf6029a07065909153cb3123781171 SHA512 742a3f80bc9f359f2ff177b3eb9ec0281353e8a0bc829606918508f7ff6a76714ee14ac498285e557bf4c7b03e2d422dd23d7935b8e7c689199a6ad77ab3e30b
-EBUILD plasma-5.82.0.ebuild 2033 BLAKE2B a92b2de18827419042bea27695be359d298f212fdd643b0bff4143132ba5ddd342a93ac2b847c9c455a1910088b36313521c16aa3b850032f911e26adc84ceb1 SHA512 e05e18972dc830ba1150f09ace1124ddba9eda9f243e09994464c2f09defc61f41d9f19bf15c9f8a0f2fc1fd02f7606814c8be31d8131130be92c705cfc8ace9
+EBUILD plasma-5.82.0.ebuild 2030 BLAKE2B a64a05c28c10890fb3f845286362f0041de75d1f895e1166ee7f1d4ea2f84249582fb4f06c202d4493b97c05359df34c3c1a6938042c9a0ef740d96c3906d398 SHA512 1faab810a201f647dabe24e7d192b53c1b7cbde16287f35c4ccfeaada018d5c967b07589e6d82734f1f5a229d351bd19666ad16d888f34dd4c599d12e07c501a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/plasma-5.82.0.ebuild b/kde-frameworks/plasma/plasma-5.82.0.ebuild
index a97ed52537bc..56c3d574ac5e 100644
--- a/kde-frameworks/plasma/plasma-5.82.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.82.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma framework"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-${PN}-transparency.patch.xz"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only wayland X"
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 5059ee370982..d015e6aaebfa 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.80.0.tar.xz 41088 BLAKE2B 210b52cc49cb218d5cf76fd5b50622a100eb3b05eb0025468abf5e473a64393514a50c84f397ef08a32c2e069eedd062af0e7432be3817a6c46828190c5c379e SHA512 2b82dda139612f7db56219b3798528ed1a9a85ce9d459d979f5b2e8e5367c8d52f913e2f806ccdc7188f70dc8b2d07d235c81e950e648c4d371f0bba40fb74ae
 DIST prison-5.82.0.tar.xz 41044 BLAKE2B 869d41631f1c41260144cf43d043bb868f3c9cf1443e544ad2a084852fa58d2a2b08a1abcd8182ba1bc2cadec229fd870ff10f483f3a9a92bc3e8b49c4138d87 SHA512 bfed4293bc3bc0c39d8cecf37a33693af59831ccb9aefc32ea717d363cfe6e0769f0f90296dd09ce5ea24016e25f352c0be400e9eacb80f813221ffce02bbb82
 EBUILD prison-5.80.0.ebuild 613 BLAKE2B 330030b711029903d5aa93c6a74d4c36654daacdccfa0767ef620d614880758f3bd889e238a434ae4e747c396ef3dd93a8a4baf6b8aef54b7f2c9155a6a3acd5 SHA512 5a16ae8cb5c9cf3a8e3aa98bc900a9f6405b916a8ec9fde75f04b955741967433491bcae412679659b6d08052347fb225fcc9be8b0456a9b01b2192870b9944b
-EBUILD prison-5.82.0.ebuild 616 BLAKE2B 8c622d0ae0205676ae04e35a3656e9146ce5990102815f934195baf8044d81454ec7e77694822eb5ccb7163e9b259d986eca4a824fc305580f9ace98bfa2aea9 SHA512 dc673ffe18fb826a19988e1a4f54173205442ecc12bede9c185304bc4676b5c384f159ea375dd056ecd7e52436f968b9c85a940fdccc05d61b17df23822e63ab
+EBUILD prison-5.82.0.ebuild 613 BLAKE2B 330030b711029903d5aa93c6a74d4c36654daacdccfa0767ef620d614880758f3bd889e238a434ae4e747c396ef3dd93a8a4baf6b8aef54b7f2c9155a6a3acd5 SHA512 5a16ae8cb5c9cf3a8e3aa98bc900a9f6405b916a8ec9fde75f04b955741967433491bcae412679659b6d08052347fb225fcc9be8b0456a9b01b2192870b9944b
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.82.0.ebuild b/kde-frameworks/prison/prison-5.82.0.ebuild
index 6e96700d651f..4b4cf5db23fa 100644
--- a/kde-frameworks/prison/prison-5.82.0.ebuild
+++ b/kde-frameworks/prison/prison-5.82.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="QRCode and data matrix barcode library"
 HOMEPAGE="https://invent.kde.org/frameworks/prison"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="qml"
 
 RDEPEND="
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 4f80b5b797ae..c1b89e301c13 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,5 @@
 DIST purpose-5.80.0.tar.xz 159308 BLAKE2B e7467c3ca5a39c2482c470aa55debbb29b3e0457271a9f126e4b68dc1c48db245bb1d7adb73fdff6f3bdd044fb99557bc08cf2a72de5cab998dd7a9485002641 SHA512 3746e66f0587ad0b7f62f0c262879a6f2f8a58af3753f6c4a1f28ca4996fa40ad63accb5d024fbef1269b137b45c38234cde0bfc5a046cf1c66b61064a7809b4
 DIST purpose-5.82.0.tar.xz 159860 BLAKE2B f29c436239b13c5c025b990a0bdda00107f947dda44b56546049a6e1341f5ca35592c5a4626d62c9ce15b914e566b9a4c96852f0ff9b22d6a22b07b744e1e5f6 SHA512 bccb2cb1ceec619eb61d27cfd027ed20e824a2ba627120581dd928bb331cc1dfc416b5f8067aa31b2a9166dca937a180efc094107a4585e590a5bd9eceec21a5
 EBUILD purpose-5.80.0.ebuild 1547 BLAKE2B 017622d61514b611f11b5e9f56cd691e101c40ecdef4ada3d1f722fd9c1b9e448b4358a76255ea8de20676725f6a895f4c80850c131c800f0ad0df9dc8861666 SHA512 dee644951181affce53a9aecf5b0ec16e92bff5385923be5dac14a7f042fcda63d6b5a4b9e1923071257d2c0d57ef62865a6a27a412af74ef973c8e95b937cdb
-EBUILD purpose-5.82.0.ebuild 1550 BLAKE2B 8886702e77c8141df0d7ca03a603d29a21764dbcfbc875f437ec378d6b11130e1ee57f403d4c70dd076d0a48b50f6ab3fd8d63661a963305a142cba2fd92817c SHA512 0a5401ecdc6d55fe03c8238f3aada4a107791c365013cf7ac70d079817781bf11a8da0766626b3ac81dc1f98a3a8e1dfdada8f60e867775a40c9a441ffc73ad0
+EBUILD purpose-5.82.0.ebuild 1547 BLAKE2B 017622d61514b611f11b5e9f56cd691e101c40ecdef4ada3d1f722fd9c1b9e448b4358a76255ea8de20676725f6a895f4c80850c131c800f0ad0df9dc8861666 SHA512 dee644951181affce53a9aecf5b0ec16e92bff5385923be5dac14a7f042fcda63d6b5a4b9e1923071257d2c0d57ef62865a6a27a412af74ef973c8e95b937cdb
 MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d
diff --git a/kde-frameworks/purpose/purpose-5.82.0.ebuild b/kde-frameworks/purpose/purpose-5.82.0.ebuild
index 0dc933045ffd..287308369695 100644
--- a/kde-frameworks/purpose/purpose-5.82.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org optfeature xdg-utils
 
 DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="bluetooth +kaccounts"
 
 # requires running environment
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 158062dcf2ca..255a5853eb3e 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.80.0.tar.xz 60092 BLAKE2B 9f3cf0859aa0f40ae3bccb8c762d2ddac244d197c06a4caf22a22cb824173061fb922f0f098410dc94edafbddc03784e0cda695ab1f7be550014fea9a0a391a8 SHA512 c5c3be2f8f1257a978136e8a3ae9942bbb5389411338a8d50cde34ec1a007d5c16acb8e0ce755265b0ba088bd71cdc0966ffab44a541c3bc7895ce2f56ce33c0
 DIST qqc2-desktop-style-5.82.0.tar.xz 60076 BLAKE2B 1d743ff60c5862740bd2ef9c0dcadacca3f63f239a78dbd12e459f929f323b695ddd9c03323146b7ac34772ff76f2137e8dad826e04abef6a1f4ed514163e305 SHA512 ce4db38f835971d6f63dced360db8a320e06e3a6f808bd017d56548041f6d0332b119dc0f6d4e160c7847d9d47e6818d2a867e0f243e58fd6c56843643d55a52
 EBUILD qqc2-desktop-style-5.80.0.ebuild 677 BLAKE2B b68dfd2079b33b871129b1342f269021f2eb186f685a1e3bbc75e07ff61282f4860436c83212fa9bfbb9bf1e15fb91302f46ef5652f19a874df63a742de9a26a SHA512 1d44d6e4006a469812cf5b31d3c0c06fd8851de046456a8a4db37fffd52989fb06cc8289a49a4f313b82fdf9aa6046e9b4e306f2bab92942d11026929dd5b023
-EBUILD qqc2-desktop-style-5.82.0.ebuild 680 BLAKE2B 9a6acae40e7e9fcd28267bbeb3b9c8cf903edf5848eecd60177b242f6f62dd5b9f5d0812fd86e4df35c350b154ce3002644472e81c97ac64311b1ddad8a680f1 SHA512 7d741e16d0c92702da9ea226703e8cb613bc3a6314da726e5f5a19512a3cb339b00ef459ed28f95cde2592e0341bb8edfe003d1fb9e0ab436af0d536c64145e9
+EBUILD qqc2-desktop-style-5.82.0.ebuild 677 BLAKE2B b68dfd2079b33b871129b1342f269021f2eb186f685a1e3bbc75e07ff61282f4860436c83212fa9bfbb9bf1e15fb91302f46ef5652f19a874df63a742de9a26a SHA512 1d44d6e4006a469812cf5b31d3c0c06fd8851de046456a8a4db37fffd52989fb06cc8289a49a4f313b82fdf9aa6046e9b4e306f2bab92942d11026929dd5b023
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
index ac284e1bcdf5..0d1060b73b9c 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 821b44cc1267..726532114989 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.80.0.tar.xz 274232 BLAKE2B 0c080aa9b63c86465dae8fb101ec5548d00b9f207e1aacf1e384071072f143fed7b46e5f280ab816afe80844c7c2e4b4bc97594f3da18f1f8bb38293d86fa599 SHA512 8826187f729d435a64bd6b18888d48a87a9c2e910a2b91dbe081212a3bb0be5ff956190a6fb1337d0e8544d54923a0dafb4971f5dec68c2fa9adf66939a22cdf
 DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
 EBUILD solid-5.80.0.ebuild 1038 BLAKE2B f7a79563a60771ce4500b61592f33ba93ba6d0dd674fc2b6dd3a00b652d135bfef91e6945179288a17ad6b4360ce6e503b334499523dcd1d68b0e88732b5b207 SHA512 7c2b0b7e7e90d38a49d7806aef5ada3875c704c5360f4e09e6a9702302260ed7a294f7d4daa93f337476dd5685a8337a8e96b35b854356159151d823ecb64fa2
-EBUILD solid-5.82.0.ebuild 1041 BLAKE2B 3e6dd5062d7173055f46d5870568b2a4298fb57c5c93504d368e27720a321146be7cdae1979d7d00ec8e5d7c6a16abce1b41b473633077fef5c7fc60d0c5bba2 SHA512 abec8fba37e6fb3b084f37a31a352bb7ee883663d7eec4d875d245659d47714950e6d92ce0d56c2d8babaa5bb5fd36b7d23f678fc31ca11f53e782aa58baf337
+EBUILD solid-5.82.0.ebuild 1038 BLAKE2B f7a79563a60771ce4500b61592f33ba93ba6d0dd674fc2b6dd3a00b652d135bfef91e6945179288a17ad6b4360ce6e503b334499523dcd1d68b0e88732b5b207 SHA512 7c2b0b7e7e90d38a49d7806aef5ada3875c704c5360f4e09e6a9702302260ed7a294f7d4daa93f337476dd5685a8337a8e96b35b854356159151d823ecb64fa2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.82.0.ebuild b/kde-frameworks/solid/solid-5.82.0.ebuild
index 5648ed735799..e8640aea1b0a 100644
--- a/kde-frameworks/solid/solid-5.82.0.ebuild
+++ b/kde-frameworks/solid/solid-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org optfeature
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="ios nls"
 
 BDEPEND="
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 1d0cc6405f6c..641fa56c10e8 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.80.0.tar.xz 293860 BLAKE2B 64d800fa0740cfa65772ebecaf033a275be7a0b9d9e9e94a38647e44f17166836788995b64f0b11b2aa9fe319155437cfd0e905071ddbf5b52270bb5b8030c3e SHA512 703f43e6498927c781126ca556cde6034314501dca7443466bc86f78f06736ef01cf1846d888e490c88d38ccf449cb4e759207a66f8a09300ae7b4e7ac6a9f88
 DIST sonnet-5.82.0.tar.xz 293844 BLAKE2B 6e2c4558957d845a281955c63de7dd87fc21634a4cb3e89af47345da070b1dc15e91c558a865e0c7ac5e2adb2454d36b6b8f2f521112b4fd07ad1b2ad02f6c04 SHA512 3bc876b1e06ba5c08c05ce74530a2584b9853e8c9742f66b19529e7f78f3aad89d3a72e0a615e912d1cfd7a24b3de3a9068d0f72dce3c51ca03b896eeedde817
 EBUILD sonnet-5.80.0.ebuild 961 BLAKE2B efc1e30526224c3d5e6e676a762b29dc4d8273b807f6247fc9e28f41ec74da9086b7f5afe13c82aa67773c6c59eadfdd1adcad979ec6b31d51412f34102685a3 SHA512 ecb9a097249ddb1dc9f9471f4785d06779f8e1cdb526bc97b5153c8eb735a9844cd21c6da0693b65f0784f29094b75d6b8d2585604fafa4304e0bcdefe026784
-EBUILD sonnet-5.82.0.ebuild 964 BLAKE2B fcf8b547323a663f1ac9782bd0c845899f7ccbbdccefd8198a3e9746300f719a4fd1340e3fef03e3d1ae01ce2f071062fbce6bbb04aa3d6b77eeeac99de33edb SHA512 47493e83c7aa4d9cebc2807305d95a4869303b08922d99dc96dc6cb94283b65939dffc4e4cb76df248bae00633c0c3454d05914cae5ac4cabe554642a8c8b218
+EBUILD sonnet-5.82.0.ebuild 961 BLAKE2B efc1e30526224c3d5e6e676a762b29dc4d8273b807f6247fc9e28f41ec74da9086b7f5afe13c82aa67773c6c59eadfdd1adcad979ec6b31d51412f34102685a3 SHA512 ecb9a097249ddb1dc9f9471f4785d06779f8e1cdb526bc97b5153c8eb735a9844cd21c6da0693b65f0784f29094b75d6b8d2585604fafa4304e0bcdefe026784
 MISC metadata.xml 502 BLAKE2B d76f720d075b51e7bfba2fbf3edf8715f158ff62585596233be3b6d3afb52212e15be4d3cfc4e83e68a52dfe3ac233af1cf82894ce3197016d163f3d2688e673 SHA512 5ffd2a07ba9206a3d6a88970687c3baa068af228e6025cbc662a466eafc0afb3598e390f907b8c334a418394e60f58db07431cd0a85440148f9959be6ea6e0af
diff --git a/kde-frameworks/sonnet/sonnet-5.82.0.ebuild b/kde-frameworks/sonnet/sonnet-5.82.0.ebuild
index c2df24e9d697..2c3caa333964 100644
--- a/kde-frameworks/sonnet/sonnet-5.82.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.82.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="aspell +hunspell nls"
 
 BDEPEND="
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 2b65cef6e793..337b64922645 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-5.80.0.tar.xz 508592 BLAKE2B fb6127514ae15ec952374b066035b26cf48323949a99ef6b66fba8165b435688251bccd38c5283dc683806d610dff812fc8c125221b74968176a911c517f132c SHA512 913631280479682dd23118b4a1f464930a00546c12f283b2dc9fb1ab96b33b576b6d5fbbb82477d26189ee8fd376842104269fb5a05ff54b16447c7ae3ed651f
 DIST syndication-5.82.0.tar.xz 508368 BLAKE2B 5bae3d80f818670cad1a08f3e085fff45116067f811b34390e4cb64c2f4aaf6c171abdc462e7075ce43b1208ad25cf15f088d8d06f3e922222cac94eb9108d80 SHA512 59e8f88138d6d18d7b4c4f2e5596606bdd13aa7425e55dadf24cf4a1592cda0c547b077d303dce514a0e20d5cca0740e6e6879ffda6470c0fa9302cd11eedbc0
 EBUILD syndication-5.80.0.ebuild 472 BLAKE2B 62af7fb42c92d330b39192a197eeca75de7c40daf20279fc41d5c37cfaa1e6455d2cf1c215d1aebf4939395880b7fd59b2f360fc0ee643cbbdf346e9e384fc58 SHA512 01ae35519cd59cbf993eca2d55a119306dd534882a4439cad314b075eac55079217d2b6900c89b0407e6a8e903a3272d3680cb62a71285c18470f2d63f17684a
-EBUILD syndication-5.82.0.ebuild 440 BLAKE2B 720d31edb85f552fe6452ec20f1e397dd4144a036c13490b4651ff18656f4b11b6054e217cc048cca96690651b5625982cee90d7675f5a7e842d3191935a01c7 SHA512 dcb7d5630bbf70f8e5c7acb51d2ae97c17b70035e00e69151067a2741680c612bfc509f3dcb50203c02f4549b00982a629ab6243b95a77315da782cd63d78f74
+EBUILD syndication-5.82.0.ebuild 437 BLAKE2B 9be19b82c675786aa597b095b712dc714068620d98a11fe82f535609b38f09e37abda0e97ea7dad1f18ea7357e93a3f380bb423d78668b45dab84874981adea6 SHA512 72ca5be7b60370d674604cc5de99855644eb0f914be70ae71063d166882a994efe504c6d2b41d77f92c9fea502842c50648545ddc72f5ba8681042a1c55a8d7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.82.0.ebuild b/kde-frameworks/syndication/syndication-5.82.0.ebuild
index f9d3fa88d675..c3867c004d48 100644
--- a/kde-frameworks/syndication/syndication-5.82.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.82.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for parsing RSS and Atom feeds"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 69468c4f872f..0c34644cff0c 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -2,5 +2,5 @@ DIST syntax-highlighting-5.80.0-fix-path-style-w-alt-value.patch.xz 6880 BLAKE2B
 DIST syntax-highlighting-5.80.0.tar.xz 2272788 BLAKE2B 45a116be75f998cb9a9cbf378418d030135eff1d1d3eb21932b202f22495fcbaa67f133dc1ae55bbcac24725cca847a2dbd880a5f5c1e39aa318a5b342365c22 SHA512 f24fb943f095b44092f62eca2a52f4b0f9ad0ce705bb0b0f8a17a9e3cda7a9892794218119e77cbc376d48ebb336904f862dbdd2715d932e7bc1c197dcbfba29
 DIST syntax-highlighting-5.82.0.tar.xz 2290880 BLAKE2B 14a98534b4e0ec85bd3bb3603c6330f665b5d2a3958f1b9034e48fdc542aca0c0eca80a1bc5c75179c480ffb40189dd94a847093e81ab4af91442a9e323f7d32 SHA512 4487fece4b144fcdc3b03bc0c11573dcdb0bb073218f25a98a7d08fe55db0fde027f32b5614fa5083097136310cae46d7d28288f7f874eaa2fbd930af2d9fb16
 EBUILD syntax-highlighting-5.80.0-r1.ebuild 726 BLAKE2B 943da1ec2eaa441a93373524f949d25356a739a3dd523f9dadb57db213a3f8cb62c6ab6ff40f705d21e23aa107d6e32d97bed7856a6bf3ea8cba2c4ddb37a838 SHA512 0e99eb2fff8f681adee7553bf42a74a77972757976b6a659a9a294da438a0d4dcf13e9e04b6540b10387abb6ad32995df1f8fea45733f6beba52f909afdd74b9
-EBUILD syntax-highlighting-5.82.0.ebuild 570 BLAKE2B 93b917d3c2724c0752d897eae3159eb4af9624ad3a84281e7d5012a7c648a54e6ae376ddd1ef642696516f6a5857d70b0fb0e4b6f6fba2663f46b7b5c2f8a999 SHA512 48e5f731f0297a4e714e98cbb5e8ec8127e5efbf329659940b4167ec5d8e9446504a593e6d023c0e58d540188f3430e6f1e2e6b4b4a37b82704695e322ef412b
+EBUILD syntax-highlighting-5.82.0.ebuild 567 BLAKE2B 8695a7114da0e9cdd60c23cb683a081db1c7ea7de45c7d859632d9d1b7add893a84b2e83811da08d7fc8fbe559031c972b67c4591cace6dcc37d3c5d5abe6e97 SHA512 467147bcdede56f1e143414be3ab96dc5de9d624399a86613dd1e9bb6e9a4e8e5f34756f38c37a9aa18ecafe540229837fbf065075bcae13cff8cab0f52bb760
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
index 02499f839b90..17d20ea30d1a 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index d34943b1ad81..238dcd1a79a4 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.80.0.tar.xz 1410660 BLAKE2B 1d64ed2d9c8ecdd5e3e3da650e512cad7c183007da0f785db0ca92ac81e62eeabfb50b929a0f318052b855636da72a05325fd9e6507482bddddd9418a58f280d SHA512 e7b30f2fdee4b1d4ec5153afe83bcbc238d7075214fb6623639ee5700ee62cea5b51ca335b1b08b1fc7ca471e55dda6b87e5a1b9d4660c299d6dfacfa5573e73
 DIST threadweaver-5.82.0.tar.xz 1410496 BLAKE2B 2723b05277c1f8baa35ca0b759d21c75016a93912eb99600002cc4d5c816971fbefa41330fb1d2861d9d1a71ea9e4b8c5e938f87c5f61f450b93a18dd365b2b0 SHA512 11814680c7209ac29751e4b1411ea2d177e71306e06a9f01635f579147efa75641d6d3dfe84c0c52950069b415edb67965fc899427d69e896028510676af0e6c
 EBUILD threadweaver-5.80.0.ebuild 360 BLAKE2B 0387409754b4cd356f90a0b62c535c0a26fffa5e61498896be5f34970b57d78a61446840a3d86a755d8b3bfd8fa0a77b2eefefbd8f84fce0b9caef198bb51d66 SHA512 bcb46d5f683f5434d0b3bdf5433efaf01b644c29a6074f0fb4887d1120e0ce4a62eb3e1129d4cd5e0ff14590fcf33446b080ed3b94e0a4f0552efeb2ebc593d2
-EBUILD threadweaver-5.82.0.ebuild 363 BLAKE2B fc40631dd957eceabc7a7eb9a2b783cd2829709d72b667328e3520e64e1f947b350ba689f764a51290d677edb4c1281c07fb0c27c4906c2dbc7541029a9283cc SHA512 c3deeb22113c8129be9ee11e6e304b0b9e2da5f45bc184526655157fad03f45136df5d59baec27498bb91dbae0b6e5ba9d5855d44c992907bcc0d85c6f057440
+EBUILD threadweaver-5.82.0.ebuild 360 BLAKE2B 0387409754b4cd356f90a0b62c535c0a26fffa5e61498896be5f34970b57d78a61446840a3d86a755d8b3bfd8fa0a77b2eefefbd8f84fce0b9caef198bb51d66 SHA512 bcb46d5f683f5434d0b3bdf5433efaf01b644c29a6074f0fb4887d1120e0ce4a62eb3e1129d4cd5e0ff14590fcf33446b080ed3b94e0a4f0552efeb2ebc593d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
index 4529902946b8..bb0ec531692d 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
@@ -7,7 +7,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 9404be4aa573..3c4f446c9b1c 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest
index e938a3cddee6..7009ea7ac564 100644
--- a/kde-misc/kio-fuse/Manifest
+++ b/kde-misc/kio-fuse/Manifest
@@ -3,5 +3,5 @@ AUX kio-fuse-5.0.0-fix-segfault-on-links-2.patch 2014 BLAKE2B 5279b07685d23b6eb0
 DIST kio-fuse-5.0.0.tar.xz 46672 BLAKE2B 4e3dbf9ad8c00140c6d3ca2c364bde1c4a8a9eacf875101cf5089460357e05421df73420f030cbef5c6aeab213eed18fa53490b335b0e00ee86cf284b3d02faf SHA512 3c75e1abc0c357be4291e9a93902e510f249e8a980ae39e997ba0f252058114b0a717667e32528afc055eccd96576acfd0942f9f45526c3be69627d399dbf575
 DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd
 EBUILD kio-fuse-5.0.0-r1.ebuild 936 BLAKE2B 877accf9fb9c6caca2fb002df8a9020a42dc67a4d008d36dd72143fe83406629fec2b89a0041878015e90bda2a4d6f3a541ecc6efffdd15f8012699faa8b0fff SHA512 e9639547a8bbbeebad3e05ce0940a59729aa036de03b4d07fdac3ff6998ca84b80af7a7f878ad328c2923bc0be3911e9e2226d29314a7ab931c9f4987c505fc6
-EBUILD kio-fuse-5.0.1.ebuild 855 BLAKE2B 75cac676eefbf3781647575d50cba35f8d4bd9d2dcd5f89147ce142b508bccb978ea0dd633523db09b3be8c2387822fbaaf166b9b6e46ec464ae6764e2c11dda SHA512 ca8fc02f65b367ec417fbbaa573b95d4a6db5deaaa5897c9a99546fd8faf411eb5418943a37498886b9889a743f27262698bdb92aac5e7ccd6aca8f20eb09f8b
+EBUILD kio-fuse-5.0.1.ebuild 852 BLAKE2B 03cbb204f563a1bd970ee0d70d744e731b5938e5fa0b976a71767dae221b69152fbfc13ced5e0dedaf5c5975d3ba1a35602fab895916ab63e5eaf0676fef8306 SHA512 5bde049440f90401f171c994dc058f4abb80d8f93cb91ef4164dd315d54c25a08f1c804f972b06553b123e259898d4ed7f427438601327127c7fd1ff1ecc11e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
index a7944ff15a1f..fe05a54a1581 100644
--- a/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
+++ b/kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 2c7ee64dfc27..a1dec028907e 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -2,5 +2,5 @@ AUX latte-dock-0.9.11-kwindowsystem-5.82.patch 1071 BLAKE2B 11e2dc4b344395aa1355
 DIST latte-dock-0.9.11.tar.xz 719904 BLAKE2B 6d88fa42eab9e44144b33ba2affd98a74632f5aedb733bc279b5edd5db75f561af5428bcd1d9d60a4af8c1134686ea47adc9be798ee1e06ef9db515296e48494 SHA512 d02747e4709de8f3091c4686f6d80129fa2fe9d6e994cec436083c59b0ceab0b01af3c1c92d946e497e725bd20efc8ec1e8d284666348a13cf6ba79e515c30d5
 DIST latte-dock-0.9.12.tar.xz 741208 BLAKE2B 634805e78c618e0958d0d2d071fd6f262bee34f4aeb0106e42ba9cef0ba245a0382c2930e7e947df99bc93574721f6d5fc035c7eab3ac761cefd51c829ad409b SHA512 11538e90b110522bfc6a56737f7c2ef22e0a0aff1153a2d85413dae3e643b3b660c36cb4d2162b902b61c55b50d798b070f3c47da0c3709dcaefa09c3eeafd7f
 EBUILD latte-dock-0.9.11.ebuild 1639 BLAKE2B a3af64d56a85ccc2edeaf43e51b72d53a81a0599a3c969ed752b8de890aac19030497d359f5e34886e65bd22105e5d48074dbde6353c3e0b26a0b2cd4666c3a4 SHA512 36287dc89bb0e5559abfc98aeea2379253c05cb7836687d3a6ad560428d986a758b1e2c32d864b20f1bf90d5c4fa148db76324d8446288a22d3971b7a21cddff
-EBUILD latte-dock-0.9.12.ebuild 1603 BLAKE2B fb921211e7cab2038353f41dfb372364ac8b5dfe9edaaa3d7bb0e81f0b7b327564303ae7ec6d9916cca1346f83de9ad3a9b627f3a1e560f5378643901f46aaa3 SHA512 49667b0ede8cc5cc26951ccf47bc49923bfc36f57ab54406b1493bf2c3cdf7f66fc6077abc6ce9c1ca4a8f8f5aafb1af13f1bc2a54ca2530f8ab84e254b77895
+EBUILD latte-dock-0.9.12.ebuild 1601 BLAKE2B 174b30caa9e5b6e9f0a1d84823777108e4e855d858a3349e0f8ca8ed2b50158c2961a2e1686071c70ffc04a07da7edc83e78d205064508cffee29a3e10c693c1 SHA512 5fc4cb1b9192fcea0187ac5eb21bc12082d66073772ce499a7ff8ed7a776926f8b3bb6f2ba036207d18631459c3c39487def4066a72dacf0c265e54f243a6e7f
 MISC metadata.xml 335 BLAKE2B f82ca43580b9ff4695a6f5ec12918e8d2b1955d17b0feea996494fa53725da09fbfcc1a99091e7799fb42feecb1e1da4f7d7ff88b0f52c1dda7fc3f65218c08d SHA512 c887c4c3536118fb9f6af0b4ff8e656d5a63e039e1725429cf1d00cbb2564da4528518ab300b6889b0feecebd0b69cacd5f206793f8c24db6a97b86057597cc2
diff --git a/kde-misc/latte-dock/latte-dock-0.9.12.ebuild b/kde-misc/latte-dock/latte-dock-0.9.12.ebuild
index 97327e76f7d4..ac22c48b7340 100644
--- a/kde-misc/latte-dock/latte-dock-0.9.12.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.9.12.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 1acd3992e807..65bd0433b14b 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index aef73b4890e9..741c90497e82 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
 DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52
 EBUILD bluedevil-5.20.5.ebuild 1186 BLAKE2B 7b169cb6e8a4599a2de5976e385acbedbdbd70e4cd21d1bf84cffa0cbfb89163fd5baaf8e41f1b418588c51ce04ed30eb601e63415c4b4ee443114510db49d21 SHA512 a42ed02515a3c4fccd8e61f8e4b652cefdad781b96f5b09ee669f42f49aa35340484c92be3a4c7d5f9b7396f54aa573c1c8503ae85bc11052d7ad53222cca9b4
-EBUILD bluedevil-5.21.5-r1.ebuild 1114 BLAKE2B 62075de061139b684027803dede5d45f7ffc5bb8534f2ce7d617360c83dd07b3b8f5e5b60c5a8c1e81b97cf2bf3f39a74badbf1ddb1ace44e4ec3242717d26de SHA512 22ae605e81bcc90b9fe4d498ad89ffd8facdb03e5009b4458128eeeffa81bea149a82213b8b9b63bd5252b37e25183259c83d88d53359a36e3ba1b484057b877
+EBUILD bluedevil-5.21.5-r1.ebuild 1111 BLAKE2B ce05fcd546105e93e08a5dc6dd85355af989752218a0fa0da860379a49e367c5a4f84f91244a2fc124eedca651d0ec5dbe86264dea8922f56bd319130adf8317 SHA512 74b6bd039671b3094dca77b13c366dfeefb0faa30e45333326512d921ecb4003bc9a6b60332b85cd1c2a14bacd5966328aaca22b188d99892a8ea1f154c41ba8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
index abb2535daa5d..c753d39b09ba 100644
--- a/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index e68f96ac2494..380552db1807 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9
 DIST breeze-grub-5.21.5.tar.xz 3143964 BLAKE2B 96f2e3bb69dafb1ab7e2f328af0f8336431a7085ffd6ac335c6a107cabe73696bda8bb580b2529f01d0c46172e65ae46831f98af0c3ee413b80959b8ea740621 SHA512 c2f16338ad330004c961a9fda6ed48d9670e956bd8562ad05b5f804e3c45ce05c243933028caedb2de981d9fa4f6d66a627aaeb04652fabddebd71fc09b08f5f
 EBUILD breeze-grub-5.20.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
-EBUILD breeze-grub-5.21.5.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
+EBUILD breeze-grub-5.21.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
index e7e9654ba6a5..3b3d0d9f2e84 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index c4ee7688b8ed..5da96db31489 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1
 DIST breeze-gtk-5.21.5.tar.xz 47668 BLAKE2B 4f8d0980c359e9a9aaf8bc4728e8480315e35f426c8199982d2c0f34b62174736ea944689ab88af10c3431998b296049c4b7b64a115081184a3372e466881537 SHA512 afbd9348b2cfd55412df50ef4f2732d6f2fbd58356579766187ea79d20b86127b6e140caa14132edb940fb5d72b5da981869cdeca3abb1c17352782973bf0aae
 EBUILD breeze-gtk-5.20.5.ebuild 790 BLAKE2B a2d20d872e041fb9e76d8123887a6a81a6e3ce1ca3d10ed991f02a6ff56ae436dc0ce7497d88b0480053ee94a2fcebe2c8f91bef40fa5a939cc258b172c01408 SHA512 26d318ef28fe68711010ea601c753d29fe5e12667fe923c30dc9654c0391f86d801b6a5e147edb75794a94cf45a512c9c01e48b906c0af2e1a6e6d8ae3ef0f65
-EBUILD breeze-gtk-5.21.5.ebuild 793 BLAKE2B cdfe28c33188108cfaf35ba56aacafc9cedb123e10e5a4121d1f0aab48d24f11b72cbffd0db327798f84811dec9c21f9e4bff0446ddc9714c87ce62816e401f6 SHA512 d0766fe45764703fdefdbf3359e9f04ee2bba914a782563b8e955646584b39073323b5e7d75075c57b08911db764516cf8ee22aa2efc1adee39ef103aa597bf7
+EBUILD breeze-gtk-5.21.5.ebuild 790 BLAKE2B 80b432e2271aee44626fbf82f37a4224e6bfe185d5a40c8a520c885aa8217a751fc35938df2e586b47dc1fa436ff5f705acbaee8d1c2a85303bf4477404ec07a SHA512 d0fef1cab3a4be5fd0a0effa92e32e91bebb7e52b1b45ae18ada1bafb86e3d77c30e4f3dbe22ec9b1c86811ddc61a337b10ca0939060e15c33bde6fa5153f97b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
index 4865bfe4a9fa..d869b30fb8ef 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index ec33487968b0..8fa9340202cf 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3
 DIST breeze-plymouth-5.21.5.tar.xz 108692 BLAKE2B 7b98b1fa6f2793470c550336c3205cd7846e40fbbe3cb7bc895e67fb557868ec3e73fd5e14a0efd22b055a760a2636ed301810c60ea53d27a382bca89525ae18 SHA512 7b562a9b86baf4f362e3cd97722bbe3940be4232910e68ff1f029f2de5d1e362d930dde03a3adbed738bda559f9f6b5b812ae7e1451a145edc37e60b5af66285
 EBUILD breeze-plymouth-5.20.5.ebuild 515 BLAKE2B 91d05f96398d5237cc9c47352f6455bbdda760ed2d7db5ff32915cf8f21409c91802883a27f06cce68509c691111b5f7e70be824b8a30ea4e231ed60e554f63f SHA512 0e9ab01c65a53885509a2b1dade68c387a6ecec47351b2587340761320b6482d8fab508f5dc950b5eb9f8d7e63fb2aa238bb62e31cb3eeea6a7a6ff8e573fb96
-EBUILD breeze-plymouth-5.21.5.ebuild 518 BLAKE2B 70b85edc94b2744ea490b6428d83a7bfbec913dd93cc17a4c55f695f2dfd640c29ce9d3bedb5dbad565e67ab3217f2fbdf2450ad8b8fafa61baa63bec042dcbc SHA512 29b50487fa92353159882e7d00f18817f84e7a5093fd7c65adabfc6463675149800d1182806ef821eb92adaf05378f653ff0c1ad3321d40c3e3813bbd78efe74
+EBUILD breeze-plymouth-5.21.5.ebuild 515 BLAKE2B 762a0f8b7eaab8a20ad9788d25903df6835c8376edd5af92c386a79624acb6f5ff673b2384e78b831b05f2788a9e6c82963b091ad0d7e004237e457353b40c6d SHA512 1ad7b85267f2c05f9fd1b0e4f1804c997f64448fc92b8b195dd5c7a8f701457de312562abd1ac692921310dea26d516996c533194d146611bc51b8641a706d60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
index b9ecc8176c56..de49b6028b9e 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index a2e62d815d68..a4fd7e1db39a 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -2,5 +2,5 @@ AUX breeze-5.21.5-fix-splitter-proxy.patch 2306 BLAKE2B 5d95c306c34482a1aa07a646
 DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
 DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb
 EBUILD breeze-5.20.5.ebuild 1265 BLAKE2B baa89c16e94aef4c3897609a0bf12cdc27fc2ba2e9c968a3a736e8cf56f9ab299792207726c68f9f66dc3f0a8fcc1feb7a25e35d74ba74274a5d386a220474b1 SHA512 45c00dcc2299ba52cebbb75a24a9ebbf2ca6cedb45a5c6ffaa39f51ea70a666632276be32719826530f992c362acc4f2c97a8617573801cab4f69555f71e78ba
-EBUILD breeze-5.21.5-r1.ebuild 1325 BLAKE2B 31bb7f89fd40b7afb9a495b49ab29a423ae124e2bba390eb9ab2cf5372de6d850faa1559c8c8f214e55402458e861e89ed49e116feeba57449a9b71817747328 SHA512 120bf11e9d6a707f523c73e13bacad3f3bf6d1502a766ba5c1093a0278365360b25981568b9a709a3ea836103f9a16943dd6d246583d7dbad081b64b68f378a2
+EBUILD breeze-5.21.5-r1.ebuild 1322 BLAKE2B efa9c3f9ad57d368c3256d5a506db91c9c68a5e50841aa23e9085ce59a9c51aaba4d9fa72f8b0cc8b02280e1b1dc7afdad3249bc5666c5640b0fb35ef897ac9f SHA512 b8ac6e723a12e554c848a9f55adb0a411fc0a1523074ab70b972f31030b4517792341759515ee1abfd6b81b3ee06146784b5e9bbdfb4491e91d55bf5d65388bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.21.5-r1.ebuild b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
index c87f6e948b99..813a7e50e8d0 100644
--- a/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 44972ba0e7fb..2702854aadb4 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -3,5 +3,5 @@ AUX discover-5.21.4-missing-link.patch 2141 BLAKE2B 23b81f9f4e0daa05183ed3a31e98
 DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
 DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
 EBUILD discover-5.20.5-r1.ebuild 2217 BLAKE2B 41d5493274bf956d46e9719c4e174a145db849ea28650e1526935e3dd07ec7b8ef158c5d166712fedff439a4187f6e508ed34f1a5df615b9d827b9d7c03fbfdd SHA512 5b1e6e3721b21f2d927bb96c8f8cc89c5e87fec0f0271257f18be0fa72581710d4902c5163d3d7e9e5c29bc1d3a9154fd6927285fd54efa207ade598b786c757
-EBUILD discover-5.21.5.ebuild 2220 BLAKE2B 9c9bb819e84c1e9cfb777ecb8ee984b88bbcd1ed526a25c6a6653b3fc5f2290358472715a360506341eed77f4ee72ccfa030b01087d5e8a1065d6684a88f0679 SHA512 5bbe2bb595a0c89dc6c7828b914ff6f2646fa9a7c6fa7e4670438873a65b1b0698c295452d337a70b39102c7565818869c94b7b659dee425886b2c15fade31b2
+EBUILD discover-5.21.5.ebuild 2217 BLAKE2B d6f0facf92e314fd59f5dd10422d0c065d9103ccfa0e3a78c1a9a7d39a00eb5bf31ab5d1855edd0e225a4d09ad387a9d37cd296702d21ea8b293da5ac9b8cd94 SHA512 c1e6c91410e560705e1be62818bbef63016bf879df5c8792be4f95451dd2c173016cb029c82bb75a801dba190120e6940c439db7d801294ea6cf0de16afd7158
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.21.5.ebuild b/kde-plasma/discover/discover-5.21.5.ebuild
index d7ff1db71470..6546053e346e 100644
--- a/kde-plasma/discover/discover-5.21.5.ebuild
+++ b/kde-plasma/discover/discover-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 2bc23ce59433..212a1670a7a0 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
 DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649
 EBUILD drkonqi-5.20.5.ebuild 1641 BLAKE2B 1c068c1e5fe42e91de3894219caffb74a2addd291be371aec836117c9fad9dcb12a15e850ad4412af13737ad1f7e2cb8dbc4f5a2676c340142e460401fe143f3 SHA512 490ea4d8560d4b7853345151ed17d3c9189a25cd34c08aa6d2df54556e477de12885b5c95ac04de928d5c059c066a7c0b01da8ab45d56fe51160e267caeb47ad
-EBUILD drkonqi-5.21.5-r1.ebuild 1517 BLAKE2B 673eb5d8b6e5155b1b21dd7432453a39ee555d23b8b6109702d56df08ed32a8426788eb5a544c6ecc74e51bc204bb96e2a50bceb626a818eb7ea5da0e3908985 SHA512 e977b5ee45fd2bf633e30e0c3d281c9b09201736858331412f0c56c1c423e6f0782383514b24193c914932e07ccfe84d0da1b44fca1d19484331330cbe1b1080
+EBUILD drkonqi-5.21.5-r1.ebuild 1514 BLAKE2B 39dff8afc6e052f17418f44e4cede324d7795855076e60e5c1a78d336b5ddc6b33df4c2fc62a0304f697c4de1de4ac49605b47d7e3203cb2a6aae1e9152aa14c SHA512 49af648e2f8282e8184f2b9f5b97ba3daaf2ac937d413e98726949bff857f22062f0c2f9947057098bd6d51416fafede67bad538637a9bdb6baedd1df8cab1a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild b/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
index f8b1658a7e54..3a7f01e642c8 100644
--- a/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 1a530e94ab57..3e884029afb2 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4
 DIST kactivitymanagerd-5.21.5.tar.xz 99760 BLAKE2B ffc9499fdd2942813cf35697cab0b2813c87614db3d72312329690dfb9a06fd8abef283e7e73cf1485d2bc430e5e0a82fc81688702750fe47494d957623cd069 SHA512 097c18f39d5024a05e645e7dcf82ad39df07afb0ad0b010410699e3fa1261002f05553dbc049af63e7882c305d4c2c20d5032e9448354de7c22d9b9371a8c633
 EBUILD kactivitymanagerd-5.20.5.ebuild 909 BLAKE2B adc2e13006c15daad7e6ce0435492420f1429cec352fb7a98b6a3d3f839bd5c31c24292f03553b0cb64f41a5301ef6ba9ce362b24811d0044b09e3cef55ef2b6 SHA512 ce43e7844ad4351c4a2d635170092739981fdeda832eb1c6f5b0f41fe7066238bf55269dd86adf0ef106008578427371ef951fe489f68422364dfd7001e6b12c
-EBUILD kactivitymanagerd-5.21.5.ebuild 912 BLAKE2B 7efe4edbe591789dd91201a4d887085abcc18a4fdcda83a0c316f26f49bb016800e6e005ba08adb165dc6254f367c8c90a1a470d0fe477a3e67faed16131a877 SHA512 87ce3c60f6ea78ac27c8d8035322cb269f063b9b7c4673e6b8ca35ec6fbc79493304a14e085fea3e209e884d96cd74dc0e68a04a582f271f9eae7cc7168c5be4
+EBUILD kactivitymanagerd-5.21.5.ebuild 909 BLAKE2B 9fe2dcef2f797cec69d5fa6ab3735d88c88c4baedc5102968dbee76473f500b1f8adf0b28ae6ae8aeb399d8b98cc840fafe06126c624f5c9d04bbdda03f06bd2 SHA512 ecc51340c8c4c2b8a9243c7db2751cc1603efd587776b71ac7a7b9325991535e1e6c8eda4cb5ba95c2e01c7b1217d56e17b6bfaae78852d79e51c164de2bc714
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
index 60354aa2c005..dbc23e202da5 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index b73a01f34009..38948da28671 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -2,5 +2,5 @@ AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193d
 DIST kde-cli-tools-5.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662
 DIST kde-cli-tools-5.21.5.tar.xz 610864 BLAKE2B 5f4fbbc100d8f7baec9353f9540dafe9427cf0b01736f055aaecfed48b3e31e1fa2d0a70b90cc99f30d3df33e1bbade888781b1e2ce95e925d871ae44a9b33bd SHA512 20859f88044c6af84ba4b666b803a6a3a4fbe33748495d9c186fc0739e7b5464b234166cef4d03f0dd44540919eca4f3ea8a1f5ac7b54d480cc9dadeaa0ec3fc
 EBUILD kde-cli-tools-5.20.5.ebuild 1723 BLAKE2B 27a37e3d774e414f3803b5985acff0411ddddfa730c4360c95614f9dd775ec42313730559d563827da9660d6f5b6adfc845d5e15ba17ea500e2e9ec1ecb753df SHA512 5bfa56010993cf83806cde159c7ed968758fa65fc7b0e81ef66b75eee46bf228ad3641255ee9c8700aabf7061f1dbd5ac78d8226b06e9240669873f4ccdb2029
-EBUILD kde-cli-tools-5.21.5.ebuild 1725 BLAKE2B d51b8bf98e9d33e347b296693cfefea2f325c0f2d02137d3665f428b15e515aecbf98a0f5e5d9ea658258091b4fcb2eda19ff0748bccaccf79f408d2cdddda7f SHA512 b35738d90476e5992bcae877e7a925744fee79ea50305c0c81fa94095b8cf797ef012f4b44345c454679c349a5b39e7c156fecfb23e6733450a6df0c7c6288a7
+EBUILD kde-cli-tools-5.21.5.ebuild 1722 BLAKE2B c3f53799f5b03bfa623099b977f31d4cbd2ffcbcf24eb97419d06ef33d269a556db0c339c74dd415eb19059c444ba0eb7fc47f1bcb22ce77d958af33dedb82c0 SHA512 240c5c44eb886b8cbe850ec32e773f5e96111429cd2198e6aa13899f4ecb71bf16d621ec628469acc25637c6911909ebf1d0028b3c7d3de96629de8547907728
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
index 7ad4920020ea..94de2cd4d815 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 57c3eacc0ea5..017e2cf5b4f1 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -2,5 +2,5 @@ AUX kde-gtk-config-5.20.5-window-decorations-reloaded.patch 857 BLAKE2B 7db0137f
 DIST kde-gtk-config-5.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846
 DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347
 EBUILD kde-gtk-config-5.20.5-r1.ebuild 1355 BLAKE2B f0c4d2ed76d28fd0da23004b600d8bf80f7fef4765916cc4370be31ec28491a7acbc9fc6a7d2ce245878cf760673b602b0dd02bbd041f24b9ee8a671e3a1792b SHA512 34f9130c5be4a6699ac906d3f5a2b82cc59e775e2f7e868fe617a6fa5c50c832895ea40e0103eca0ff96e1189f1f67cc26b0b9a7082de7cbabc745a3e989bb9d
-EBUILD kde-gtk-config-5.21.5.ebuild 1284 BLAKE2B 2fe97ab88e174f2985b00846ca1f3840631abfe8192f3776f2c7b6c0027f8fccca9434db323b605faf7c72bf1ad6a85637505d51caca39f1b8fdd0cb9efa40bd SHA512 6886ae53627460280726f8cf09f3deb3c11e537471f3c53ce860691e2a89d5ea1a586a5632a50dfcf57117ad3959eb8fb6aa8de36c89a12b7d93bc5ec38f3ebb
+EBUILD kde-gtk-config-5.21.5.ebuild 1281 BLAKE2B 2966bfa66ca1bf58a298d8cd04e4db5052f6873aeffe865c502d3c9c1e0a2387c1d3c41c7837abe973a30b0747f5dde95126e3b74c03b3628e8ce7687e0ff0c7 SHA512 89e9a85aeb731f66987f267dbc810650a11b34d45a60458106fc6b4f3e8ecf592086fc679c3de83777b3335fd5c01668ef577f746a37b2d71e61ffed9a6a86b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
index c19ad83bd2c2..1568b0e460bb 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 92fb68cc9034..51528353139a 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe
 DIST kdecoration-5.21.5.tar.xz 46236 BLAKE2B 3fc48fd91ff5e53c4a98f37572785b25f25ba23218aefc6e07b1b7c3495055002b379f826191e0155a39ae61dd8a0052e51d50af059fa8e3bf12e3dcb22f613a SHA512 ef86f9946cad9de9a5e3767e2dce4f30436c9fb013bf73d5ca31cb852d3dae92cd3906adcb178070f74922f3776d226b8f812ea24eb82a57662c0bf675d38edb
 EBUILD kdecoration-5.20.5.ebuild 479 BLAKE2B bfad15f8c0653891ae88aedd7210aa0be9f48b8fd7e440f07f39dcd0a01978c9ec270bbbb9ced6c3b8b48fb547ff2c1a74497b1796d1101e0a1b0239abbee207 SHA512 5809e9fb0e8214bc568758ec5df8969b60d650a3f5f88064c473134d594b0a3a5a71196f5f29580a8b5161c006afbf5c9589077407410bdd953fb0e481526585
-EBUILD kdecoration-5.21.5.ebuild 482 BLAKE2B f786c8248edca18475c95df75a1309c30f51c8dc3f73e694c559aebf981d39f95b6569a4d1278e0ce1d4f71c1ff34639c49c96b4247f78c23708fdb85727affd SHA512 8376fc0a0c4153d9e2ba39a9ba3794bc4952491be6c9952347fdc97f3d59ffb64459d641ace223a1d770f1e45ba5410304379432773f4a876a3bfc5d7fffc426
+EBUILD kdecoration-5.21.5.ebuild 479 BLAKE2B b64ec4043b3a32daf4717bca3394c031b5af903243238cb4a5514605402c6154d837ab1046ffb2b3e9424712d1def35555bc38242e4e396240d6f471f1d0ec48 SHA512 5fbce6761a4afbc358756c80f3f823ed49c313a5d20320c14b32e4addb2a95fdb329088144b6610c388cc422231c58a81c67d37a01d279191171a390cb5583b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
index 772726b619c5..ba18bb06cfb9 100644
--- a/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index baf89835dd71..67896550708f 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -3,5 +3,5 @@ AUX kdeplasma-addons-5.20.5-no-kiconthemes.patch 1004 BLAKE2B a1b1e95d377b15ab97
 DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
 DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1
 EBUILD kdeplasma-addons-5.20.5.ebuild 2129 BLAKE2B f81e68e4c5a6d7624c5d6e593c39a2c076e7ff7eb329cf95d1922a9c901bf6a82812e05cd42139897ed40f9cc44e4fc77988ff5bf4432de32ce982bc8fc5baf9 SHA512 0bd0d2de34d489cb113bfb81c91032dfbb5ebd9241751801334331dc2f5373950776b8b02ac099635cb6199cd716d8aaa8060dff0488d8c614cfb8ea304d3222
-EBUILD kdeplasma-addons-5.21.5.ebuild 2082 BLAKE2B 7c48249ad97f9f6261825768fe7eda3e3c89612cb988f8ecfa208b1d06d08a8c8bf786d35b4bdff200d476174f35358fdda440f29db2b983e993bdbff710495a SHA512 72dfb4b13eedd04f46259d2f3bfcea9722e9dd73920176065154861bf589d8ba81e52386a2d4170ea4597b6b8d403ab890217602dfc88277997601df5cb7351b
+EBUILD kdeplasma-addons-5.21.5.ebuild 2079 BLAKE2B 19c27c73a2d26ffae8a1cc44e48350b3d391a45d33b8e61ca81b5b7ca8fa1b026867720fe34f79f4a11b6322e4ed8a86f3d7528fe5fbae503605af71d8671650 SHA512 db7612e36ce39cab39f65c8707e347cae01a3cd572f856e9512bfdf2d006558f92bc5e47c68cb897baff800d2abef9b6add55dc879d5b0939c09e0ad78c719dc
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
index 7d312067f3f2..11489f598f86 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 835e298c41c9..e25f2b26cb84 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654
 DIST kgamma5-5.21.5.tar.xz 83168 BLAKE2B 5b6cec28329437dbfd93ccf24e26032dad1a394133f823dc6e47a0d82e2aee1d5ca387876a4951c2dec4b072268dcddc58cf0d9c69ad107360279c9027e6e777 SHA512 31da4b0e4aceeffaa17b9d9c13a12db8a7009575e92977f5261fea4b578cc8cca1a8f159a4229a7995cac2beb76583c125448a346ac1cdfdbb774bf76b2e34ac
 EBUILD kgamma-5.20.5.ebuild 677 BLAKE2B 3bf52f57c349619543fbc9c21da7f2bc5d3f43392e1c93e443431316af858edbe98ea644f573e4b2bc60349436af3fe9891b62d18d7ebd097429e1f4213168a4 SHA512 12d05f2f9bc9a147f54ceabe03810b397f393d988050648debd992ec22d453210491ff2292a5034cc3efa3498708b8ec0dcbf5f03b6a1e25bd02942e45547d58
-EBUILD kgamma-5.21.5.ebuild 680 BLAKE2B 3f8a743abb35ea9b08a97b1bcfa58b2ca22599ea6cea4d5e8bc2696c7e6901bb174738acae18d2f184a9042399460cd567333fcbc8f9bdeccc41369b82d2666d SHA512 9545bd4fd9f85b331edce69a83bbf0f5066ca80ee4072ab57332732550198bdb5cf88e7ba2f25a78ac48032b3ff3778f7a00e3c72e84500416aade8b08d63c80
+EBUILD kgamma-5.21.5.ebuild 677 BLAKE2B 276f1a82474c690e5ed4a803ddcd536728d70a3973151534cb435a69f302b2c612baa106281b28ad07b2571e739dc506549785af4e1028b11aa77a10c75667f4 SHA512 2c31c58a7011e039a4aa8f5d04520b15bd90dad56cce061d5d4b38e5b4991759ac6fa00deb9670b8926d52692d15cfa32b2d1be0eb9c18db8182891372706023
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.21.5.ebuild b/kde-plasma/kgamma/kgamma-5.21.5.ebuild
index 7b67115da52f..164fb76d3897 100644
--- a/kde-plasma/kgamma/kgamma-5.21.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 4fe3ea36b664..066b8eaabe7a 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -2,5 +2,5 @@ AUX khotkeys-5.20.4-unused-dep.patch 780 BLAKE2B 82fe708c5e56a2f848dffeba923ea21
 DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
 DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5
 EBUILD khotkeys-5.20.5.ebuild 1403 BLAKE2B 38399ad2dab11d01440e70a695d87252cebba536ac1d839b6716cd75d334663a2e0291970eb11a5ab9f850578aae65e2c894cd7f2dfb1d076b25f2d03b937982 SHA512 acace4a1d436a6b976909b4358e6f8e94bb4ff85983af66f631fafbfc602c018ba99d6517421a76a69375e1469ce0b1e9c053b269151af1a9b161d16a05a79e9
-EBUILD khotkeys-5.21.5.ebuild 1349 BLAKE2B 44f45d12ecbc77b5334007c0fec67393b6dace0eee0044d4bd1026735ab463c7759ec1d841d8d631beccd829680c6a85b5a47073c6d4d36feceb6795193901c5 SHA512 5792e75e05382883b6c1055448d8dbddd76d9316ed521fceb8dce8e05ee3f61396c1e2d3f9408af4a2a141ee307532cf5be5e14d3bff37005e75543b456f1b3c
+EBUILD khotkeys-5.21.5.ebuild 1346 BLAKE2B 98d708e9f0834e4a4572ecb4a13deb8ae3819bb25aae2191ebd12e6207c30f6404b9c1afd7b34592a96c2be5b8c2c166b7b74008a6df62419ba44fff535c5881 SHA512 de5172eb39e2d1da905fa46ffe4553efa11cff52b05f14b2842d2ff82a2daabcb76ab715ac1439497a24da9d9af23a2025b284f1ca0962000c3d921b029f9d1d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
index c6e7519c239a..2d31ae1ce1b2 100644
--- a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 0e8afd7b9181..e084b62c0d82 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -3,5 +3,5 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26
 DIST kinfocenter-5.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
 DIST kinfocenter-5.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
 EBUILD kinfocenter-5.20.5.ebuild 2691 BLAKE2B 986fa3655c926cb93446e8b9195d0b43f4184e721dbc15911c877a242ce34c8078ed82cc3fc31e01eea0931adc33c522d97c045b137194518641a126e4370372 SHA512 5cf14c0d3259d0d05b957a553aa7c9158eabc6250815810bff1a66e292f2983a0f0464ec9fa75eb66191f0733732d602011b4853943ee41f5c4aa7cf45ef5b71
-EBUILD kinfocenter-5.21.5.ebuild 2539 BLAKE2B a29663fe6c17f8ec61919fed251ef9f8cd7ec0c5156d821a27596ce14b1beda233d27e979223ef5145ba8e76c494094a71c4be64579e3874f2d882e86bb9b6c9 SHA512 8b37737dbde1fc4b3b967cdf5a9cb0055a0247877fe56e612434032bdf032e901fec0321f44defbdef07390d3e9e082fe9ae0731fd747bcdb30d8c90de584b7a
+EBUILD kinfocenter-5.21.5.ebuild 2536 BLAKE2B cf5f5a7b0b5a934a88790f0ab564f1a0398bfe4ca94369aa1c0756e7e9846784175a0835f8062fc29ded31bb2c7254a44e47a9795ee129e07e0ff2e428641e4d SHA512 31c09305eb04dbcdd90b9c5436ce5175024ab6649085bf6f0f825bd48646ca119b6ffd86a5fddb897dc055a3c47d17bb07bfa369ea25a76aac80cf3bad0440ab
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
index 2321b8e4c6db..34faa34418d0 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index bd84e5c95771..a41ffc35328c 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
 DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919
 EBUILD kmenuedit-5.20.5.ebuild 1096 BLAKE2B 32b74d2ce2e60b8629a3be5c0bc2c8371b230e3b9667210b77ba40740bb5cd2bd253ff15d6e984cb44c6ed3f13f0a420adf017bbc6ab5d381d2b206e5ee4c978 SHA512 2c4598f4ca19dd8a00b2ce25b7a9185464350ecdf882f98157a6efa98bdf9a6a790c0ca3eb75f374da614448fa1878ce4e088cfa0ea01a47e110f3b1f5cec5b8
-EBUILD kmenuedit-5.21.5.ebuild 1063 BLAKE2B 65fceb6567d6b45683853093c7d8c4cb61d8128bf40842126abeca938d6b57ab19c11c0f9281b680814190a63e0f77e0a90f3f4317c6201f4d7e0017ab10dd4d SHA512 6d21d92d3d0ff806b37326706d163b97eaf66b7f67813f9c082662e74bbbd67037cb3984b6afeee84ca80395a7bc4488e1dd478c3a5e6ee0b5d42c20538b1c39
+EBUILD kmenuedit-5.21.5.ebuild 1060 BLAKE2B 9c0e66d2f8ff87c12aa71f1770f0338eafef0353733cc5e3a85629fcc3209619703717542730e712ea7827151058f366f1ca2e849c6dac844ed81f352da24888 SHA512 4734af0613b32b84d8eb38e3a4d99d0339fda1a538bab08b5471f1d69d5a2ef480d0961c5386b616b58aeb493e7a16c36e545f6b934904da28fe1df128285a8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
index b295b218730f..41d7a4fa89b0 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index a15a210df0ea..8ade83941767 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1
 DIST kscreen-5.21.5.tar.xz 114956 BLAKE2B e236b765ae57f4138feb70d9652ada33f57abd0581c1ec9a5bc826a6c31a1a5a5a6236cf55bb3a24f7a4de0a1aeb088cc62a09dd6353f126aafa04f4d3b2e73b SHA512 d57a561b22aed2301574e4af37d45046f4fbd360f8eae3465303c29a490f9dcc33a93c7e38890bd2945a4d868c23719a0ac11cfcdd22e613fc8612fa53694784
 EBUILD kscreen-5.20.5.ebuild 1225 BLAKE2B 90e88d5de8bf1bb094912bd415f232e26723cc555be0107a85ce2c07fcde5be6ea00550c82e6e597673260c3364e7eaa1b28613e4c11944d1e48a576cf1a317e SHA512 75ea7aa848c2c453b9264c1975992e6aa8b1bd4b86f48daf58be727e42bbf0f21e1eaf670657c2ee8795b5dc721ff52715dd3d84bc185fc6727f76b71925fa18
-EBUILD kscreen-5.21.5.ebuild 1228 BLAKE2B 1674ab07aa3b0ecc2af7634455152a70a4086cfd108caba8effc4fe5fa1cc6e356b9694ae621a36442699422d10a8e34b5466bafeed42583d1c1543a72a45861 SHA512 2fa67b30793b82d4867b00128727e3f45f7fb04a4974edb09696ec10aa787a7dc0f040c2391214ee2a504bab64577dddc03b72885967f2a62c460851ee16df30
+EBUILD kscreen-5.21.5.ebuild 1225 BLAKE2B 2ca59ec61ac7ee9da79514d7201b7c312a1b00f15bfef37a534861796fb989db15eb024616e95c513bac2973586ec7c311b84187471ea9ab264aba60840e9f75 SHA512 74e702f801e6b2949a71a1195f074cb0d98bf88c10d93190e0e64512d66dc6277c95afe3e7d529a255bf949b03d6544c7d3e0bd3f11372c1317aafd7a280375e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.21.5.ebuild b/kde-plasma/kscreen/kscreen-5.21.5.ebuild
index 43e8527e51da..c5f9fe7c4cb9 100644
--- a/kde-plasma/kscreen/kscreen-5.21.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index ae171ca785fc..bceb67937154 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -3,5 +3,5 @@ AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f
 DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6
 DIST kscreenlocker-5.21.5.tar.xz 117420 BLAKE2B 1727425954ee4402b8e4ce6fd05ab157597867cdfd5c6a5a4d841f5ba1723c3f0a7b056ca3bc31b48891c2edacc670595ed59677a9ee479047f5c850f4cddc27 SHA512 0ed1f1399d493f39562c3655e4f541b65c25beaeac77315af34e49f79f7dfd954099b7ab91f2eab8b1d2f5dc3be8f0a54c7d53d902bc31971bffa6b94476c8af
 EBUILD kscreenlocker-5.20.5.ebuild 2146 BLAKE2B 3d3dc126b774e8138200799d790f0085f97fce4656635331c378b842b38567e1cb3692c6da55650473144c457d96d167bc4b0620b06718787a32cc8d328de7d7 SHA512 9e2f4532549c8edacbe448e3291c7f3d4a40e02a3ebcd7057535ef0d380c114aad8a143378e743e9d3031becbe0a97a3b67a019dce3759517d3e53940618ab2b
-EBUILD kscreenlocker-5.21.5.ebuild 2219 BLAKE2B 2fe00f76146c707be342025ab712a30e95437c0a2b01aae66ac4b2b4a00d5f7a262a3825e6253b9c463dd36b320cc29523854ebc386d5426d50955f6c72e7446 SHA512 d42b08cd56b34f36bdd7a9dff796257ad896e0f9af64bcd069087a920db30261d5e9816908aaf959d52a3cf0a6834012b38caac88963af971d803341a93b0e34
+EBUILD kscreenlocker-5.21.5.ebuild 2216 BLAKE2B 7f9d583471c6863674b68ba4de62840875c592910e68ed8603e5a18c5e38968188f9e9ceac96600be1bea445fbc09d03a2e130f00a9edfbc669f3973306fa753 SHA512 0aa508fc73c7ac615df539639988a843b6dda928264309cfdc9519a7e1aa86fffe95aa05b8e14f1a20a8d2a2127287669b4891f4f687e08ec832e88f2062a51d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
index 88cc23577b3a..89547b3bd301 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+pam"
 
 RESTRICT+=" test"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index e7eeacfa8533..2c81c28e9223 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -2,5 +2,5 @@ AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6
 DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55
 DIST ksshaskpass-5.21.5.tar.xz 24148 BLAKE2B 8cae47375a883948cfff373b1bf113359ce4c1d548c982dc6c9d8a9a28c16661813c1d8077f463a6ec1dc80c69b2736391c56382bf3ff2b7d2f3da24d6e64f2b SHA512 c342723383d13b8df977bb4ab3c6b50c15007d12fdd27c0e51ad41cf77bbc5ddae404a9fe10669ea22933140a55bc293e7296d8e3e488cbce36158475403d7ff
 EBUILD ksshaskpass-5.20.5.ebuild 1433 BLAKE2B 6dd8e7879c893ce4ee72ed3689436ba10b2dcd013a9a65a44b2214045effdee41e5826507067bd0c5dd2796a2fd3cc195ed8d576f53ec96a90d6c235f7caa5e4 SHA512 a166ec2e7109ccfda8e8d942ebe4e8b377d1de94c83ef4d97a552a7d7ecade3a8e4eede2d06b9aa7a5bb94a714a83985ee9d59d44b244cdc2c51ec9fdb0e158b
-EBUILD ksshaskpass-5.21.5.ebuild 1436 BLAKE2B 1d0d2ba232fff79afc46f1ae3a4f582d599b00ef13aa2655d3a6c30523491be63e01d35c578607d2a37182ce397623058a4d49e2675c45275f834fc60ff0d531 SHA512 592d1e743b30fc37464145d8de78126a2806bc39fa6ceccb7535e863b69cb3b3e35d30e4050fca34e33a779b42d08a8b9cdb2cf8a136e16a8d9de21f8985b3b3
+EBUILD ksshaskpass-5.21.5.ebuild 1433 BLAKE2B 9d3692f5a819276620547d5220e654609fb1c0f4d4f31c4372ddd61f15cb41b46b742c105b4035c942dcb1331a44f7f99949e6868619fbbb48fbbfc387ff97c1 SHA512 c29fb24b6f166089ca64e802cee20897cc557caa92142402bd0fb25c70ce5161540463e3518874b6b3a56e878cbf51886bb078dc37d378a5da0f2317a86ebd31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
index 696527628879..b57e023f47d1 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index a2e1a188218c..16f0538c62da 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
 DIST ksysguard-5.21.5.tar.xz 604624 BLAKE2B ac95499a75be6eb2a56d8e96a560271cbaa2618c0a21493d3226cff0aeeb05ebd2644a65567f9ddae2f07016a22e2c9dbfc3c42b14b504d13e788ff1312a18c0 SHA512 53e41ae1fb14d8e3393671e2d42ab7304b144f8938c821402c16c66aa09917e3dfc8ce766df43f1bb9c09e2934a6dcd48a4a4781d379026164b278aaed95858e
 EBUILD ksysguard-5.20.5.ebuild 1643 BLAKE2B d36fb83d570031f8ff00c8251ea6396d5cbd72ed88731ef5ae5700350e236136a6bc768fc878ee4e010fe2f62bd2482b2d01c34f8f05e6631ff86d17e8f706af SHA512 639fa1c575235b7e740787fb90c64a2eb87819332e0bf248b791b773f739aed18168d25214ae1bf2e8f01b1a2eec931d85a32c47b8b92ecb8402dba63922e849
-EBUILD ksysguard-5.21.5.ebuild 1590 BLAKE2B 5b3b03c6886a5f2f3734cac2a96f012d9b75bbfe4d77a0ab336719b9a39b60d821d2296faab332e4d40480b3b8ca30b5e56bf58dc621aecf644cfc75e9150207 SHA512 5e9550b48a8125bc1306a24a203a1855a33e867ba95b744030ccf603f7c5f6ef6a8c4f9a7b45e0b11a098590cd13bea3fc919df5ecc1095f2e95b8aa8724ee5e
+EBUILD ksysguard-5.21.5.ebuild 1587 BLAKE2B 889817dede3d969f1c2dff5cb7f9a87ea334e07147dd34bfaebd2b71b6879f81f4b408b98c9635794b28cf54b7da7a72ec9df73a3e9a4a1237f7217614fe178b SHA512 7ff5fa50c8a4cdb382db1a1de5c685cfbc3565a041c0b286d2b872eb2c00c31f1a3c5322f76079505d895f39ddc9ec195878601b1330a1187f29b261892315fa
 MISC metadata.xml 508 BLAKE2B 0c56534db9cc082a5aed32fc958940d305acadc6aea338945edfc1adc349b51437bcbc549fc1983b73bfe4b511a0328be0632571ada20dbc2f6cb15f7300de5a SHA512 acf19c8d5b52abe5a2c0cb8fa4c75262613cf673e597ae3b3a4ce79fee76d75fbd2632612267eb9e4a18b27d32ca9c0f5df3a9d6a68f67e9a99d87d51ed2dba0
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
index b6ba2ea44f62..e370b1517773 100644
--- a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="lm-sensors networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 4482ac578bda..c30ee5fa0044 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -2,5 +2,5 @@ AUX kwallet-pam-5.20.5-socket-listening-error.patch 1444 BLAKE2B 6013b4229b4047b
 DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
 DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d
 EBUILD kwallet-pam-5.20.5-r1.ebuild 805 BLAKE2B 955e48072ef94dc72e564c5d22a0a53ceac2f6e652497342b7ab9224551cd15b92a37d4a3a7909ff5039ec70e904b5a3a72860f8c24ba483c99a38e9d5b1afad SHA512 e7a5dcb9fa5a7392849c7602c5cb2ad730e12b62a98dc6b04556047db047af9c3b02827c681b487ff6fcd44dbbdb5c8603e4902338f6dc90dd9631f006be84b5
-EBUILD kwallet-pam-5.21.5.ebuild 734 BLAKE2B a526f6380a350610992b1b88f1114f4f81ad8b919fa785c421a9c849457b9eaeaabc463c687bc41afbdc8d5a95d98099fe485868ce42e210ae2220fa953453a9 SHA512 762a7bd7e8778a7070b9f8f151cd3f277f18b35528b51be9b6b7f9558fd2b38dfa40c55b3bc56cefd6e00fb6398f0c68498214bab40bda8ecc6ba1f9a0518874
+EBUILD kwallet-pam-5.21.5.ebuild 731 BLAKE2B d7380ef4185c0d9cc3a0ffdf5e36848292e083c2b20821a27ba50d9f46fd0ff2c2a03f4139d28a47a614c5f753c915c23fc47cf0d592a5330dc2bc1fb6b83d1c SHA512 ba1b94ad19d2cc0724ab7a72c04bf18307577e29d3ce8b0effc561f5323b6a9159360c39cfe121b4a3ce2e0c89514c40e097c504e9500b6776761e40b1efc422
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
index 852aef5a0d46..b656915b89be 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index c0e23a9a852d..36735420796c 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d
 DIST kwayland-integration-5.21.5.tar.xz 23336 BLAKE2B 361160eff499863787d997f7eabd9dc7acfa5e9831de700cb1fbe6a4a5f10795b9435a505ff7af40eae4e473826fefda275ad8dc15efb6ac609788d9c85b25da SHA512 87e1d71f8a18ebbaadfb76a7e2bdfb47933a500d3cccb589f697e2b368302f3b8c61a0e742cd436119adb3a885aa6d94b8d522befe2908fb2b3816def93bb282
 EBUILD kwayland-integration-5.20.5.ebuild 699 BLAKE2B 9a6e9b7c4d79ee888a4857ac896241f9a937d06b59c7e3cd7ee23eae6a2c17c41d21425969375f8fda76b44e11476e634712ca6eb8cce7781eac379b9d0b5b44 SHA512 5353f1632d829788fa7a1a4c6fb38cb99eae5f8005c7c343bec9ea1537c137e9af8e50770d6879dd03482956a11a4ccde5e85b9db5a40756f4498b809f4291ab
-EBUILD kwayland-integration-5.21.5.ebuild 702 BLAKE2B 6c080feff3e03ea7187872b7bfe28166177b73474cfeac8c31ed88a33f6b5a7b71f9af36629a1dd78c14f2e2dc1b0ab8ad9a5e007230644a573eb48c1eb2cb86 SHA512 a05f520a7770d48e29b792d0a5aec0d8398da70d02b0ebf4745d38753bbeac8e2ed64b95031d60672a6f60e9c6c0cd5a51527599d5dc5005ff99a37ccb5be634
+EBUILD kwayland-integration-5.21.5.ebuild 699 BLAKE2B b70d306f6debb66c8bfbd0aa3910bc109ce2dd525415ac6e7328f00307cc0aa24a201dfc5f5bd90afcc8cfb0b9582b9dbb48e7b860ae58e6af7a9262a3c51fa8 SHA512 61bf8a5a4c0fa9b5087797e579d4fd2682a21fd9a4e1bdb26c5086282345741df85cf1a264acfc4f309e466b36093a325a1f6954955182c4bacf733868dc0bad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
index c999b25b427b..5279c343be42 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 09849b83d30f..6c3ad5dbb726 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5
 DIST kwayland-server-5.21.5.tar.xz 219148 BLAKE2B bae7a3a82a7251c249a8d36ffbab764c6f3372675605310f2c46d977f8a8a6f192b551b7adea590b253c64af1e22e2e8bec8671065a389396def35c83fcbe39f SHA512 ff02ee6b1fb7cd193b49a4cbcf98a6b3ab6262e9da4211d91b764d8aaaa858c17863fccee19b649d2966c3a2721ca3b7c55f8a660a91d9eb56b1eec11d0766f5
 EBUILD kwayland-server-5.20.5.ebuild 783 BLAKE2B 43c0ca3b268f9ca661e2abd1aeb6eb0d51e3540a85034654af5077ebb25046b41fffe26c8246062e1dd4fc239be5019220558914e2f7d9ce40d24ec415f40430 SHA512 9f71f6e2afd18cb92be2c8db63c3f2b1787f84dd3c57843e1e55b70a2ae891cd33f7b6d3c12bc5dd7dc28661c6f43bcf4a95d05ddb92ace9e84c6fd8080cd4d7
-EBUILD kwayland-server-5.21.5.ebuild 821 BLAKE2B 4d3e26bcf34073633341749110c6b98b210324ff48e1d46d088bd8e8c63e28f8b2c43732707cbae1d37b8ccfe493d13efc80d58f42914222d3cc721d71c05e4a SHA512 2df4f5beefcc19d4bd27254d7d731efd356854e7f43ba98e22c7907bb9cd8964ad126e131ddad51804ce9e0e03c307a52af8e47e81729cd64f16dc6cb6798083
+EBUILD kwayland-server-5.21.5.ebuild 818 BLAKE2B 37c065491c6eae784d1329e77d80279d8341c90ad74a2724a68cdf6972ddd653bb177def7bb18ce7bd3d8bab348fd2dc24f3a475a2da03f419ace42c029246e9 SHA512 6c2ff07507d57f8687b72e952a4e3e1633b70211a5cf1cbb99038203cd21b642a808bf506df786273f125c1fb7d0559179ae890f5107e358e07c362609b97255
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
index 1f6fa51fe042..741574f84679 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index bfc28c178fdd..8e843f181ed3 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -4,5 +4,5 @@ AUX kwin-5.20.5-revert-new-focuschain-w-minimised.patch 2199 BLAKE2B 66835e1af91
 DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1
 DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c
 EBUILD kwin-5.20.5-r1.ebuild 3941 BLAKE2B 99593d2bc2ae9dd12ec340f2a610e23ae7870d2f88d2881707b65bd60efcc022f32c38a0420cc77b4dfa2ca542410040ef8efbb96d771af2f2743f6bd1d2238b SHA512 afacac18c55ad2325828a0d9387b024ff72884eb1de2e42fcb8494a978ec422d10c85539f2f986c3320e66a41ea85d3d3abe93d69c3e62de5373dc62f8aeeff2
-EBUILD kwin-5.21.5.ebuild 3985 BLAKE2B 77b9220f31be471d55f9ea5e0e54596e80dbb3272138f1e0dd350416d4768ad7f4c9d274df219c59e878a4d838da2792871aadd013947647c54af23ba392b14e SHA512 a42ca9de164f1df15535394b3f4c4fc2c1c24674adac466ff1a1e6d722de51102427f1bf53807270f65f3a62e24573bc496ee6ea93171bf740e10d28ae32ce2f
+EBUILD kwin-5.21.5.ebuild 3982 BLAKE2B f311f212416378470e03db3f66ae92e3f714eaf93c7ae1ea5d9b4e5c02452efe7159cd73622f18249ef1d5be66f742442300699397ac3402f5bb249b8a79597c SHA512 9a86af01a4fcfe940114f594ce02486916c0ffb05e2a185fd9390a48b044e5ad29590795552fe3e474f838481e62ecc31e2b0a82b200ce75d8c6000156fd8a6d
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.21.5.ebuild b/kde-plasma/kwin/kwin-5.21.5.ebuild
index ec85a4ca09f3..9340cfb8534d 100644
--- a/kde-plasma/kwin/kwin-5.21.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT+=" test"
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index ca3b67d6700b..1b8273544b5e 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a
 DIST kwrited-5.21.5.tar.xz 20420 BLAKE2B f761da00c5025e5f9fb11b519ba5fc057ed24366206e421683ff281255d1d5ccac7ee2c33898654f33621d39e119fd16fd8d73a6cbe338af450222ffd421a82b SHA512 b187763675cfa386ef51ff6f5bb59458d799c2010d93fd35ad0fa32c1d0898d35927eb77d82dcdfa079bbd1c8c889823cc802742016d767618e6e9e25ac417fe
 EBUILD kwrited-5.20.5.ebuild 592 BLAKE2B e61189e803740da434c1947b07f7cefebcd6d673f399d5332116741656f950a7a79f7f9159a6818b1f78fbdbf586586084a29d856355534ea97586143dd72a5c SHA512 4b772de6b79b9febafba47e68f5135607f9485a49b0c3639236288f181ba1606e2b8d057c56b7241564baa6af785770e396d45d0f78e21c026e9379b66474008
-EBUILD kwrited-5.21.5.ebuild 595 BLAKE2B 312df57a2d2d12db465e13df5ae9ff450187f65824e74f4e88acd9f4a1a42573e30268499d665814d851b9adf1b14802f736a1e587d19eb78286b32cf292d84b SHA512 7a818ac5188f37260dba64a2e97fd0cfe5130ccdfe465c8e00c9b9564adbcceed72e13f01d34376555f0bf961c6419911905caba7047e791b6af3ac3de0004f6
+EBUILD kwrited-5.21.5.ebuild 592 BLAKE2B 0756a5820fed7a1dacfbc6c3ba7ca8bafd62c1531a693536b6a4924cff98168d216c50946af0a098c4cbc9a12c53926260b1f0f544c0a46ce8b38bc0e2101f89 SHA512 24525654fbabc2987d8f187c3be98a817e23b81facd783b77debcebd41a373f75dbfeacec7bfc4e2a1a1ac72b2f3314ecfd5a12940c7e42f1296f2b9bc5428f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.21.5.ebuild b/kde-plasma/kwrited/kwrited-5.21.5.ebuild
index 7e9879485783..10f4a89de81f 100644
--- a/kde-plasma/kwrited/kwrited-5.21.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index f2dc7ea03e0f..e52a6480cc70 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb
 DIST libkscreen-5.21.5.tar.xz 84600 BLAKE2B a7f14446932a9e4bdd0d7d90c02916380b7f263e14c3e49d30932a2c2de50046a46b6644a24697e6f94d5e72062f17ff66a1496ca61fa65c53cde349a0b4421f SHA512 283d4cac77f106d24f6eef0ba6f7a7490aff87ef5017b2db7e52ca5fd3066a33ee4e40a190cdb4e26903a79defaa724ee0a3df360464af3f76c3386c341d2d75
 EBUILD libkscreen-5.20.5.ebuild 647 BLAKE2B 5ed57c2ae5202c78bff6a157b0e13aa9e14823407ebfd1c965e450e5f3cfd3a374bd6a4e505edf6359ddab7ed0f524529548a3d9dd9ad3c993f6505c5cb22b76 SHA512 b42752e489219cca984fcffcb5c7d1910a6a2d71b4335bda4f2ffa1ebbd6b0593ae47d1ae1c0b126ed5141e56c25fbd105f99cbc954738c22f21dc5d2b746b20
-EBUILD libkscreen-5.21.5.ebuild 650 BLAKE2B 8d5fbb7371470d091b934d35f6d80fda835419c942df81ff902836cfc8083c17ed8d1a60fac3530edfbebd556e5824f36435093f70a38c9be034af7571e8fc60 SHA512 2c765ccd0425a2278b595b7490b26e2c5af3a75760c4c0201a80b3550ef1778871d3090a6595a4fd8b3faf76a62b8f3c02d0fd46f428b67ba25aecebeb8e3d64
+EBUILD libkscreen-5.21.5.ebuild 647 BLAKE2B 214676fb4fa3d3cd9dc4918ff516a3743e5596a1e048294cf658a7219bacf4f917cd95fb7bf0aa63c9172b8e84e2da2852e9fd953c15f7750a2b13f0cbc3a1fd SHA512 398b080163d6a5962981697994c1ffca9fde92d2f9bb16dab66f3779e2ed40644fd2cf55602da6121cc777d65bac3154d791f668d8dfb1580209841a9332d8be
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
index 9392a06c43e0..0a239d5bf89d 100644
--- a/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b8798bd88fc0..1a6bd3432e31 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -2,5 +2,5 @@ AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef73
 DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
 DIST libksysguard-5.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
 EBUILD libksysguard-5.20.5.ebuild 1689 BLAKE2B 89ab4bfe0742a8b6c3bbd6e8d356527e78328e9ba96d9a27ecb0d19c8690d1ec65f626e43e3ce5379100f90de32a9b17cdeb82170ec8b5b44f0b29ca88195d05 SHA512 acb35714b8b71469fb5ac15ce0d5283d79d01df335e5fdb3fa97aa5102bad9554fd35a808ebf8ed466477d4b07b86ab7e35325fa9cc7f42c13f6e4b226a14e18
-EBUILD libksysguard-5.21.5.ebuild 1692 BLAKE2B 10e41622113c837bd9d5077ff50420fa86d3ed146cffe64ea3c646b5b79bdd170a23aa4e257c0829bd2ded01f511bb38713f470975ba79ef6aa5562fa2d6ca8b SHA512 09f16b0d85aa099a385178a53a0063eedff8a69f6d720466e1a21b2365da070a4fd33af442fedf9ce87c5c340632f26e4fb90cd1ff21eb49e5503077f25f090c
+EBUILD libksysguard-5.21.5.ebuild 1689 BLAKE2B 25ba7ecd1b6590393450d4909d53064ee5c9b72f9ee28a2b58312293138dfdf4fc19be0060024876240ec00ea65f2d8d648c6c8602ad296d14b984314d8b3a15 SHA512 93a8decd5e9ab4e627b48cf57ec61a089dd7a81dd2f69433c3f0dbd2dae5a2627fceccbd0147b5240ee94d69b10ee5494281f41b65d12e7651d0470dc119baab
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
index cc9223d34656..0c4c4f344a8e 100644
--- a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index c2b7ee1af2a5..cffbaa92a598 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -3,5 +3,5 @@ AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
 EBUILD libkworkspace-5.20.5.ebuild 1409 BLAKE2B 522dd3752451c44c7e3552c48fe51e91cea10ba2707844dcaaaf7b01aab0310a7c6499beeb5fe1b33dcb5d91670936748df735d99fe2ee2bf77ab1e4a22d5433 SHA512 42954b88ffa84cc9aa30fa82fc00061c5cc5225210e47cc948de50ea7c7fb620bb9b07bc4bdc37d4c5be0610b4b4fe8de7be3970dcc11737842ee599be119a15
-EBUILD libkworkspace-5.21.5-r1.ebuild 1242 BLAKE2B 6527e217d14ec8e5b021416e3f8d5fa5b437d46a6ef191d63d78c1d1eba895c953bf4e1eb41d9233636b74906023c6761c7ec710014069b138b31df8338b5db0 SHA512 081e2b0b73db8c93f4e345f4ba7e38c196304ac8c7e32402755e875bffa902c3f0287e7bfedadf00eaee5c21ade56f8e6d2310f0be2dad48d2e4be3ccbbc7870
+EBUILD libkworkspace-5.21.5-r1.ebuild 1239 BLAKE2B 29b2a81890471c12443c93501ed5420dbc6fd6113a951dca6cb9ed58de6e22047c3fa54d11c5007e04ce6932aceb46742797cb17cd357a48f29aa8b849bda565 SHA512 ec2f1e5d5ce1cec05042a736ea48917521fa4c147432b92005e9675c3c0cf177f2598ead48ba043ceffab735fa5dcb419a64457e4620af050c950821525eba05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
index 10cabe55d613..73f46ec757b8 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index d2403751fe9a..da902a9e5713 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -2,5 +2,5 @@ AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748
 DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32
 DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f
 EBUILD milou-5.20.5.ebuild 913 BLAKE2B 828d57300e687005e26521d5b2a1319865ee34291750fe66d5e2e2eea738090269035d242fbb8ced5e247848d0ca8a323aaa63bbf9eea3655ff8ef8e83caae9f SHA512 122b969b228816e4d2552bb5e52acd11efbff05b4208312b59049981abf94de250f04b3b38f08ab55c6e1f2ddabb4af86bf4abedf7a7790ac84d455136fae34c
-EBUILD milou-5.21.5.ebuild 826 BLAKE2B 2b8017674fcea46e24f3f4de17e2ff863936359aa6c22d883c68f6152e4144db60f657437c101505c77f945a553578088766588a331533ffe35a2ea37281251f SHA512 90f82b6df71c8e77925c2591d4a2dbf877fbe2d4af9ddb6c685dc7910d540cfa959b03ddbeda164c8eec5496d96dee0defc7279559095158fc4386e193f61c8f
+EBUILD milou-5.21.5.ebuild 823 BLAKE2B 753fd5c8246b905c36f73ff26ff58945a9d51bc5e46dae3ea6f6f011a2cac481cfbb4cb7323454656c72ee3d980854eccbe5e71f8fabbdacf26acc6719d34fe8 SHA512 0d1ad8eb23a902c13deb12da2e4d1471df72ad510335ed56c72f67a2a4ded48373ca4d8d41f1eb7fdd3758f9630a0586c102d5bf27fc7aece2d002cc9b515c54
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.21.5.ebuild b/kde-plasma/milou/milou-5.21.5.ebuild
index bf862da17f31..3ddb72aa699f 100644
--- a/kde-plasma/milou/milou-5.21.5.ebuild
+++ b/kde-plasma/milou/milou-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index d7ce9da13d97..f20cbeb12825 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282
 DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a
 EBUILD oxygen-5.20.5.ebuild 1363 BLAKE2B 7c9c6354c95b83c9a998c7a52f11cbf6524031e3ada6fe351b3defe401f2c418f54b1e6f4808454f1141d55efdb1896d9cc388412ea97460928690cbd91ed20e SHA512 9bbfbd9f56bd3343356174581fbb912eada64ba1f2bc5c3468dd12da5b12efc5c38a88135248f76598e72590e2eb54eef7a80b3ac8292aa39afb5e6c16a978c9
-EBUILD oxygen-5.21.5.ebuild 1366 BLAKE2B b6c2200077941549c3d184bf9af1e7b14c5c41c489b49ac7cf370657e3ddd90996ae8ed137a529ea0308d71870a6658e88b4fa0998bf572dda63e877020d186b SHA512 5eeb1e66fc16cc8297774f45ad069916f7a44ec9bec4b22ee6a926bc3592f554150b9242e66d07c2e96d67438cc2f8689f504e99d13ced28c72ea260c60a4ee1
+EBUILD oxygen-5.21.5.ebuild 1363 BLAKE2B 700541554aad8371b525ac98bdd4f33e6bc78200e82279f120e0197561183f0298a1f33e4c398cb7988ec4a009d267bf08f4a907ae135db8f77d1a919ee5c11b SHA512 cc7e82878da2895030e9ff06651c7a1a71f021fb7e661e1de8b294e30c2a31145e72444fec9f6e66db597e00825fa71cba1730fad381ecf6ed8b6e21906687b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.21.5.ebuild b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
index 8ba5dd7c0f31..6782ff35b4af 100644
--- a/kde-plasma/oxygen/oxygen-5.21.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 2babdb6aca73..2a48c30c93e7 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152
 DIST plasma-browser-integration-5.21.5.tar.xz 205668 BLAKE2B cf2eaff44d3bd4553e09b5802d01903be6d6a57acac312068a636af15a4daee44a855d3dfee771ff47b4de6a98e46f8d8225242986fc73d5e21eff6b1a59338c SHA512 83165c59606d32b65359ac7a9f79beabdcd50ea35becab2d6cfec3c34e0981a0bd0452176cf213e6de0db293b4adc1615631be6477048f5e8033cc5e16f1b9a0
 EBUILD plasma-browser-integration-5.20.5.ebuild 967 BLAKE2B 1828fad5558bbbd88b3341860e17c42540eb794a8fe42bffa4f5bc39cc31564cef001bd643592af374d3e4f55796fdcffb1298e9c9665bf7bf22aa5c5d5f169c SHA512 9363154d26a04e728d16688f60f357a8cf4a5d1a53ab446523db95f337fc3dba2817be615f8059f35547cdf8cf862f3712e62a05a1a0576ddb09af832702c5d0
-EBUILD plasma-browser-integration-5.21.5.ebuild 1012 BLAKE2B 6948b6f1445ceb952a9700b98180ddd225e177ada0fca6568776e9bcb9d61572c83faff6b9f5342d078dd57c8b4f4b51963290c002f8b91e48c9af674d546fe2 SHA512 0cb0195d2f0530cb1ef17da57aa40fbb39e8a8356f81fafbd2b0513fffb53bbde7c84a1123db9700a21cd6b30353feaaec7b04581fdee03dd5c9865c4003d500
+EBUILD plasma-browser-integration-5.21.5.ebuild 1009 BLAKE2B 3053ba179dda44694f18a26061f7899453d274f596724f5fe478a0de1ea8576c51a1abd861a1a300da2ecd2a9b2a38a9d6c8eba86e34b9007d4e90d065c90050 SHA512 dc417612bbca4439133ca48e4b1ca027296beb56c3a9045d4f8e9aaed00200b66e07fd082508670d19c2ad1fa89904ecae463491e7720688ccf270b1e3090228
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
index febe0f1383cc..cb03cd8cb0f9 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index dad2ab40ec5f..982d26b35e1e 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -5,5 +5,5 @@ DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd
 DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.20.5-r1.ebuild 4879 BLAKE2B a099ab12d2c22952694f9990180523bcd3d36c2f2166baa6d8fc78a6c81a9c69d48b3cbaecb1d96984ad629bffe16709ab193069fdb5f4f522691b993a8c14a8 SHA512 74bd8aa888856ca1ea599e5df140f4236db55a4e18f0e4a4a69119c549649822cb7ac28a40ea1a596d9b72427dba98852b17a5dabb7eced8e5472d537be3ebab
-EBUILD plasma-desktop-5.21.5.ebuild 5196 BLAKE2B 60c867601091f91d2f4fca44a30423d7701e9f41ec1527dbbee1a6ceac875699007ec370a05a6d051c9ad6f4f61cf1f4f55e5599dc50634d6876876ddecb853a SHA512 50a309c3ddd1c9ffb30e7f10caca7d68fbb373d0b102b2a9509c043e79070046113de086bedd92004ff22550dc1637ae38fe27afeeacaf404dd63cf864286349
+EBUILD plasma-desktop-5.21.5.ebuild 5193 BLAKE2B 831ede60054ade3be55b1a7420a4196c4145227502b4f1f8952b7c075bd780f61fc15f06c5627f72e69e75c7a67779770647679f20ee9801157d4473beebbba6 SHA512 906bef59a4f879bf572801ba54b400223dd5c04503add170f42c6961c8332422a1719877acadf7f9d592f61102102c88335764774ef0fc803b9f22b153921438
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
index 68705edda325..0e6950fd4a0f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 7f720587a297..8db2b2b4582f 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-disks-5.20.5.tar.xz 64636 BLAKE2B 769c131e069861dc06a56ebf0e5f8aef9306ba10660228a8a1b0d6a240126556d18a8c5323255efaa237bbb116c6db2881047257e834597e112e79906d1b64ff SHA512 dd27cd4b612620de2a28001bfd3c95a3ec41fc8f96fb0421ad660885600b663df95315a8cd0710c0457f51633dff91cdefc75417b3751f9c21d50cc45fced9bd
 DIST plasma-disks-5.21.5.tar.xz 71428 BLAKE2B a5f2d27afa851f84874b05531d2f4a80b02f5c4238594fb7bffd3a364883aea777379c565621350a227d3680d87d4553dbec1f86dbdde12ff1f125cb5685ddf6 SHA512 b7057416b9ea692b70865122b4f4febb727c6a6dd72ffcd1cc23c9280ecba650b30c2e0002130ecceeb78b556c3e922c3ed83ec0e0d03163e01789cfb10d9426
 EBUILD plasma-disks-5.20.5.ebuild 1030 BLAKE2B 927fe7401594d9e5078d6349b599550e5a1151bdf34afb9c02ab6849a53bc868596d48973db1c025471013a7c1913d35465874f7bdef33a2c945da1815fa3991 SHA512 a32351344827faee19cf7dc2a83f28f956cb3ace3096c424c7c881ef68004b201df7d6cfdf9fde870870377d920f73b82edd44dc3918e7eb6d2010be0b7c8aae
-EBUILD plasma-disks-5.21.5.ebuild 1033 BLAKE2B 9bd04493a19a15c4cb228ee3cb6e8367d9c267496d16a6d4e9fe2a3987fd36e9ee6fb8f2549886a7472e3555bbbc7fab6cb26237cc06aa1d95875fb6b80c9bf9 SHA512 77074b67c227729ca999d1a03a041b4adcf2dabe86f9043b7becb737451f1cb284712a35c2175b250f62a673debb71019e197c89275c9ec252eabd3cac03d414
+EBUILD plasma-disks-5.21.5.ebuild 1030 BLAKE2B 8cc8c2981c42e066d573b4c61b0d06d6340ca62a347cda39fc807f978d4ca210e84f98736483f37bc45a829155eb232504ef2acfa3a5cb066a5c95f7aeab5cdb SHA512 7ae7aa0277c169cc8c9d25aa66db2ef1f8a9dc6b6adc23079a1f0da337dcb0e7d5577fc4c50fad3dfcbc5228365a30402ca83904ff696aec4c5dbb99a133c608
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
index a48f543b9225..13c38f80b378 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index 4de1eff2dff6..014d1aa1a4a9 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd
-EBUILD plasma-firewall-5.21.5.ebuild 1394 BLAKE2B 52d9a0ecea9b59234ce4abdf59b7aaa26bf438ab00c32b7385c77cc24bc0a73d467c76003c16fa2635a73dc36ef05d808501bebc00b084670098925a0353ae65 SHA512 3825593fdf8f5a3944fe21070612621030339258e97a67b7cd5188148a40ca99088b901ddf5275bd7eeae7bddcc056d010ce69c53c98e927d39405163c254ffe
+EBUILD plasma-firewall-5.21.5.ebuild 1391 BLAKE2B b5120092b36428f2458f26417c2190faafa856bc31e25a4499aa97fea14593b8f4fb26211b97871a8a65ae5c519f64a28aa2eb2d378872a402fee0579fe5ebb1 SHA512 7b7500aba94ca646d473fd7b7b76b20675257d72dbeb252c7d2f3187f093d705d49d1890a20f9b2b2e3699b2058954d7986f28056d7df5f9c66a95e53e4855f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
index a417fdd8672a..e4adf22c451c 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 75e2d77c6238..5974f6783374 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604
 DIST plasma-integration-5.21.5.tar.xz 60972 BLAKE2B 2122d64fa98dcd65936b18a5f8c09939680566770468817ab14d9116c92d226f234811952fd61222ca5e000fe213735c0da26ce73f3c5587cff4d61fcf88d902 SHA512 655fee4335569325431e9fb7d368bdf82b43f1e0e0f727f95f11f481a81e8dbdcdc43470c1768b9ab5701159ffaf571b551edc57510a653e1c7fedc1c4216d92
 EBUILD plasma-integration-5.20.5.ebuild 1235 BLAKE2B 194e3e91201852ac809135bbcb2ffe9c0a19a36bb580310af719d53c4edccb860be165917d484d283dde10a3134576887da66a9369690dd84c96496c1a0d3748 SHA512 e82e9265f293ff1a50bb8b02cc84c3fe46035cdccc8a5bb4970c29a5734e7dcf1fda1a5736a2320ddd178fb83e8ef14cf96c7503669fbf8eafd5863fec350e46
-EBUILD plasma-integration-5.21.5.ebuild 1238 BLAKE2B a774d3389d2e968807b00075e48846bff8eb61ab5c2eb746b65e09efbcf96206d0e4e4f9e9859a5301cf2ac248eaa2e1b389a3520c1c70ea814f006865e3963b SHA512 3216cb569143f1ca7f935218d0b420d26d549e0dc668946ab71d666f661ef00caccae8e85bcbf3773cfe5ec60a0c706f9b5134fdf44c176bf832a094c7d2130e
+EBUILD plasma-integration-5.21.5.ebuild 1235 BLAKE2B 5c31aee5c4c9974e5d8b2cdffa271c2644e634ff2e99d6842f114aab07289aebb60cf4c6bf1398c568a786c77dabd22d5614b27ce1f24fda19b157bd0033be74 SHA512 7b9f7a55405ce89b556d04b63519304faf175b6ce119f9747d6b1a3c71b63255300d165d65663fc82e9e6b067bd33a4aacd4dccb8261ab5e96f595f1e8da8966
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
index 02ab146b45d2..b4955ae97b26 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index beb3d43665fe..7c0ac16ae46e 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.20.5.ebuild 3646 BLAKE2B e0e2f932a40c719a31a3c083c92c79d0953106ccc5f062d1214f4c93f8fd598182fa9a41910db67f1d1cff9a15164a4167fc11640060b15c4d5f8baad8909f52 SHA512 a483608e1b05606a3b93189beda17e7dad428cf183d48b8425dbb2d69124637fe34d4ff5ef499a386a7b9418f983d4181744d4fd6b860e201c1478edc4956462
-EBUILD plasma-meta-5.21.5.ebuild 4043 BLAKE2B df884c5ab7d2f61e00228d7ecd1635e191953179cae6ed21eb930fdbe4e7a592435e9bd60da7b2886ec9120315335db48cbd1adac1788a9be676e83d91e0a3cb SHA512 8e870d2305d8d44360f58bc7ef1128df5552f8fe6aed808441366f8e387489acf82ee59e17a2c473755b1ba209bde135de388f25795e4853521e4aa8717ba5e7
+EBUILD plasma-meta-5.21.5.ebuild 4040 BLAKE2B 614877bb903d223fadc2c19963ccada9a350d65e705eba59f29b753e5bd7448f4fe66bd42e94432867403293cfd84062fce597721c4e7b16bb96c6ea6ef83dab SHA512 ec273d84d957bdbd8d641dac1594cb068bac1fa7600d41ed91bb726aa838ce41646e5ef770447258a2b7ff1c20116894f8394223152e859353fc2e2371259d15
 MISC metadata.xml 2311 BLAKE2B e7f8095b8d868028ffb9a6f0fb9795d2eea72b22e3b770ec08a2b75a463198c1e82242b39b413ffc794462fd2ea0324eec38f210867d22814ea005966ba1dcad SHA512 e680e2d8103eb6f65f186a77c57692f17483c2530029c8f4bd94816d87b73e1157f7310f60f8660b2e45fa048e783208df1b19cdd5711616f497d5ab16d3e7b5
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
index 240dc1de7b29..a3729a5e3d62 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
 +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
 +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5a985297a95a..f3f9e245415c 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -2,5 +2,5 @@ AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbdd
 DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7
 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
 EBUILD plasma-nm-5.20.5.ebuild 2320 BLAKE2B aced27381cb8b277a01c3d4b3799cc51fc8936d867bc82112fe5511ac5cda11ef1a52bb76122974345c21449218d4185d461979a670898ccb3191903e683a7e7 SHA512 364e2fd1608293b335445c867a1f7b20d652127cb81fd6fd353f575058ab70271113765a09b99c7355662e63946aa205b4532b7a4b2a37d1cb6655956a7b48a0
-EBUILD plasma-nm-5.21.5.ebuild 2336 BLAKE2B dc9e3466e4fb1e67fa12af3139d14182e3b588a083417b1c1391b7cbddc4e8e87a25b2df69b54e63cd642a6754e77fa511068d780e7c45c9ff1e9d152a3509c2 SHA512 998385241a12e7f8e8b7e81885a4e433e574449d6ab07c47db847a273d161e2ebdb808ee6c7e88c695ad38463592d4cd9602819fef56c66ef6021366f55909f7
+EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
index a24d6cab271b..8e934494dfe4 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 2c0b8c1b71bb..1b752e1ead4d 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.20.5.tar.xz 114276 BLAKE2B c41d5093af494ab0eb17452098e47dc53b56256c98181a4f034df8662aafe51b3138fbb41ae7ba0b9d31e6595bf8871d93b6838f69cec30c0981690c4df85233 SHA512 8d01c79fd75e494f816049400a10929f427bf09d79ebddd73a125d4795722fea44319450c5f4d7d8627a03fca4a8f11405e267a87ca5e85016038fedc8131bda
 DIST plasma-pa-5.21.5.tar.xz 114508 BLAKE2B b33b5050e7de5dfd99e2f6b881d779e6e92fbd30c45fcd86b0ec65aec81d06b983789c4e617372b74604fcb51315e57e5f1978fcaa4cb9c6c45aeac94f4a2c85 SHA512 96a170b0ae90ff5a8015a532cde50e7a786452f9d04a30f7ee2402c9e7065ed1891e229f589bc79337ad68cd310c339840b10e7bb94551bab744ab7ae9a2ba40
 EBUILD plasma-pa-5.20.5.ebuild 913 BLAKE2B f18b9f14e13d6896ce77bb0d86c8bb131788fb23e4b14431c342b365f6c363ea9083a8ad94d1031e323812e98d5065b91988dcfaa459a7e3e9ed7efb3e4bd622 SHA512 99e8aca732b0813b6f1583a08cc66d2d0f6f1d9c99f8ce14564bebf0a8192caedc9b694de1600ab8db6a5fe0c8a5b6d11a7f30530db8825f3731775bada4e1a9
-EBUILD plasma-pa-5.21.5.ebuild 848 BLAKE2B 518c70fb3e7dee877f0f91a6290502acd27196f44f751f1619e3950edb65be199f695092285a686d8fa3522b56f601e95575cab65d20932561a6c0a9ee6cc4fe SHA512 52fd2d1cc94d145b5b5244f4551dcbdd9a7c0386dc3a60b83d5117418418a41e5dca85169f75b834419bc2976b34337382f5ea4ddbc76fd167e3f5f3f221ed2d
+EBUILD plasma-pa-5.21.5.ebuild 845 BLAKE2B db67708d89753791f8823b47248693673e3629f0fb55baf03f3bf1e8db4c4472e99eba74fd8b218a4abdc0f34d2232da59929b3c6c6f63645333e528a87be845 SHA512 082f71d18ba742274f806794225a8b6ca090266d2b53fad041bbdba09dc6e537d3067ef8e96278d52861ab9a401c6a997ef44c3ea2d9b816550680f93407890c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
index 5925ffbdeefd..c02937a9d845 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index d5ec8ac91e4f..211a04b4261d 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.20.5.tar.xz 266680 BLAKE2B e6ba310a3d089ee36a9098d9a58276cb8491a0c3016990e7643036ee905624c5f974b0d2e470047b59e5cc114a80e7426dbf1d0561bdf4fd26a218e47ade8ca8 SHA512 d10a5413835ab9ac4f1c521839f56b12862d87eed25c13d7ea70398bb892da7ab558bfc62fd2fe8451fc11ab9023d2e9a6e78c677bfa3e104c15f8e87ae1db77
 DIST plasma-sdk-5.21.5.tar.xz 270648 BLAKE2B 59e6d00cb24a392aa829bea8e0206c7f7867e8f5cdba4a6a2ab6f4f328dd83fb18d1f25c78a5b461d182e8705cdfc8f3141ea947eba6545c9dee0d159de3bece SHA512 83d27d9ffca15baba292bdf285f19a743589f5a4433c6fad8fd581a93a910be0ce98f3163c7d6872d6a95b71342e301de5ebf6ce2677fcdfb61b8e4644a0d80f
 EBUILD plasma-sdk-5.20.5.ebuild 1254 BLAKE2B cb559aa2ee0528a7eeb8e243b20fb5523815824f462c753710ddea96ad91fe209901c229364965afa5b9f642bf5e2d58f9f3574c1fa35baab1b3d6a554abd2b6 SHA512 049e651adceb62effd9bd377788eea05297b20647159ee8eff151d7accd0eb8ddbf769e6dddc2f2e3c411c39d58929f0d7a03cc76cc523e0449781b7854d91d9
-EBUILD plasma-sdk-5.21.5.ebuild 1257 BLAKE2B 24e8a128c62defc55ef8327158275a6b3888e39551e10d63521ea69bcfb52ca8740ad5bbcd1f1c83d03323f46780749d44dd3656fa4bd5f6ad1d7eda6be16ef1 SHA512 25c158cdd21d525af0dc6334cf3550463272786666a4ba44197101b48b3c7187a666be06be3f7af75acc58f1626d7377a9bb772a5a1c85de64b5cc152a43dad6
+EBUILD plasma-sdk-5.21.5.ebuild 1254 BLAKE2B e7aa53c5060bfba5172d6f7acd95ded4b5ece499f1c9682ba71ec06253144cb6c778360a2bbb40f41171ae2a1fc146fd3e208d66971f6ceef6c6e05e4137bd8b SHA512 3f24a166cf129d2cee91aa4037e5754ab8bd8a179f003bf4d3448154da56407133348095c390317f7bbd978369c1e0726ebeff94517c45afe8e573618fd14e9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
index b63a63ef1036..b27038110e78 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index cc286f42a0e2..205856b77f5d 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-systemmonitor-5.20.0.tar.xz 105596 BLAKE2B 93a5feb8fba244580e65b55633d803e14051b476f3ee5fde617285c61a84be7b22c5c09f4a14e0e7b9b3c88a45868c9f8c5c72e8cfd4488add192e9e1ceeb594 SHA512 56c6a5fe4646aaa2fc76c30f28362252308516b06132501efeb9905097a5c895250076b09ef2bdb7a9f4ad77435c622bd4b3f1ad5b69116f6654b3046829f2a0
 DIST plasma-systemmonitor-5.21.5.tar.xz 124792 BLAKE2B 47c55bd7ceb31c7128676e539d7c48325db68b49bcbee0a4d73cd61ed1360500e7765ed2d5d01bde542bfb74e7b6db26158c6b281aa1e65a5ba450595117777a SHA512 f21db1dc9428b9f97b4b012ae481738f7aa96c9080f35870c8a8f2dfed582b937507fd626723dbd60e66656d78984bda24279c77548d65efd847e15374b024f0
 EBUILD plasma-systemmonitor-5.20.0-r1.ebuild 1201 BLAKE2B a1e49bd8b4106cbda357a6067cb8854ff3d2e0b81a3fa35f7d07552b20ff2e0bb9f98770d7109b34202d077e0fdcf6fd9bf0ebe00ad644dba20a0e7080aa8bdb SHA512 02a6ccb0e36661a502fd5e7547310b4c57ded67196b194281499af9278c80671478dfdbde001a8c8432b93c9f7d3fd1b4fae53b4c1f438afed4dcd8674bb0bd2
-EBUILD plasma-systemmonitor-5.21.5.ebuild 1162 BLAKE2B 89735d0c7115a3ec0d2ce485874dff7fa3faec32d634569081fd7e6bd39cf0ad432f072ce1ce0b8990d59ffa21379ec75ff29a179f9e54f30406fb908ab196d2 SHA512 3372e6cddfd2830d6ab636ce21affe3b03ec2c390bcf2c7f53f4ef13bbe5a0af78af580a57e7a0e2b53cc8b8656d24c2e196eee3ea14bf486ff349c891eee93b
+EBUILD plasma-systemmonitor-5.21.5.ebuild 1159 BLAKE2B adc30ef18953aaf667f8c424450d57cb47deb43311696847e664b8201dc72a05cebb472f6108a528fc88c7f8d3168bf3c9fbd3217ae9257d0e5e3128b8ed6c45 SHA512 4b7101d5da1682a10664edd530573a19028510baa6ba9a82f31f5e87bc05a8a52dc069d4a603a119ba9d498c56b5912515390716d89e28fc8fadd05f0665c662
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
index 9b428635ce8e..67759df28e46 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 26d8fafa5ecc..1c66a91b4e68 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-thunderbolt-5.20.5.tar.xz 56824 BLAKE2B eb3289a0e9959cf291d1eed2d52597d9ffdc8993096ec0b1ba850720c726fe412ac43bfcf8f7b4c721d6a982ce1f127e323b420ec57da33dcd206438d9602ba7 SHA512 ce07bfd0733f6dda4429b77afbe699edb85e46cc31656ccb7a6cbf366fdba2720b4d92e4327edfdb164867873bbe7d21dd2da5e8764bb36e8b3c154ab8f3088e
 DIST plasma-thunderbolt-5.21.5.tar.xz 56556 BLAKE2B 9f80e1848693fccb15cb56f8d6ce89136efa1baa60dfd42498a49f59c9e688ea454aa52b40e8791999fb12dc540308bcdb855cd7462b79079a257a58a29004c8 SHA512 b627ee07e0fe308b70b11c2a887443b8eb3997cb9895a67f8d7760a4294bf36eb612ff888c981ba63a6485180ae7d1cee3d9c7c0bb741a3db3599a2650ba6843
 EBUILD plasma-thunderbolt-5.20.5.ebuild 890 BLAKE2B 45c2d0e5db8d5afcb07765774699b20deed7edc2c0ce65cc63e220023b887e47183dc34dc77c262e6ecc8320197111317918b5408e235762f66d35729ef13382 SHA512 62504d4a964d604279263fcf03d1d3f239357bad1725e680d0d4016886cec7fc65be18dd7aa522a17e4d816990b943b196dfd78e1013ef6fe245cb485aefa9b9
-EBUILD plasma-thunderbolt-5.21.5.ebuild 892 BLAKE2B ecb7c9805c89a7b283bad0878565644666a82fba73b92bb78091949a3ed7628ff16aaa48e9e9a945b61681572dd90d4da3c80a253be6027be9c11a95e1359e52 SHA512 48f301b3be53f70bb87d4bc34ee496fe03743d3956149cf1abb6b38e279e6de0d73ee7d2395d7d7685108e16fd475d96aa2cc1e59c6c31b5497c1aee017a6256
+EBUILD plasma-thunderbolt-5.21.5.ebuild 890 BLAKE2B aea9c51bbd46e64cf892347f12ef69e949ec8c2374380ee6a4cb36aeaaf97a7ff0e8f11796d0f308fa45d49a622bbeeece5f14611b826e332f8b89cc99eae977 SHA512 5df2219a0225b546724d1d823b8015b78edc392ae8fcd517549d2a879e7fe662729180a9d1cb5db5ec3aacb9b6959ec1059cd755e3f77e548b1b0e96afeb841c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
index 952807b2c0bd..20215a7ab5da 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # tests require DBus
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index e70834ddb5cc..cb12e0818af8 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d
 DIST plasma-vault-5.21.5.tar.xz 160084 BLAKE2B a893a8cb9a3911eebb7cc1933f5bd6ee527a639e0ffaabfd9db864acc15962127e87abe3838a24311c65e87f2bd2320f788a731ee2145909e7d2605fccc9184f SHA512 bb3a4471e6a7cfc98eb4867142467cb009456c7643e87f274372e6d9d8cff1b97c6e70c1a3a51e21b72cc0d7a63a801f4681e3977339eac6a9ab108b13dc6d5c
 EBUILD plasma-vault-5.20.5.ebuild 1274 BLAKE2B d58ac0f5516afb9df2192abcc98f61fbc6f1b626e76723a3a963859e7acd6242b1c3a91e5879c34608c161a1d841b310f7aa52e669e4f1824cb803396ad4b7d7 SHA512 6c9dc99f2a4e04a382b91b822ffb2a363c8952ed111159b8e1da9703ef553e813574a3cdc89497e29706074f6709d90eabebd6d7525d20bbcf5c63bace02d8da
-EBUILD plasma-vault-5.21.5.ebuild 1277 BLAKE2B f268af5874174cf55c37060db377c89957c9e948ba7774f1b188d2655ad98d04646ed64e6f54e11d6104a89064396042fe7ac5f8b2b65e2a0ccbadcc23588fd9 SHA512 d235011265a3a6a09ef33a6361aac0b04f5aa735c186f3abedf15edafcb293ca20183f10e79fcd1c0a423d45bf5238184882df9abd28f03baa7b387a296d1de1
+EBUILD plasma-vault-5.21.5.ebuild 1274 BLAKE2B 3685fcf92739494b5a31ef3b1e0394e3be7a3e1f0d76eb5a4444e9232f5db527ac1f2e1b6cb79ab75378402d9168d786cca3e88484f106e458fe0d23713c0fc2 SHA512 920e0e6472ee03d98ca9849f280b7dfb02d08eab24d5965664762e8b3a917d2e83440f81d1f0372572a484f735d7e2a5ca37cf039455d052e1167fd34e020d38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
index 6487b75bfa37..bd0a97d39996 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 957b869fa4bd..308487728a1a 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.20.5.tar.xz 45932988 BLAKE2B f97004b26d967acf8dc4e24b9d5efeb99c56d69f640d03662162ecf9782c9e0343d99c5ba2813ebab9d9811a03ca37c6ad73ed420f0bb88a393a49e1dce69a76 SHA512 60719b4d963b8e8e4306c2ced7433aa8a009029de7f5fe5e1d4a1743a2554bbf5a64d572a839c2210a474a51e849c7a5bae74dd121f06ca80f076d85bc8eb8b0
 DIST plasma-workspace-wallpapers-5.21.5.tar.xz 48099464 BLAKE2B 1cf45627c00ebce5ac6960cbc1c773f4239398de247a2e29866de8daa53e7a9804b2185d148c3a8c507eac1c6a333c9c6a5472b37d26979029df3652e69913c0 SHA512 d0a7862b55238bafc106b654bd584cd6e2fbeead8d6694cc71df23e74a2da02c0b25b2f412514b45c1d2b04567e7758ef7d77b6fc5bd814b5f5bdee0c26926ca
 EBUILD plasma-workspace-wallpapers-5.20.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
-EBUILD plasma-workspace-wallpapers-5.21.5.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
+EBUILD plasma-workspace-wallpapers-5.21.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
index d290aa752bae..c46c7d6c1304 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 4fdcac4f3957..25bd5bdc96ca 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -15,5 +15,5 @@ AUX plasma-workspace-5.21.5-transparency.patch 14371 BLAKE2B 6ce2619103bbff528c3
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
 EBUILD plasma-workspace-5.20.5-r4.ebuild 6402 BLAKE2B 9421322f197d94628fad7ea6fda583c2b86ca5858f83989d85003f141a5eb7e7fbe69761f71c653abd3d093ec7eae610e4db5769475c5aedc82da78e2b5cc2fe SHA512 f23ce6fa49a5dc0f8515b76c2a4c9425b4c41891ae4e1e06b211d86a2826df1bfd54bf26496f1bc53f9bac422a81151fe53e510f8c01287e7dfdfe10b1e5b06f
-EBUILD plasma-workspace-5.21.5.ebuild 6353 BLAKE2B 290903d9d22a174803c592752d697de2267ffffaff097b704efd760fc449597726c6e202481801b277c6ee45a274c1b63e002b901f0f3589048b2caecc480b64 SHA512 aaa4f90762f3cf8989dbb7bd2324217a46917b8738da7d6b4df691bcb64c84a44bd5fa2f3743432dcc564dd019981b09bab84b51a9706b993978f56abb5bda9b
+EBUILD plasma-workspace-5.21.5.ebuild 6350 BLAKE2B 4d126e250eedfff978e5c0d36d3f629bc03057347603ec470c4ed69656b2025ad4704883b086cd33eeb591a5dd8d259b4f58342c426b853ba86cfbc9fad3d066 SHA512 79e67ef32136f66256b044a60ed1780bf8814a826730402033c386bf538e4509807890403a5238cf6f95c483f668e7d7b4d823b9c15597e005f859ce960dc58e
 MISC metadata.xml 820 BLAKE2B 4b861592915543bb74f501d3b06bb2599d45232a016a7a6d89b62e56624b401ab6852ed471a4ccfbd2ee4a435ad18a3c25eb5df331b6d066378a3217755863de SHA512 c292e4c1476f1222269e26be998648b05c5ce0201193434e4b5b81f2a9d794bdf4a961a203edc77cf4d5b9a967454feb0c9514549170ab6f79218e6ed356cc72
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
index 6e92371027f8..f23f675a0389 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
 +semantic-desktop systemd telemetry"
 
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 1a4b67c6fb6d..6f43d687f8e8 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.20.5.tar.xz 43024 BLAKE2B d7a2a6a347484f27d73ade549da7cd338ca23f2e69543c8f2724222e3585fe0f49067ea94c1a70e8fdead16634e408fbf742aa798c5b594e0040b96eb54263ad SHA512 a150c77aad5cc663dd8f2d718ddf06472563782ff5d831bc3ade5b790cb8eb4a15890181c7587e5c74d73db0b2f05185b705ff1288c43b3940461aecc87b5e78
 DIST plymouth-kcm-5.21.5.tar.xz 43356 BLAKE2B 46130ebb6ce4a9522546d87f7f42d65cf41f1eb9dfc5a454732a55d8cf0b6b73bf5f2a9286f05aa21bce73218c10499de7953fe06f3ecbd369071fd9a70e2b0c SHA512 d8b8187ecce7bfdd2a3c22dec9b4ea2b085614a7e3b495671226bb9c5fe0a674d75ea03c74bfc3cc58f0ae3a7fc82ec2261d1ace5483658fd65333f61f95ba07
 EBUILD plymouth-kcm-5.20.5.ebuild 958 BLAKE2B 56cdda9d404624a30ac92f34adeda79496b7a934e9f0452e45ea728e453c9de5a911ca11d6d05c204fbbc2fde66636668fed7c7d88b2fdc1603ea9200da7d3f5 SHA512 f8939dc468cd8b68aaa391e81dcb7f7e8128a8d65eded3487315377186541d057526e73f6049a845969f27a8f39e68d012a81c4d357942e8ed231284001f8a54
-EBUILD plymouth-kcm-5.21.5.ebuild 961 BLAKE2B 576c672d0307524dab5a190aab180845d9d8d3dc89a9204a1703d5fe252d5f4e5a7607df7243e2025945080ab2e49733c69c11b6d986cdb2cdb5a036fdc90d08 SHA512 ed211012ebcffd563b72e0408f4d747ee5da2a50f07162064e1f0d4c1712f6dc21c08eb28cc84a2ffcbf23c2ce36383069ff7e391d584ad178e9420fe9c6de5b
+EBUILD plymouth-kcm-5.21.5.ebuild 958 BLAKE2B 36635d101b5ad1fe414c917c504a432e88b6281f474b04b5a9e62152a244150d914b571105517987496035038ad1f92f9408c5cb15a541e06b3c90b2bf21f718 SHA512 4ab44b34b5b2b59d50518641dc48df4cae86395c2ca084a64dce87d9d33e159b9ada04339557fa6fd9b2ca2ae0e34aaa1f0d8421b9951ffe3d15535b01066ba2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
index bf306e6bc990..2ffc9fbcaca3 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 5f2098269552..fd92d5c9f54f 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.20.5.tar.xz 44792 BLAKE2B 41adcf417e8ce207b3f2a28f8c5a9b2e7c4da155290c55742529101319cf8ead12de22d59b4fe8bf7e67b6e6b48fc7b8afbf9655d58903d5fed3447e85bf7d2e SHA512 fcc06391ec8d8bb8a01d86ef1f8bdc45cb0ee5fef23429b5488a62497036ac6001a928d1920e92306b3ec77669ea73ab2f1071652cde12786e497fa48adf8328
 DIST polkit-kde-agent-1-5.21.5.tar.xz 45848 BLAKE2B 1776b97fc4ea6a5d4ff13b90b054379997226ea3726c94ff886ba719f5445c8548d0680c3634b7ecd3f6cc2e9e1d2416e8ec58e8b822e465cbbc0c2e719053c5 SHA512 840e63d962054e6be2204f0ca5142249338050a1d3df3db66667275ae3fb1930bd3d9f4ea37b85feee73b33822c8b34015028b981d7a100afeaab793f1525ea9
 EBUILD polkit-kde-agent-5.20.5.ebuild 797 BLAKE2B cf8202ed6dd97e164233f887d8361fed86fee23aa12038c10eab511e32ae2d12a1ff35cd782da84700a5480e8ea361892e609fc064cf049b2406fa07c1f64c0f SHA512 00c522ce0838c4fe3adfecd94a16f5bb0459e6fd987e9bb3d8e936000259b55a6e69ad54e75fb78cfebe80d268650a4d8784ff844cb4e8fce358f98fdc4ab85c
-EBUILD polkit-kde-agent-5.21.5.ebuild 800 BLAKE2B abb95b7bc181db092f98dc0cec508b0844b685d7161be8bbbed907aad9ed9ce68b5a2630b1cdcd87cf44f58863e53a0dc76deb178dfb46fe75dd80644253d078 SHA512 703772b00b37fd1ba801c64000574e4b9b476a48fb15b64dc8b8a1795f38d8042141d6e181b60412e625cf5479e939f53e432fa895d2e2c179e298a76ee3cb68
+EBUILD polkit-kde-agent-5.21.5.ebuild 797 BLAKE2B d7cb522daab68684ae76a2b91c95cba2b4aa788a96c439513e17e465dd485e7f8b275ad7d6c2b39762efcd8f03c43fca48039f8c5b25da6a137bde11cbb156df SHA512 76b0f30794becc44fedf66707e76a8f117e015797350994a58fa4dd93747635c7080e900d4af3826190fa6f3641a4e8e9cc8ead4b3398e3209ed02af7abfdd00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
index 4d7c33a4a505..b8356bded94a 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 6aa7f0fc5a7f..c1e45d55956f 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f
 DIST powerdevil-5.21.5.tar.xz 617468 BLAKE2B a67f409ea8e5a6c3353deb749db65f64bbf4e40d8ea84b6d8df6385e62bc1fce34552bfcc7dbe63f19161af59098173c0ad1854d3ab8ff30457e6b44985b2af2 SHA512 0d6b9cbd5cbf5cf3d34e3053f352d86586ed3672ddfae068531b899827d65b9e42c5ec0013f684deca501528590ec5074371fa7699aae4d6a20b120e319b625c
 EBUILD powerdevil-5.20.5.ebuild 1944 BLAKE2B c607dcdde420cefbd792c3da32155ddbe3d9135fad8651d030154e601696c5d17487e98ac1a566d6fcf36b2c81b2e93792580097c9843d8b49207d10a9c5c625 SHA512 9f856f88e9ffd80d1b0a3a2679d6fc07b03752d6039ab6279ce1ce3142a3d934ba8a57797f68338a6a5c6d103e5ed3c861606b31ec30f4c29107a369917d0c89
-EBUILD powerdevil-5.21.5.ebuild 1947 BLAKE2B dbd20cc6d03d7c2d79cdc0e2b5738f70685a5effc1a479a54f1251429095c8f2be3df348171c51b7ee8ef2b829952a0bb6bce0f5b6c8abdfdf7d4c0f9ff01919 SHA512 4c10a44569d9f55b4a1f9125f8e3612618dbb8802633a88b6ca5e4816d75ee46bde988fd4ca5d9f816410b2caf4a2f4887ad3cf54f3a95f59424c9e99d26ae9f
+EBUILD powerdevil-5.21.5.ebuild 1944 BLAKE2B 1432032d37d0b87d73948241be37f027abea350cf7fddd46c2392b004b2ae02528af97e6bbb6d7e89e6a06579d1ddd3bc07168bbd937085db5e846c293d128af SHA512 5ed57a70af96c40b428804baf98abf573002f567e85dbb8ecc0571a83cb1e0e58424d86aeb6f3e8ef2fe03aa6d9f01ce3b3b39cca7da6390b21f635d8697b7e5
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
index 4541c8b19d68..14d9ed14da68 100644
--- a/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="brightness-control caps +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 36f709515876..d6e7a94c6bb5 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.20.5.tar.xz 64796 BLAKE2B dc2365a08f64ebf0709ceda56599e7a183c0fd2c7ba33a05efb5132438c2e92c9c8b7d5e775c305e5739d04e633dd15119939e352e5842572d06930d7ffe9ec3 SHA512 96511d979046bd97da1513be559312f851e63b3e319ee2f78ac83b275cf748e30ded430d3f6b9736da21e7710802dfed31ae23187888d367537e3642aed1769f
 DIST sddm-kcm-5.21.5.tar.xz 64672 BLAKE2B 4c8f3059a4d6fb57f517eb17008bf923c91ee8cd18385b117666ca294b5ebb912280281e7be624d9be803272a644ed4dd01ff3e8b6e358c9248d7daa0cee3f98 SHA512 fc2fdaf67c144cccc8d2f68cc20e50027c1a083d6b33d37e8c8e7fa703b2904c11b63fc9acca63422688013346f565c77a1f02721c7f8dfcaf52bc97c7b07dbb
 EBUILD sddm-kcm-5.20.5.ebuild 912 BLAKE2B 2725b43e1a871a9cfe473112129e2ede2c720561a25edc40781f7334ac3d897040935e648a9f4bbe702db72d37c627a6d26a997bad7d7951fad3fd1bda93f42f SHA512 e231cfd5380e8c39b057fb9e8a723aa5b1c411379a314721c2c257c6c8f3940907a1d3f11544186f61fcb0f93eb8bf10cdfcb90181d080ad92fb279d5f39c956
-EBUILD sddm-kcm-5.21.5.ebuild 1075 BLAKE2B 4cb971b1428dd4fa5bd193f3f9eca67e2dca68b1b0c655c80b50531b7a83b51a2368aa34ef72c51c24f3080eecf75962f609407ec7ece9cdf63d4dd0763a401d SHA512 619c591dc8565fd1cd50fae67312ef9e46d8d6a399b61c624f8ee246b7f886e06c84661a6e8c35da840a6fe993f93d75018c3fc094745b93ef0ff5959b218b49
+EBUILD sddm-kcm-5.21.5.ebuild 1072 BLAKE2B f4d0f44a3d18bd4e12c9bc8fd624629747607eb1055331815c1fb0fafd4484af1f8f750492a68610f6ac2b622d3073d19e7031e70885e79f1218f07a6e123364 SHA512 72aeb29b7261016868675f9a7a4008a2ac07f3f680e87e19d2d751f3575f294bc3e40b856b57fd615b295a4fbf17668186468b03fb9a8709361ca104aee58e7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
index bfb383decbbd..0a69fd203254 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index c0c423940819..96d405e6bd58 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.20.5.tar.xz 193844 BLAKE2B ec81542b9bc06931eff60204f87e2d6aec8de57f97d57d4e057a8805bb4c1b02278c9fb12a9545bdb632d0896a6ec30833ef024e5b4232fe41baafce5af517dd SHA512 c68669f5a5d08ce52a9b0034d319f691a9419cb035ecd04895313e7c853cf6c01e72c8ee1fa15f92f7f22a9734d45b2373d9a4807d576783dfd7f5b5de14c994
 DIST systemsettings-5.21.5.tar.xz 199680 BLAKE2B a37300b6f3b53f5c62ffa5ff06581f1988720e87bbcb64f5c8048cdb99834b5aa37528c80615a07f8dc8f1e2bb246543479777e5c2b2c5499b1187ffca041b45 SHA512 fac4f4081583079b20c4935e694ef05908d0ef62938e4560cdf9a3119234fa3d0c13f973854b83535fde3594e713b0bfdbfbc0db36994a9a507c4063b714a410
 EBUILD systemsettings-5.20.5.ebuild 1671 BLAKE2B 09e31ef2f9b0e6b20f7ed985d0396df135e9d47ae26259c6f43d71012648163a1f9602d46ebd359bf178a86b0fbe26c5838116e789a7aaf6315fce06b763c23d SHA512 e93803ac517b58f655380c4ab69082ec7d2f800c9372f8c68ef9504c08c42f30ee82847c5b93216578b61aae3692c45aa8c187dc141e8a7ed608ac99aa8552e0
-EBUILD systemsettings-5.21.5.ebuild 1674 BLAKE2B a79b56617cf723493335a7b22090ba80f3036cb012d5a805cc4b123d59f18310318a47dd60f5153c1deb614f48d10cc525f1cbf31ef727e60f6d2b988101f93b SHA512 e08d27a3368cd3b6a3521e012dc17dfece402e7b9f5bda78a26735241d6ae877659f314cc1814ace2242de10e3684265992adc5a2b36609801bd6d6e3e0691a2
+EBUILD systemsettings-5.21.5.ebuild 1671 BLAKE2B 95d86adba6cfea80c54ebe2126d7323017412ca3a167b479814cc7b04d535b827fa1882b41f98e1357f868613f43ecc1e8f1fb265bcc2fdcec2054a69b2b1988 SHA512 24124ae30f11144a29c10a2da73da1edb3f48a099c6ede5b9b7e6c21af32896451333e774522ad328eeafeb1e928aa5a27604b96700a86341b7e13ded6a2ee43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
index 0db6d4e59dad..f50aa78a2035 100644
--- a/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 5f2909805479..8135071bac27 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.20.5.tar.xz 81876 BLAKE2B 9a0a8052a7a7d9d0200723440176bef37ae6e29417ccea67b222096f0b65e3c371ad83071d93ab05ec6d7de377383e61c126da3775f31189ff1bdd3c4a947933 SHA512 618abd6182e561664b10bd751792622dd88f05932c88505e141ee143e475b228727d2daa509bf113906a97ffc507cbd11f51e15b729f2e55210d9c0000f742a1
 DIST xdg-desktop-portal-kde-5.21.5.tar.xz 82860 BLAKE2B 583dd6f5360282d3b86d73b65ab5ddd136b5f251ad3b41a977248c44f99ab7c407868a8238307184d3206b35c987adaaa8aa15df5abb2a8ecf2aa31b4591e6a6 SHA512 98fe44d4a00cb16f3e3ebd30b184e836dd77efafbca7625b555852b0dcd45c4ecf71ab5d93659e3d508f2b3b42696422516a08e2ae759bbe916fa5f9fef6010e
 EBUILD xdg-desktop-portal-kde-5.20.5.ebuild 1098 BLAKE2B 605dabf48ead7954293cbad4674f56b275c426875236d896b4824ce2c189fcde97ea5b34290b1f7712b77b3f39cd2edcdc88359f12e77d3802e32c33a96ad8e8 SHA512 88a0f4b23d16feb7386fd021c3d5cb193f56d05069c38dcfcce78e9aac888a54bbc7bdee64ee5c42931e933dcb80235e8347b47592198f69bbab0fddbe64af43
-EBUILD xdg-desktop-portal-kde-5.21.5.ebuild 1101 BLAKE2B c2859fd8c2246df5d5e62900aa8edd7def13d11fcbd177e9581c45a091020c1392261e594ebdcfad37c2eb2745423efd4ed617ef0301d9ec02a1bc8cdbfa9685 SHA512 09bc21be18330f16ff14b9366ec4225a43b339cb39bdd8b2a71c471e35e48ee19d181d129b4aaa4f0d89fd7fdaf7a637edc287c412a31e89735ef0f76f2172c8
+EBUILD xdg-desktop-portal-kde-5.21.5.ebuild 1098 BLAKE2B 22981912d0c61cb667690b79e324dfef8c30f8a59c85039962490ff865ce0b39411a2800d356ca13a0156e98aa228125fc288707bc7b301d314f657d4f8e583b SHA512 34aaf74d6c49cc3062e7ab793ba49f45036b23661c0bcf0440ecf5eef2f6f5c63b1b2da7f6e79f21ca1c1af0ba12d0397f39af84cd2ef070191d4976f79399a4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
index 8f474386d973..86cffcfd51c8 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index ee200760e9a3..cd6d2caaf970 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -3,5 +3,5 @@ AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
 EBUILD xembed-sni-proxy-5.20.5.ebuild 1008 BLAKE2B ec20ad28545f19387f66e83b6b084581aa9cd9714dcc77d69de13b4ff691fbe7c7c94fdf2fe9632f5db3551f97a135eb4d6a0a6d922d114ed80cf31896ac84d8 SHA512 2af9311890058f23bd5dfda125b6d6585d1174e945af9c60d3870026a5a4de7f4aafc5df3fee0f3807ea6d9b225761740be0b16ca3e629ed8986695e5fbde680
-EBUILD xembed-sni-proxy-5.21.5.ebuild 1011 BLAKE2B 93394e2287665a6bf2331aba17eb2deef1c57235f0f7d65f01b60015e2bcd104174411c630051545b7f7382a10eaaded7b90367ded58c2a2a78466243f32cb1d SHA512 a6c0c2ae972bc269e3cb50ae3be577f1747df86879e8ad8853617ff5c602156f2c17be2818812a0d943c17fc6fb79221ad6d6870c29a2a08c4b94b75274ef0f9
+EBUILD xembed-sni-proxy-5.21.5.ebuild 1008 BLAKE2B b8d6e076b18f28c877f39013b0f75ff1ce02b9b20643d0d292a422628290db5d6c0136f22caa075896ca4e59da3880f5b87dc2e4e366495e9781e5aa534a247f SHA512 d4eeee9d46b74cea015db69bc37355a290cad657eb420c9b514a491f0231fe02ccfcbc917ac92269ff096caa298acfd0ddd78ffc3d0dd11d762dab3a2d08e8d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
index 7049a2e9643a..32e2b27fd79b 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index bb020c7105fe..8dfe22ca1ae5 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 53ef2e8f5ee3..636dae29afae 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,5 @@
 DIST evolution-3.40.1.tar.xz 12223944 BLAKE2B 00e37d45c5139e77ab9461948185467c9d2fadd3b315bdc65b6a55fe78e605a1eb65479ced304fc0d5a2bd2acf813164fc567254ad8e692701823420195c810a SHA512 acebe937e7bce5e998b86ceb8e53b07ffc9f558543b72cc5d68a54ca2714684bdf3f22726f243754c6ecea7205ccb1b9411095e9c62ca7f9890d2edb0a0b0d00
+DIST evolution-3.40.2.tar.xz 12215356 BLAKE2B df1bc738ea058c2e624e7d56b69bb13e059ceb25fc4fa26d00823677fee61ccb9adc16ee70f5f702163b59f3fcf760a116eb2eabe2350edcad693614d6c0b68e SHA512 081692e157bcc300ef26179f5e12a22bdc993043ca7c56b63622c4608b3c36c3c2e642d5353124c8661cc1ce2841d147345de86b4171ee7341493ffe0e24fc08
 EBUILD evolution-3.40.1.ebuild 4174 BLAKE2B 934f54e05123d518ebc4d8b2df4e545da85a50d8d23d1e20b9d59f4489fc741a68e98fa79cf0abfb288038e0e8adfe4d26296279c59d90f4f585fad9da776821 SHA512 b0fbe1e12c1fbb7b047a81f3f99ef6e6fcc360e6f319f7d6e751f38e2134bce15d6d381964a5d30c541493a356a1ba4b119ace6c9f200bfdfccfea597657036c
+EBUILD evolution-3.40.2.ebuild 4176 BLAKE2B 0ca9c2838cd05916d7d79f3b39c751298bd52803494ed195d6dcf5acce89b53504701f9b9e364787e722b51bee0740bcbd09c5f80586d0adb8ecc8f1bfb002d0 SHA512 38663f3563dcee27f007be6d67c22ad9f35f9acd96dfd86eca51329b16ba266a34b21a51689ad5f99c7c5da587e7961b0f4a225833aa72e7926c3c21baf0f2e5
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.40.2.ebuild b/mail-client/evolution/evolution-3.40.2.ebuild
new file mode 100644
index 000000000000..9e0a1d3f5578
--- /dev/null
+++ b/mail-client/evolution/evolution-3.40.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.56:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index a2674879c644..b831e439c328 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -68,7 +68,74 @@ DIST thunderbird-78.10.2-uz.xpi 586596 BLAKE2B bf71e12dd8cd771cbe86c2ef1c598fd3f
 DIST thunderbird-78.10.2-vi.xpi 674614 BLAKE2B 3e24680e55133daefdd3b1759a9d257a10d8e11d8c0f28935e14f4c8639b9986a1367a2aea43e1fc51641d47f3814f76d3d2049e51006ddf13fea17189261cf2 SHA512 ed954eff56724b89745f85ba83ef13aa404c190a2e5efa85ea4ae27fbd37f8a211bea8878179c257cffc35a24b312116314f14351a440a1d9f407a23f7146154
 DIST thunderbird-78.10.2-zh-CN.xpi 687175 BLAKE2B 19dab68c9608822f54523bbc99647a51731c17290ef49d51379c48d284180e0b3a9f66380222a767c4d3dd0dbeecc7036cff95b57e29399d922527c2187058ea SHA512 5b90f11c3ff739fec02adec18285a95e70a02370567d9dadea97d64798916c793c5155bc3b313b489518d326124f215e29267a6465d7b52513fd2d3c25c97cde
 DIST thunderbird-78.10.2-zh-TW.xpi 687616 BLAKE2B d1b895a11c2ef84b2ffb4e9c24b477f77f84145b87659a29ebda5c5295c127e37fbe04f4e8662e552f848b4758ea19116e0b4fb8733fd467de1f3d827c3637a6 SHA512 fcf0ca89e6c80facd0b669fdb2c7807f48f703ca7fbf193882d2f4a8a4037ef4aceafd5aa04730c5fb9184b74e50ec74369684f55e3f786215acf2aeb663c31c
+DIST thunderbird-78.11.0-af.xpi 548343 BLAKE2B 5eb0f8bde98e845046980bfa098b9749113cd4a95cff2ebcf7d387769bf407fb4f59926fea905dc293f916a91e0e0aaf78e1f4b2aac60dc1a38684a7293bbbef SHA512 2978a9f8d81d936495207e9ecd45e67e9073037ffb9481e5dbfaa73a776a7787970bbde9ba9790c6ad53998fa391d251bc6b8eb5a3a04dd3bae791b8b426e73e
+DIST thunderbird-78.11.0-ar.xpi 648611 BLAKE2B d41906f09fb0522199e74ac0a7823f3769e23fb310c9d62a0332d288fb7cf46f7d1d97321f4cba6fe03b53c5e254e2ce27cb8606c58a9c1559b152d2be70d681 SHA512 595415279e9f14abc678d652bb58c3b7a5b4907dd979b86320aa4ea5c499bc02034c5fad4ffb388719ac8795923e9eb7936f9700b5655457cfb3942fddf6b821
+DIST thunderbird-78.11.0-ast.xpi 561258 BLAKE2B 156729fe4b59c1594c35dc4e1bf198638cf361a679a95470fe495833c518c583abfbd69f358bba04f2c58d5a0d941603c969d640f9c18a26126a78f48e9b64d1 SHA512 d5821cf2aba5c3df1dac2d4310ba77aa7b5c1a69067216404944eff8b06bfb4eab2816aafbc490cf365c90aba850e6766092d9ae96dfb74ee9bb0452b591c21c
+DIST thunderbird-78.11.0-be.xpi 666676 BLAKE2B 81877cd6f49e61d462d22510ed82b3a6e31ce34d2d11f253ee6ce31e7569dd6f3f5e4fd0ff41a7404c3b374fe01b6495af064a722f445c4ac23d7941e546b9ab SHA512 11243c238d1fff8519e58d5f138b3830f398c5f561a968d448dbe3703d81ab98056ff65dd80ae3c268ddc14583437a1b4988323ae20c235652619c887e89a137
+DIST thunderbird-78.11.0-bg.xpi 672416 BLAKE2B 625560636cbd8522d9425e395ce28829644d86700c365987ba31e92c9d8fb8ea5d132f62ff12b6386c41dd995d3b95d49e55c84c5be7d68e687228f2f510b0be SHA512 1c16a3ba03579a462ed1f36eadb409c81cfa6185f6112a674aea9cbf445529d66c51e844ea7ec6c9c89ed8bdf593223a80116f976dd242078487c18a20f7abe4
+DIST thunderbird-78.11.0-br.xpi 604529 BLAKE2B b2e9f794d23b4a78209ffa355db99ce06ce573bfc9c3ee69a0cf82ebfca1e06c06b3e6ba869dfed72abe2d6ef84a87224fe713febe2c00828770a0a13e0a70e4 SHA512 f4a67b79ba899c29f6a0ee5ee2677a75898ecd417a5460af52e1dd72a99b985db9f00fe682a2249cf76ec7576316a52d24995b39e5e5ecac5fffc7b3abfb1126
+DIST thunderbird-78.11.0-ca.xpi 620448 BLAKE2B 9b88bbb31a16934ca112f806db6b8a7225ce7969073b297b03f71522c5f5f069958fce80608da0e30cfd7edac5b1c5f9c161078b7210affa48e103e3e5aa7185 SHA512 5abf0bb7f9b9ffb784ce89bbc74deebdfd042ca465b14cd7560bc6e8d774fac8d1998dd1afe3bab31a2347bddb4b64621bce39429ee49c17302a0cd7c85987cb
+DIST thunderbird-78.11.0-cak.xpi 635650 BLAKE2B 2d127cd4601de8b7aa114a3a96ec21e35dc7e0fc2da0df3a8a075ef2abfd044c797059cfce2167b839398c0762ca8378b7878c7208f0cfecf5ed4ebcb0c54883 SHA512 d74ab66d99895b6ba97e2e2ea8d3a285d0ba87f242f5f5ebcd155a15155b23db3eafd19599eae4d4f759efbbffa10b70ecfe899751c2f0e7c31fe7e51e47f99a
+DIST thunderbird-78.11.0-cs.xpi 635344 BLAKE2B 9ca8d944d2be138d90a8da9e93d3e7a2ef5306dc3bad3fe874bb62347359f58472d38794210de3898774c2b1ede57b5a4cca10d210b63dd2aaa44e936d41ee7d SHA512 b967644424cfc8132a76ba82dbca88b6c712bf1c37f46d57f0f17cbb493de4e3468c9ed6b20ef030c087316c263cc081fa7fb796c5f9cdaf3e34212f211ddfb4
+DIST thunderbird-78.11.0-cy.xpi 646232 BLAKE2B 0f180f548f4bbca346b877092b940889ebdd8b2e97819052744a0b0ba2bdddc413d335e13b3392b0e02a7c347616d12cf266bae8d19f5365779eca449119599e SHA512 b9bdd207ab9165e383a51f094d8ffa07ac20bf9d15f0f6832ccccc3342244ab7ba3344e20d3ac4c3ade70fbfab7c5598e9051907427a4553aa63022ac23fcef3
+DIST thunderbird-78.11.0-da.xpi 620991 BLAKE2B db619e56d9140b547055ed21d13590ffae23ca6528603cb40a68c7b5b46ae0a70bb267f79fd6b450cc106541491cb95072e8d34e1f22ccde3ae7138c809cde7a SHA512 7417e454e1621e47df72b749da146faa0d9c88955c85655fb3edbe4a8e550788e9f6c53565a78cfe82e9ce0ab3524052cbfa0fdff5a71d2291284299a4ee4c33
+DIST thunderbird-78.11.0-de.xpi 665194 BLAKE2B af74caf1d4a6ae13ee3e6c59a3dd562333588c4b855b1f2cebcdf1f36a02fe2645bf6f402ca22cc69c7e38febabbf2cd63858eca31a1450224c7a5f7b68e8432 SHA512 ee3163c6b9e3c1583c0c3b5d33112f5e9f37b336e3ec52980dee7bab02f016a4b6a7f6f82851932c4d72f7c85428e24e308e798fe34c41b8cec3cb226b3c150f
+DIST thunderbird-78.11.0-dsb.xpi 666778 BLAKE2B 26a14ff3711b6789b62cfab66b5e125bb4b1d41489b32a939602d37571503539022e7a72503417eb4f8d6d8f12c1d0ed8097e6d3e4cdef6b3c3b609d8209d279 SHA512 d8781e76172b29f68943f5f3bcf922b40937495a189ef709dcae19e2977cea27caebdb6b17989fd594bf707fdb0a288982d7ee4bbc916af987add20cf55b55d5
+DIST thunderbird-78.11.0-el.xpi 774458 BLAKE2B 5ca290b9df4e7a7d7cb109bf1f026f88b47941d0e224de56ffe2fb1a8b4df8818584f163cb48657d022e553821349e1f2fb8f27a102de0986912402b9dd519cd SHA512 06d1dcc0b17604cdd68bf8c0b0dc6a014ae6f70c05b4a1c5b2768a45eef8099686b307ce3e0b13a1d294ef45f1707cc7252c0c85d6b0bcf204cacf189f63bedd
+DIST thunderbird-78.11.0-en-CA.xpi 611764 BLAKE2B 3c7df065c37712eeeb4d383eb42673ec31e8ba9d3d80a042728de1c276619ed19dc509762ec90f13b13a48b73991d2b9aee33df101039f18a4096ef0640f5e59 SHA512 843582f12e6d32c4eb27a0e984a96a406fa39b1adcd253c372e05c826e623e8059ccc704f7438cd4a14216b4251ceaa8c5b8b48dd8d34cc9f12336a3fb1ffe89
+DIST thunderbird-78.11.0-en-GB.xpi 611188 BLAKE2B 9702b2e97c951589974f5b7f80636838261da021c4736e08416f15b0a7d30bc0885c6570fdc1f127111ce1f68e2251f181bc19b9bec887b7b1034becfc166fa4 SHA512 f0ecae7a6d3272cc779c35859647a86ec2f857499b47634006db528373a43aac79329e9ffeee304eb0a95195915f7aeb1170ef74240bb67e560d4305f960b21c
+DIST thunderbird-78.11.0-es-AR.xpi 657793 BLAKE2B 895e2b21661c7c82475d3c93695e011f15f44d63cb49eab3b4b0c6a6d7d062eeb4282b1e16843d9202dc172e146406ed21851197e5eaff52dbbd81de0ea4f441 SHA512 570adcfa7416d1d3b2dbf6923927580c1334efd16ad024ab10df0a9c20558aaf4c14fb67245fe7d72b1d14454b759b38e3545fb62e9f9eb3feb881773dfcb6bc
+DIST thunderbird-78.11.0-es-ES.xpi 569808 BLAKE2B fd1edf9defcb06a2be32a065c72a479b43d66122636a5024d415d91358296a516730942aaf486fd18b391cc66a3282d8ac81263df261b5a98e3ec8a23cde3a18 SHA512 64fa4b4eb00c95dc8ccdc369cfc3c50a06bda3fc95a4d5625d677e27354f116d33b3e7de1697dfd16fa6429dcfbcbc2c7b8e4cdc9d6598ac08487d12b3d898ca
+DIST thunderbird-78.11.0-et.xpi 597738 BLAKE2B 449b1057f9647f36e725368933b56125bf22377be1551c5c1a2c2b2dd4627114ec8257dc7b6960a2d31465c3026ce2f29c91d1c86fe7aa3741b9a92f425a9f51 SHA512 9f36639ddcc96851585a1cd5d36fcacbc4bbb6c1155cab5da1376f40b0a2a096c0d923ee00db32ff3a40c6543b957ae75472b1a052310be7cb0539cb3a826619
+DIST thunderbird-78.11.0-eu.xpi 632960 BLAKE2B 7953b03d89922c61a4b2b4fd1328cc9f39b0095d071738c08531883ce4636a50669f62d26b87750c573638e0db48fb67aba18df70106636789306ac1ffe690b9 SHA512 e590ac6762c92b95e7c820f86f1484f72acf878489356c74b346073a39417b1db5a99a233d2466bf4f350516dab0279753e5724588bc0edca5965831c96a0e13
+DIST thunderbird-78.11.0-fa.xpi 639752 BLAKE2B 9762634fb297c77110d6d45a64ccfc298510c838aaba9203a1e07b640e6aa72fa3083f722a070864927e0f687a6b764aa0cd51df79c50a1d9c71b289c0f13ade SHA512 de2725034fd0373ea8955905079f4eabfe1d2baba44fbdcd614fd85ea33a8b8eabf4371f19e6f046929cbd56e4bf70e862693f1fbd97050c3411c83de8317234
+DIST thunderbird-78.11.0-fi.xpi 642456 BLAKE2B 5af89a5311f7a373cd07a6350ef5bbc865be21d53cc33e5aa7a0ccf6d2963a25cbfb3cdac7c805f66feb084d807fed3a72aa3dd561c3d03ca647faaa6b3daa19 SHA512 0a22233c37b279b344862c0d156f938c588921aefc4852f3d4631a459b5a177cb74495ed61bbb90329aeb781f909cd9a330d2153114b8ebd64f53eb37bfa7965
+DIST thunderbird-78.11.0-fr.xpi 669492 BLAKE2B def525cee10efa0978d778ddb0ccd9672eb51ab5d7eb5a4a09b64773b410b5d2b3d17b93445cd324431cdec0ac8da8e72bab5534d60c694f2a50172280156174 SHA512 18b4aa4cf6684f0510b8e3cf990c79bb5b3c61ae37012dda0bc14febfa9ecb53f4cc86f21c40deca972972b1e89a9f15231a7498c3578ab22d1753b3dc397dff
+DIST thunderbird-78.11.0-fy-NL.xpi 653078 BLAKE2B 043b2ecc0f54e0ba9b6f75ed1a0e8502ff4e5788e41d8c54a4895a107fd044fcb1aa4237a1e593f1cdcb8782e25226b6ba996df830aa1ab5b005410a7988c558 SHA512 e3b295fdb187715bda511105be726bddbbcd8ca3446bb8199937bcf98d16caa5ff7df52c9ef6170b85b8b0a0369179744e5a02283908c5fd1a3fede244d3ad77
+DIST thunderbird-78.11.0-ga-IE.xpi 600708 BLAKE2B 9bb307d36ce5b9178985b818b75f417a4f44b29e748b847427598cd34a1202a15a5b2fbad00060bb98dd2ac0e1881845dbf23544f4defb16932c228fbe7eac22 SHA512 52a330bb02aac06ab2588537316a6241332bec6e2d616a3c5bba44fba1d50d4bc25ed3ca91372c74979ea6c92eadf484170e033bb0f2a12e22b54da0ac88fe4b
+DIST thunderbird-78.11.0-gd.xpi 609380 BLAKE2B 8e33f096bc758e7d13c67b46f7508941c14dc8936678df293edb8782dc625c0b93ecb3b3d6df2b060e318430b9ced5c79c884b3fd495156e052e3edbf045d217 SHA512 e41728ba4d570995fcc382d372c7f1bf83ec1b554371748580b48d7f119047075439de662bc17bfeb60e20134f1f29ff3855c6e8a6e09498db606194c651dd05
+DIST thunderbird-78.11.0-gl.xpi 615733 BLAKE2B 2b5364a9d4c03540091a60195f9a3d7b18cee3857693613c8d121731f1ff370209134ddffc6190e4e95b8ac5c32a7fbc8df81497e6dfaba680f91dc8f46feb2f SHA512 c7b2aee95fdf67a65a9ffcb48ce8da2c720b6a6674a945012289f53d30e855c0602fc5df8b7186aadacb993fc2b1494bb79427d095db1daffd724e6fdec5a8db
+DIST thunderbird-78.11.0-he.xpi 640490 BLAKE2B f79910c79f9ba9d5ccbf72b5104b71837a77d53dcf92627f264b7a9f8717dc08ade847d717fac74b72ba102e204daa5af673a9438a52a4353890148456ebfa1c SHA512 54122ab286ae100a38d0e9172d447d85df2692ea47baf57bb4632204c689ea6db83546610db1f0a93795eb7316bdee7db8b7adba8975bc51729b368df1bdc546
+DIST thunderbird-78.11.0-hr.xpi 629032 BLAKE2B 137a179f6d3b774e177fd8d1b7035c5a872a998a2f22b5507007e7655e3b70d07414c9dd97c793276a892115c031afbb37e81a61f48ea830419e597b01fa9fc0 SHA512 2714cc3c735c227e7da7c61d078648814c1533f18ad18f90edc66a3e35af924b0728e335d3381c211333297aeb7cae5122f3803554ab825fbce54c55f0bc5087
+DIST thunderbird-78.11.0-hsb.xpi 668608 BLAKE2B 61dccd236d7fa6d0e0df69727650f0f2710f14f6733b71e99b3f349f9446d551de861d5b44a3b8096a3a36503cdda7313d3459c974adabd19d8bb66f6bdd1df3 SHA512 d9461ec874a3c4a14ea8450868ec4193ed160df3e43fb083b1bc0cd3c9e208a9698f5b84cb4088e02fcfcad83e88a98406a8782672c57f3caf609917443620ce
+DIST thunderbird-78.11.0-hu.xpi 679836 BLAKE2B e58d2bfe5c6919fc46ab323a325dcd3ea6b2069763da16f8cdeb79a50dd7a1812f01e42a89abaa61d1bee4dab608c15e898f3563fe2b5eb2d2dfd61cd4e08d48 SHA512 b27bc91598df5b47453593c0ca75217f59143db756a496386907992bc9d7d259655985459c6cacf9736b5d12f8ebd92d7419c478892e22a2c6747a05bbdd3c64
+DIST thunderbird-78.11.0-hy-AM.xpi 713327 BLAKE2B 25269f40b57361629a7212bfd1a5e8525e78d388a88e3648eea9316e7a181ecb79ca1657b1699103780fbecdb77ae939d2db29b424dcc00abb3bc8a65cf95b1c SHA512 389a018f3185b24d5141a235f12d8a450aa86d3a17d4af03049453c607bedab9f953dba3f4e0b6c6512eb56bd9276a13871b56c386dc0e1433c819fddc95a03e
+DIST thunderbird-78.11.0-id.xpi 620681 BLAKE2B 614ef09d3bafdceb05809efc973a38f23b7647561c80365d8b9dadeba0eb871b44af847ddecc0ee14a9ff8fe70c3facca2e1ba2a072ff3bed648c556cacab461 SHA512 2761954d55dda11609a20ce67868b9d83d3bc2608ecdc2a2d5bd8ffed628e80e62696f10b44026f53600becb0c0cadadf486f50e64f8ccffa7948cf1273fa910
+DIST thunderbird-78.11.0-is.xpi 581637 BLAKE2B 2462fcd02e4affe409def825e5e220e1c4a3a0b0ec9e6666c1641dda1aeab472c088688e971ad149d3462eb1d11521c4076142da37e22c52756a2442585a0ea8 SHA512 52b11675f5333e3519e4972030d48f158ad1a266774a387a34012839227607ffc70662d6d94c06e3212825c187261339f112bc3b3181aa89b9c66c2f0e480bdf
+DIST thunderbird-78.11.0-it.xpi 572964 BLAKE2B c272e3f7203dc8494f83075f8121971e9fbee227e99cb84e33db32df61e0504b3a30ccafbeee42757cb437382d98a3251b019522077f1c4bc5012a0487275f52 SHA512 c09e348a4cdc1a682b30358a9c2a8a49342f07de5fe746e17079a11c480a5046cae348b0d8cdf56df3af3a77020feb6d1248bc22ded14c0d2f1f6d3c5b74053a
+DIST thunderbird-78.11.0-ja.xpi 722453 BLAKE2B eac59b6fa660fa3d80f4c968c444b495017b44cb73e9ec28840fd135dea439b5fa481ef10fa57333e2cbbc4d6a68634ce2b1705cbacbfa7be74aff14e41f718e SHA512 c141ca2158307241f8b47fbca516944b81740c7a198f969e502bd774ac868037e9680024d910a737b34b026c465471bc2f493de4a6d6adf5e16c4aec66102cdb
+DIST thunderbird-78.11.0-ka.xpi 717016 BLAKE2B fba12a3dcff7cfe1421bc1d8ea130dff1c3c474e8aeb202463dc1bfcd681ea60e0076a6323ffd270e448dfb01a511ff93e13c906e0ab8f23d0da1c741848e988 SHA512 546d7863ac06da5334a89f8b3e590d596e58cadd3e7fb32420afad64d63ca31e4e8697e59e8f064a1dd1291c9fe6cb8993acac292f968494dde044e10bd71118
+DIST thunderbird-78.11.0-kab.xpi 651922 BLAKE2B 3b94ce7c69c7ed81361e4366c28de31e4e2e6f7e646e587ecf0bd410f3f52c3f284ca61805fe0ee0d86bc7d6763aee8a6071f53fb99d4638ab631451303ccb8e SHA512 60761ebf5d8fb8ff639e9178e5788fdcd9728cef6f69ba4dd9553eacf61b3e0a1ed3aa0489c277bd618745dc64da7587de8ee0f3f8d5f7ae3f93957f5456dec6
+DIST thunderbird-78.11.0-kk.xpi 720464 BLAKE2B bd741e0567c243303ae7287f9f12dfb7c59f286b8638285ea2b44e0bdb911dfc40434438fe7640f0a3a36a0863307ffccdfaac83d3c023cafb14d953f05a753e SHA512 d92a7e142e6e8d01853d55ba0fba3b94df2847a7bfc8c7086d3ab06646c6bc55d3ecf9c63e4dcf1e42b883f297f55fd9ca94e19df12d54d33a406f9b985f1218
+DIST thunderbird-78.11.0-ko.xpi 688207 BLAKE2B 1cc5547c1bd57daaa84557de95f708c9f44f66091b82749622e59030e91a1c1a6e7a503c692b1097f35cb1376634d1e9aef2c1d3ecdb82f02f3b8d7ac8d02ddf SHA512 111c022dfae9705ca43bec679e84345415626e29b6320ce1001e8a00c5b34948ed7dad0548b864ef367d4f8db91b4e56554f2ba7ec490efcea69207184776404
+DIST thunderbird-78.11.0-lt.xpi 660298 BLAKE2B d494291f5c7f5010128da76a704c8b6a780e1b37c6e89b5b4f275c4c3bba69d0e2bb7b7b2e27ee8922085570d5b7f43d65b3d9fad4f7589dcf32d7db965b135d SHA512 02ceeaf31b2d42494d5d1b8351912e4f4df5925e3b1111c0bb59ec84187ae83fd241a99f4f5660a8d7a0bf636b9c53c74fc61640065829735859c633f4f79758
+DIST thunderbird-78.11.0-ms.xpi 572177 BLAKE2B 9ac91c920b272754c6f97c1f0018b7bad5d78b017705f4a2d8d8ae2e54bcaca373d64ebce37cb76a4d99ab4dd17cfa275fc24bf1b6e1c60f062cea43242e9c11 SHA512 5e31a0eb2e34aa45f75ee932150131e5618984d2e7d04acf5cdb4a72c5fec53131ea1bd36e407b98266d9a497219745c2aba9b501ca813a133abd7cab81fa9ac
+DIST thunderbird-78.11.0-nb-NO.xpi 637236 BLAKE2B 86d94e683a3bddd0a344b8c3313dca82ec588a6957e6731734f1368a99e82acbb329f676bd516c43f7a54ad2ce18ee1d839283d132eb15300364477f13807abc SHA512 9953462a1ed7b3ec2cfc979d4379b711ba065d9c519677abe10f0c13196e36830dd6bb549d199b681042200ac64668152b6855e4f23ada38815cf63e3df4e95b
+DIST thunderbird-78.11.0-nl.xpi 644361 BLAKE2B 27a5a7a210ddf4f6c5e880f5234d938d61f513911db6b4954fc3cf97de257f253f089c2e4380294863bc08d8358ab9d3b79b786a0397076565d331ede5d94c66 SHA512 b4ba64c3bfdd3f4f5c52272802e927e2ad0bcd78b7553e7a65a16ecac715e5f9940f4d202097fc05e9b694e56e1ca9ddd99f1fb7f16b749e58a1f84835cadc4f
+DIST thunderbird-78.11.0-nn-NO.xpi 640698 BLAKE2B 64a382fdeb55933aed0f12e4e01c5cb4e858885213cb48c4f95030d61bd8bb50e7bad4ab27bffa85f0a741cd77bcdf9ac962f854cf665a0717f863ab70d30334 SHA512 2cd14aef1333764eab9635b9a676e9412843ca76bad49f68a75ff888a2c8159a6d8790db482c879b620754ee7102656fca3dac78d4ca37c4eb65ca9afc1b17e8
+DIST thunderbird-78.11.0-pa-IN.xpi 633218 BLAKE2B 782271f2f4c3858f3f7e4e9594210f2420f1116c28c2e28d7086194768c611c4f8cef2d26d6afa16a3449617eedef6395f54a1ad96136dde5763da5509744e20 SHA512 a0e5cceaa1b3a4278384c3653f463b9ba7829e24739cb6986b9e2bace54c4724e0747d72c7c8e7de4a0b06523e8722ccc21af3e2467580f2d8e375a62eb859d7
+DIST thunderbird-78.11.0-pl.xpi 637127 BLAKE2B 15bd3782cd937d32665e078bf064b3d359625a546bf160e53ca19e3cb6d0628b68ba5bc2237cc2668e5812ff0fcda98271e5cdf848d5bea59588d23c6355c9e3 SHA512 e6f552fe5cfb51cd1b8fbaa5f5e59606ac032bc4316b694429da2357cc20f466bd2fb93b53e4e8c8397dcb0b688912f838acfea9312ea4c6f78d5874e1350a6b
+DIST thunderbird-78.11.0-pt-BR.xpi 649418 BLAKE2B 5f12a096e4e8f4a1784c5de3042995f40e7bc389d935aabb2dfa6c90aaacfb4899d23ebe177b094fdc601303812096d4972fde661d34c407168c86300e43064a SHA512 8c31c917ef14f6b9ad1064d268bb5c32ac8cda2e43586abbd4dd2e898dbd6699e0c7babd2f0e4607b2ae2ddbb099acda46deda11ef329bad7ed46162bda85454
+DIST thunderbird-78.11.0-pt-PT.xpi 655488 BLAKE2B 34101f209071fbf439ed15b0ce1af5f16f5d07d9adcd84e15e64f2939177bcd192591ec3bcc962df3c6467d55b743867f4bcbecd330af667a758167b2129ac1b SHA512 81db3d1f452b06e08e81f7c40d0fd5ee6887e8c1e618b676dba10a9deee720da318db8b52c9632ae1b727b75e7c3577a355779fe233319f53881ea4b393f5da3
+DIST thunderbird-78.11.0-rm.xpi 646533 BLAKE2B 6ed3823c693a13accdf5293c55e61302f8747b43ded4b36dab0d28b31430174579cc6b8a37605a0ca3ebaf901ad00a15eb9e6fbe22822e17e9569b7d15b2597b SHA512 e0831ee2236dadf6554021c7f4b80329532a39233fa94109d304993f72a9be6436e0ed2f3aeeff928342de1798d4aa225200cd42d517185f8bcb8dc7ee813cf8
+DIST thunderbird-78.11.0-ro.xpi 662634 BLAKE2B d0d396b81621aed365b580dc802f3fd8d70da2814190f87d0007620110f03fcd45cb501a6be7b5fe8f616a2b25c7a312512f51e936d1894300b919fde21b412d SHA512 ac89bbe12cb3db1ab4afdb768ca7681a8620b8fd0ea13753806f8841e5f42b8e069cf8864b5b273e347068e30644c8cdfc748ef8aaecd16eac9e0d9d69b7f426
+DIST thunderbird-78.11.0-ru.xpi 756179 BLAKE2B 97ae08626e6d3cb79549a922cc77d407087b089099bdb313748b35105018cb7dfe20c180ce33590988dea28763801a5883c73384234dacb04a258cbb5045c22d SHA512 218d371689587addb7f58bf77800418e71865655a6b8a741a856ecd19664e714c5a706c28325871a455e14802d2ad19570e4dcc2ec36bb541030d1427a4e07c2
+DIST thunderbird-78.11.0-si.xpi 651107 BLAKE2B 023dd3bfb33421ad40838de454d26c3273edc18f8c37a0a138ef9b31e360639d5fe4c7ecac13d045ef484c95255ac7c8560f7a89de6d3acacb3bd62ae1d718d8 SHA512 b4407aeb29a7dbb11ddb1af9b819b26d02c0cbc0b9f8479d8186d63ad2919ed1f93c3e1f4cdc1033944ac4611623bb9e4cd41e5695873bd0c16f466f0a200ff6
+DIST thunderbird-78.11.0-sk.xpi 643226 BLAKE2B 4538fab12007f8bff1e398d91f4cd8a4ab5daec2a7a02f699fadd9352bf563de37984a2317cfa55979451b8e3ab139d0e9bff6b212895e35dfc47802323d96b8 SHA512 4c097c03a9c5f67d6c315f8d097760260986cf8cc299cbbe8e73c21cb1adccd9f27c91b420f6fd8dff07dfa1d9ef08ce8964dacc4ee2f27353fc6789c000ef5e
+DIST thunderbird-78.11.0-sl.xpi 632387 BLAKE2B 0447e0295494f468d339f716a64155ae7bd06ffe1bfd85d123498b8f7f08946280cd24f07249128cff90677a4bdb38a93dc1494d091d99f193ee35e2c2e0b29c SHA512 88a0188d61f53888221a62cd107c3cd140bea943e9ab04667a84d1fc4cb960e6e7a65b0415db77e5e16ff37edc80a0e4cbf2d1ec4f7cfd51aad4ac04d9715bff
+DIST thunderbird-78.11.0-sq.xpi 657820 BLAKE2B 05dac5425b86dfccdaf9e6851173e57783b9dc542b04b94bc38ac1c26d85e0de2bb5f458a99cbf6e2c1e03e87b4066ef7a0029a75aac072adca1376441737417 SHA512 271b0e279809375bdc32017bee724483de054f8afd29ea467fad49e6ae867447fd63a4ab29997a2f2b50d3cd0b1a68367363e2c1f352729ab0d288fbb6451b84
+DIST thunderbird-78.11.0-sr.xpi 683118 BLAKE2B d3994161023a5e6d678cc32d8e192e3ee3e127b1b4cc0e2d060a3b126757f835f9c5ed2c5bcea1834bd779a412f7b38a02030b818f9dc11128dc4fcd4d892d45 SHA512 f9aba1f45d313d9c6eb6cb2177e218e21c1a6e9e7908675462893dae3354eda896e6ff8a00d3f634883165e01dea5a7550c752e348745489937d7179e3407049
+DIST thunderbird-78.11.0-sv-SE.xpi 648871 BLAKE2B c42ae9287630439a52b77d2ddf4dd00ee83ae7b85a9a7bd184e69b2d7ccbd11352098dfaa1164a1ee6ad3d8df72bd7a16a4991a6c1da4db6d00fd41ac0603d70 SHA512 708950a9bd38375e469f8e0006c4c63f867828f7324e847bc9116f2cdc59c73c4b8a0bfa65568c28d71163cd2cd13f73749590578145d809ee6306a627c17bc1
+DIST thunderbird-78.11.0-th.xpi 712040 BLAKE2B 7d45cc692e84122fbb8abf265d000fddeea685059f93ae862fb0f49f9a6ee46af5f8c40cc06efc849b5704356c7ad2925addd087468216b715399bed14933638 SHA512 739f265f30e43ee707ac8b3f422b3665640133a5303a07ffcbc5c0f503bcc27236fdd43fa8650c18432ad7888d96ebcd1c6d7043d75be27c76723e02bd816671
+DIST thunderbird-78.11.0-tr.xpi 649072 BLAKE2B f2e78a3c0098b4b13d6f0c21a091843a77151785f3c054fead3a42c0a8524af9d3db4ea1fa67f8394dc7e713d4c67b15baef37be1c6fd8f7a8f31adddce7b42a SHA512 d7c2015420542ce94419b3edd6a77fff5ce48206d8705ed83845725ef7f76b7e64d39c033bb419d61bc74fd0aae9472fd5be7670f186b0f778a61fb6d757a65a
+DIST thunderbird-78.11.0-uz.xpi 586597 BLAKE2B 8b064a4ddadf316854546ed33c65aac119376f09091d42c22f47dd8f40ac210d12f5f1a8101b03f9113ed0e5c09e9ea3c21c95525c4a2a0bc2eaac195924c831 SHA512 72be001755d84ec39c00cf2d9a83d787d1716620da0c1a99b8f5ce793c89af89a8f49361a32ec4335c7a900da7ca718e3e38ddc80f81ae22786f158ff7c7ae07
+DIST thunderbird-78.11.0-vi.xpi 674611 BLAKE2B 67834c7860979a438ed61056080b32c7be4416aebf87325172a15ff48f915a0d61c6a45e5cfc84c4aa74cd0f3776e5dc1476e187f7c07c5378abc010ac2af5ae SHA512 336075fc449df3ac1a05d041d7fab80ca7c418cb43bbdb45df50b1a206dc95e0750f1b4b61da6d5473346e183f0c7525ef41de76dab9ff60ff8923b030a67486
+DIST thunderbird-78.11.0-zh-CN.xpi 687183 BLAKE2B 9a18986ed58dec976e82f533a8a08cd6f374f20f3fe016ca8dff71fc01be7de0cebeb2cc311791bd41cee66f53f8f275a16cec376efe70848cb761daebdc87db SHA512 53f81f5e5bfd20c3a6dd144d780e76016a58c0c60c034e7b7738a81d9ee6e702652ea8fb3e40861918e7606c6159ed09dd2e6ad7522a1d25f6c648fcc6c908f3
+DIST thunderbird-78.11.0-zh-TW.xpi 687626 BLAKE2B 4822fd23fc0864238bbb85742fd9f9ce6a9f13384270a738d95f33defa5b07f453cd490d9df771a8fed594007512e40bbebf3434d29dad61319b35230d0e7229 SHA512 95eaa27e5877a3203ae0976bb349b38fd3d6ec0b44e0cc333e2573877d5482897d5ad4c888d8947c6d55ab3e6c2e17c21fe69c3aff3d3c81549e8f19918c0153
 DIST thunderbird-bin_i686-78.10.2.tar.bz2 68305977 BLAKE2B f5878bb6d196e1bc97ecb3923bfb5df8674899ebe4a01f1a4e7665a07438e8312fcc0866987c78b2b9e2b09034a482505c5cf6a7f4b2449251ae73921b2f03db SHA512 1e29d9592363e804cc921765859de33a1260ee31396d61f85886ec4feb5f8661ac8abc9d61d4ac3a9b5d0f2515340689fcf5b93994bb7eb97f7ee1382dc7d621
+DIST thunderbird-bin_i686-78.11.0.tar.bz2 68286013 BLAKE2B 949e86083a46fbea1a7e663ec263fb3e6030bf7779ada6439737af9f871087a2a154f9bcbaf1092ab38e8acc4c7ef78c84dd5b967b01b2fc1d49eee4f3680696 SHA512 519245cc8c28187e7778f2b7a8bcd828c11fd52f57d4ce9549b223dc45b9348414b5a67d7d5ed3fbaa9e3ca6e9064f1ebfb99d5156806532d22e533c9ed9019a
 DIST thunderbird-bin_x86_64-78.10.2.tar.bz2 65441993 BLAKE2B 594d3d0b742c7ed4badd7e9711e08cd01c8fa653e6fe3c4a93ad131dd2bf808e3eac66bcb9fa2cc89401f456fc5b5974297880a90b54227f2edd8db0941e0bc8 SHA512 8a705f9a3d33a99045b31a16a58ca2b895117a6983f65c1986886008e1a8155b29ce0325e59b003d5e3b521e484a648ae95cc81c9da7afea9c59420a04572e9e
+DIST thunderbird-bin_x86_64-78.11.0.tar.bz2 65289371 BLAKE2B ea4e8f2bf49e3674bdc1375490ce403d69062468b3e75b8ca8293e1d3be89ec7a70b1603f075ad73090d6898eeaad438fa480832c607b72b90499cf4d01fa218 SHA512 a3b633efe617261873ef0a509d182e9024ce028869ae877d8772fc5dd375fde3e67ee6889be1d56c24dab175db22ce9c3610bc215e32b46a3081ac9326ca3fc5
 EBUILD thunderbird-bin-78.10.2.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
+EBUILD thunderbird-bin-78.11.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.11.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.11.0.ebuild
new file mode 100644
index 000000000000..908f3ef026b2
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.11.0.ebuild
@@ -0,0 +1,378 @@
+# 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 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="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +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+-2.18:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+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 fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi 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
+}
+
+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}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# 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}/chrome/icons/default"
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^} (bin)"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r1 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index e73d19b89da8..2d9d19dc1275 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,6 +7,7 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-13.tar.xz 83664 BLAKE2B 92250d5bc3821ee1ff032236bd00e01a53e0af4f9e39696a634edb39f0a182bf5ff74b7fc0f107c9c53136c64485c398391e3a857c8b2b904115fd13d17e2a4f SHA512 96739811bea833a6a9cb09075dfe49c6fa7f613e8bd41e1d830d6ae6851ce8e2f5d27c87d0035b6f3a099340dfd7eebe6ecb930ff25079e76cea92a7610293ca
+DIST firefox-78esr-patches-14.tar.xz 82976 BLAKE2B 08cc3618c8069f4169b7647e7eb699153d558bb89f8a4f1ed74d5ccd339f77119cd8f253df011f0c2f255ad889b65e843171d7559f469788463ca7e9aa2e96aa SHA512 1611c6f9d2c7d586e7b53810c1cfdb2682f5d289b1b019b71694b1ab2d8bbdfe827a73cfaf59f7e4808c0b90409ca4fa57e27655d8cdf0c578ffdbad33659f26
 DIST thunderbird-78.10.2-af.xpi 548348 BLAKE2B 44d4c00a3672a82a1d7ec37394b6952824d940163a63213b8efa17488d97277de285f053ecca2925baef5ebb296647914028fbf37c884cf8d2527219e762d7e5 SHA512 04be6901b422e6a0a93d4b2a8c930f3ac8c78d4ce4fdff0dcfb904184080e5f1b0a10b05c44358069dfd9372fdabfeaa4b7a8b92fc16867fbe43569264996a08
 DIST thunderbird-78.10.2-ar.xpi 648605 BLAKE2B 5f78480a6bca437d650f8567e8fc53dcf1ed61b6fc303f245d6634917caba60a85aa95636029891230d898e49076601be9c5265c9f00f2fb3ee88793e9159a81 SHA512 85d4711c30a7956199d34b5bb5b20a1876758bb12dd0ab09a636d5cdee8c3038f5f7a1940327218aca635e8789a36cd4d8318878999bee7bf49e87e88e7af829
 DIST thunderbird-78.10.2-ast.xpi 561260 BLAKE2B 5c5883a0f42ef3b5ba1d42e70ec5d526eb93254d797c60ef757eed42285c9f9105a644088137cf59847da9fd20b7fdbdfc65c12c5c31118b8b004ba45c00bd28 SHA512 b3650198079ef290e82e51b9eb659c6675927378b14903de31d746ba6f5144bc8b1bc59b4909226118b4d5b88eb16ee7aee686cb15e6a28ae34e3a5bcc6d6441
@@ -72,5 +73,71 @@ DIST thunderbird-78.10.2-vi.xpi 674614 BLAKE2B 3e24680e55133daefdd3b1759a9d257a1
 DIST thunderbird-78.10.2-zh-CN.xpi 687175 BLAKE2B 19dab68c9608822f54523bbc99647a51731c17290ef49d51379c48d284180e0b3a9f66380222a767c4d3dd0dbeecc7036cff95b57e29399d922527c2187058ea SHA512 5b90f11c3ff739fec02adec18285a95e70a02370567d9dadea97d64798916c793c5155bc3b313b489518d326124f215e29267a6465d7b52513fd2d3c25c97cde
 DIST thunderbird-78.10.2-zh-TW.xpi 687616 BLAKE2B d1b895a11c2ef84b2ffb4e9c24b477f77f84145b87659a29ebda5c5295c127e37fbe04f4e8662e552f848b4758ea19116e0b4fb8733fd467de1f3d827c3637a6 SHA512 fcf0ca89e6c80facd0b669fdb2c7807f48f703ca7fbf193882d2f4a8a4037ef4aceafd5aa04730c5fb9184b74e50ec74369684f55e3f786215acf2aeb663c31c
 DIST thunderbird-78.10.2.source.tar.xz 353926908 BLAKE2B 23ed531fae63453b0b088f6eca4df3fa70c87e659ccb4afb6e1a26a9837cb0740ae354ed8078dbbdf7480d99fc7b82f0f37f37978f957a1d855f61e9f10dd974 SHA512 b938580055b8b935a37cd7b7aea9b654f5dc42b0a5d459ccb95d10fbde49405c5fad3ebf450ecd1077289aef008801d1dbbb7d5be56bb238616df14a7658c3f4
+DIST thunderbird-78.11.0-af.xpi 548343 BLAKE2B 5eb0f8bde98e845046980bfa098b9749113cd4a95cff2ebcf7d387769bf407fb4f59926fea905dc293f916a91e0e0aaf78e1f4b2aac60dc1a38684a7293bbbef SHA512 2978a9f8d81d936495207e9ecd45e67e9073037ffb9481e5dbfaa73a776a7787970bbde9ba9790c6ad53998fa391d251bc6b8eb5a3a04dd3bae791b8b426e73e
+DIST thunderbird-78.11.0-ar.xpi 648611 BLAKE2B d41906f09fb0522199e74ac0a7823f3769e23fb310c9d62a0332d288fb7cf46f7d1d97321f4cba6fe03b53c5e254e2ce27cb8606c58a9c1559b152d2be70d681 SHA512 595415279e9f14abc678d652bb58c3b7a5b4907dd979b86320aa4ea5c499bc02034c5fad4ffb388719ac8795923e9eb7936f9700b5655457cfb3942fddf6b821
+DIST thunderbird-78.11.0-ast.xpi 561258 BLAKE2B 156729fe4b59c1594c35dc4e1bf198638cf361a679a95470fe495833c518c583abfbd69f358bba04f2c58d5a0d941603c969d640f9c18a26126a78f48e9b64d1 SHA512 d5821cf2aba5c3df1dac2d4310ba77aa7b5c1a69067216404944eff8b06bfb4eab2816aafbc490cf365c90aba850e6766092d9ae96dfb74ee9bb0452b591c21c
+DIST thunderbird-78.11.0-be.xpi 666676 BLAKE2B 81877cd6f49e61d462d22510ed82b3a6e31ce34d2d11f253ee6ce31e7569dd6f3f5e4fd0ff41a7404c3b374fe01b6495af064a722f445c4ac23d7941e546b9ab SHA512 11243c238d1fff8519e58d5f138b3830f398c5f561a968d448dbe3703d81ab98056ff65dd80ae3c268ddc14583437a1b4988323ae20c235652619c887e89a137
+DIST thunderbird-78.11.0-bg.xpi 672416 BLAKE2B 625560636cbd8522d9425e395ce28829644d86700c365987ba31e92c9d8fb8ea5d132f62ff12b6386c41dd995d3b95d49e55c84c5be7d68e687228f2f510b0be SHA512 1c16a3ba03579a462ed1f36eadb409c81cfa6185f6112a674aea9cbf445529d66c51e844ea7ec6c9c89ed8bdf593223a80116f976dd242078487c18a20f7abe4
+DIST thunderbird-78.11.0-br.xpi 604529 BLAKE2B b2e9f794d23b4a78209ffa355db99ce06ce573bfc9c3ee69a0cf82ebfca1e06c06b3e6ba869dfed72abe2d6ef84a87224fe713febe2c00828770a0a13e0a70e4 SHA512 f4a67b79ba899c29f6a0ee5ee2677a75898ecd417a5460af52e1dd72a99b985db9f00fe682a2249cf76ec7576316a52d24995b39e5e5ecac5fffc7b3abfb1126
+DIST thunderbird-78.11.0-ca.xpi 620448 BLAKE2B 9b88bbb31a16934ca112f806db6b8a7225ce7969073b297b03f71522c5f5f069958fce80608da0e30cfd7edac5b1c5f9c161078b7210affa48e103e3e5aa7185 SHA512 5abf0bb7f9b9ffb784ce89bbc74deebdfd042ca465b14cd7560bc6e8d774fac8d1998dd1afe3bab31a2347bddb4b64621bce39429ee49c17302a0cd7c85987cb
+DIST thunderbird-78.11.0-cak.xpi 635650 BLAKE2B 2d127cd4601de8b7aa114a3a96ec21e35dc7e0fc2da0df3a8a075ef2abfd044c797059cfce2167b839398c0762ca8378b7878c7208f0cfecf5ed4ebcb0c54883 SHA512 d74ab66d99895b6ba97e2e2ea8d3a285d0ba87f242f5f5ebcd155a15155b23db3eafd19599eae4d4f759efbbffa10b70ecfe899751c2f0e7c31fe7e51e47f99a
+DIST thunderbird-78.11.0-cs.xpi 635344 BLAKE2B 9ca8d944d2be138d90a8da9e93d3e7a2ef5306dc3bad3fe874bb62347359f58472d38794210de3898774c2b1ede57b5a4cca10d210b63dd2aaa44e936d41ee7d SHA512 b967644424cfc8132a76ba82dbca88b6c712bf1c37f46d57f0f17cbb493de4e3468c9ed6b20ef030c087316c263cc081fa7fb796c5f9cdaf3e34212f211ddfb4
+DIST thunderbird-78.11.0-cy.xpi 646232 BLAKE2B 0f180f548f4bbca346b877092b940889ebdd8b2e97819052744a0b0ba2bdddc413d335e13b3392b0e02a7c347616d12cf266bae8d19f5365779eca449119599e SHA512 b9bdd207ab9165e383a51f094d8ffa07ac20bf9d15f0f6832ccccc3342244ab7ba3344e20d3ac4c3ade70fbfab7c5598e9051907427a4553aa63022ac23fcef3
+DIST thunderbird-78.11.0-da.xpi 620991 BLAKE2B db619e56d9140b547055ed21d13590ffae23ca6528603cb40a68c7b5b46ae0a70bb267f79fd6b450cc106541491cb95072e8d34e1f22ccde3ae7138c809cde7a SHA512 7417e454e1621e47df72b749da146faa0d9c88955c85655fb3edbe4a8e550788e9f6c53565a78cfe82e9ce0ab3524052cbfa0fdff5a71d2291284299a4ee4c33
+DIST thunderbird-78.11.0-de.xpi 665194 BLAKE2B af74caf1d4a6ae13ee3e6c59a3dd562333588c4b855b1f2cebcdf1f36a02fe2645bf6f402ca22cc69c7e38febabbf2cd63858eca31a1450224c7a5f7b68e8432 SHA512 ee3163c6b9e3c1583c0c3b5d33112f5e9f37b336e3ec52980dee7bab02f016a4b6a7f6f82851932c4d72f7c85428e24e308e798fe34c41b8cec3cb226b3c150f
+DIST thunderbird-78.11.0-dsb.xpi 666778 BLAKE2B 26a14ff3711b6789b62cfab66b5e125bb4b1d41489b32a939602d37571503539022e7a72503417eb4f8d6d8f12c1d0ed8097e6d3e4cdef6b3c3b609d8209d279 SHA512 d8781e76172b29f68943f5f3bcf922b40937495a189ef709dcae19e2977cea27caebdb6b17989fd594bf707fdb0a288982d7ee4bbc916af987add20cf55b55d5
+DIST thunderbird-78.11.0-el.xpi 774458 BLAKE2B 5ca290b9df4e7a7d7cb109bf1f026f88b47941d0e224de56ffe2fb1a8b4df8818584f163cb48657d022e553821349e1f2fb8f27a102de0986912402b9dd519cd SHA512 06d1dcc0b17604cdd68bf8c0b0dc6a014ae6f70c05b4a1c5b2768a45eef8099686b307ce3e0b13a1d294ef45f1707cc7252c0c85d6b0bcf204cacf189f63bedd
+DIST thunderbird-78.11.0-en-CA.xpi 611764 BLAKE2B 3c7df065c37712eeeb4d383eb42673ec31e8ba9d3d80a042728de1c276619ed19dc509762ec90f13b13a48b73991d2b9aee33df101039f18a4096ef0640f5e59 SHA512 843582f12e6d32c4eb27a0e984a96a406fa39b1adcd253c372e05c826e623e8059ccc704f7438cd4a14216b4251ceaa8c5b8b48dd8d34cc9f12336a3fb1ffe89
+DIST thunderbird-78.11.0-en-GB.xpi 611188 BLAKE2B 9702b2e97c951589974f5b7f80636838261da021c4736e08416f15b0a7d30bc0885c6570fdc1f127111ce1f68e2251f181bc19b9bec887b7b1034becfc166fa4 SHA512 f0ecae7a6d3272cc779c35859647a86ec2f857499b47634006db528373a43aac79329e9ffeee304eb0a95195915f7aeb1170ef74240bb67e560d4305f960b21c
+DIST thunderbird-78.11.0-es-AR.xpi 657793 BLAKE2B 895e2b21661c7c82475d3c93695e011f15f44d63cb49eab3b4b0c6a6d7d062eeb4282b1e16843d9202dc172e146406ed21851197e5eaff52dbbd81de0ea4f441 SHA512 570adcfa7416d1d3b2dbf6923927580c1334efd16ad024ab10df0a9c20558aaf4c14fb67245fe7d72b1d14454b759b38e3545fb62e9f9eb3feb881773dfcb6bc
+DIST thunderbird-78.11.0-es-ES.xpi 569808 BLAKE2B fd1edf9defcb06a2be32a065c72a479b43d66122636a5024d415d91358296a516730942aaf486fd18b391cc66a3282d8ac81263df261b5a98e3ec8a23cde3a18 SHA512 64fa4b4eb00c95dc8ccdc369cfc3c50a06bda3fc95a4d5625d677e27354f116d33b3e7de1697dfd16fa6429dcfbcbc2c7b8e4cdc9d6598ac08487d12b3d898ca
+DIST thunderbird-78.11.0-et.xpi 597738 BLAKE2B 449b1057f9647f36e725368933b56125bf22377be1551c5c1a2c2b2dd4627114ec8257dc7b6960a2d31465c3026ce2f29c91d1c86fe7aa3741b9a92f425a9f51 SHA512 9f36639ddcc96851585a1cd5d36fcacbc4bbb6c1155cab5da1376f40b0a2a096c0d923ee00db32ff3a40c6543b957ae75472b1a052310be7cb0539cb3a826619
+DIST thunderbird-78.11.0-eu.xpi 632960 BLAKE2B 7953b03d89922c61a4b2b4fd1328cc9f39b0095d071738c08531883ce4636a50669f62d26b87750c573638e0db48fb67aba18df70106636789306ac1ffe690b9 SHA512 e590ac6762c92b95e7c820f86f1484f72acf878489356c74b346073a39417b1db5a99a233d2466bf4f350516dab0279753e5724588bc0edca5965831c96a0e13
+DIST thunderbird-78.11.0-fa.xpi 639752 BLAKE2B 9762634fb297c77110d6d45a64ccfc298510c838aaba9203a1e07b640e6aa72fa3083f722a070864927e0f687a6b764aa0cd51df79c50a1d9c71b289c0f13ade SHA512 de2725034fd0373ea8955905079f4eabfe1d2baba44fbdcd614fd85ea33a8b8eabf4371f19e6f046929cbd56e4bf70e862693f1fbd97050c3411c83de8317234
+DIST thunderbird-78.11.0-fi.xpi 642456 BLAKE2B 5af89a5311f7a373cd07a6350ef5bbc865be21d53cc33e5aa7a0ccf6d2963a25cbfb3cdac7c805f66feb084d807fed3a72aa3dd561c3d03ca647faaa6b3daa19 SHA512 0a22233c37b279b344862c0d156f938c588921aefc4852f3d4631a459b5a177cb74495ed61bbb90329aeb781f909cd9a330d2153114b8ebd64f53eb37bfa7965
+DIST thunderbird-78.11.0-fr.xpi 669492 BLAKE2B def525cee10efa0978d778ddb0ccd9672eb51ab5d7eb5a4a09b64773b410b5d2b3d17b93445cd324431cdec0ac8da8e72bab5534d60c694f2a50172280156174 SHA512 18b4aa4cf6684f0510b8e3cf990c79bb5b3c61ae37012dda0bc14febfa9ecb53f4cc86f21c40deca972972b1e89a9f15231a7498c3578ab22d1753b3dc397dff
+DIST thunderbird-78.11.0-fy-NL.xpi 653078 BLAKE2B 043b2ecc0f54e0ba9b6f75ed1a0e8502ff4e5788e41d8c54a4895a107fd044fcb1aa4237a1e593f1cdcb8782e25226b6ba996df830aa1ab5b005410a7988c558 SHA512 e3b295fdb187715bda511105be726bddbbcd8ca3446bb8199937bcf98d16caa5ff7df52c9ef6170b85b8b0a0369179744e5a02283908c5fd1a3fede244d3ad77
+DIST thunderbird-78.11.0-ga-IE.xpi 600708 BLAKE2B 9bb307d36ce5b9178985b818b75f417a4f44b29e748b847427598cd34a1202a15a5b2fbad00060bb98dd2ac0e1881845dbf23544f4defb16932c228fbe7eac22 SHA512 52a330bb02aac06ab2588537316a6241332bec6e2d616a3c5bba44fba1d50d4bc25ed3ca91372c74979ea6c92eadf484170e033bb0f2a12e22b54da0ac88fe4b
+DIST thunderbird-78.11.0-gd.xpi 609380 BLAKE2B 8e33f096bc758e7d13c67b46f7508941c14dc8936678df293edb8782dc625c0b93ecb3b3d6df2b060e318430b9ced5c79c884b3fd495156e052e3edbf045d217 SHA512 e41728ba4d570995fcc382d372c7f1bf83ec1b554371748580b48d7f119047075439de662bc17bfeb60e20134f1f29ff3855c6e8a6e09498db606194c651dd05
+DIST thunderbird-78.11.0-gl.xpi 615733 BLAKE2B 2b5364a9d4c03540091a60195f9a3d7b18cee3857693613c8d121731f1ff370209134ddffc6190e4e95b8ac5c32a7fbc8df81497e6dfaba680f91dc8f46feb2f SHA512 c7b2aee95fdf67a65a9ffcb48ce8da2c720b6a6674a945012289f53d30e855c0602fc5df8b7186aadacb993fc2b1494bb79427d095db1daffd724e6fdec5a8db
+DIST thunderbird-78.11.0-he.xpi 640490 BLAKE2B f79910c79f9ba9d5ccbf72b5104b71837a77d53dcf92627f264b7a9f8717dc08ade847d717fac74b72ba102e204daa5af673a9438a52a4353890148456ebfa1c SHA512 54122ab286ae100a38d0e9172d447d85df2692ea47baf57bb4632204c689ea6db83546610db1f0a93795eb7316bdee7db8b7adba8975bc51729b368df1bdc546
+DIST thunderbird-78.11.0-hr.xpi 629032 BLAKE2B 137a179f6d3b774e177fd8d1b7035c5a872a998a2f22b5507007e7655e3b70d07414c9dd97c793276a892115c031afbb37e81a61f48ea830419e597b01fa9fc0 SHA512 2714cc3c735c227e7da7c61d078648814c1533f18ad18f90edc66a3e35af924b0728e335d3381c211333297aeb7cae5122f3803554ab825fbce54c55f0bc5087
+DIST thunderbird-78.11.0-hsb.xpi 668608 BLAKE2B 61dccd236d7fa6d0e0df69727650f0f2710f14f6733b71e99b3f349f9446d551de861d5b44a3b8096a3a36503cdda7313d3459c974adabd19d8bb66f6bdd1df3 SHA512 d9461ec874a3c4a14ea8450868ec4193ed160df3e43fb083b1bc0cd3c9e208a9698f5b84cb4088e02fcfcad83e88a98406a8782672c57f3caf609917443620ce
+DIST thunderbird-78.11.0-hu.xpi 679836 BLAKE2B e58d2bfe5c6919fc46ab323a325dcd3ea6b2069763da16f8cdeb79a50dd7a1812f01e42a89abaa61d1bee4dab608c15e898f3563fe2b5eb2d2dfd61cd4e08d48 SHA512 b27bc91598df5b47453593c0ca75217f59143db756a496386907992bc9d7d259655985459c6cacf9736b5d12f8ebd92d7419c478892e22a2c6747a05bbdd3c64
+DIST thunderbird-78.11.0-hy-AM.xpi 713327 BLAKE2B 25269f40b57361629a7212bfd1a5e8525e78d388a88e3648eea9316e7a181ecb79ca1657b1699103780fbecdb77ae939d2db29b424dcc00abb3bc8a65cf95b1c SHA512 389a018f3185b24d5141a235f12d8a450aa86d3a17d4af03049453c607bedab9f953dba3f4e0b6c6512eb56bd9276a13871b56c386dc0e1433c819fddc95a03e
+DIST thunderbird-78.11.0-id.xpi 620681 BLAKE2B 614ef09d3bafdceb05809efc973a38f23b7647561c80365d8b9dadeba0eb871b44af847ddecc0ee14a9ff8fe70c3facca2e1ba2a072ff3bed648c556cacab461 SHA512 2761954d55dda11609a20ce67868b9d83d3bc2608ecdc2a2d5bd8ffed628e80e62696f10b44026f53600becb0c0cadadf486f50e64f8ccffa7948cf1273fa910
+DIST thunderbird-78.11.0-is.xpi 581637 BLAKE2B 2462fcd02e4affe409def825e5e220e1c4a3a0b0ec9e6666c1641dda1aeab472c088688e971ad149d3462eb1d11521c4076142da37e22c52756a2442585a0ea8 SHA512 52b11675f5333e3519e4972030d48f158ad1a266774a387a34012839227607ffc70662d6d94c06e3212825c187261339f112bc3b3181aa89b9c66c2f0e480bdf
+DIST thunderbird-78.11.0-it.xpi 572964 BLAKE2B c272e3f7203dc8494f83075f8121971e9fbee227e99cb84e33db32df61e0504b3a30ccafbeee42757cb437382d98a3251b019522077f1c4bc5012a0487275f52 SHA512 c09e348a4cdc1a682b30358a9c2a8a49342f07de5fe746e17079a11c480a5046cae348b0d8cdf56df3af3a77020feb6d1248bc22ded14c0d2f1f6d3c5b74053a
+DIST thunderbird-78.11.0-ja.xpi 722453 BLAKE2B eac59b6fa660fa3d80f4c968c444b495017b44cb73e9ec28840fd135dea439b5fa481ef10fa57333e2cbbc4d6a68634ce2b1705cbacbfa7be74aff14e41f718e SHA512 c141ca2158307241f8b47fbca516944b81740c7a198f969e502bd774ac868037e9680024d910a737b34b026c465471bc2f493de4a6d6adf5e16c4aec66102cdb
+DIST thunderbird-78.11.0-ka.xpi 717016 BLAKE2B fba12a3dcff7cfe1421bc1d8ea130dff1c3c474e8aeb202463dc1bfcd681ea60e0076a6323ffd270e448dfb01a511ff93e13c906e0ab8f23d0da1c741848e988 SHA512 546d7863ac06da5334a89f8b3e590d596e58cadd3e7fb32420afad64d63ca31e4e8697e59e8f064a1dd1291c9fe6cb8993acac292f968494dde044e10bd71118
+DIST thunderbird-78.11.0-kab.xpi 651922 BLAKE2B 3b94ce7c69c7ed81361e4366c28de31e4e2e6f7e646e587ecf0bd410f3f52c3f284ca61805fe0ee0d86bc7d6763aee8a6071f53fb99d4638ab631451303ccb8e SHA512 60761ebf5d8fb8ff639e9178e5788fdcd9728cef6f69ba4dd9553eacf61b3e0a1ed3aa0489c277bd618745dc64da7587de8ee0f3f8d5f7ae3f93957f5456dec6
+DIST thunderbird-78.11.0-kk.xpi 720464 BLAKE2B bd741e0567c243303ae7287f9f12dfb7c59f286b8638285ea2b44e0bdb911dfc40434438fe7640f0a3a36a0863307ffccdfaac83d3c023cafb14d953f05a753e SHA512 d92a7e142e6e8d01853d55ba0fba3b94df2847a7bfc8c7086d3ab06646c6bc55d3ecf9c63e4dcf1e42b883f297f55fd9ca94e19df12d54d33a406f9b985f1218
+DIST thunderbird-78.11.0-ko.xpi 688207 BLAKE2B 1cc5547c1bd57daaa84557de95f708c9f44f66091b82749622e59030e91a1c1a6e7a503c692b1097f35cb1376634d1e9aef2c1d3ecdb82f02f3b8d7ac8d02ddf SHA512 111c022dfae9705ca43bec679e84345415626e29b6320ce1001e8a00c5b34948ed7dad0548b864ef367d4f8db91b4e56554f2ba7ec490efcea69207184776404
+DIST thunderbird-78.11.0-lt.xpi 660298 BLAKE2B d494291f5c7f5010128da76a704c8b6a780e1b37c6e89b5b4f275c4c3bba69d0e2bb7b7b2e27ee8922085570d5b7f43d65b3d9fad4f7589dcf32d7db965b135d SHA512 02ceeaf31b2d42494d5d1b8351912e4f4df5925e3b1111c0bb59ec84187ae83fd241a99f4f5660a8d7a0bf636b9c53c74fc61640065829735859c633f4f79758
+DIST thunderbird-78.11.0-ms.xpi 572177 BLAKE2B 9ac91c920b272754c6f97c1f0018b7bad5d78b017705f4a2d8d8ae2e54bcaca373d64ebce37cb76a4d99ab4dd17cfa275fc24bf1b6e1c60f062cea43242e9c11 SHA512 5e31a0eb2e34aa45f75ee932150131e5618984d2e7d04acf5cdb4a72c5fec53131ea1bd36e407b98266d9a497219745c2aba9b501ca813a133abd7cab81fa9ac
+DIST thunderbird-78.11.0-nb-NO.xpi 637236 BLAKE2B 86d94e683a3bddd0a344b8c3313dca82ec588a6957e6731734f1368a99e82acbb329f676bd516c43f7a54ad2ce18ee1d839283d132eb15300364477f13807abc SHA512 9953462a1ed7b3ec2cfc979d4379b711ba065d9c519677abe10f0c13196e36830dd6bb549d199b681042200ac64668152b6855e4f23ada38815cf63e3df4e95b
+DIST thunderbird-78.11.0-nl.xpi 644361 BLAKE2B 27a5a7a210ddf4f6c5e880f5234d938d61f513911db6b4954fc3cf97de257f253f089c2e4380294863bc08d8358ab9d3b79b786a0397076565d331ede5d94c66 SHA512 b4ba64c3bfdd3f4f5c52272802e927e2ad0bcd78b7553e7a65a16ecac715e5f9940f4d202097fc05e9b694e56e1ca9ddd99f1fb7f16b749e58a1f84835cadc4f
+DIST thunderbird-78.11.0-nn-NO.xpi 640698 BLAKE2B 64a382fdeb55933aed0f12e4e01c5cb4e858885213cb48c4f95030d61bd8bb50e7bad4ab27bffa85f0a741cd77bcdf9ac962f854cf665a0717f863ab70d30334 SHA512 2cd14aef1333764eab9635b9a676e9412843ca76bad49f68a75ff888a2c8159a6d8790db482c879b620754ee7102656fca3dac78d4ca37c4eb65ca9afc1b17e8
+DIST thunderbird-78.11.0-pa-IN.xpi 633218 BLAKE2B 782271f2f4c3858f3f7e4e9594210f2420f1116c28c2e28d7086194768c611c4f8cef2d26d6afa16a3449617eedef6395f54a1ad96136dde5763da5509744e20 SHA512 a0e5cceaa1b3a4278384c3653f463b9ba7829e24739cb6986b9e2bace54c4724e0747d72c7c8e7de4a0b06523e8722ccc21af3e2467580f2d8e375a62eb859d7
+DIST thunderbird-78.11.0-pl.xpi 637127 BLAKE2B 15bd3782cd937d32665e078bf064b3d359625a546bf160e53ca19e3cb6d0628b68ba5bc2237cc2668e5812ff0fcda98271e5cdf848d5bea59588d23c6355c9e3 SHA512 e6f552fe5cfb51cd1b8fbaa5f5e59606ac032bc4316b694429da2357cc20f466bd2fb93b53e4e8c8397dcb0b688912f838acfea9312ea4c6f78d5874e1350a6b
+DIST thunderbird-78.11.0-pt-BR.xpi 649418 BLAKE2B 5f12a096e4e8f4a1784c5de3042995f40e7bc389d935aabb2dfa6c90aaacfb4899d23ebe177b094fdc601303812096d4972fde661d34c407168c86300e43064a SHA512 8c31c917ef14f6b9ad1064d268bb5c32ac8cda2e43586abbd4dd2e898dbd6699e0c7babd2f0e4607b2ae2ddbb099acda46deda11ef329bad7ed46162bda85454
+DIST thunderbird-78.11.0-pt-PT.xpi 655488 BLAKE2B 34101f209071fbf439ed15b0ce1af5f16f5d07d9adcd84e15e64f2939177bcd192591ec3bcc962df3c6467d55b743867f4bcbecd330af667a758167b2129ac1b SHA512 81db3d1f452b06e08e81f7c40d0fd5ee6887e8c1e618b676dba10a9deee720da318db8b52c9632ae1b727b75e7c3577a355779fe233319f53881ea4b393f5da3
+DIST thunderbird-78.11.0-rm.xpi 646533 BLAKE2B 6ed3823c693a13accdf5293c55e61302f8747b43ded4b36dab0d28b31430174579cc6b8a37605a0ca3ebaf901ad00a15eb9e6fbe22822e17e9569b7d15b2597b SHA512 e0831ee2236dadf6554021c7f4b80329532a39233fa94109d304993f72a9be6436e0ed2f3aeeff928342de1798d4aa225200cd42d517185f8bcb8dc7ee813cf8
+DIST thunderbird-78.11.0-ro.xpi 662634 BLAKE2B d0d396b81621aed365b580dc802f3fd8d70da2814190f87d0007620110f03fcd45cb501a6be7b5fe8f616a2b25c7a312512f51e936d1894300b919fde21b412d SHA512 ac89bbe12cb3db1ab4afdb768ca7681a8620b8fd0ea13753806f8841e5f42b8e069cf8864b5b273e347068e30644c8cdfc748ef8aaecd16eac9e0d9d69b7f426
+DIST thunderbird-78.11.0-ru.xpi 756179 BLAKE2B 97ae08626e6d3cb79549a922cc77d407087b089099bdb313748b35105018cb7dfe20c180ce33590988dea28763801a5883c73384234dacb04a258cbb5045c22d SHA512 218d371689587addb7f58bf77800418e71865655a6b8a741a856ecd19664e714c5a706c28325871a455e14802d2ad19570e4dcc2ec36bb541030d1427a4e07c2
+DIST thunderbird-78.11.0-si.xpi 651107 BLAKE2B 023dd3bfb33421ad40838de454d26c3273edc18f8c37a0a138ef9b31e360639d5fe4c7ecac13d045ef484c95255ac7c8560f7a89de6d3acacb3bd62ae1d718d8 SHA512 b4407aeb29a7dbb11ddb1af9b819b26d02c0cbc0b9f8479d8186d63ad2919ed1f93c3e1f4cdc1033944ac4611623bb9e4cd41e5695873bd0c16f466f0a200ff6
+DIST thunderbird-78.11.0-sk.xpi 643226 BLAKE2B 4538fab12007f8bff1e398d91f4cd8a4ab5daec2a7a02f699fadd9352bf563de37984a2317cfa55979451b8e3ab139d0e9bff6b212895e35dfc47802323d96b8 SHA512 4c097c03a9c5f67d6c315f8d097760260986cf8cc299cbbe8e73c21cb1adccd9f27c91b420f6fd8dff07dfa1d9ef08ce8964dacc4ee2f27353fc6789c000ef5e
+DIST thunderbird-78.11.0-sl.xpi 632387 BLAKE2B 0447e0295494f468d339f716a64155ae7bd06ffe1bfd85d123498b8f7f08946280cd24f07249128cff90677a4bdb38a93dc1494d091d99f193ee35e2c2e0b29c SHA512 88a0188d61f53888221a62cd107c3cd140bea943e9ab04667a84d1fc4cb960e6e7a65b0415db77e5e16ff37edc80a0e4cbf2d1ec4f7cfd51aad4ac04d9715bff
+DIST thunderbird-78.11.0-sq.xpi 657820 BLAKE2B 05dac5425b86dfccdaf9e6851173e57783b9dc542b04b94bc38ac1c26d85e0de2bb5f458a99cbf6e2c1e03e87b4066ef7a0029a75aac072adca1376441737417 SHA512 271b0e279809375bdc32017bee724483de054f8afd29ea467fad49e6ae867447fd63a4ab29997a2f2b50d3cd0b1a68367363e2c1f352729ab0d288fbb6451b84
+DIST thunderbird-78.11.0-sr.xpi 683118 BLAKE2B d3994161023a5e6d678cc32d8e192e3ee3e127b1b4cc0e2d060a3b126757f835f9c5ed2c5bcea1834bd779a412f7b38a02030b818f9dc11128dc4fcd4d892d45 SHA512 f9aba1f45d313d9c6eb6cb2177e218e21c1a6e9e7908675462893dae3354eda896e6ff8a00d3f634883165e01dea5a7550c752e348745489937d7179e3407049
+DIST thunderbird-78.11.0-sv-SE.xpi 648871 BLAKE2B c42ae9287630439a52b77d2ddf4dd00ee83ae7b85a9a7bd184e69b2d7ccbd11352098dfaa1164a1ee6ad3d8df72bd7a16a4991a6c1da4db6d00fd41ac0603d70 SHA512 708950a9bd38375e469f8e0006c4c63f867828f7324e847bc9116f2cdc59c73c4b8a0bfa65568c28d71163cd2cd13f73749590578145d809ee6306a627c17bc1
+DIST thunderbird-78.11.0-th.xpi 712040 BLAKE2B 7d45cc692e84122fbb8abf265d000fddeea685059f93ae862fb0f49f9a6ee46af5f8c40cc06efc849b5704356c7ad2925addd087468216b715399bed14933638 SHA512 739f265f30e43ee707ac8b3f422b3665640133a5303a07ffcbc5c0f503bcc27236fdd43fa8650c18432ad7888d96ebcd1c6d7043d75be27c76723e02bd816671
+DIST thunderbird-78.11.0-tr.xpi 649072 BLAKE2B f2e78a3c0098b4b13d6f0c21a091843a77151785f3c054fead3a42c0a8524af9d3db4ea1fa67f8394dc7e713d4c67b15baef37be1c6fd8f7a8f31adddce7b42a SHA512 d7c2015420542ce94419b3edd6a77fff5ce48206d8705ed83845725ef7f76b7e64d39c033bb419d61bc74fd0aae9472fd5be7670f186b0f778a61fb6d757a65a
+DIST thunderbird-78.11.0-uz.xpi 586597 BLAKE2B 8b064a4ddadf316854546ed33c65aac119376f09091d42c22f47dd8f40ac210d12f5f1a8101b03f9113ed0e5c09e9ea3c21c95525c4a2a0bc2eaac195924c831 SHA512 72be001755d84ec39c00cf2d9a83d787d1716620da0c1a99b8f5ce793c89af89a8f49361a32ec4335c7a900da7ca718e3e38ddc80f81ae22786f158ff7c7ae07
+DIST thunderbird-78.11.0-vi.xpi 674611 BLAKE2B 67834c7860979a438ed61056080b32c7be4416aebf87325172a15ff48f915a0d61c6a45e5cfc84c4aa74cd0f3776e5dc1476e187f7c07c5378abc010ac2af5ae SHA512 336075fc449df3ac1a05d041d7fab80ca7c418cb43bbdb45df50b1a206dc95e0750f1b4b61da6d5473346e183f0c7525ef41de76dab9ff60ff8923b030a67486
+DIST thunderbird-78.11.0-zh-CN.xpi 687183 BLAKE2B 9a18986ed58dec976e82f533a8a08cd6f374f20f3fe016ca8dff71fc01be7de0cebeb2cc311791bd41cee66f53f8f275a16cec376efe70848cb761daebdc87db SHA512 53f81f5e5bfd20c3a6dd144d780e76016a58c0c60c034e7b7738a81d9ee6e702652ea8fb3e40861918e7606c6159ed09dd2e6ad7522a1d25f6c648fcc6c908f3
+DIST thunderbird-78.11.0-zh-TW.xpi 687626 BLAKE2B 4822fd23fc0864238bbb85742fd9f9ce6a9f13384270a738d95f33defa5b07f453cd490d9df771a8fed594007512e40bbebf3434d29dad61319b35230d0e7229 SHA512 95eaa27e5877a3203ae0976bb349b38fd3d6ec0b44e0cc333e2573877d5482897d5ad4c888d8947c6d55ab3e6c2e17c21fe69c3aff3d3c81549e8f19918c0153
+DIST thunderbird-78.11.0.source.tar.xz 352417996 BLAKE2B 8c8c972df68468a13c33526d076f40b02ef2b1568ae24a3b496cfca65647ff079c27117092c3e856f4b8ac535802619f7f01e14fd2804a37586006c4f6a12158 SHA512 c669439ae671a0a589f69902cced5685b8bab346c0ca3eeabd58d0449af338fb7a7a9189d6c2ef784f660c32278fee70766169d91293447eedef2e18a84f116a
 EBUILD thunderbird-78.10.2.ebuild 31630 BLAKE2B 5b56dc8f68ebdda86d69e46b2ce0753cadb8a8c32931d2a7846c5b594ce38b541caffd18cd36904c2d03bfea702bfd7a445005780993db899ee4f1e7ccadff9e SHA512 a73a6d5a899410d0b3c516d3d97984a4250488aac330e5fe76d37a1ee187e93e56277350da9d4d42eadde1042f8d0b713389fbde264bf2a7b6d35c8b8af9f8f7
+EBUILD thunderbird-78.11.0.ebuild 31630 BLAKE2B 53828ef48067301d4b2551109cb9ae5dcd30bf380279e02d5a9914da56117b5ffa52b973cf5653b1ec4d6ff5894a1be069549aff5d8b5bbc108555324acfbb2d SHA512 6ac404c86ed1f4ee3d33a42375261bfe03b57072a9f2ac89c4e4918a2809741d506296a5b615b4dac3fb5fd882c469f07cfb07593b9a385268d6f3c43312ee2b
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.11.0.ebuild b/mail-client/thunderbird/thunderbird-78.11.0.ebuild
new file mode 100644
index 000000000000..878962ef03e1
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-78.11.0.ebuild
@@ -0,0 +1,1108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-78esr-patches-14.tar.xz"
+
+LLVM_MAX_SLOT=12
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+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 jack lto +openh264 pgo pulseaudio selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.21.0
+	virtual/pkgconfig
+	>=virtual/rust-1.41.0
+	|| (
+		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )
+	!<x11-plugins/enigmail-2.2"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "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
+			ewarn "=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
+				ewarn "=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 fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-calendar
+
+	# 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
+
+	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 wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	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
+
+	# 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 icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use 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
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+	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
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 41f670e4d15f..c0b357546951 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index d85869e36554..2018860c8638 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -114,8 +114,6 @@ DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod
 DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7
 DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip 11197 BLAKE2B fbc5efeb39aa911465f17b41e15574564dd9f6711ddac8fefb6db2fcdcb1c9da86d352aea7ed9ec53ffc01d16361985cefa171c240e55a8689d3f16e01f3a64d SHA512 c11ab427de7456beca56fe2c3539161bd92c20dfc345e8b52f5752bad387e93396929bc42057e09f82038f0e59471f0a0450b66693d11e2199a7ad69eba79f01
 DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod 37 BLAKE2B 2ebc74d62cb97bf929cc59df3774562560bc2c1c5e1717380b05fd79f98b1a4396082d62c4992751207915c03c7ea983f8eb91b604d03f628b06d3dc804815dc SHA512 94811e2f653bfc9aa65b2f21212d65e96e0415541152a8607f9ab0d44bc1ab46175f39362cc9c1174aa0b1ea60e00fa977287905096a66a0ecfe62ee75ae1c6d
-DIST github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.3.0.mod 106 BLAKE2B 0d7081550b348defc558bcf0640e4986c14da5c7d51cda597dc18825866ee46083d663aa28604c325163b0f542122999ca25b60edb39b769cd1bbb61c6b68bca SHA512 05a9cb317871ee38514f4fb7cf272e75271b365f5bf924c66fda5c4267fb2a2e88867b07b099e71559e2d57662c93bd52b979027207e8e2b1d839145a2ac31e9
-DIST github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.3.0.zip 2649885 BLAKE2B 4a007656cbcbf53a013772a4091d16a7db312a47014d77cf30caa693937447a619d996b63250975a20b60302ce86bfb42bb96eb94ec4fa5d707300f49957606c SHA512 c9ee6253bf66b3b6a33f1214bdd5eb5cd3bfad8de5354594f8b958a4d2d86eb698ffe713393c918c293f2f8688fd055cde8d3a346d869626fdb7de4c76872384
 DIST github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.6.0.mod 106 BLAKE2B e31ccfa3e22e09f2c95505501982b10b26a9041f178fbd522379b274554cb04f3413aabc03787fbca4646501a4fdb2b2e1a88773e9abcf99d662687b8cf3dc04 SHA512 3ad8a5c34ce16954e5630963fd183a2e5f3cd9a8fa558dec0cfbbe2060c3ad84d9c8a7735ec677e2e3df90e1149315a96bf2a1564a86ef35f6a45fa9b39cb15e
 DIST github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.6.0.zip 2654158 BLAKE2B 839629c827e1dfa57e00710427463a352ccf0cfd417145a181d234a487a9eea140c6e63d8eb90928f0cf3deda16ab5e6d2483ee94ddd87652dcea74c7311b2bb SHA512 6beb06fd7852ab1463ec9bb7d51a1768e435d59e8dd95dc677671236da81ca601bd849a60d2be6a9ebdfca32afdaae946231956e8b732f33e4a9b0b0c081d260
 DIST github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.0.0-20180130184737-2c6c146eadee.mod 34 BLAKE2B d0276e3bc36acb1c6c2a17b186bc2ba8ab5f82381004ecee1da5a2f90b61e66b1a83154806573692a35a4b672ceac49d9bda8a93811fb566b3bb0625891392ee SHA512 73bc8769cbc0938d92daa7242da3c117fb1fb3d26c40b8d3c055a325b684145a59e6c80a84cf59f0f2d9bd85175e9fc797e41658feb9c299b0607dbd9fe30d19
@@ -198,8 +196,6 @@ DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323e
 DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
 DIST github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.4.2.mod 254 BLAKE2B d34a84e558fcdea3f4d358d80b9d4546391170c4ff5a5c659e0dec17591443289d2d88b70c3c0c2e86d235cb9ccd5e0be77df9d0b2a7c67023600fe2c03a251f SHA512 176447c95e05a84b2b3eb7badfa561ed3cff9796f1756dfcd47b6c0250fbe3be2c7e7650d78393c3e9f1a9582a22cdc639bf578847821fa3301d487ec788a8da
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod 111 BLAKE2B cd42dc1330b96fae45e713c29f29646a37b6ad3470419a4bcb43c20c06a5b4fc1f3e198b5b2f99ea6da0d3eb241a2e5becd89fdcde6f015a773cc0170686dc40 SHA512 3f63e75a3eaf94a9dd340bf3fd5f615ea713ab08725e9d90435ef4a7df218f1793069a73c0295a667edc008cabe6ed8cb9e3db71035f0a3b801e73e89fb38697
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
-DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip 220586 BLAKE2B 278d2b04a115fd65be0ef9dfa583cd587b5006133599e17051f0d2632cd50503f764cf9ff614073ccf68bbd5dacb37621c99c4b2b4fc001cb56a650333540b26 SHA512 965b002270ba1938a9dd81ca88a290658514a93f400105f158374950abe7e14342980a42829151316d955222e92de0232dae7ad0a7baad88a055cc52957a987e
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod 210 BLAKE2B 1f8fa2bba38f34095585872959f404b3a82f4ccf4d7665f86fa573ad62634420ac4efc8e5eb99f3a44bd6cb7aafaef7b6f4e4202fc956e36eda54d1500493702 SHA512 b4eb091abe317866a323b709143ab9c8c806ec52d14a05f6765e6be4ab33bf1bf8c5977530e017a72d668cffc8878f93f7ad89bf9241817fbf8789452e66e544
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip 235845 BLAKE2B 6e927f0d5a67ef81c17db697f4b0e2a804c7699aec395229899d4f7b8a7dac9dd2e062cffa7bb0e457e9be1276e709e79bcbd9165d762211e8d2a11a63a6d446 SHA512 536fbe2a387bb4f771762a6575d2dcdd970568fb7f2f3b8495abd4f0cfc5edb3efc3f058aa162948a6f33d91066257832749a72c212513b1f7cf13a704072ca7
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
@@ -272,7 +268,6 @@ DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F
 DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 7699921 BLAKE2B f318b2a9ae8e4f4065aa66afb2ffaa2fbd4a5364c1d1b095c6dca38881d007399d3a55127498c1a6d47ea2176c5822abffd42d9d4074c05b1004b1b39066e688 SHA512 f6980bb5981696058766d67a6ffbb8d6e600ba468e48b98132a9be9628ae432fbc4bc341283c99e8535efeaa8baf9fe1e6621647e23dcc8c43d0e16711cd0099
 DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod 66 BLAKE2B 3c0df58b5c2aa6eb4f2c943cc0033f853f4d4d63e4d405cf05ee52d8f690c4f0e2068ea96e17956be286c956e61e0ae30f3c6262a458f5a4fa8d1c5bb0328430 SHA512 0654069c54acbc55a2c4014548742fd9be1b2846bc98ac7f44c9feef61ea58e80a813b891c2b7ce0ed48b068f4ae24a8370c92fbbeaa187c13717bd78f4c5b97
 DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 8155800 BLAKE2B 7d7b2522bfba1171cb0d99b7720f68a4f645149f80cfcabfaf068ae4071eafe6d03de2a099e6c027ce02e02222649ca8b9b7dbd03227b677aeb80a535af77d8e SHA512 38f0fd555b09d5bab48191432dd6dcbdea5c171870500a89b1f43a2554e9f5c15af4e7a3c20a369d7b1d82fa2b1669f40676b5f04a0ea6878133b863f8f19f8f
-DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F@v%2Fv0.0.0-20191019224306-1097424d656c.zip 3609 BLAKE2B 30643301e6c943df029735c8f4b0103b868750a729c36fa4ba2029a010fcb3e8d408382022139e5f85ecb5a3ba195c660364e7540e243a6f2283ca6e6b8b1359 SHA512 5490f417aa17a94d699d1a90208942b5446c2daca31c29704957c95265e2fd38b53dda5a1e8d62a9d19642b9bf46ead0c22b8d0cd56ec283ebac97a3274a6314
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod 75 BLAKE2B 0326456cbc5968cbc6068bf4dcf61ff05d0cb193d96f238ea7ee34c7457a70c0aef4029ad33512deee60ae07740777662a5613e222304a00d942d06a9321d1de SHA512 d1dbd3c550a62822be4a6e018e2d1598dd7993db76c2c5d0ec958a0d83fb73c1d9803ef3d5e298a5b7e7cc8fb2359013703e6dfe2ef85cf280035e414f78bf69
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
@@ -316,12 +311,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190420063019-afa5a82059c6.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip 1587056 BLAKE2B b8b8cb2f12231f2e5129646f34a1138b138ea6b38af50ad8baafcaf155e9eb623e320823ec1b7502431df3f95dfa7ea1c8cc21abfee3c8831d913347aead0669 SHA512 0e635def6bc35ca664d28575366161fcce349c9f78386a9ffa3dc700da1e1badd6fbb8440113451ad7c1cb9a18b49f949632734946ec56ff56d894d8d74b56bb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
@@ -342,11 +333,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 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-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -368,7 +356,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.zip 2944986 BLAKE2B cb7ef605e711d8df0fb925898c7ab3df27a057e7ee9737cadfaf1474d8c93a6f8d0dd23eae0519326ace2bf095b799de93b6927bdddd3872ca4ac1b45bf0701a SHA512 600318a6e26978681f810e57f568794381853ff97e1d8a481adf9ca4d21fcb4815d44812c2a2e7e8c29ebda15c7b873d7428643628d2c8bd4b2b2d59ff581d17
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
@@ -390,8 +377,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-DIST protonmail-bridge-1.6.9.tar.gz 1877045 BLAKE2B 18aaec6528ff5d78c48f426e2d2ca57f45c374fcae6019b0410c66ad85726ac151cceb9f3cd3bed10a5709de7e3eeb4a0ad559a8e28e33940cdb94e089cf834f SHA512 64928010eedac3434e5c17e7d38074807e81e877c3f675928835613e7955de0e3a0495861b933478a1d81e37020c1fc600a5495e2f1fd319d0c15de8d3125ebe
 DIST protonmail-bridge-1.8.1.tar.gz 2728694 BLAKE2B ebed984db917d5e0b30ccd05f26b4d82089bcf1f7aab6d6bfd3e1087f8ff9e6192c95108dadf0f063ba1cb353605a7b4cf079e7dc2e7e11563a353bc4af75298 SHA512 38671c89c47e1b3f66a5aa00c09ef70b7374b730cd43b43918a2818f33f53b35d6c0ec0b4e7aaca463d17d01ac4b8473751adc1741211b7994eaa9ece44334cc
-EBUILD protonmail-bridge-1.6.9.ebuild 22373 BLAKE2B 865557533b2ca99b4ade65c4a5aef540b3ccfc2d5dcfafa1297e2f98ab0ae0a87e7456e4646bd28f4d1b3bcd60fb909f2268f1cfd64de12ef44ffed85c63d791 SHA512 f5b54f38876283f325699ea6274eba7b01a8deb6bb656ec4cf93c1756c0d95441724bc277d5242bc16fad237e36e498138c7c143e55aab58b9d281eeb35dbefc
+DIST protonmail-bridge-1.8.3.tar.gz 2728631 BLAKE2B f42d6b09dcef7777ae4605e81698e579d284dd6dd88da31ae1817d679f2b94baac6ee3b73ce172c4dbf1d5a07c4e17f52f59dc95e8b28e3b532be04531d06be9 SHA512 135fb12c6832ecb2476e801d00bca1d46fb3d5931b66c66d30da4f7e52a9d4437103a083fa3f72570d5035652adfcc9e0aafa5011f6eb212878db91c5bbcc53d
 EBUILD protonmail-bridge-1.8.1.ebuild 22606 BLAKE2B ff0e8d79f12d449678d8050a39801278fd9a4d08c38f37ecf3081417fae7f74fb71f79e173ffbbf81dfc4f3deed55664917cff4a2fdc1beaaf52b402fd90618c SHA512 bee10c3a9376f83409cef80135600b5b6f78c185b61543e8d4497b0d904c582c506f88f994b3340c0338ad73076e988aeb64246ccf49488ed8ccb18507509ffe
+EBUILD protonmail-bridge-1.8.3.ebuild 22606 BLAKE2B ff0e8d79f12d449678d8050a39801278fd9a4d08c38f37ecf3081417fae7f74fb71f79e173ffbbf81dfc4f3deed55664917cff4a2fdc1beaaf52b402fd90618c SHA512 bee10c3a9376f83409cef80135600b5b6f78c185b61543e8d4497b0d904c582c506f88f994b3340c0338ad73076e988aeb64246ccf49488ed8ccb18507509ffe
 MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.8.3.ebuild
similarity index 95%
rename from mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
rename to mail-mta/protonmail-bridge/protonmail-bridge-1.8.3.ebuild
index 59127288a9fb..6487150f5142 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.8.3.ebuild
@@ -121,8 +121,8 @@ EGO_SUM=(
 	"github.com/go-errors/errors v1.0.1"
 	"github.com/go-errors/errors v1.0.1/go.mod"
 	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-	"github.com/go-resty/resty/v2 v2.3.0"
-	"github.com/go-resty/resty/v2 v2.3.0/go.mod"
+	"github.com/go-resty/resty/v2 v2.6.0"
+	"github.com/go-resty/resty/v2 v2.6.0/go.mod"
 	"github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod"
 	"github.com/gobwas/pool v0.2.0/go.mod"
 	"github.com/gobwas/ws v1.0.2/go.mod"
@@ -203,8 +203,8 @@ EGO_SUM=(
 	"github.com/mattn/goveralls v0.0.2/go.mod"
 	"github.com/mediocregopher/radix/v3 v3.4.2/go.mod"
 	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
-	"github.com/miekg/dns v1.1.30"
-	"github.com/miekg/dns v1.1.30/go.mod"
+	"github.com/miekg/dns v1.1.41"
+	"github.com/miekg/dns v1.1.41/go.mod"
 	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
 	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
 	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
@@ -271,7 +271,6 @@ EGO_SUM=(
 	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e"
 	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod"
 	"github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d"
-	"github.com/therecipe/qt/internal/binding/files/docs v0.0.0-20191019224306-1097424d656c"
 	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d"
 	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
 	"github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d"
@@ -319,16 +318,18 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
 	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
 	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
 	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
 	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
 	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
 	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
 	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
 	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
@@ -339,14 +340,19 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
 	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
 	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
 	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
 	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04"
+	"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
 	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
 	"golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec"
 	"golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod"
 	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
@@ -357,7 +363,6 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod"
 	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
 	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
 	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69"
 	"golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
@@ -383,12 +388,12 @@ EGO_SUM=(
 
 go-module_set_globals
 
-MY_PN="proton-bridge-br"
+MY_PN="proton-bridge"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
 HOMEPAGE="https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/"
-SRC_URI="https://github.com/ProtonMail/proton-bridge/archive/br-${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_SUM_SRC_URI}"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5bda6478452a..a09ae1d32310 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 fbc80b583b92..06ba3093de79 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 410 BLAKE2B 7e92d1db9f8f9fbc4be1f11f0c4aa0fa865564dade0697ab9a450259b8ef481b80a3dfc5d0677c3a6bc192be93e2d2f9f85fb4d0bf0c9323f7a681f8c67100fa SHA512 5d870eb76d6be678e72102972d3de9409e3509189585ea225e020fe049502f5533aa0cc83b1ae249932230e60a90205e896e65521dcf2fd9d3432e6927dd02d5
+EBUILD ahem-1.0.ebuild 417 BLAKE2B c04918b6df41c47d0036fdb7bd163806a00d1555cc27debe39ef5d1e666edb996e52e4f3e3e25c2cd3559b1c9b2f4b82380002d00d9cb556321dcdb98af1300e SHA512 0aa1624668d16c21095edf09717634ddd40061892ac42345cc1480df5828c9da0564188b1d33312181d3d544d1f536329e7700222416596e0f0e622dfe090a31
 MISC metadata.xml 242 BLAKE2B 852fa1bdbece95256f2a92d7a3fd3141d8a0b9f39387e14697f4e97fa3a8a0123784635977e600941e4e17f46f318b3b7b52c5ac0d85f9f1640e5bd129706657 SHA512 3cdeca97afe277da128de9af34c80c6049587a09362632c78d64ab1ec52e31819000ce1d93d1b704c74028ec93a78500c203196973eaf1264f30e7e7d0093a92
diff --git a/media-fonts/ahem/ahem-1.0.ebuild b/media-fonts/ahem/ahem-1.0.ebuild
index a896e7c135b9..79a4a56ef7a8 100644
--- a/media-fonts/ahem/ahem-1.0.ebuild
+++ b/media-fonts/ahem/ahem-1.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/a/A}"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/arabeyes-fonts/Manifest b/media-fonts/arabeyes-fonts/Manifest
index 3509c74462c2..413c26154f3c 100644
--- a/media-fonts/arabeyes-fonts/Manifest
+++ b/media-fonts/arabeyes-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST ae_fonts_2.0.tar.bz2 1550827 BLAKE2B da4ba24968875d2f475600301091c486b7da8eae2d229604020e59cb6cbc55f43d9849b71ca285d94e27ca3715ec376770610ea305b78d2fc441a6143cc6a29e SHA512 46c94aa1ce872aa1ad4dd01d698d4691a6301786f8be681723df9bdcdfb86db12b15bef2a6acfed704b29867e9c01e385b4c2c490548ce68f7994b8127a9270e
-EBUILD arabeyes-fonts-2.0-r1.ebuild 563 BLAKE2B d1ad88532eee18c50170f2476642437fbbbf812b6519d0c66114cbf757267b1e452ce8bd4efe2fe09d152ad6b7031612b2b830051fca58801277ee48360cd741 SHA512 eb2f96fb89f2bde68141f5d0c3a90bde65e9c17fd471adebeba7744a195be456748258583c1a6cbd99887c007947c62de3ed15354e3de306d3024d50a5d1e08a
+EBUILD arabeyes-fonts-2.0-r1.ebuild 570 BLAKE2B 64311a8b0d1784b1e1863b30d2941a20922b2714fca2323670d11b87988e075fbb926e34e66231c388c2d61892ed248e999031eafbe5d81fedacadc1aff93289 SHA512 e0804fced6cade43e7207f78af219627cbdafc052b3f4470d50b93fab908665cb8389bd55637649273cc9371f81971e3fc0cd86bfed743faa9646304744f44fc
 MISC metadata.xml 316 BLAKE2B 723c24d6f84b81214862b9b87b53411988f5c8301c69cd4f6bd891221c166d2bd19e2ca003b5ff63bd292cd4ead03782e606c2a221ec427ca68f1a89eb5342a8 SHA512 d4e5a2e1470726810dfa15fc49144adc9caa1664fde1314a38c40a29b7d24e6c7dfd7c8f7eadf9ea8a07d12b3a7c3fb1b9f78f3530fa5ec5d67188f577942255
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
index 5791ca8f0dae..4a29ad22c05b 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc ~s390 sparc x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~ppc64 ~s390 sparc x86"
 
 DOCS=( README ChangeLog )
 
diff --git a/media-fonts/clearsans/Manifest b/media-fonts/clearsans/Manifest
index 2354db2197e2..92af91623002 100644
--- a/media-fonts/clearsans/Manifest
+++ b/media-fonts/clearsans/Manifest
@@ -1,3 +1,3 @@
 DIST clearsans-1.00.zip 3972903 BLAKE2B a60df319173cfea54fdd089abd96d7e9a52d4e54c6248db909b73ed76217a9a4ab7312921e6f6d5e7677f0d0a2b77d8870447aef0cff2113718d0f2a400c4efc SHA512 83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d
-EBUILD clearsans-1.00.ebuild 476 BLAKE2B 5744f4f8daf50c162fb6dd79971163d6c5bf60bf4b2ae7da3d8905c4736c631b232e4012a97470773cdeb7952092011dd88a03777ccd12ec8f23b75e130d7238 SHA512 88f6fc595191195e2c28c2573140b4206804124b1650ebcfdd185b45d309f8289e3685d3f07428755902345e452bb10c2988f8a5a502c8fd10f9227dbd53c145
+EBUILD clearsans-1.00.ebuild 483 BLAKE2B 2f3a48b84c93b122742ce87f5cfc333e9775459e4a5739711f647cfad2a8a69906359aba1e65bea9d59d0d4ac7ef0e1ff0ab0725cd7115efac5af51ce9c25b1a SHA512 5d5451a36380b2b3fc41efa0448cb3d8d7826af39216744de7df00cc916078bd08995044b4ccf0b6eb66883d6709df026ca41bacb3d5a98c58c76867a5769a7a
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/clearsans/clearsans-1.00.ebuild b/media-fonts/clearsans/clearsans-1.00.ebuild
index dcf5264b489b..276b5cd5b26c 100644
--- a/media-fonts/clearsans/clearsans-1.00.ebuild
+++ b/media-fonts/clearsans/clearsans-1.00.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-fonts/croscorefonts/Manifest b/media-fonts/croscorefonts/Manifest
index 04b9b6b577ae..bb6acda5e353 100644
--- a/media-fonts/croscorefonts/Manifest
+++ b/media-fonts/croscorefonts/Manifest
@@ -3,5 +3,5 @@ AUX 62-croscore-cousine.conf 852 BLAKE2B 4616f113926cb805f819db360580271bb787dfe
 AUX 62-croscore-symbolneu.conf 366 BLAKE2B f9903ab279cc6fae210896409deaf118bdbffac68135be5e5360dedc89be1ba81e13b490923c7d322f739df507096dec8269024d8e5b48c7b985871b4b21a4f5 SHA512 2c0a0e37422cbcfe59fd9d18c0491b208537a2510b6475cdc4fafa8700628b152a5c09256cec274c79201455976988fbea21b1b600e3713f6ca9f6d0b633aed5
 AUX 62-croscore-tinos.conf 842 BLAKE2B 6483ec81aa6d93385081ca48c128a2943ea5e3f58696499d65eeadb5d59abdca1c81ecd2ce9d9d1c950db9dbbb65376014014c6efa13ffe5f2460d8b69eb8b9e SHA512 5cffeedc50c0d4c664a4f0939db603b0c0cbf48036ccd04f68cee1a40efd4bade3aecc6ae704648229c0e8ae8e18c6ea40f43cbfd2b6545f4f6fc3702a1d3d69
 DIST croscorefonts-1.31.0.tar.bz2 3223864 BLAKE2B 4fc011557f81c19d4bc79f014c438868d2a63fe8932140a51523fe582a62a07ee1e51799bb3b13cb801a6ac0af72f23abade4cacccbc4adb3523f3a8d440ea8d SHA512 dcd5ebb854f78353a1d91bb74a5ac7b5e237040994c7e2a69cf68511f06b10006fc3a490840d48c12ee7f862d2dfa3106c9e1787a726a4b158eaea5cd5ba8842
-EBUILD croscorefonts-1.31.0.ebuild 738 BLAKE2B b7da56fb5ad8747f405354c170c637d886350b90ce971419034ea7c9a60aa7b63e237e7deec2b55f479f1f8908fa3368029f6f73544a1dc8815a4679d3ecdd50 SHA512 bc495b78376ae22bae84722b9eef5392b4a6695e806fce19b5a4cf0649a4df4e8fb22630195f7409cb4350accfb99b429ca54d9176dbc64b962a35e32226c1b7
+EBUILD croscorefonts-1.31.0.ebuild 745 BLAKE2B a89ca48398965bd39ab26eecb75f73f5a3fd1619fc750d01722b038e6d4547cf98da92ced2cd55f6f8ab79644bec68d6985776e61e88b16ede13b06dd32a1ba5 SHA512 4b263e6ab89cf82c851079a80e0551e7931f94f490b9568cdbb6be2def3eec42d2c5acd1d1ab46e4de275c052f09e86e1b682cccb1ca5e972d3110a3c6552e12
 MISC metadata.xml 790 BLAKE2B 1299513e819f53f388bb8d639aa070cc00acba9d619656e9891ac35ed043ef61d9ed285f11113bc27803201d0f6e0cea152cd2fc314f72db1ad65ecf1be837af SHA512 9ce6c85eadb03a6f058f1ed2c3f3d68db160627bd88513c8cf3886e5e6556ccf1582391a1c6c96dd0ca8baec1573acb88df4495e1bdffaf37f6c069fd9d08a41
diff --git a/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild b/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
index a0689b4926ce..97d4bbed4856 100644
--- a/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
+++ b/media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 
 RESTRICT="binchecks strip test"
 
diff --git a/media-fonts/roboto/Manifest b/media-fonts/roboto/Manifest
index 6792aa92c80b..523631f912e2 100644
--- a/media-fonts/roboto/Manifest
+++ b/media-fonts/roboto/Manifest
@@ -1,4 +1,4 @@
 AUX 90-roboto-regular.conf 438 BLAKE2B 495141f1945f1dc52ca439e15189899e4b4f46584a218b338d035c4d0c250e66ace88a0dd2522822dc493491f16813cca23dfc5b88e6e1bcadeade4b1ec5c348 SHA512 cf8e84eeff7c34d5d218c283c43a0440c2af6e46d6d7f8d68c5d0eb5fe6431ce3ecb89ce9f558cbca24a23658e315d2dea4472fd3905ad9f236efda4b7a8a8c0
 DIST roboto-2.138.zip 4324398 BLAKE2B 5573b551711ee7fcd931ef88886f8e3a5667966e4c1645fc8708c67b8f7cd704e2f5e008328b3a62bcfcf765a880ab103e45b4e07a64a5d6be0ec71136f50260 SHA512 4cfd20a1e19a986b17f731745a4d5ee909b852649e340d25de8197fbf6656005ccd3b4c591641938edbfebf0de81c71366a2afa007bb403285dea4d3dbfbd2a0
-EBUILD roboto-2.138.ebuild 554 BLAKE2B 7b08694b10ccf07e34eacddce956f14011df593cb857aa04aef73e53e879085da7cd3f9838193ed520a3f40af9c728072c7b016df2ac17e19a1a35c14d3abdb2 SHA512 850b4c3e95eb96fccbe52a03632dda1e52cf1fc961bd14c081794f5f4c36f33cf58a5bed7af6832c8df16a1b943b503f38715f300fb689aa644252a7fc0bc568
+EBUILD roboto-2.138.ebuild 561 BLAKE2B 0415e7b3e845fe611049c502002b47e0de6eb24c876c3549c576e9b34504b049b22deb4942b6e3da896c44c5d7179604776807598e5e538721d74c53d245d0b4 SHA512 bc489271dcc600584aa5bb08f0f777bd977b35b5095e8ee93032ba671f583b57e03dc70f0a7f7d71749fdeb9a86eff585adea6ea7f95ac1076cddfe689efed7c
 MISC metadata.xml 326 BLAKE2B a7d2d8689edd75ae371d695ef9e08346b61c214444f51742180df110e22c071e362550c48f3d2dcecee059fcf890e66d4e5e3faaac6ffdbaa401bb9cc96275bf SHA512 8d079f482bb1fc7726801cfb2f16cd9f04677303f2ff3f9946d3f4a2c89461c5f4d92ea153a3b24a41bba3213f53fa2483f164f68cc1bfb5e1c49ef750c63f72
diff --git a/media-fonts/roboto/roboto-2.138.ebuild b/media-fonts/roboto/roboto-2.138.ebuild
index ec3c6d3efcb5..efb98a04c0a4 100644
--- a/media-fonts/roboto/roboto-2.138.ebuild
+++ b/media-fonts/roboto/roboto-2.138.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 1a504a069258..e5a3e86b93bb 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,5 @@
+DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
 DIST terminus-font-4.49.tar.gz 648477 BLAKE2B 67bddaae88b7411381bce5e8fe5c1b0dab334a33f1371a33038556beffa779afec8706f27b156e5660bfab5b8b7aeda75267c68945e1be3b41dbea7e9345f164 SHA512 27d396e7fe399728b5e9228c901922588eab0b344ea438fcf98f18f80ce816d838a42d5a3da0b5644d895747bcbda0e30bb8dabf342c0439d1f6b51f7acf8496
-EBUILD terminus-font-4.49.ebuild 2691 BLAKE2B 7db0388e95e03dfd7376ef2ecade3f302d9ff1e3fde32f019288963114175e18d23a3a50ab32caf33f5455e31c5f594d4270a09e547fea1d34276d0dd9c6308b SHA512 6cb12771333949c118b7e2258f3b278ca695770b32d0ff36de543c87f22cc0637de8037478d9c30e3d9033d37210b4ff1447570acaa40366c754067d53f9e544
+EBUILD terminus-font-4.49.1.ebuild 2722 BLAKE2B 77655c67ffb24927e56afc3faa5968f22e5f91a8b5b287968aad08ade1df6c30105293a37b956b38ebc53aebecf88997051fdcf56944fd2119eec299880d865d SHA512 c49c0b21aa5ef18083d7447f04bc5b603a0a59180659de1b7a9267bc8ad65ca6793cf6f1353414c5be0e0253b4aa67bcd1577507e4fbc9fd783c691e3425603d
+EBUILD terminus-font-4.49.ebuild 2692 BLAKE2B e4c34d0d5ce30238b52837946b5c6279efe0a54597dbd531914b8cfa343b0fb32654368fe52b4dcee8e83182267ca240bcb9669f53fbfd83536bb469c5c3a12d SHA512 fcf8edfd26105d8c4e0037b9f8b32031d1e3cbe25e8ef99d2e03c7b36d3cddf8a53236bbb27ebc894241cd9184b9516f46317f3119559a824c7c66d4aae1b5c2
 MISC metadata.xml 1787 BLAKE2B f83cf459e35bae521d4f6176c7d873cbde7413ca52241feaf442c818a9e1c30640cca1127788737da53eb659ab73913471d830f0234198880fca33aafe811678 SHA512 8dbb13ccb276600255a0188254098e78540f54b4ff5a481909c94e15519b1cbf58dd58f5f4c44adbd48252da22579fff8d1d4301eb798c466132ab820609affe
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
new file mode 100644
index 000000000000..04fed52ebaeb
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit font python-any-r1
+
+DESCRIPTION="A clean fixed font for the console and X11"
+HOMEPAGE="http://terminus-font.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="OFL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote
+	ru-dv +ru-g ru-i ru-k"
+
+DEPEND="app-arch/gzip
+	${PYTHON_DEPS}
+	virtual/awk
+	pcf? ( x11-apps/bdftopcf )"
+RDEPEND=""
+
+FONTDIR=/usr/share/fonts/terminus
+FONT_CONF=( 75-yes-terminus.conf )
+DOCS=( README README-BG AUTHORS CHANGES )
+
+REQUIRED_USE="X? ( pcf )"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	default
+
+	# Upstream patches. Some of them are suggested to be applied by default
+	# dv - de NOT like latin g, but like caps greek delta
+	#      ve NOT like greek beta, but like caps latin B
+	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
+	# ka - small ka NOT like minimised caps latin K, but like small latin k
+	use a-like-o 		&& eapply "${S}"/alt/ao2.diff
+	use center-tilde 	&& eapply "${S}"/alt/td1.diff
+	use distinct-l 		&& eapply "${S}"/alt/ll2.diff
+	use ru-i     		&& eapply "${S}"/alt/ij1.diff
+	use ru-k     		&& eapply "${S}"/alt/ka2.diff
+	use ru-dv    		&& eapply "${S}"/alt/dv1.diff
+	use ru-g     		&& eapply "${S}"/alt/ge2.diff
+	use quote    		&& eapply "${S}"/alt/gq2.diff
+}
+
+src_configure() {
+	local configure_args=(
+		--prefix="${EPREFIX}"/usr
+		--psfdir="${EPREFIX}"/usr/share/consolefonts
+		--x11dir="${EPREFIX}"/${FONTDIR}
+	)
+	# selfwritten configure script
+	./configure "${configure_args[@]}" || die
+}
+
+src_compile() {
+	local args=(
+		$(usex psf 'psf psf-vgaw' '')
+		$(usex pcf 'pcf pcf-8bit' '')
+		$(usex otf otb '')
+	)
+	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
+}
+
+src_install() {
+	local args=(
+		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
+		$(usex pcf 'install-pcf' '')
+		$(usex otf 'install-otb' '')
+	)
+	# Set the CHECKDIR to a dummy location so we always get the same set of
+	# files installed regardless of what is in / or ROOT or wherever.
+	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
+
+	# Remove trans files that the kbd package takes care of installing.
+	rm -f "${ED}"/usr/share/consoletrans/*.trans
+
+	if use pcf-unicode-only; then
+		# Only the ter-x* fonts are unicode (ISO-10646-1) based
+		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
+	fi
+
+	use otf && FONT_SUFFIX=otb
+	font_src_install
+
+	einstalldocs
+}
diff --git a/media-fonts/terminus-font/terminus-font-4.49.ebuild b/media-fonts/terminus-font/terminus-font-4.49.ebuild
index 896a122f4614..7f8326f79edb 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote
+IUSE="a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
 DEPEND="app-arch/gzip
diff --git a/media-fonts/ubuntu-font-family/Manifest b/media-fonts/ubuntu-font-family/Manifest
index 242dda6a1c2a..c468aa45ff34 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 537 BLAKE2B 33070434280388b5e16db1a89b773b7fddcae7a4531495702e9210b975f7ea6c528b7acd39c856cccc8cefb85d870041871fbbdaa2ede96e26a9108e51176761 SHA512 901b482e17a1eeed2690086dc16dc563edf645b225af52f6126db5595432b1168b05093c1abaa3b19afd85675e709246c75ae8517f321a12cf7158becc65d19b
+EBUILD ubuntu-font-family-0.83-r1.ebuild 544 BLAKE2B a69224a52a9918f180105825437ada3629bef2e2508355463ae9a3dd39a90ab8b6ec47661a0f83654b8b09c14bd8592aedc7c26d0c49f71efcdd8bb7d6cb8591 SHA512 a62b91f87743c068a9beb5da87d40ddf853a7253d2276b64ad29a9fa2f7580e92b3f3a55fe6059257a2182e5f3267232643d64896f9c272e7c07269a9fb8fd29
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
index 768b2dd001d6..0f1820dfbe96 100644
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
+++ b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://assets.ubuntu.com/v1/fad7939b-${P}.zip -> ${P}.zip"
 
 LICENSE="UbuntuFontLicense-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6bc743d21544..6a655eb142ea 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 81210ac369f5..f811072c9dec 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-40.1.tar.xz 3601652 BLAKE2B 6e3ec73742a0de864a131b25b2ed2c3346aecea9455ccbae701d70a50a45dace90d4002c56829e9a831a16ec827df6e1ab257c9ec5b755b863e98d63cd8a59bf SHA512 1fd2f6689f8a74254f4436fedf8a5ee7c1488d70b467dfb94c3ca3e0e269aaa75a77d15d5bb3544e699f5c8759e30a25942857188cb98b4d9537165b67d6d14c
+DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad
 EBUILD eog-40.1.ebuild 1591 BLAKE2B b021bdc30c23209e66970052e2a05b295013fd53765e966436cad01af8d33084306accddecca864ed3ea07fb97dd675b74b6e76d15a761f0a1f9fd8eca82d311 SHA512 38158a2a01bae2503b81aa8ed540c7b0f45a138915d1fdf5eb5cf3d4e661769cf2d92d89f743256922436dd2ff1a69a21902dafbcb6de89627d6bfe3d0b6d598
+EBUILD eog-40.2.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-40.2.ebuild b/media-gfx/eog/eog-40.2.ebuild
new file mode 100644
index 000000000000..e0fd2241d634
--- /dev/null
+++ b/media-gfx/eog/eog-40.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # Not packaged
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 65e7b773304b..bf8360050d3c 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -7,7 +7,7 @@ AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.pa
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-EBUILD freecad-0.19.1.ebuild 9126 BLAKE2B 2c127488f5309c92ca01e7043134dbb8fefde95765abc4331b31a8bf1ac93cbfb27d346ac78528db71d450435cacff3b8010a41e2df6b9a1c7b764567f7a74a5 SHA512 8a91ab734c6ffe0b531fdfab8f510dee58b6a45df86cd3a5c07eba1081d5561555bd0206de3202e4dd975a3abf46628fc1d7ab264b4251c9d1d6a1497a1d30e5
-EBUILD freecad-0.19.2.ebuild 10910 BLAKE2B 42b059f8a7a33802aa13c59d7e0a08ad3266289d00ae5158ce9f7e8a6ecfec6624f117f9306b76d886f11aa859b2bf9d0448ef2a0a87203e2b7cd2e1f72fcf73 SHA512 ab440703b114fbd322e06992b690c2e2648c160066825ec150cfac54d89699b2e674bfc383f45841a057489213f762dd51d7c5795a87193e956efe99d5e6b7a9
-EBUILD freecad-9999.ebuild 10864 BLAKE2B b996ecda080d0701348c865c3b44bbdc0e64ff485f0caf40573008f25cc2ba9d5036a7f0ba625bb02550b8014784ad0b8aeba8fd613f88c8026c7881b06fa51f SHA512 ec4f1cca38aa1b9967d2881ce1a5deca186fbafafdf57bb3c3f5a3fef2cda0d1339e667f5cc7cdd009e7b469968b23b3df2e8b9ff728cc5e81a72f4b37348fa0
+EBUILD freecad-0.19.1.ebuild 9240 BLAKE2B f8dd7d7a0a04699a2fef44fbb204f5ba95b304aa851743aba899a1a80228bd8896c8ca9d20fe85ea4ebaf6e38fab5c94db619aa12c1cecb7b8534514b138ecca SHA512 2a9a5edc12a38413043f57762d6e1d8b622abbaa594f27db7711388b055f02b247854e56d2a92612165e35360f82e285cf924947c6bbf675b9dd95063012338f
+EBUILD freecad-0.19.2.ebuild 11045 BLAKE2B ea1dff90bb4e9aaaaf16d8d67db8f1076003105f771ce2ee0101b87443f7e1d9414a44dc302d2b6ad3881378ed99dea84dc8731d97dc94da318252b2f8f66bab SHA512 d5aaef2a1d591a4f4c1bf419f2cdec029129e017ce6ae3bfe937b8250eea9c7741c459ba848ea5580151e417b5e08b46d18ddefdacc1bb49b7b86f3dd392bff1
+EBUILD freecad-9999.ebuild 10999 BLAKE2B 5599d2539df1c00804d441d0b1ba0a8b4860194585e573395dcc051e21e2685a47303a4b947b8c32978de16cb9ec52eb25e29bde5269b60deac035257ee307a0 SHA512 ba5e260db5d825e803906551accec9b6407aa91979c11c687932488bf1625953ab5dcfb6b1702e19b89b70ec7f1b58312e0ea681a6ca9eaf82d2549ce1bd54d3
 MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild
index 1d7e61445995..0589fef979f4 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -214,6 +214,9 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild
index 393c42ede035..dcceebb859a0 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -227,6 +227,9 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+
 		# install python modules to site-packages' dir. True only for the main package,
 		# sub-packages will still be installed inside /usr/lib64/freecad
 		-DINSTALL_TO_SITEPACKAGES=ON
@@ -238,6 +241,7 @@ src_configure() {
 		# bug https://bugs.gentoo.org/788274
 		local OCC_P=$(best_version sci-libs/opencascade[vtk])
 		OCC_P=${OCC_P#sci-libs/}
+		OCC_P=${OCC_P%-r*}
 		mycmakeargs+=(
 			-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
 			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 765ee01a7a03..490b29d07939 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -224,6 +224,9 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+		# Use the version of shiboken2 that matches the selected python version
+		-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+
 		# install python modules to site-packages' dir. True only for the main package,
 		# sub-packages will still be installed inside /usr/lib64/freecad
 		-DINSTALL_TO_SITEPACKAGES=ON
@@ -236,6 +239,7 @@ src_configure() {
 		# bug https://bugs.gentoo.org/788274
 		local OCC_P=$(best_version sci-libs/opencascade[vtk])
 		OCC_P=${OCC_P#sci-libs/}
+		OCC_P=${OCC_P%-r*}
 		mycmakeargs+=(
 			-DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
 			-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index cfdfb52fb93d..8f5bdbec9d0a 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,4 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
-DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
-EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
-EBUILD gmic-2.9.7.ebuild 4260 BLAKE2B 96fd28e34efc81a51e21aad3b89a913e4d4a5a427a6913da38f5bce4d559d995b8cbbdd08701880a61572a6f9e8c5d63ed6538a1af0aff7fb03f6ae86f5b6336 SHA512 4d908e35ad53b771bbd6373b74218480dcdc48ae94dd389e525bfa239d9faedff4ae78b151da44123a5777efad51be81743383e7b57d80412d958f50231e21f4
+EBUILD gmic-2.9.7.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
 MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
deleted file mode 100644
index 5e85c6f688ac..000000000000
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use openmp; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		# respect user flags
-		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-			-i gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		# Bug #753377
-		local PATCHES=()
-		cmake_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.9.7.ebuild b/media-gfx/gmic/gmic-2.9.7.ebuild
index cd2efec6e1b2..5e85c6f688ac 100644
--- a/media-gfx/gmic/gmic-2.9.7.ebuild
+++ b/media-gfx/gmic/gmic-2.9.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index b1e262275e5b..2825bbd9598e 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,6 +1,10 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
+AUX test-exitcode.patch 1077 BLAKE2B 7e270c939a421d8c709d7e24b9628c69ec03f72431b6d783043e904ea92bba1938207d08d9275ac1b90825149c92ed48d466fd5edc03fa694fc57465ef474db7 SHA512 703fc73ea3829a8d5c6f64d0573439570300635d3543437983359afea0522c95da6c8b0f2cba3736d0f22f939aad72b4b27c648d166feed96ec6447a68f33b75
+AUX upnpc.patch 1032 BLAKE2B ffbd89511731d5e71a9568fb9578888152af50d18e443871ffde0eb0cad65a98c7561587cc4c9b288c6de158263ef4f172477ee836ab07c4a72d419521872f20 SHA512 7dec34031545e238388134166dd11ca1bf65975caab46ea308a9e36daaf1eeda71c70d260409ed3a64f277a2d65c9f1441c5af02fefa33e263906c386482e98e
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
 DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
-EBUILD hydrus-441.ebuild 4618 BLAKE2B bac19cf03e878ee758abf325f7b3f79ef3227165d2cc4a1711cc1e44b06b72739c40ee69bb25d4b428ec7b768e25f947bdffb72c3d976e8467cea34e4c6ae381 SHA512 acb8b4a07664fe2bd3447ede6b7c7f708b3e06e4ec9c067395cb3ed615904f468672ffa6635e411320a7c1da0815061dbdb53a3e1dd16dfc0831434f80da8690
+DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
+EBUILD hydrus-441-r1.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7
+EBUILD hydrus-442.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7
 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/files/test-exitcode.patch b/media-gfx/hydrus/files/test-exitcode.patch
new file mode 100644
index 000000000000..d61d341ee1ef
--- /dev/null
+++ b/media-gfx/hydrus/files/test-exitcode.patch
@@ -0,0 +1,36 @@
+diff --git a/hydrus/hydrus_test.py b/hydrus/hydrus_test.py
+index 3504c9c..7f95af8 100644
+--- a/hydrus/hydrus_test.py
++++ b/hydrus/hydrus_test.py
+@@ -91,6 +91,9 @@ def boot():
+         if sys.stdin.isatty():
+             
+             input( 'Press any key to exit.' )
++        else:
+             
++            success = 0 if controller.was_successful else 1
++            sys.exit(success)
+         
+     
+diff --git a/hydrus/test/TestController.py b/hydrus/test/TestController.py
+index 0c43440..7e6c5ef 100644
+--- a/hydrus/test/TestController.py
++++ b/hydrus/test/TestController.py
+@@ -168,7 +168,6 @@ only_run = None
+ class Controller( object ):
+     
+     def __init__( self, win, only_run ):
+-        
+         self.app = win
+         self.win = win
+         self.only_run = only_run
+@@ -827,8 +826,7 @@ class Controller( object ):
+         def do_it():
+             
+             try:
+-                
+-                runner.run( suite )
++                self.was_successful = runner.run( suite ).wasSuccessful()
+                 
+             finally:
+                 
diff --git a/media-gfx/hydrus/files/upnpc.patch b/media-gfx/hydrus/files/upnpc.patch
new file mode 100644
index 000000000000..ea78f2b70b63
--- /dev/null
+++ b/media-gfx/hydrus/files/upnpc.patch
@@ -0,0 +1,40 @@
+diff --git a/hydrus/core/networking/HydrusNATPunch.py b/hydrus/core/networking/HydrusNATPunch.py
+index c959753..6792d89 100644
+--- a/hydrus/core/networking/HydrusNATPunch.py
++++ b/hydrus/core/networking/HydrusNATPunch.py
+@@ -3,6 +3,7 @@ import socket
+ import subprocess
+ import threading
+ import traceback
++import shutil
+ 
+ from hydrus.core import HydrusConstants as HC
+ from hydrus.core import HydrusData
+@@ -18,7 +19,7 @@ if HC.PLATFORM_WINDOWS:
+     
+ else:
+     
+-    possible_bin_filenames = [ 'upnpc-static', 'upnpc-shared', 'miniupnpc' ]
++    possible_bin_filenames = [ 'upnpc', 'upnpc-static', 'upnpc-shared', 'miniupnpc' ]
+     
+     if HC.PLATFORM_LINUX:
+         
+@@ -42,7 +43,17 @@ for filename in possible_bin_filenames:
+         
+         UPNPC_PATH = possible_path
+         
+-    
++        break
++
++    maybe_in_path = shutil.which( filename )
++
++    if maybe_in_path:
++        
++        UPNPC_PATH = maybe_in_path
++        
++        break
++
++
+ EXTERNAL_IP = {}
+ EXTERNAL_IP[ 'ip' ] = None
+ EXTERNAL_IP[ 'time' ] = 0
diff --git a/media-gfx/hydrus/hydrus-441.ebuild b/media-gfx/hydrus/hydrus-441-r1.ebuild
similarity index 65%
rename from media-gfx/hydrus/hydrus-441.ebuild
rename to media-gfx/hydrus/hydrus-441-r1.ebuild
index 2e6f4152ae78..5ce5c4bdf642 100644
--- a/media-gfx/hydrus/hydrus-441.ebuild
+++ b/media-gfx/hydrus/hydrus-441-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite"
 inherit python-single-r1 desktop optfeature
 
 DESCRIPTION="A booru-like media organizer for the desktop"
-HOMEPAGE="http://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
 SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 # hydrus itself is WTFPL
@@ -39,7 +39,7 @@ RDEPEND="
 		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
 		dev-python/six[${PYTHON_MULTI_USEDEP}]
 		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		media-libs/opencv[python,${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
 		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
@@ -48,12 +48,12 @@ RDEPEND="
 		ffmpeg? ( media-video/ffmpeg )
 		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
 		mpv? (
-			 media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
-			 dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
 		)
 		socks? (
-				|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
-					dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
 		)
 	')
 "
@@ -70,26 +70,14 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/upnpc.patch"
 	"${FILESDIR}/userpath-in-local-share.patch"
+	"${FILESDIR}/test-exitcode.patch"
 )
 
-# Delete files only needed for testing
-delete_test_files() {
-	rm test.py || die
-	rm hydrus/hydrus_test.py || die
-	rm -r hydrus/test/ || die
-	rm -r static/testing/ || die
-}
-
 src_prepare() {
 	default
 
-	# If tests will run, leave the files until tests are run.
-	# They will be deleted before installing the package.
-	if ! use test; then
-		delete_test_files
-	fi
-
 	# Contains pre-built binaries for other systems and a broken swf renderer for linux
 	rm -r bin/ || die
 	# Build files used for CI, not actually needed
@@ -107,47 +95,39 @@ src_compile() {
 src_test() {
 	# The tests use unittest, but are run with a custom runner script.
 	# QT_QPA_PLATFORM is required to make them run without X
-	export QT_QPA_PLATFORM=offscreen
+	local -x QT_QPA_PLATFORM=offscreen
 	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
 }
 
 src_install() {
-	local DOC="${EPREFIX}/usr/share/doc/${PF}"
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
 	elog "Hydrus includes an excellent manual, that can either be viewed at"
-	elog "${DOC}/html/help/index.html"
+	elog "${doc}/html/help/index.html"
 	elog "or accessed through the hydrus help menu."
 
 	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
 
-	DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
-	HTML_DOCS=("${S}"/help/)
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
 	einstalldocs
 
-	if use test; then
-		# Delete files only needed for tests now. No need to install them.
-		# If the tests didn't run, the files have been deleted already.
-		delete_test_files
-	fi
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
 
-	# These files are copied into DOC
-	rm COPYING README.md Readme.txt help_my_client_will_not_boot.txt || die
-	rm -r help/ db/ || die
-	# The program expects to find documentation here, so add a symlink to DOC
-	ln -s "${DOC}/html/help" help || die
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
 
-	insopts -m0755
 	insinto /opt/hydrus
-	doins -r "${S}"/*
+	doins -r "${S}"/.
 
 	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
 
-	sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" > "${T}/hydrus-server" || die
-	sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" > "${T}/hydrus-client" || die
-
-	python_doexe "${T}/hydrus-server"
-	python_doexe "${T}/hydrus-client"
-
-	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png"\
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
 					   "AudioVideo;FileTools;Graphics;Network;"
 }
 
diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild
new file mode 100644
index 000000000000..5ce5c4bdf642
--- /dev/null
+++ b/media-gfx/hydrus/hydrus-442.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 desktop optfeature
+
+DESCRIPTION="A booru-like media organizer for the desktop"
+HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus"
+SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# hydrus itself is WTFPL
+# icons included are CC-BY-2.5
+LICENSE="WTFPL-2 CC-BY-2.5"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+mpv +ffmpeg +lz4 socks +cloudscraper charts test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[widgets,gui,charts?,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/service_identity[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		media-libs/opencv[python,png,jpeg,${PYTHON_MULTI_USEDEP}]
+
+		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+
+		cloudscraper? ( dev-python/cloudscraper[${PYTHON_MULTI_USEDEP}] )
+		ffmpeg? ( media-video/ffmpeg )
+		lz4? ( dev-python/lz4[${PYTHON_MULTI_USEDEP}] )
+		mpv? (
+			media-video/mpv[libmpv,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-mpv[${PYTHON_MULTI_USEDEP}]
+		)
+		socks? (
+			|| ( dev-python/requests[socks5,${PYTHON_MULTI_USEDEP}]
+				dev-python/PySocks[${PYTHON_MULTI_USEDEP}] )
+		)
+	')
+"
+BDEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/upnpc.patch"
+	"${FILESDIR}/userpath-in-local-share.patch"
+	"${FILESDIR}/test-exitcode.patch"
+)
+
+src_prepare() {
+	default
+
+	# Contains pre-built binaries for other systems and a broken swf renderer for linux
+	rm -r bin/ || die
+	# Build files used for CI, not actually needed
+	rm -r static/build_files || die
+	# Duplicate license file, not needed
+	rm license.txt || die
+	# Python requirements files, not needed
+	rm requirements_*.txt || die
+}
+
+src_compile() {
+	python_optimize "${S}"
+}
+
+src_test() {
+	# The tests use unittest, but are run with a custom runner script.
+	# QT_QPA_PLATFORM is required to make them run without X
+	local -x QT_QPA_PLATFORM=offscreen
+	"${EPYTHON}" "${S}/test.py" || die "Tests failed"
+}
+
+src_install() {
+	local doc="${EPREFIX}/usr/share/doc/${PF}"
+	elog "Hydrus includes an excellent manual, that can either be viewed at"
+	elog "${doc}/html/help/index.html"
+	elog "or accessed through the hydrus help menu."
+
+	mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die
+
+	local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/)
+	local HTML_DOCS=("${S}"/help/)
+	einstalldocs
+
+	# Files only needed for testing
+	rm test.py hydrus/hydrus_test.py || die
+	rm -r hydrus/test/ static/testing/ || die
+
+	# These files are copied into doc
+	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
+	# The program expects to find documentation here, so add a symlink to doc
+	ln -s "${doc}/html/help" help || die
+
+	insinto /opt/hydrus
+	doins -r "${S}"/.
+
+	exeinto /usr/bin
+	python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server")
+	python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client")
+
+	make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \
+					   "AudioVideo;FileTools;Graphics;Network;"
+}
+
+pkg_postinst() {
+	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+}
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index da77ca5c7bf0..3b8655f94d89 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,4 +1,4 @@
 AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
 DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
 EBUILD prusaslicer-2.3.0.ebuild 1812 BLAKE2B 1d34a7cd0dd5fcb40dce9d8fcab86d8b643722a8ebe4810ce0b83172304d2a8aaaea76ed8a6077ed30dab134152294ff42b54476b401b5482691beb41bc8aeb8 SHA512 df62be529a5b69d88e44ac219e6a5e9a51738509f4946397aa7771a29a544aeb9bca84213525c5f6540de3649f5742ce759d2d5303783b2e9f7a70e7f6921997
-MISC metadata.xml 964 BLAKE2B fd4b95e2725a37291f9d7f39aaf75d34068789960c27d6180e809c33b9624507dc5abdb16d125eee88acffbdb424bb949751a86da6475747ef658913b0f6dc44 SHA512 27a581c15d36f0514183f663a645198feed74856c8a9eef7dc8d7c7f460bbaa89f5a5e7c4b8884d400346baffcde66b8f9552d4204f17b7ac905e9f06100b762
+MISC metadata.xml 1027 BLAKE2B 8a247ceabac85b67484df3c9853225f1cb7d1dcff13c2069a4d37578a741f3cb0d4c181d05eb910147a79e969f3042eeb7de9dec03a9a8f69ffe9e5975c55656 SHA512 e9d281340a7aeeb0e5f0e8fef26e71a1abaac2033322a3e0a778d0852dc0aa8ea01bd34dba653c5f143a8259ce36ad968f9969d57c86ee3546f8c3c37802bf51
diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml
index dd17dbe10ea6..32e35320f53f 100644
--- a/media-gfx/prusaslicer/metadata.xml
+++ b/media-gfx/prusaslicer/metadata.xml
@@ -16,6 +16,7 @@
 	<upstream>
 		<bugs-to>https://github.com/prusa3d/PrusaSlicer/issues</bugs-to>
 		<doc>https://help.prusa3d.com/en/article/general-info_1910</doc>
+		<remote-id type="cpe">cpe:/a:prusa3d:prusaslicer</remote-id>
 		<remote-id type="github">prusa3d/PrusaSlicer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index b5c776dcb635..154d70d2da8b 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -8,4 +8,4 @@ DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a64115321
 EBUILD slic3r-1.3.0-r3.ebuild 2741 BLAKE2B be0b9946dfcefc79bd0ead2db2dc7d684a81cb1f6c5af82f57347006a2f155cdb9276eff6e47b16bbfea8c0a64d6c89455f39faa010686393df211bf9569a6e9 SHA512 b0f97a438154a387d8e0d6245328abd9e3cce85ea6f80ff2c41b9a22d77c9345e023ab44b8bf521ed223b6c201481f52d9130b4abb37938af46456c4061a1fb1
 EBUILD slic3r-1.3.1_pre20200824.ebuild 2777 BLAKE2B 15ef5c7e7a21769ce90e52953536673e3658acdb9674d504c35ca42732b44688c23ee44ac7c845d6b73a7aa52f6fe23363bf6cd25d2a5f2193586ea3dd12e928 SHA512 b7d0ca2b4f9c449088240f332d95125288a73dc3a0ab591ecf476c0d3cec1d2378f0ec5c1e27fb628ff616fe0895d9ec2dc586a82afe37dcb9cd19a293648b68
 EBUILD slic3r-9999.ebuild 2688 BLAKE2B 4b9af5d0085ba6d6632ede733a6fade66dff9d50c4230762c56920cf1c226a3962d6c33432cece0e26d65fdff9764c7255dbabaf98bd0d09cc0dd2bef6385534 SHA512 b871d0d53023b9e6c5caaedea1c121063da47f4cb9fccab328af6e40deefc36c52057dd803ce7aed7846ca61504dab8be8b341fad1a8332467e1a2c387bdf3e2
-MISC metadata.xml 910 BLAKE2B 037c38babeaf484e00175fa577897939965d4b0c9246ae43cea6099eb9c80c64b150b58598bd4d9b6b4cea3c3d660d50d75a83a4dcc75c23bc52619ea42d2e35 SHA512 60ddcbb15c781478becc5779ff884d92b735d87b7c97f8305641b3a98db3f07a35d02c86c2b1e032fd05fa351a6f343e7c4f09aff31c5d2844bf34930dbcc316
+MISC metadata.xml 976 BLAKE2B 5283df869a4c21b2d99b78aa43aff2f273d868989749952b0a9302396eca8d2677cca72bcb877afb9b2b7a9f02d8b7f723ae7a8ed209ff734555a76f2b43c296 SHA512 4b241f369f20a6af6496784a3e0a5b5885476d213758615bac8a960bb18e92a4383bb3d5e9edd4863edf2061b0c85ec7a9b4e7f58a1c3ebc226c4ee5d5179c76
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index f2a29f739d2e..45df234a6cdb 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -15,6 +15,7 @@
     <upstream>
         <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
         <doc>https://manual.slic3r.org/</doc>
+        <remote-id type="cpe">cpe:/a:slic3r:libslic3r</remote-id>
         <remote-id type="github">slic3r/Slic3r</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-gfx/tintii/Manifest b/media-gfx/tintii/Manifest
index a9e6025092d7..87d612bdb591 100644
--- a/media-gfx/tintii/Manifest
+++ b/media-gfx/tintii/Manifest
@@ -1,3 +1,3 @@
 DIST tintii-2.10.0.tar.gz 620863 BLAKE2B 61127bfe1ce1eca87cea7fcd5cc6ef95c445ad0cdf32fd2d752a27818df8132ee0d7e6eab355c37ff3535be416a79b34652e8a28d8f93e0bd523a15396f6a4cd SHA512 884a9a3393080ee064069288afc13b2f72272571efaabf013ea2029627fc2ed922dcb791b8316c1d2117faf553d6bf333cf35f0486ba82aa2dc0987f9ce5f9a3
-EBUILD tintii-2.10.0-r1.ebuild 561 BLAKE2B ced5199db24463364ec48ebe2eb205cf7311e4a61036fea450f40dde443b19bf366cd860ded5511131bb12868082b958d9d9ce5771f8a17b3dd78adfd8529993 SHA512 ed3b7fb7fd039463cfb04e579a29e3752882a0fdfd70fe9a49cb10a9fc944fb9bef3c7775c2cc84e6f10a93da8fb070c8b9f2af0fdbaaa89e1e558a9f6e8142a
+EBUILD tintii-2.10.0-r1.ebuild 555 BLAKE2B de7a9038871008016e49efb5d65c9f212232a5a31c25c96a2480530827d4f9c9b7a7be61f0b7919d0cee4224ab7011c700c349108ba5e9e82c5362c8b6e0cf83 SHA512 95d88eaf7d18690444ba482f509fa949f769e8b81d20c12117cc5ddc3746efb424ca409801ff60f68680a041136f093ff0197f658341573b3dcf95d6d10487f7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/tintii/tintii-2.10.0-r1.ebuild b/media-gfx/tintii/tintii-2.10.0-r1.ebuild
index b9a5dd6fbb4f..fdaaaed69261 100644
--- a/media-gfx/tintii/tintii-2.10.0-r1.ebuild
+++ b/media-gfx/tintii/tintii-2.10.0-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit desktop wxwidgets
+inherit wxwidgets
 
 DESCRIPTION="Photo editor for selective color, saturation, and hue shift adjustments"
-HOMEPAGE="https://www.indii.org/software/tintii"
+HOMEPAGE="https://www.indii.org/software/tintii/"
 SRC_URI="https://www.indii.org/files/tint/releases/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index ee98cac38519..8eb56131667d 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,16 +1,10 @@
-AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
-AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab
 AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401
 AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122
 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120
 AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957
-AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee
+AUX zbar-0.23.1_python_tp_print.patch 1671 BLAKE2B e7d869e64879fb77151b1e8d668659ed1b5ca8061a8b2d3f2bde1bd5ef3384dec208e5f43f6e326c173634e017dd1261ba1d725a68f7a3c5f384e5a2a84bae26 SHA512 67e87f27dd9149e5cf9503613d3458dff5a3fd97084858f5ca88335c5053e7eb9b000cdec215d7b38bf9dd344b2dd9c310de320c60fc308de0ff7c411dcbcb35
 AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a
-AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
-AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
-DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
-EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4
-EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78
+EBUILD zbar-0.23.1.ebuild 5378 BLAKE2B 0a0600179d7dc1812dbaad0446b91d30f4bbbd0d6d2271800afada662ab1bbfdbcdf22c78908594b0dddcf13ce5ea107d5f039a580137cd3e58c1f8c4986358a SHA512 6eb6125996b9b2fb138e489aee1189b1a480dbb1b990cd7996b83fc59a31e0fef7c3b1bec14db7381837784d644e69e6b5f7e40bdf5429411120af04526d3e00
 MISC metadata.xml 737 BLAKE2B 51ad296b25247d05d1872f0ce6ac5ab5dc0c3c0141c19a851a13c5dab881c2c6f7c8b538bf86783ea9138318e369e25d1828d866adb050dd98dbd336b6932a1c SHA512 0811b0674da5175f0ba71238a8ecad01a5d0000dec24988df42ab91748de016e717471822d6903f279ad411cb50207bc6c4dc6de11268e065961a96948434e6f
diff --git a/media-gfx/zbar/files/zbar-0.10-errors.patch b/media-gfx/zbar/files/zbar-0.10-errors.patch
deleted file mode 100644
index 63328ce664bb..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-errors.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- zbar-0.10/include/zbar/Exception.h
-+++ zbar-0.10/include/zbar/Exception.h
-@@ -32,6 +32,7 @@
- 
- #include <exception>
- #include <new>
-+#include <cstddef>
- 
- namespace zbar {
- 
diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
deleted file mode 100644
index 1206a209d458..000000000000
--- a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://bugs.gentoo.org/769716
-
-From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001
-From: Klaus Ethgen <Klaus@Ethgen.de>
-Date: Sun, 7 Feb 2021 14:22:52 +0100
-Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=iso8859-1
-Content-Transfer-Encoding: 8bit
-
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c2b7819..f6224a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk],
- AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
- AC_ARG_VAR([GTK_VERSION_MAJOR])
- 
--AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
-+AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"],
-   [PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
-     [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
-      GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`
-@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
-     ])
-   ])
- 
--AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"],
-+AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"],
-   [PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
-     [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
-      GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
-@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)])
- AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])
- 
- AS_IF([test -z "$PYTHON"],
--      [AS_IF([test "x$with_python" == "xauto"],
-+      [AS_IF([test "x$with_python" = "xauto"],
-              [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],
--             [AS_IF([test "x$with_python" == "xpython3"],
-+             [AS_IF([test "x$with_python" = "xpython3"],
-                     [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],
--                    [AS_IF([test "x$with_python" == "xpython2"],
-+                    [AS_IF([test "x$with_python" = "xpython2"],
-                            [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],
-                            [with_python="no"])
-                     ])
-@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"])
- 
- dnl GObject Introspection (GIR)
- 
--AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"],
-+AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"],
-   [m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
-     [GOBJECT_INTROSPECTION_CHECK([0.6.7])
-      AS_IF([test "x$found_introspection" = "xyes"],
-@@ -696,7 +696,7 @@ AC_ARG_WITH([java],
-   [],
-   [with_java="check"])
- 
--JAVAC=${JAVAC/ecj/ecj -1.5}
-+JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')"
- 
- # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
- # look strictly at the $JAVA_HOME in order to avoid mixing different versions
-@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
- 
- AC_ARG_VAR([JAR], [location of Java archive tool])
- AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
--AS_IF([test "x$JAR" == "x:"], [have_java="no"])
-+AS_IF([test "x$JAR" = "x:"], [have_java="no"])
- 
- AC_ARG_VAR([JAVA], [location of Java application launcher])
- AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
- 
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
--AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."])
-+AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
- 
- dnl Search for Java unit test library
- AS_IF([test -z "$JUNIT_HOME"],
-@@ -850,7 +850,7 @@ echo "GTK                    --with-gtk=$with_gtk          Gtk${GTK_VERSION}"
- echo "GObject introspection  --with-gir=$with_gir"
- echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
- echo "Java                   --with-java=$with_java"
--AS_IF([test "x$win32" == "xno"],
-+AS_IF([test "x$win32" = "xno"],
-   [echo "Dbus                   --with-dbus=$with_dbus"])
- AS_IF([test "x$have_GM" = "xyes"],
-   [echo "GraphicsMagick         --with-graphicsmagick=yes"],
-@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"],
-   [echo "        => the zbarimg file scanner will *NOT* be built"])
- AS_IF([test "x$have_GM" = "xyes"],
-   [echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"])
--AS_IF([test "x$with_gtk" == "xno"],
-+AS_IF([test "x$with_gtk" = "xno"],
-   [echo "        => GTK support will *NOT* be built"])
- AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],
-   [echo "        => the Python 2 GTK widget wrapper will *NOT* be built"])
- AS_IF([test "x$with_qt" != "xyes"],
-   [echo "        => the Qt widget will *NOT* be built"])
--AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ],
-+AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ],
-   [echo "        => Building a static Qt library"])
- AS_IF([test "x$with_java" != "xyes"],
-   [echo "        => the Java interface will *NOT* be built"])
-@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"],
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
--AS_IF([test "x$enable_pdf417" == "xyes"],
-+AS_IF([test "x$enable_pdf417" = "xyes"],
-   [echo "        => the pdf417 code support is incomplete!"])
--- 
-2.30.0
-
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
new file mode 100644
index 000000000000..8d4d821426d2
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
@@ -0,0 +1,55 @@
+From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Date: Tue, 28 Jul 2020 10:27:30 +0200
+Subject: [PATCH] python: enum: make it compatible with Python 3.9
+
+As reported by:
+	https://github.com/mchehab/zbar/issues/92
+
+python bindings don't build with Python 3.9, because it is
+using tp_print, which has been silently ignored since Python
+3.0, according with[1]:
+
+	"The tp_print slot of PyTypeObject has been removed.
+	 It was used for printing objects to files in Python 2.7
+	 and before.
+	 Since Python 3.0, it has been ignored and unused."
+
+[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ python/enum.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/python/enum.c b/python/enum.c
+index a1135531..dfe1b1ef 100644
+--- a/python/enum.c
++++ b/python/enum.c
+@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
+     return(self->name);
+ }
+ 
++#if PY_MAJOR_VERSION < 3
++/* tp_print was dropped on Python 3.9 */
+ static int
+ enumitem_print (zbarEnumItem *self,
+                 FILE *fp,
+@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
+ {
+     return(self->name->ob_type->tp_print(self->name, fp, flags));
+ }
++#endif
+ 
+ static PyObject*
+ enumitem_repr (zbarEnumItem *self)
+@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
+     .tp_new         = (newfunc)enumitem_new,
+     .tp_dealloc     = (destructor)enumitem_dealloc,
+     .tp_str         = (reprfunc)enumitem_str,
++#if PY_MAJOR_VERSION < 3
+     .tp_print       = (printfunc)enumitem_print,
++#endif
+     .tp_repr        = (reprfunc)enumitem_repr,
+ };
+ 
diff --git a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
deleted file mode 100644
index 3be9c2222776..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 20 Oct 2019 01:44:02 +0200
-Subject: [PATCH] Create correct pkconfig file for zbar-qt5
-
-Although zbar supports Qt5, the created pkgconfig file always requested
-the Qt(4) components.
-
-Fixes issue #62.
----
- configure.ac   | 13 ++++++++++---
- zbar-qt5.pc.in | 12 ++++++++++++
- 2 files changed, 22 insertions(+), 3 deletions(-)
- create mode 100644 zbar-qt5.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index 935110a..49ef6a8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
-      CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
- dnl -fPIC has no effect on Windows and breaks windres
-      AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
--     AC_MSG_NOTICE([using Qt version $QT_VERSION])],
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+     qt_pkgconfig_file="zbar-qt5.pc"
-+     ],
- 
-     [MOC=`$PKG_CONFIG QtGui --variable=moc_location`
-      AC_MSG_NOTICE([using moc from $MOC])
-      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
--     AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+     qt_pkgconfig_file="zbar-qt.pc"
-+     ]))
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
-+AM_COND_IF([HAVE_QT],
-+     [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
-+)
-+
- dnl Java
- have_java="maybe"
- 
-@@ -820,7 +828,6 @@ java/Makefile
- zbar/Makefile
- zbar.pc
- zbar-gtk.pc
--zbar-qt.pc
- doc/doxygen.conf])
- 
- AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
-diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in
-new file mode 100644
-index 0000000..3378993
---- /dev/null
-+++ b/zbar-qt5.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: zbar-qt
-+Description: bar code scanning and decoding Qt5 widget
-+URL: http://zbar.sourceforge.net
-+Version: @VERSION@
-+Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
-+Libs: -L${libdir} -lzbarqt
-+Cflags: -I${includedir}
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
deleted file mode 100644
index 8484e31b7375..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 52a4fa5242af5da770b3cab1713f87e8d899e7ed Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Fri, 27 Dec 2019 18:33:17 +0100
-Subject: [PATCH] Fix detection of errors in the v4l read.
-
-The return type must be signed in order to detect a read failure. Also,
-display an error message after such a failure.
----
- zbar/video/v4l2.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
-index daed38b..c0398ea 100644
---- a/zbar/video/v4l2.c
-+++ b/zbar/video/v4l2.c
-@@ -133,9 +133,11 @@ static zbar_image_t *v4l2_dq (zbar_video_t *vdo)
-             return(NULL);
- 
-         /* FIXME should read entire image */
--        unsigned long datalen = read(fd, (void*)img->data, img->datalen);
--        if(datalen < 0)
-+        ssize_t datalen = read(fd, (void*)img->data, img->datalen);
-+        if(datalen < 0) {
-+            perror("v4l2_dq read");
-             return(NULL);
-+        }
-         else if(datalen != img->datalen)
-             zprintf(0, "WARNING: read() size mismatch: 0x%lx != 0x%lx\n",
-                     datalen, img->datalen);
diff --git a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
deleted file mode 100644
index 75d02cb996a5..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba0bcb39c4fa57634c05597464352d4e630f1ea2 Mon Sep 17 00:00:00 2001
-From: hz-mk <51707958+hz-mk@users.noreply.github.com>
-Date: Tue, 11 Jun 2019 16:32:18 +0200
-Subject: [PATCH] Reset conversion descriptor after close (prevent double free)
-
----
- zbar/qrcode/qrdectxt.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
-index 2ab7b9b..4be7635 100644
---- a/zbar/qrcode/qrdectxt.c
-+++ b/zbar/qrcode/qrdectxt.c
-@@ -409,7 +409,10 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist,
-       /*If eci should be reset between codes, do so.*/
-       if(eci<=QR_ECI_GLI1){
-         eci=-1;
--        if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
-+        if(eci_cd!=(iconv_t)-1){
-+	  iconv_close(eci_cd);
-+	  eci_cd=(iconv_t)-1;
-+	}
-       }
- 
-     }
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
deleted file mode 100644
index d51457a9e1d8..000000000000
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
-REQUIRED_USE="
-	introspection? ( gtk )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		X? ( imagemagick )
-	)
-	xv? ( X )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		introspection? ( dev-libs/gobject-introspection )
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/hamcrest-core:1.3
-			dev-java/junit:4
-		)
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10-errors.patch"
-	"${FILESDIR}/${PN}-0.23-r1-nonbash.patch"
-	"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
-	"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
-	"${FILESDIR}/${P}_fix_python_detect.patch"
-	"${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
-)
-
-DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python || use test; then
-		if use test; then
-			# make tests happy
-			# because one of the test requires loadable py module from the current ${BUILD_DIR}
-			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
-				-i test/Makefile.am.inc || die
-		fi
-
-		python_fix_shebang \
-			examples/*.py \
-			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
-	fi
-
-	if use java; then
-		java-pkg-opt-2_src_prepare
-		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-			-i java/Makefile.am || die
-	fi
-
-	# do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
-	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with dbus)
-		$(use_with gtk gtk gtk3) # default is gtk2
-		$(use_with jpeg)
-		$(multilib_native_use_with introspection gir)
-		$(multilib_native_use_with java)
-		$(multilib_native_use_with python python auto)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable v4l video)
-		$(use_with X x)
-		$(use_with X xshm)
-		$(use_with xv xv)
-	)
-
-	if multilib_is_native_abi; then
-		# both must be enabled to use GraphicsMagick
-		if use graphicsmagick; then
-			myeconfargs+=(
-				--with-graphicsmagick
-				--without-imagemagick
-			)
-		elif use imagemagick; then
-			myeconfargs+=(
-				--with-imagemagick
-				--without-graphicsmagick
-			)
-		else
-			myeconfargs+=(
-				--without-imagemagick
-				--without-graphicsmagick
-			)
-		fi
-
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			append-cflags "$(java-pkg_get-jni-cflags)"
-			if use test; then # bug 629078
-				java-pkg_append_ CLASSPATH .
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-			fi
-		fi
-
-		if use qt5; then
-			myeconfargs+=(
-				--with-qt
-				--with-qt5
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-		myeconfargs+=(
-			--without-qt
-			--without-imagemagick
-			--without-graphicsmagick
-		)
-	fi
-
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems (bug 672184)
-	mkdir qt zbarcam || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-src_install() {
-	if use qt5; then
-		local MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/zbar/QZBar.h
-			/usr/include/zbar/QZBarImage.h
-		)
-	fi
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index d74a878a969a..7b07b269b68f 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -87,6 +87,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
 	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
 	"${FILESDIR}/${P}-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-0.23.1_python_tp_print.patch"
 )
 
 DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 29c49573792b..e2b9d1821597 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 f23510264441..dea4d646c68f 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,9 +5,9 @@ AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d
 DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
 DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-DIST alsa-lib-1.2.5.tar.bz2 1068496 BLAKE2B 84fe4e22d4316bfc84f15f2493f40f113eb3db7722f230550586533e80daf214140164e8ddc1a399b82a3fd0fb21125ff225cfeb45eaa19320c2e2aa3997c662 SHA512 d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725
-EBUILD alsa-lib-1.2.2-r1.ebuild 2166 BLAKE2B 58967742d15b0a540b7e2fe327c99380904d7ac04937896c0720965a9fd35e170a53f8549355e5b96c498ae0b9f1fdb21a3085aa1eb02a9a93daa8f0a63968fb SHA512 bc1f41efe336615cbd10d236aacbcbdd1b65a6ffeccd1f20cb4107153e7ceb1d1f3bffd0bc2ef9c39a320dc7bfafbc54c2078aa5288e9f6a50d6f720478aa55b
-EBUILD alsa-lib-1.2.3.2-r1.ebuild 2103 BLAKE2B 124b90973277ca6e2c491a9cecdd5431eefac44f945735d2beeb237b9085194aab6e9b9cbc4c2218f922f387bae104557f8d9e0c9dd4aaf9ca7f2150dc9c37e7 SHA512 35f88e0b6228c8ea9aa87c10b2cca397f5d03a679cbaf61f080a43d633bc789bea3abe7efdb52c80188b8a5af36929378abea999a5bc8c4fc81d63368ad30160
-EBUILD alsa-lib-1.2.4.ebuild 2171 BLAKE2B f6bb453b17e2f8e0bbdf955c361f61d485eaffba4b62363ce0454fb3c915f1721bdc03e946660d4b790d7991d3e625772b85f7622aef5d26374ebd639938864d SHA512 d56d4ec475ad8f400a96aa06e82b029c85162e5b68f4806a835d6f05d5bb8b5c1854719b98f9cff6f26ac53f4323757c8e33c6c2b005be5a5330fe1f89a08c2c
-EBUILD alsa-lib-1.2.5.ebuild 2125 BLAKE2B 30d8d6573061912979ebe2f8e8b4b2c64e01de20d52e1e8a54d02e17d2dac7ed23ff12ef86c44adb6b047c876eea37ac7ad24ede14ea4a1bfd4fd0babc650d35 SHA512 c9b53f2a8da72d1255ce967447773f52f8f3ce8c33ccf13604f2dec4da9adcc6f0d028e1cb23c46eb648f57511f6126e6114268bef0f70a9bfb2894fd686d60f
+DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
+EBUILD alsa-lib-1.2.2-r1.ebuild 2180 BLAKE2B aa741e7e53d443b27d520ccf0a525384085844c64d5289ed22067b65ec0ee4cc9a4a75d68891fc6c830513b95de0ad6cac8280aa6cf7a5d37c9c6acc6aa27c82 SHA512 37fcd87e520494e1f0797cd5b023d9eac4dd78ed894588f85d223bb2a4b49da824381254cfd79905bb686a2751d22299d199df4eca5989b09ca8ac08786f4c8b
+EBUILD alsa-lib-1.2.3.2-r1.ebuild 2117 BLAKE2B 9e6c389cd0915a78ab9b6b6ddb6ae82a1bef79f5f316c3bc26481ab38ee1eb88f32f059cec764e0e127eba7978322c516aece84bf784250e958df7d93fe98dc0 SHA512 12f9735f278467a883b189c74d03cf8c78940dc18d21175a5938565db3acc7b2a17a7aca927055728dbd965510387fdbcf4b2158a1f8f1af6542d54258fec8cf
+EBUILD alsa-lib-1.2.4.ebuild 2185 BLAKE2B 4de58c07e729962ffdac6ef2e5f9dde20501f6f85309f6afd2890ed7af6d07e8ffb61acff72bca686fc19cd5c170619399707afb1fb1a14bb2ebeeeafebb05b4 SHA512 7351bb783d5a3025cd3cb6951e7c06709332f871af51929edb6662912b91eaf975904b1b9c3cdf1702fea196d4f2c712604241ebe56d701c7d732cf6b85a3f5d
+EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 05f90764647c..1a2b04a4cebf 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
index 726c108f049b..af903f22501a 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index b784b7409239..6b0ddd2cccbd 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools multilib-minimal python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
similarity index 67%
rename from media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
index 8183119b95e5..88c9ad860cf8 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
@@ -6,9 +6,20 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools multilib-minimal python-single-r1
 
+# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
+COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
+SNAPSHOT_PV="1.2.5_p20210604"
+
 DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ -n ${COMMIT} ]]; then
+	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"
@@ -28,6 +39,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
 )
 
+pkg_pretend() {
+	if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
+		eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
+	elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
+		eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
+	fi
+}
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 3092f65a12f4..379972fcd26f 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,4 +1,4 @@
 AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
-EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B f2aacb25b617553d2710a501717b2ad8a7990a3f4f706fbb9c58b3b81bf258c336687babb1f26600061e7888ed83818152c73d840c9897ed982ec88d5fb8b618 SHA512 1acad998b4c323e392f5522a997718768a10028faeb2506d270dc0a7d451d6566340935da6b202e37c29fdda0a40d5c59da52ef29c012f6d2c1651c41f31e7df
+EBUILD alsa-oss-1.1.8.ebuild 1048 BLAKE2B f4199707657e3702dc7ace1f4d795cbc3ade403a59589ff1a5ea6df49e689753dfe1fe5a8cb89f3fa6359c4bfcc018fc214608796dbf830d9880e35318950699 SHA512 f05077db85038f1444c22282865433119a7e434d1640d190c0409174eb82a1987bc686c86d50d258089ccce10b4da69e9569ab5f94fff3d77bb3111265b72bf4
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index d82463055d1c..c2914d837c64 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -9,7 +9,7 @@ MY_P="${P/_rc/rc}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 34471f52cae9..f5d8c71f4936 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -2,8 +2,8 @@ DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce193194293
 DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
 DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
 DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
-EBUILD alsa-topology-conf-1.2.2.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
-EBUILD alsa-topology-conf-1.2.3.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
-EBUILD alsa-topology-conf-1.2.4.ebuild 501 BLAKE2B d365eefaa426de5d0fb3af996e4bfccb41cb55f93c8c6e5dbc75437855aa18327cd141dd3c6950752a2fbb68502156cfb611b801766e9789564de68d4d673641 SHA512 3254160b67078063e9101b8acc064de321f41ada4c32719825e3e36bb1ed35d6390408743e150fd8b0487755e5bd0d5b78914a36a0d06f50a472d3f8a5a58f6a
-EBUILD alsa-topology-conf-1.2.5.ebuild 558 BLAKE2B aea238864b62e8ba0f9b890a594a2db0a1734b85ef0eb9c487f2acbedd0b89522c67b75ba6147d4db6650ee19c8a1d578d10f3f217872f64bfbc355b05d37abf SHA512 44b7671b62ec0c1e3117cd8c2bd429f3201ad1828851efef866043702f81bd9bccfbafdae604d60132b48e73ae82f87b05cfb4c26e289e17884550c3f9b0523b
+EBUILD alsa-topology-conf-1.2.2.ebuild 504 BLAKE2B 7ae0989b47cc763201860307402eaceb1b68bb5a63cc7bef1a9aabe085dd4e23751728007e69806e497d291252ba4298594a957ab9d9b8367686f4db62775a6c SHA512 f94b3fa1e52ce9e38521fb946b89c724323ca0012ba7857cd851972811830b667d022255b3dfecc90783ce14b6a9c2e794fa52dc55b1f52b754847680b57c02b
+EBUILD alsa-topology-conf-1.2.3.ebuild 504 BLAKE2B 7ae0989b47cc763201860307402eaceb1b68bb5a63cc7bef1a9aabe085dd4e23751728007e69806e497d291252ba4298594a957ab9d9b8367686f4db62775a6c SHA512 f94b3fa1e52ce9e38521fb946b89c724323ca0012ba7857cd851972811830b667d022255b3dfecc90783ce14b6a9c2e794fa52dc55b1f52b754847680b57c02b
+EBUILD alsa-topology-conf-1.2.4.ebuild 512 BLAKE2B 2953768b1fba1e9a007c350660ba36fbbda3f7f3d0b8baccbbb5b1d1f8b2d9861086792d7d2ea788c544d02653c3427ddd6b5a9cd96423b94e6a8d682a7bc3d0 SHA512 e0dfe99bb206983ffdf99b68b22832d3e7c887f47f5d5607d0c5f034fd82c52e42ebc39892d11db4758666085ee4a72677773f4d8abe44d1884bc6660028784d
+EBUILD alsa-topology-conf-1.2.5.ebuild 569 BLAKE2B 031df6bdb91155682e5fcf7b7ccc0dc5280850b5db1d6e37a9abb9dd68c570b176a3479e11a782ced1c0d38758d720c11c18d42545b83b30c50b3318f43653f0 SHA512 e187ed4d6ce42d5be288cfd94d19915245063096ffc1ea36814f2403460292f1ece6ee2bec2e937dfc39a4eff8b30b34f0dad542cd5aa4739cfcf05454a52400
 MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
index f912f7fefcca..1a1d090cf8c7 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
index f912f7fefcca..1a1d090cf8c7 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
index d7ed7caa0c1e..5887f834f029 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
index 259b34980290..421ef5520192 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index f7063d218513..856bab850d2e 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,9 +1,10 @@
+AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch 646 BLAKE2B 271b720dbcfe5d32794b38125c0d947b62623a8f24b9cbe8a215281cd0586c65de805be2c5192f855f46744fda9b21a5fd463df7d540bf42f9c3035aedcda374 SHA512 aea5277bd5aa68680e31ffb09cd8853e13b9417bf8070480d450873f2864eb4037eabc8c23fafaa7fc482b5b2605ad1b9e45ff13b2b15ad8cb504b2d940d8bfa
 DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
 DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
 DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
-EBUILD alsa-ucm-conf-1.2.2.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.3.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.4.ebuild 495 BLAKE2B 5a7fad73d0723cfd71638c6a3a1e3bca99daf6c37accbbfed4fee49eef8a683f5cbd75ad375034d48416bd560a5738e9b43078abc62c917534a4f709365a33cf SHA512 8c9a2c4d69e2b9e23b9c5eba95b065aa83fe82c1b306484923362241ce04e07c4db4c4a812db1fe80dff641c2f473998ed912bf8dec9ab37054ed688f7758e47
-EBUILD alsa-ucm-conf-1.2.5.ebuild 553 BLAKE2B 7a3244a22de8962e5fcc2bede58f28638a2e474f15a3b4c4596bee02c9536ce73c21197e984e7ebba053603237f68d036093be9c859b6d871d61f1e0cdfdb164 SHA512 bcdc43a3170a910718f6861adbecc64aa514aa6389b75817252334112c226d0bd736b870ebee28c9a2add6ffcff99c7c5928f416876d208169ab686080a326c6
+EBUILD alsa-ucm-conf-1.2.2.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
+EBUILD alsa-ucm-conf-1.2.3.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
+EBUILD alsa-ucm-conf-1.2.4.ebuild 506 BLAKE2B 8d0c2d7a32bcb383f3b4bea98980a4799ed552937572a372266a01decb1c7d2332be5569ce01a76fb78441387f2b5a0d178c1a58d1b569b3a9a958bd84334865 SHA512 24630384d5ae157d083548282a21f238896fad252bccfd2c33d78291f1030db050fde2dff3518ed5b3ec465d9f69c8296fd96bd190e49ef4a21c6ca47f0915cb
+EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
 MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
index d85f2a03a32a..a89cadbba436 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
index d85f2a03a32a..a89cadbba436 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
index 6c74519bf103..3e722a7d42e8 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
similarity index 76%
rename from media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
rename to media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
index 2b01161620d6..444cc259d28b 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+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"
@@ -17,6 +17,8 @@ DEPEND="${RDEPEND}"
 MY_P="${PN}-1.2.4.81.g4884e"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
+
 src_install() {
 	insinto /usr/share/alsa
 	doins -r ucm{,2}
diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
new file mode 100644
index 000000000000..6564be8977c1
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
@@ -0,0 +1,20 @@
+From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 1 Jun 2021 21:08:53 +0200
+Subject: [PATCH] HDA-Intel: the lookups are supported from syntax 4
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
+index 5794e72..8a8e0e7 100644
+--- a/ucm2/HDA-Intel/HDA-Intel.conf
++++ b/ucm2/HDA-Intel/HDA-Intel.conf
+@@ -1,4 +1,4 @@
+-Syntax 3
++Syntax 4
+
+ Define.Use ""	# a non-empty string to use UCM configuration for HDA devices
+
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 0d647f4f412b..41ffd4ca923a 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -2,5 +2,5 @@ AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e5
 DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
-EBUILD ilmbase-2.5.6.ebuild 1084 BLAKE2B 71b2af01ffac5aca97b5b9602dd48a981ab7033fa4eefb049c20f0c31248eed0d65203418b9cd48f2bb2fc0a5d9be43dddcbe032adf548f5f0f9b4cc1be9478c SHA512 06a57c99df83bdb300ffaa2e9537b3771a1131e1cb5c1cb5f9ed4205fd53b98e96b1c4e40459937231ad8e42de32b6d53f7396167bc5753256eb1da7af4b1a66
+EBUILD ilmbase-2.5.6.ebuild 1083 BLAKE2B 8fa4ae20ed86dcd0cabef3a7d61e2a8b63b47a2c7951da60ed585f03fc97ad16f0eb560ae728cce9002e5b606b94aa63279dcda8ba27d9c23751fe068338fc1c SHA512 66542d6d72105d250a394bee7cfd6b847c2b9e7a3b3f517e107320a693178f339fb7c25b82c98e547f006f03f9e7da9673e448aedd606368a9e83e0ee365e500
 MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.6.ebuild b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
index 6b83e84966b2..24718e290866 100644
--- a/media-libs/ilmbase/ilmbase-2.5.6.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="large-stack static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 202d5bd5fb1a..4278c7df6c7a 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
 DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
 EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
-EBUILD libheif-1.12.0.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
+EBUILD libheif-1.12.0.ebuild 1832 BLAKE2B c356d6900836f2be4a67be40684ffaf0546195d24c0387e1b140b5b2ffdb9d46f860af7350b6013a799ca783a37f981ca79e6e392d77b2b6f41d84e88a7a7ba5 SHA512 eedc2d6763d9a7d7116ba536f08c70c87e3255b2bcca2086eedff96109a94270ebbb424b6c87d88be58767259de1cf64ed7a63daf707143b51b563f37d6baadb
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild
index 05d7c5f68ed0..1a9f7ed19924 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index e7f82a1c5fcc..8d28412e6e0c 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -9,4 +9,5 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70
 EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
 EBUILD libjpeg-turbo-2.0.6.ebuild 3051 BLAKE2B b85cb9cb4ad088928d5c8e81535c58e47948df44a0c3bcc887303fbe68e053aa2cf5c7a66c1812a4fbb60c6067f98c6b233203c6d7f5ec00ca5df53f708c6d19 SHA512 f072c13c9ad72b532b09ee3ec415a189491bb9eb0dee6f50f2b0a601cd24c952c62f8a947ec3af4e2f669c6a7353dbc8d9a5d6814e9aed45e14088e64e7e6df7
 EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3114 BLAKE2B 5da60b00e56b11581e85273e73252842d52833eab960ad6e9240c64d5311908fcaea885dd014f05e48ac7cee525a23b4e3932f5becc26079194c535253991788 SHA512 9766f9cd99a23bdc83e1cc27a04a8eb704a79ac1454dcf67e2ce107469071ab581b275b1d70de18376c95f99e03cb90a189ac1ac50068e1b61a5bdc32666de0c
+EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3232 BLAKE2B 789ebf33027f218a795226880ccc4d0c64055a1c8ec6fa0f0556b26affcae2b3db4469090acdf2462cb14f908562af77d3850b001aa6099cc79dcb9cc899f06a SHA512 ff846c4d7a91de095a2af7ef38d66041aaae616776c0b0e46f2a33a924c711424717fbd67ad91be99a4b45452d19a03acdc226d00f621774aba0f116265a2c16
 MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..78714e29ba7e
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib java-pkg-opt-2
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG ZLIB"
+SLOT="0/0.2"
+if [[ "$(ver_cut 3)" -lt 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="cpu_flags_arm_neon java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+
+BDEPEND=">=dev-util/cmake-3.16.5
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+	local FILE
+	ln -snf ../debian/extra/*.c . || die
+
+	for FILE in ../debian/extra/*.c; do
+		FILE=${FILE##*/}
+		cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+	done
+
+	for FILE in ../debian/extra/exifautotran; do
+		cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
+EOF
+	done
+
+	for FILE in ../debian/extra/*.[0-9]*; do
+		cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
+EOF
+	done
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DWITH_JAVA="$(multilib_native_usex java)"
+		-DWITH_MEM_SRCDST=ON
+	)
+
+	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
+	if use arm; then
+		mycmakeargs+=(
+			-DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
+		)
+	fi
+
+	# mostly for Prefix, ensure that we use our yasm if installed and
+	# not pick up host-provided nasm
+	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
+		mycmakeargs+=(
+			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use java ; then
+		rm -rf "${ED}"/usr/classes || die
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local -a DOCS=( README.md ChangeLog.md )
+	einstalldocs
+
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+
+	docinto html
+	dodoc -r "${S}"/doc/html/.
+
+	if use java; then
+		docinto html/java
+		dodoc -r "${S}"/java/doc/.
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 8c37556c0ae7..f6177c2e035c 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,4 +1,6 @@
 AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
+DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
 EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
+EBUILD libogg-1.3.5.ebuild 803 BLAKE2B dab16ab6c46e9395723d4b53d2cde5c2f0c5788cdcc8a2b1d0d6e1fd230b5268876bbfc6507c3a3890e5874e1421de7b96927faa13e757f0474fcf7855879cc1 SHA512 43272ccdbd28c3c386a74c108dbe6eb0b92d5cdb6f289e8715878356b3b8d203d6c668e9c36d354bbc6032f498ffb42e5b44f93fd518714e5ddd1a95f06c494e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
new file mode 100644
index 000000000000..420164577697
--- /dev/null
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="The Ogg media file format library"
+HOMEPAGE="https://xiph.org/ogg/"
+SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ogg/config_types.h
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 787bbf2e61a8..1a3637ed0ade 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,5 +4,5 @@ AUX mlt-6.26.1-fix-crash-w-ogg-album-art.patch 2476 BLAKE2B f11ae9637e0143134996
 DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
 DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
 EBUILD mlt-6.24.0-r1.ebuild 5347 BLAKE2B bda27b1eaa0ab139b06b029790b9528f3978b188eab9c75307c1128b60f0fa21ab34bae69e6f0efb0dec654f552fc8fc60fcf88d13a85ec85982465f907d8d3e SHA512 04e4f83c6efbb5a9d5fd7f307904f0473b82d385575332687b1c4ef87e69914605f75daa1ce116f913fdd6bf5ef7d8109c5bc469c39a566ec9cde110c7db8029
-EBUILD mlt-6.26.1-r1.ebuild 5386 BLAKE2B edcdd8c673bd54906eb1c3db1a2c48f42f20177da3ff4283f966c2c54ff8fe406feb962e47e3d219f1e493c6b386d96539ad21242bb4e3bc9eaf55705b5920d2 SHA512 fccede28d33ede488d2092150f1fce1867d502927eb6cfd0a49ddf34f01ec69bbbb5f507e609ecb8a6e8ee0795c817e95c56758953dc875a95e31873b818609f
+EBUILD mlt-6.26.1-r1.ebuild 5385 BLAKE2B 64c6779bf90e459905f1b93c28d7f21b4974a1fa8d7b0df205fb6ffe32d57b8516cf43968fc9af140cfdeafa9dce1a85d1b93411ad2f83587a7e837383af6579 SHA512 3f33ed0fd4d22fe7df7a53ed8810f296c1b4829410b7ddde3424bc55e6a321597dc80537488541490bc3536bf8f3de6d995a740f1adb7b65a99c3af74a701a84
 MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1
diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild
index e8345a2f096a..b811f88b94bf 100644
--- a/media-libs/mlt/mlt-6.26.1-r1.ebuild
+++ b/media-libs/mlt/mlt-6.26.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
 ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
 qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 3bdc8b0effeb..6fdd3e4e0982 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -6,5 +6,5 @@ AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deac
 AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252ff2422a52b56f3da8b0f256a52c714120fd2538b16e476271766a6130b97ec5025859e1320ca0a90c3ef5502fb0005f630 SHA512 d80fc47d8c4a768100cae38edcbf6741583507119d8cd8e2b6620cdc727599e5a1c170380cc25c711279b59c3432782c30315c7ffacbb78fcd1536dc12e3481a
 AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
 DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-EBUILD opencolorio-1.1.1.ebuild 2446 BLAKE2B 7f459eadf77b865ec3043277871b8fccab21ca4c404f8b0a1567823cd61c8ef0036e82e7b0cbeb9b6fda230986514192c57b2e8c8a6f749c4f7a662d70e3a2fd SHA512 7c784907a256dbbe789f79b5346ffe0b4abc48b0586bd50542cba04e40c62c5006fb3a65882708adf082ca344cc788afc0df9d5a9097a1a6f0896b536263af69
+EBUILD opencolorio-1.1.1.ebuild 2431 BLAKE2B dae7f1858e54c9638bb5933c9025eb8156fc5de0d3db21452ddaf4093e51d145dce3752bd27c4fc5d384a80a4ed912639026e22707e7220230ad3aa3a4f0f969 SHA512 afad8d6463be608e277474e899bac9b70d53a6d64bac9ca6a4193fd7c007dfbcc94bae4c43971ac0ef1f0eeef045e8e25ab8df6cd05d06e89990a5adf2a3598e
 MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 5cff05b434a5..8d00c38a8539 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit cmake flag-o-matic python-single-r1
+inherit cmake python-single-r1
 
-DESCRIPTION="A color management framework for visual effects and animation"
+DESCRIPTION="color management framework for visual effects and animation"
 HOMEPAGE="https://opencolorio.org/"
 SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/OpenColorIO-${PV}"
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index ced4ca51be23..3d8585a6cb72 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -3,6 +3,6 @@ DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff623
 DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
 EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
-EBUILD openexr-2.5.6.ebuild 1694 BLAKE2B f45b32bd7ea15dd7e76f747e2c658142224e69d7045e95c2987638697bccb656a5d136a6f01d0ef48afe054e13802367bf8f7df5801bcfed1419ec3147ede763 SHA512 da11c73e626e3bdbf673956aa2ecaa93e04ae1e6360785db04cdfcddf380fb1a91ad4cce0ac7db486b1cabef00e7eea5d463d2aee3fd4b570e7732b75140b14e
+EBUILD openexr-2.5.6.ebuild 1693 BLAKE2B a422c9edba74894aea74071a44c1bfd4208d28042bee923c6096260f7ea699d4b35a15f5409507b2c7b970b76fb427fb799c8c411db6b180650e5dd3148cde5b SHA512 a24a022533124096014a2126ee24d54aadd8d68cf66fd5f5c89624acd660ef943e2e684dac350fc6b9f59f3b768f2eec17a7a6cb8752b43fdf6318c53c1dcbc4
 EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3
 MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
index 87fd140fe31b..45229f8154f5 100644
--- a/media-libs/openexr/openexr-2.5.6.ebuild
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
 
 LICENSE="BSD"
 SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index f3ca59240df6..1c9ab72d204e 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -1,9 +1,4 @@
 AUX speexdsp-1.2.0-configure.patch 1092 BLAKE2B a4629cb00d1920133db30cf1cbdaade58fe69176515c75f140f9ae9060d3111f8d88b65ce67f3bd6c7d86f60db25d15997182865e6a528a8e20603f3edb6544c SHA512 0c6f1b8ae83e98c8899649e3f108ccaad89286db317e5c3f19bd0d78f71839b92b10125ba09b640453d299b3343bfaec128ae72daff72f37f95cbf38652980dd
-AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0516aee5bb5ed0906c46d5d1e44b406236404ed00a8f0b0df5e6093a7cbdb10c453d4ab69b8df63ebb127d47a6930d546476099f SHA512 075a88f7f16d4744c95a9208ff4e803bfc28bff99113c3e919a9ce24c8e6bf91eedcbe9d487b668428db357092cc5db455e6256020cec598120c971734258b07
-AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
-AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
 DIST speexdsp-1.2.0.tar.gz 919621 BLAKE2B 70c7d07f4b23abbb70cfb212a6541288c71f57fffd5fe22ddd94901a7d01fa403a69b7884e3a4a2267ffd45a7e053b1ae7c7fd662e57053a06d4a7efb7889610 SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec
-DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2.0.ebuild 1378 BLAKE2B ac273c245f9e714d6f2d78b430cd76456e5d6efda0a70025cad29a0ded97ae55702ca6cfa97f459aa07836ca22ba92a371f8890a1254d5aef41828106bc67c3f SHA512 80cdfab3dd67d22eccc5298307ee9d8584d7c7b746cc986bb30d354603213ebfbf63f2ee0a77a9b8c39e67f523532eeea406a16a86575da5605a31a90b7d89d1
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1452 BLAKE2B fb1c74522d2ede3f6c2e85c31259beb4fa6f62173f57a2e457ba2b31a7602501094c15616d025d18262710cc9890d3190951e37dfd26d9f5f3ef6b2d3825abb5 SHA512 e830cc39bbacf1af828553f4beb987055975de1574bb0089662232d82a469046750977d271958b6119ade46528b3518892845dbfa23cc6e9f90b3904c0f75b6d
+EBUILD speexdsp-1.2.0.ebuild 1376 BLAKE2B 9f44b14947abecb3b893c1ab049d52c0a1b04d45c5b9edb169f3f789e3bae5452c33fd97b512abe38759097328e3c12fd21ca20da06c15cf3ec8d0441a89bc59 SHA512 23faeb35901be800a1bd79352288ba425c8f417aa9e52faff4e5fb7ba1439380e57d466b0b9d8912535ba76d00d0b69f8c70dfa85f18b47660b324d219296eb4
 MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch
deleted file mode 100644
index 835769dde707..000000000000
--- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c470e2e89a6ca75b507437467692cd684b71a526 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
-Date: Sun, 5 Jul 2015 18:10:19 +0300
-Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined
-
-Not everyone who includes speexdsp_config_types.h will have a test
-which defines those, and if we've chosen to use the stdint types at
-configure time then we know exactly which header(s) are available, so
-just choose the best one then and generate the header to use it.
-
-This patch, including the above text, is copied from a commit in the
-speex repository[1]. The original commit for speex was made by Ron
-<ron@debian.org>.
-
-[1] https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87
-
-Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
----
- configure.ac                             | 6 ++++++
- include/speex/speexdsp_config_types.h.in | 8 +-------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2cd2d1e..1de0c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -334,6 +334,12 @@ AC_SUBST([USIZE16])
- AC_SUBST([SIZE32])
- AC_SUBST([USIZE32])
- 
-+AS_IF([test "$ac_cv_header_stdint_h" = "yes"],    [INCLUDE_STDINT="#include <stdint.h>"],
-+      [test "$ac_cv_header_inttypes_h" = "yes"],  [INCLUDE_STDINT="#include <inttypes.h>"],
-+      [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"])
-+
-+AC_SUBST([INCLUDE_STDINT])
-+
- AC_CONFIG_FILES([
-            Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
-            include/Makefile include/speex/Makefile speexdsp.pc
-diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in
-index 02b82fd..5ea7b55 100644
---- a/include/speex/speexdsp_config_types.h.in
-+++ b/include/speex/speexdsp_config_types.h.in
-@@ -1,13 +1,7 @@
- #ifndef __SPEEX_TYPES_H__
- #define __SPEEX_TYPES_H__
- 
--#if defined HAVE_STDINT_H
--#  include <stdint.h>
--#elif defined HAVE_INTTYPES_H
--#  include <inttypes.h>
--#elif defined HAVE_SYS_TYPES_H
--#  include <sys/types.h>
--#endif
-+@INCLUDE_STDINT@
- 
- typedef @SIZE16@ spx_int16_t;
- typedef @USIZE16@ spx_uint16_t;
--- 
-2.1.4
-
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch
deleted file mode 100644
index ae29da58438b..000000000000
--- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur speexdsp-1.2rc3.orig/configure.ac speexdsp-1.2rc3/configure.ac
---- speexdsp-1.2rc3.orig/configure.ac	2016-12-12 20:04:48.710853453 -0800
-+++ speexdsp-1.2rc3/configure.ac	2016-12-12 20:05:07.588052415 -0800
-@@ -151,10 +151,17 @@
- AC_ARG_ENABLE(sse, [  --enable-sse            Enable SSE support], [
- if test "x$enableval" != xno; then
- has_sse=yes
--has_sse2=yes
--CFLAGS="$CFLAGS -O3 -msse -msse2"
-+CFLAGS="$CFLAGS -msse"
- else
- has_sse=no
-+fi
-+])
-+
-+AC_ARG_ENABLE(sse2, [  --enable-sse2           Enable SSE2 support], [
-+if test "x$enableval" != xno; then
-+has_sse2=yes
-+CFLAGS="$CFLAGS -msse2"
-+else
- has_sse2=no
- fi
- ])
-@@ -162,7 +169,7 @@
- AC_ARG_ENABLE(neon, [  --enable-neon           Enable NEON support], [
- if test "x$enableval" != xno; then
- has_neon=yes
--CFLAGS="$CFLAGS -O3 -march=armv7-a -mfpu=neon"
-+CFLAGS="$CFLAGS -mfpu=neon"
- else
- has_neon=no
- fi
-diff -Naur speexdsp-1.2rc3.orig/libspeexdsp/Makefile.am speexdsp-1.2rc3/libspeexdsp/Makefile.am
---- speexdsp-1.2rc3.orig/libspeexdsp/Makefile.am	2016-12-12 20:04:48.690853242 -0800
-+++ speexdsp-1.2rc3/libspeexdsp/Makefile.am	2016-12-12 20:08:27.740161974 -0800
-@@ -29,7 +29,7 @@
- 	pseudofloat.h smallft.h vorbis_psy.h resample_sse.h resample_neon.h
- 
- libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@
--libspeexdsp_la_LIBADD = $(LIBM)
-+libspeexdsp_la_LIBADD = $(LIBM) $(FFT_LIBS)
- 
- if BUILD_EXAMPLES
- noinst_PROGRAMS = testdenoise testecho testjitter testresample
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch
deleted file mode 100644
index 3a413625085e..000000000000
--- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From a2133f5904ddb616b6578920bd2199f5accb484d Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Fri, 24 Apr 2015 15:55:32 -0400
-Subject: [PATCH] preprocess: prevent rare overflow on overlap-add
-
-Reported-by: Fabian Henze <flyser42@gmx.de>
----
- libspeexdsp/arch.h       | 3 +++
- libspeexdsp/preprocess.c | 2 +-
- libspeexdsp/resample.c   | 6 ------
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/libspeexdsp/arch.h b/libspeexdsp/arch.h
-index 6b3bc5d..c2de991 100644
---- a/libspeexdsp/arch.h
-+++ b/libspeexdsp/arch.h
-@@ -101,6 +101,8 @@ typedef spx_word32_t spx_sig_t;
- #define SIG_SHIFT    14
- #define GAIN_SHIFT   6
- 
-+#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
-+
- #define VERY_SMALL 0
- #define VERY_LARGE32 ((spx_word32_t)2147483647)
- #define VERY_LARGE16 ((spx_word16_t)32767)
-@@ -203,6 +205,7 @@ typedef float spx_word32_t;
- #define DIV32(a,b)     (((spx_word32_t)(a))/(spx_word32_t)(b))
- #define PDIV32(a,b)     (((spx_word32_t)(a))/(spx_word32_t)(b))
- 
-+#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))
- 
- #endif
- 
-diff --git a/libspeexdsp/preprocess.c b/libspeexdsp/preprocess.c
-index c080581..3053eb5 100644
---- a/libspeexdsp/preprocess.c
-+++ b/libspeexdsp/preprocess.c
-@@ -980,7 +980,7 @@ EXPORT int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x)
- 
-    /* Perform overlap and add */
-    for (i=0;i<N3;i++)
--      x[i] = st->outbuf[i] + st->frame[i];
-+      x[i] = WORD2INT(ADD32(EXTEND32(st->outbuf[i]), EXTEND32(st->frame[i])));
-    for (i=0;i<N4;i++)
-       x[N3+i] = st->frame[N3+i];
- 
-diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
-index 4940a64..4e47d67 100644
---- a/libspeexdsp/resample.c
-+++ b/libspeexdsp/resample.c
-@@ -83,12 +83,6 @@ static void speex_free (void *ptr) {free(ptr);}
- #define M_PI 3.14159265358979323846
- #endif
- 
--#ifdef FIXED_POINT
--#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))  
--#else
--#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))  
--#endif
--               
- #define IMAX(a,b) ((a) > (b) ? (a) : (b))
- #define IMIN(a,b) ((a) < (b) ? (a) : (b))
- 
--- 
-2.1.4
-
diff --git a/media-libs/speexdsp/speexdsp-1.2.0.ebuild b/media-libs/speexdsp/speexdsp-1.2.0.ebuild
index c7a59fa4a317..1f36b74e0d68 100644
--- a/media-libs/speexdsp/speexdsp-1.2.0.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
 
 RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
deleted file mode 100644
index 6d75678b32b3..000000000000
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P=${P/_}
-MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech -- DSP"
-HOMEPAGE="https://www.speex.org/"
-SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
-
-RDEPEND="!<media-libs/speex-1.2.0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-config_types.h.patch
-	"${FILESDIR}"/${P}-overflow.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		libspeexdsp/Makefile.am || die
-
-	eautoreconf
-
-	append-lfs-flags
-}
-
-multilib_src_configure() {
-	# Can also be configured with one of:
-	# --enable-fixed-point             (no floating point)
-	# --with-fft=proprietary-intel-mkl (mkl)
-	# --with-fft=gpl-fftw3             (fftw)
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_arm_neon neon)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index c7d7829e6321..0eb22a18fb60 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,6 +3,6 @@ DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b12
 DIST vulkan-layers-1.2.179.tar.gz 2771214 BLAKE2B ab9ddde54998ae44f6e3400c721c9b51b347d4424d2118b8b7371e9d1160a76257ca8f8295e9c52dfeba386a09e2b048111f242b7c4b912db1e5748e5dea8762 SHA512 e025c8f36f911bf838ec3a57123aecf44ec8d5ac5d170ef0e6d0ef7bd15789360faa89eb00c19edaa8e60503c4a80300448893d5185cd2880dcd817153e9cc4f
 EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
 EBUILD vulkan-layers-1.2.170.ebuild 1484 BLAKE2B a55abcf6025c76230286e85d0ad316695e45273f7200b4d5c85aa9ceb472b3f74345396fd3ca8df2d831733e29406d5d2cb2d671c45a6d9e64bc6859e7fde95d SHA512 a7d29d48fccdad1be28741fe4b788aedfa7c1b948e70b0bea86ad2437de0e351d59e8aa5dcb88e63a096684bc0f292f7151c2c1f6cf93501f1cf9230e025e663
-EBUILD vulkan-layers-1.2.179.ebuild 1501 BLAKE2B 71ff0726d0fee9cb437de7ed4cbe09826bd03c8194ed66e65e48299099d8d53eacc990cbba18b942a2f008666549623f311a7744661c57ade81d044125694003 SHA512 7c7c996f3bbc2751c690f45c0305ffea4077b8c310e9f9f5ad999327f60668613ddf0df531c17ff73cf0222ef2f77524974a769f93b26d888cc0cd85e0ad2070
+EBUILD vulkan-layers-1.2.179.ebuild 1506 BLAKE2B 629d570ffd1689ba3432e9c7b968558ceaa78c03488acb8899c286491425cbd4c22f19177241190828f7720cb9867ef6b1f3a0f53bd9a8460ec85d4486b0e4f6 SHA512 219316065e2dec1b97e2b770da03cf162923adf75eb4c6ee089abe82f51682d9805af2ea7f4e36e8e2fbc9adc2ed7f7e945876483937582a81ccf43048e05f55
 EBUILD vulkan-layers-9999.ebuild 1482 BLAKE2B dec0bead5a4c7cbdffc429cfa352f82ba3233c5cb0c94476815dbe6dea75f34a586454c128837ead1f44bc9a12f56c098ff3a22ffa555f4ac6f2d5c3d4358051 SHA512 0fd1f1695bab45ebbdac3868caaf259845f8c11300fa8320c059a6f81389e5ad6f75bf95453272613a72d61558b870dc8b076d36e1fb37e918f7663fdd016126
 MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
index 2950360f4c72..07c02145ee3c 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index e5f8546f79ca..58c743bc32cd 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -4,6 +4,6 @@ DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9c
 DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
 EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
 EBUILD vulkan-loader-1.2.170.ebuild 1729 BLAKE2B 85d77609918dc0ad75eea293cfde60a0e9335846f0a830a675494dee107dabf5470aa4433cbd3ec5d1b2103812c606c90a3a026b2e8c140521c130af0d27a572 SHA512 b51620c05c33a040d501a61d09d4d1d4ccbbea20a7f4de0a993a64c8fea360f8843921f195d3eab1e3a03a2af281d2deea2b00faabf7f1d504976ee491d35d90
-EBUILD vulkan-loader-1.2.179.ebuild 1718 BLAKE2B 06a770aff1a8f1687ac393d9cb1f6e18ed4418133eaaf182631f17f9e6fbe53cd9f2b09caf8279c31678b0f8927f29eefe95b5c9f3c7f753e8051de78deb9cc4 SHA512 ef42dc550fd44f131972a10eb223810709b656d403fc853bc9f2f4a4ea9cd80cb71add8474669016f1b271144d6762098816f83b90818c1c736ff34865d94da0
+EBUILD vulkan-loader-1.2.179.ebuild 1723 BLAKE2B cdd03e4754af95391cdd06fcac58361b869974f114f31018322497e4e12d4726f4e991c5cbee62e763ebb65f7058cb8e28b70a5b49f539284f833ca6f00d3fe7 SHA512 9a111e74fb6c6efae372ae29cf0533bd3c5e0ee8dbe3cf04abbc124028c413e875777057b33dd9b57fda90f785cfb21d1eea9a802bd344d04952f267a967ae5b
 EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
index 79d96bf973de..52680c705249 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e2f8dfe86a85..b033728c7253 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 2937a1277e0d..de854febbd4f 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,5 +1,7 @@
 AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2722d07a55e63e3a1ad36507bb15c970507450fcc29b51b8cfb77a1a15d8a68a9b1e5dca3279f5b2df85e731f8 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
-EBUILD alsa-plugins-1.2.2.ebuild 3025 BLAKE2B 95444378f3b08143085f7130f0a3594bbda46d9ae1f22d90682d60d1dab0663dbd5ae3f74d9ef102363bbc3237b9b722771290a17283a87e8c63fed852d095e3 SHA512 acfe326be9071e01346145f4217ac73b5c240e9bf0a5c12424027a8ba297ac34089f0d4181d783167d230a7bc612357d591a927c703f789674ba56043516ef3d
+DIST alsa-plugins-1.2.5.tar.bz2 406134 BLAKE2B a1bb2f187c92a2999722e22775baf2c1fc4240162bb71f454c60359ef61b46934ff8ecd5af97589bafe2c7f737530cf5a4dcc139af7ed001d8dfe24bf3ae045c SHA512 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf
+EBUILD alsa-plugins-1.2.2.ebuild 3036 BLAKE2B 8f7b60e821e0e49f7ef4d996e2d83655a571e1e5fa87daa7345ae9984d98673e02e98de6ca28ad309c260ad46780f1bc8cbb7bffadbcb0b445698681492b9eea SHA512 58900ec7dcc36f35774d8970044c4062e1a550691f8583743c2c42b7e95c74f148b1a87e10ad59b5f54ee1719423f2f337915974b7330c376ee3f6a2566d09f3
+EBUILD alsa-plugins-1.2.5.ebuild 3043 BLAKE2B c9d6d689b4aaca87b8c0d0f64b6bc8514923c512d9d3c23625461f793224a77f00b47e11a0988a1a31838a0319e02523003057d73fd8025ad268f2f1bd41bbcd SHA512 f9785f6272cd017b705485a6d4f6327656acafb7e1a77657cac2386b4bcdcd4dc588de2882e8df8b39021cff40bfe98d091f275cf8138a74c05c079384c52303
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
index dfabd31b6fef..aec784056d64 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit autotools flag-o-matic multilib multilib-minimal
 
 DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
+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"
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
new file mode 100644
index 000000000000..5c90ab1ff094
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~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/x42-avldrums/Manifest b/media-plugins/x42-avldrums/Manifest
new file mode 100644
index 000000000000..ab06977d7c56
--- /dev/null
+++ b/media-plugins/x42-avldrums/Manifest
@@ -0,0 +1,5 @@
+DIST robtk-0.7.5.tar.gz 117218 BLAKE2B ed1d19644b0d1bbc072098971062b66810cf137499a6ac4a706865c3f7dbd1c4741fb7dc9d8fe7f9112a43744c9bc9dc97d9e53264bbf9625291c6b49724bd35 SHA512 93527d5c67af786f93338c722e10e8c71379372846d06905af1b10b7085c34c09ebf445e174c32206b06cac876ed8093b3631f8ed15c10fcbe44317b6b8e2559
+DIST x42-avldrums-0.4.2.tar.gz 35246454 BLAKE2B aa8197e9b4e49f106f223cdc59886c76e33901b78c017b63598ff777cbbc7731318aeee90eb0687ce6bcf53b5f372218a0a8998c53d3c16ead9e8451d28f270b SHA512 4a8e51a02022294eedcb676579db7fbbf6d0054c71bb86a600403dd251a5bc179785d9a436ceba27a27cc49a370801e3838081d787d9b6345c85ae45b5f0e9e9
+EBUILD x42-avldrums-0.4.2.ebuild 1039 BLAKE2B 76fe87281bf86b38dd65b8c1e365b221a8458a171ec8d97a25b067a19270744225fa13569194c21a2478b8b98967ee1ec3d2be6e230b975beaf1410e6c419325 SHA512 e3e79c35848333ec55c66ca6e334b51e96abf588d3472671960d4497bf2cd301fd8e89b4a657ec3fb5b59ecd78bd5e17de29adc0530e5be4857ba5fffd7a0c0d
+EBUILD x42-avldrums-9999.ebuild 1039 BLAKE2B 76fe87281bf86b38dd65b8c1e365b221a8458a171ec8d97a25b067a19270744225fa13569194c21a2478b8b98967ee1ec3d2be6e230b975beaf1410e6c419325 SHA512 e3e79c35848333ec55c66ca6e334b51e96abf588d3472671960d4497bf2cd301fd8e89b4a657ec3fb5b59ecd78bd5e17de29adc0530e5be4857ba5fffd7a0c0d
+MISC metadata.xml 340 BLAKE2B d5cbd8288964ad9666df4937cc4d1404ae0d184798e4eae7bf0452132764b4dcb7c08c667b7d8bfe28e0a879afebbe610ca8167133f135cdefe5782760194020 SHA512 8ab84573278eaf3c9a1f58930be664a6494293e2ece2196c154a4c639738616011310e3774d09697d8cee6ba333a67c3a0a06ac62be7e41437ff6169c03386b3
diff --git a/dev-util/jarwizard/metadata.xml b/media-plugins/x42-avldrums/metadata.xml
similarity index 61%
rename from dev-util/jarwizard/metadata.xml
rename to media-plugins/x42-avldrums/metadata.xml
index 6c9274348332..5f5d01566d0e 100644
--- a/dev-util/jarwizard/metadata.xml
+++ b/media-plugins/x42-avldrums/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">jarwizard</remote-id>
+		<remote-id type="github">x42/avldrums.lv2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild b/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
new file mode 100644
index 000000000000..1fdd52ce392e
--- /dev/null
+++ b/media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="AVLinux Drumkits"
+HOMEPAGE="http://x42-plugins.com/x42/x42-avldrums https://github.com/x42/avldrums.lv2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/x42/avldrums.lv2.git"
+	ROBTK_DIR="robtk/"
+else
+	ROBTK_PV="0.7.5"
+	SRC_URI="
+		https://github.com/x42/avldrums.lv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/x42/robtk/archive/refs/tags/v${ROBTK_PV}.tar.gz -> robtk-${ROBTK_PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/avldrums.lv2-${PV}"
+	ROBTK_DIR="${WORKDIR}/robtk-${ROBTK_PV}/"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/glib
+	media-libs/glu
+	media-libs/lv2
+	x11-libs/cairo[X]
+	media-libs/libglvnd[X]
+	x11-libs/libX11
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake STRIP="#" RW="${ROBTK_DIR}"
+}
+
+src_install() {
+	emake RW="${ROBTK_DIR}" DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
+}
diff --git a/media-plugins/x42-avldrums/x42-avldrums-9999.ebuild b/media-plugins/x42-avldrums/x42-avldrums-9999.ebuild
new file mode 100644
index 000000000000..1fdd52ce392e
--- /dev/null
+++ b/media-plugins/x42-avldrums/x42-avldrums-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="AVLinux Drumkits"
+HOMEPAGE="http://x42-plugins.com/x42/x42-avldrums https://github.com/x42/avldrums.lv2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/x42/avldrums.lv2.git"
+	ROBTK_DIR="robtk/"
+else
+	ROBTK_PV="0.7.5"
+	SRC_URI="
+		https://github.com/x42/avldrums.lv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/x42/robtk/archive/refs/tags/v${ROBTK_PV}.tar.gz -> robtk-${ROBTK_PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/avldrums.lv2-${PV}"
+	ROBTK_DIR="${WORKDIR}/robtk-${ROBTK_PV}/"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+RDEPEND="dev-libs/glib
+	media-libs/glu
+	media-libs/lv2
+	x11-libs/cairo[X]
+	media-libs/libglvnd[X]
+	x11-libs/libX11
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake STRIP="#" RW="${ROBTK_DIR}"
+}
+
+src_install() {
+	emake RW="${ROBTK_DIR}" DESTDIR="${D}" PREFIX="/usr" LV2DIR="/usr/$(get_libdir)/lv2" install
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index eb3ff44e0509..be8daf2d874a 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index caa06fcab35e..a3010554deda 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,4 +1,4 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.2.2.tar.bz2 1876266 BLAKE2B 2bfe4464869927f73b1059de9d972231b90af3be930e0e63048fcc40dadace0c842396e339874595f917b632fe407e16977a8b774240ffaf758004d42f46a27c SHA512 935d46ee3cc843566ccea183bcf7ea36439a4a6aa22964ebf6fd2722b78ec634d3be4e6a30b04c608abe6c5a132dd633f8343fff19f9d90a756d6699fc849a16
-EBUILD alsa-tools-1.2.2-r1.ebuild 3413 BLAKE2B de2a4379b262ae815828dba0ade2ea67374a619c09946ca8fb56489fbef3ddb38490fc87d269ad694e696e0bfa49e3f11eb21964f024deed55dacfa0efb83fbd SHA512 8697d2e9a4245e20c7a44c4feccce91ec5506288a6171d1a765bd60683f3253a9535c70c21a024f57e4ec4eb25d1672470881f7584953ea7b9b3b98f19617f18
+EBUILD alsa-tools-1.2.2-r1.ebuild 3427 BLAKE2B d82cac5f95da90ab930cbf1ba96ba3bc3c00f5453cb80dd1672210628fdbcf0a3a1f14b578e56ab89a058edf0e33305ccceec21d3163b4ef628355f0adc34dec SHA512 c77460f347017900b62532b4a65bae9c5a858a7ebe9c329dd6c75333dd1d1f66455d6401c2f558df8cd4d8e9e90b3b06ec4e7645657810b4bda8b15f85428b7f
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
index 4686591d3c14..90f3ebe67707 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools flag-o-matic xdg
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 880f5a74f6d5..8ec0b615c71e 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,13 +1,15 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
+AUX alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch 1663 BLAKE2B 15f3778401410039d30aa93c12f17a7b9581474a7b1f2cf9cad743992b3b7ae9df65810af842d5a00f36d62e53cde51cf2c6ba8d41e1aab7e0a089a4396fe841 SHA512 2b6f0e6c6e68adff98911547d6b5372493d313ba1f7ff16f845ebf58d584a83916b213c3aeaef1198f09808851b01dd533b2d85fc7b72032843319ab60a707e2
+AUX alsa-utils-1.2.5-fix-the-nested-iteration.patch 989 BLAKE2B 5f5956c72a0e9605011b953f98ae29803f50e0c427c794331d1b99e7c1a4dc81379a074a1403ba71737cf8de03c0d749e4544a22a8e2f39984ed9dd6482b40dd SHA512 0cdc8c41b70be714515f355a630fc28b68b95cb7b5a5cbb58c1b288ee0edf3128eb8f80bb874844cf11268c89bb04e82f1fe8c4c1ebb7cd7334d28f2896d5a85
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
 DIST alsa-utils-1.2.3.tar.bz2 1277105 BLAKE2B 70037123de16d4d267fbe862acba31144e1f060cb01c294cf0691d9378e1f04b108c9f3a5e071979abe9b5c1c15a49facc9e0be73122caaf812047a514e4de4d SHA512 5aeba2e5b7279c62d4df85b61a26b3f41e5465bac5a0b94c7bbe1299f7aa38e8cf2a1f749f618289a63b61f76609fe54169fcbe70792b45adc8957811b672012
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.tar.bz2 1326676 BLAKE2B 52cbe978390e1b5600bf7422e67ece1d24a946d99acddbc059bf6eb3a0b8dfe37cc573167013296e923bf1597973eb55b2580eaf849e088822ba7b2afc14279f SHA512 0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1
-EBUILD alsa-utils-1.2.2.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.3.ebuild 2334 BLAKE2B e8dceb69a7dde34306d35baaa15b8e986a3b0d9099fc110e2ebcb05f6961e63b643ba80026f35477cc15368f31f7d36eb55f4233b10d194471024a45978170a1 SHA512 a28f3b896110d432768193b5122feff2190334ef0ffdf6f48f393a57b29b4edc289a97ccd8d3e851aa970a72788ea309c5c95331bb38253f95b5221a719a0835
-EBUILD alsa-utils-1.2.4.ebuild 2335 BLAKE2B 001e48c41114d82be491c59c42f04d351bc2949498e4bcb6c29cd9697206ff76c93c76bda22528f6c7745eae05f5190d7b3c6ec2472b2e6506a4e829261ead57 SHA512 4e47c7a7db56f528aa524376dc365a9daf076f65629262d962ebe6878bafa8b6cc5a3975792fde7a71a9c456001ed3e9836a9026bcb935b8e1deb7748770c27f
-EBUILD alsa-utils-1.2.5.ebuild 2341 BLAKE2B f1d3124447c60c824dac7c2e9b4007ba93e5eeaf558dacedb344a4a6d0b18d3e7be5bf7cb2b8f99f1f6d07e62da85cbfcf416a049030d3edc2c74b62b5185546 SHA512 2dfcf714a7d865085086b742914c2faeb036825273bef722351ed9219ca074612e7745afd8b11a20a58e1e8999f71d28744992d98b4c3bc9cb9df438d5c66b49
+EBUILD alsa-utils-1.2.2.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
+EBUILD alsa-utils-1.2.3.ebuild 2348 BLAKE2B 572712ba71f0ae8cc2b63064e1c63deb4380dfa33eb9a60103c12bdd7ddc66541529c819883af1238e42d41f2631e9097bc743cf1adf1e6f87503939c1dddef9 SHA512 12ff0f279cbcb7c8d1fb3d45abc3a8e5eb4dc8ddf65faf90d10f5d4c7d791cf2cbfb436ff91470860b1157d3caa166b21d5989346526936f14fb0b2c5c70b008
+EBUILD alsa-utils-1.2.4.ebuild 2349 BLAKE2B 2ca0e2e274b2f89da4b04d84b97902e44bcb490cec14a299d6cf40015a7eecb3684f69392959888f675f0aab1924beda3b54b1cc897b0d556be0e580e6da1c8e SHA512 c6f576c19240035bd60b72bf025fac21f8af8063a7a6619b8f27fd6a3b56b79591b08f7c5cd7bd8f8f4795457138897224ef634f7208a5910749e27aa54448f8
+EBUILD alsa-utils-1.2.5-r1.ebuild 2513 BLAKE2B 8ed803654a0a5918ae83774e65f07159ff0ea14324c937c3f6452ab526241db10dc5c5c3486b9ad9f33b765fcebea6eaeb9324f5f0d5fe14be30677969322250 SHA512 ac76c3dbef7dca7fb2da0ad8c93a862393712bb5ce638083adb7c2eea9e63167981117f5a91193b0b6cc5aeb66590ddf9b0d91b752e3792812608f2cb18a001f
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 0ec8d4c4e195..05318d998ea3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
index 0ec8d4c4e195..05318d998ea3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
index e88a3ec3ab73..c9640682fba3 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
similarity index 91%
rename from media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
rename to media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
index 507876a36c16..2c95a68cb144 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -24,6 +24,8 @@ RDEPEND="${CDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-fix-the-nested-iteration.patch # bug #793410
+	"${FILESDIR}"/${PN}-1.2.5-fix-potential-null-pointer-from-strchr.patch # bug #793410
 	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
 )
 
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
new file mode 100644
index 000000000000..f06756a8af96
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-potential-null-pointer-from-strchr.patch
@@ -0,0 +1,49 @@
+From 3d7a6facd9e1f962eef6c4ba3aa4cdc22477a6ac Mon Sep 17 00:00:00 2001
+From: Chao Song <chao.song@linux.intel.com>
+Date: Mon, 31 May 2021 10:29:57 +0800
+Subject: [PATCH] topology: fix potential null pointer from strchr
+
+This patch adds check to the return pointer from strchr,
+because it may be null and cause segment fault, if component
+is not properly constructed.
+
+Fixes: https://github.com/alsa-project/alsa-utils/pull/91
+Signed-off-by: Chao Song <chao.song@linux.intel.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ topology/pre-process-dapm.c   | 5 +++++
+ topology/pre-process-object.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/topology/pre-process-dapm.c b/topology/pre-process-dapm.c
+index 450ca717..dbaf2f11 100644
+--- a/topology/pre-process-dapm.c
++++ b/topology/pre-process-dapm.c
+@@ -146,6 +146,11 @@ static int tplg_pp_get_widget_name(struct tplg_pre_processor *tplg_pp,
+
+ 	/* get class name */
+ 	args = strchr(string, '.');
++	if (!args) {
++		SNDERR("Error getting class name for %s\n", string);
++		return -EINVAL;
++	}
++
+ 	class_name = calloc(1, strlen(string) - strlen(args) + 1);
+ 	if (!class_name)
+ 		return -ENOMEM;
+diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
+index 09aa3758..ac8caeca 100644
+--- a/topology/pre-process-object.c
++++ b/topology/pre-process-object.c
+@@ -492,6 +492,11 @@ static int tplg_pp_add_object_tuple_section(struct tplg_pre_processor *tplg_pp,
+ 	}
+
+ 	type = strchr(token_ref, '.');
++	if(!type) {
++		SNDERR("Error getting type for %s\n", token_ref);
++		return -EINVAL;
++	}
++
+ 	token = calloc(1, strlen(token_ref) - strlen(type) + 1);
+ 	if (!token)
+ 		return -ENOMEM;
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
new file mode 100644
index 000000000000..e175287a5598
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.2.5-fix-the-nested-iteration.patch
@@ -0,0 +1,28 @@
+From 78212445de4c8e07873cbc7dff2abcacd031f151 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 1 Jun 2021 17:47:42 +0200
+Subject: [PATCH] alsactl: fix the nested iteration
+
+There may be nested iterations for hw: card names.
+Handle this card name in snd_card_iterator_sinit().
+
+BugLink: https://github.com/alsa-project/alsa-lib/issues/142
+Fixes: eefc2c6 ("alsactl: use card iterator functions for all card loops")
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ alsactl/utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/alsactl/utils.c b/alsactl/utils.c
+index c79fd951..881b5053 100644
+--- a/alsactl/utils.c
++++ b/alsactl/utils.c
+@@ -247,6 +247,8 @@ int snd_card_iterator_sinit(struct snd_card_iterator *iter, const char *cardname
+ 	int cardno = -1;
+ 
+ 	if (cardname) {
++		if (strncmp(cardname, "hw:", 3) == 0)
++			cardname += 3;
+ 		cardno = snd_card_get_index(cardname);
+ 		if (cardno < 0) {
+ 			error("Cannot find soundcard '%s'...", cardname);
diff --git a/media-sound/entagged-tageditor/Manifest b/media-sound/entagged-tageditor/Manifest
deleted file mode 100644
index 935ab15dd6e0..000000000000
--- a/media-sound/entagged-tageditor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX entagged-tageditor-0.35-buildfixes.patch 1859 BLAKE2B de254c5d617c074ade950b37b14c9ec49c92f2d22efdf6ccd2d4d156911c4e77220ed0297e5e4f0c6997e62172b5fbc706a567837fafc8d63638e302ee349c35 SHA512 544c91b207744a55320935af689c0987f5798ea931b7bb498dd1b2028defa690bdeb1419de2701ce3a2d35f91b2943f0818dbc63c36581d7019b53c6493a8406
-DIST entagged-tageditor-0.35.tar.gz 4606721 BLAKE2B c7013ed9bbef046bc46897f59e6bf668f835dd80ece83d19ef9ea83f089461cb677cd55a98554310734c36bb97945db7db13eb00cd7ae06e82c0f3ea00e928ae SHA512 cefebce7381d489ccd821933c3a1d330713d4de6cf9366aa699f5017939620589c95a2ee162aabc7bfa6d42d56b5986f4ecaa2f1f77ec586cda5f6780f0a06f3
-EBUILD entagged-tageditor-0.35.ebuild 1132 BLAKE2B 59bd583b7eab1724a6c4c777abe57cfb5b3187e8bad93ddd6db89c64e3fd57bee8c2182514b2e7ba3d73555591d958e6729aacf2755ee5bd57cbd6817f97aab0 SHA512 fbceb85a877ead1b15290b19e63951b44074cb7aa8d37c2ac3cdee81eacbabdaea4033f6ecbfb752602d831b214cf83cf17fa576d8f3aa394c58dc04537d6d0c
-MISC metadata.xml 294 BLAKE2B 9f0e6935f2296bed9ad96d9a3c14c1b8fc04785c660279184c86b1f05f411e1f8c77ce267d628fbf33d19e69123d6e1e1007ec7fd87a087a5e8c8945adead4b7 SHA512 d9ab3a99fc847b029f4c1ac9ab321b066de58a68c2e5841147b6a4a25a940c8629f0dd4acb06a057acafc7420009fbd4b3843ed82ce85ece6e32b21aad24690e
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
deleted file mode 100644
index 1113fa708d1e..000000000000
--- a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 java-ant-2
-
-DESCRIPTION="Open-source audiofile tagger"
-HOMEPAGE="http://entagged.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.5
-	dev-java/squareness-jlf:0
-	dev-db/hsqldb:0"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-db/hsqldb:0"
-
-EANT_BUILD_XML="entagged/build.xml"
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p test/entagged/junit || die
-	mv entagged/entagged/junit test/entagged || die
-	rm entagged/*.jar || die
-	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
-	cd entagged || die
-	eapply "${FILESDIR}"/${P}-buildfixes.patch
-}
-
-src_install() {
-	cd entagged || die
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	java-pkg_register-dependency squareness-jlf
-	java-pkg_dolauncher ${PN} --main entagged.tageditor.TagEditorFrameSplash
-	newicon entagged/tageditor/resources/icons/entagged-icon.png ${PN}.png
-	make_desktop_entry ${PN} "Entagged Tag Editor" ${PN}
-}
diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
deleted file mode 100644
index 709b16b32a58..000000000000
--- a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build.xml	2007-03-23 16:25:25.000000000 +0200
-+++ b/build.xml	2007-09-01 09:20:44.000000000 +0300
-@@ -30,7 +30,7 @@
- 	<property name="entagged_dir" location="."/>
- 	<property name="entagged_base_dir" location=".."/>
- 	<property name="tageditor_dir" location="tageditor"/>
--	<property name="tageditor_version" value="0.21"/>
-+	<property name="tageditor_version" value="0.35"/>
- 	<property name="tageditor_jar" value="entagged-tageditor-${tageditor_version}.jar"/>
- 	<property name="tageditor_zip" value="entagged-tageditor-${tageditor_version}.zip"/>
- 	<property name="tageditor_tar" value="entagged-tageditor-${tageditor_version}.tar"/>
-@@ -52,7 +52,7 @@
- 	
- 	<!-- Compile the sources -->
-     <target name="compile" depends="clean">
--		<javac srcdir="${entagged_dir}" classpath="${entagged_base_dir}" excludes="entagged/junit/*" source="1.4"/>
-+		<javac srcdir="${entagged_dir}" classpath="hsqldb.jar" excludes="entagged/junit/*"/>
- <echo>
- Entagged Tag editor is now fully compiled.
- You can use either:
-@@ -71,9 +71,8 @@
- 	<!-- Prepares the classes to be packaged -->
- 	<target name="build" depends="compile">
- 		<!-- Jar the classes files  -->
--		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/*" excludes="**/*.java" >
-+		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}/entagged" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/* miage/**/*.class" excludes="**/*.java" >
- 			<manifest>
--				<attribute name="Class-Path" value="${tageditor_jar_classpath}"/>
- 				<attribute name="Main-Class" value="${tageditor_jar_mainclass}"/>
- 			</manifest>
- 		</jar>
diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
deleted file mode 100644
index 4d2b70e37efa..000000000000
--- a/media-sound/entagged-tageditor/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">entagged</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 77376906bab6..120721cc7d7c 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
-EBUILD gnome-music-40.0.ebuild 1922 BLAKE2B cb18d9568e0fb13bceecff8b94618c268f9afd415ab3e9a7a89d4c91888673b6e559ad7f078f4aee1fd00d18526e30d9c6cb2d26da022c72f3d27e2ec1ebb483 SHA512 9b12ea406f65353ad45eb719999fad8b45ff79fee26dff65b5cfd3e07b082fb138e845b1f0f90c64be18be3ad914f33e73cff0f94a18280bcbd3d2816359dafb
+EBUILD gnome-music-40.0.ebuild 1929 BLAKE2B a86a4506fc9ab52e31b19183ab6d8a102709dfe0c49474924b485990b2228fffa8c6c61faafee8b361bafd8cc09e70bff5d4799f1b532ccef34dffb0c14b640c SHA512 4ac8aea4cd09634a181429376b3f490dc9aa53caa52bb788de36225dd51da22f91b7bb18a02f17eec53cfdd61bd33c15f8fa50c7fb5b297b9fcd305480812621
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
index b9e291603ed2..21901b881186 100644
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ b/media-sound/gnome-music/gnome-music-40.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 9a5f82761f10..9d69c4a7571f 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,3 +1,3 @@
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
-EBUILD mikmod-3.2.8.ebuild 468 BLAKE2B ce607f9ef7281cf67e83613937e8e457f7980ace5b11cd71082e7bf8fb09de88c2ed37ac56330c6c8554c12fb4ef683cdc7c629e91ced5741dc0af7d0966922b SHA512 da2419c35eec0c6cf8d2aa894a9b8f460690b74a3292dd1596f65587a3a34c299c30e750c36d84a61540ca87d5f56b35772b725aabe1800780e024d0ebe92719
+EBUILD mikmod-3.2.8.ebuild 475 BLAKE2B 6c6da2ac2ec2544c0567191ae1015662d58ca4b77f6e98b5ddfe5a90daaf9a0686c6a54909b4d11160eaf74f918e51fc771bf23796849bfdc33835f11f873056 SHA512 9afd87c8a7d7c164e25994db09cfcd6da25da716678c247708aaad5a4bc5dee5aaf1cc38f3dd2b53c693d801390c6d696de87319b3f090c3d268dc4023867af6
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index aa4da6360bd3..35c7ad01c3a3 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 96c16f8d44a6..5f3ec62e231b 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,7 @@
 DIST mpg123-1.26.5.tar.bz2 1051356 BLAKE2B c58ccb78b406bd9405c803d4d203a75ae981e3493fab84e15da49290d2d1b87912292838aa48c50cf192b8bcee4ea1bf18d89bbfc6df14452cb350356e6cbba0 SHA512 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
 DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
+DIST mpg123-1.28.0.tar.bz2 1063321 BLAKE2B a4fa37ac9c3aca867ac4f18eea9c2d39ed80c7e86908b2f5399da8ae82c2e4b57c1a041f17427702da14af9902051ce4de5a85497f7236963ae390ef8715327a SHA512 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
 EBUILD mpg123-1.26.5.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
 EBUILD mpg123-1.27.2.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
+EBUILD mpg123-1.28.0.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.28.0.ebuild b/media-sound/mpg123/mpg123-1.28.0.ebuild
new file mode 100644
index 000000000000..b8286510b25f
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.28.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index b36b59b9503d..d997931eba44 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,4 @@
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 EBUILD mumble-1.3.4.ebuild 3757 BLAKE2B 38b1bd1778be0290bf1a887fb615a7b8b247e324cfc4df02a816923962e3fe4bc58b7e298d7a4b50ee41b304a5c1f8d3574c675a33adc9af1331bb76028dd957 SHA512 0a450d16a7102a5b6b7c337999fa649d585cecd6ebf9bcddd7352a1806aa3e6ff580fc5b1687a4bd40ac1b1726cb461861a2f24ef84b7e403afcea6078ca197a
-EBUILD mumble-9999.ebuild 3001 BLAKE2B 3aec4e582c1ddd342d72ce457dbd2f8693ac5209eaeb3cc8a3b8d6301f1aa306bb9b0c18d09a056ddf1f14633c7422abc219cdf4012e9ff7185398ddc1c7b3d1 SHA512 924aa3db870ea5a8447e41e664be154bc97fedb0fe885e888a41d9cae9404018b374522a07be38b5fdef4074a05c7f8aa03b1134769f6221559b064175fe1cfc
+EBUILD mumble-9999.ebuild 3032 BLAKE2B f5dbfab60d82ea467f4b387fab941555ecd05a82ac80d67cc6dff962d049f3dd91ad9e59ed3a15dfdbe5c0c1981f6116decdf503526cad3aa2a37a5da6fe1f28 SHA512 6ff0537b360e770b73dd081aab902603f6583a268702d4aedc8d75619f9aa4dd9bb058d5cf70e4f0769fd037fd8564a041dcf7746831061d1c65db175d3fb5a0
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 88978a8aed86..260bec92b200 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.mumble.info"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
 else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
deleted file mode 100644
index 74a9b4243c0b..000000000000
--- a/media-sound/protux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST protux-0.50.100.tar.gz 392027 BLAKE2B 3aad4eae28fe866bdff456b79ffcccba0658b97b06c29757757a1f7b8318a27c8e13166c0f6dfa0815276af4358dda031b9c2d869ffc007e9b21fb29d0733970 SHA512 8a7f241c1673193141f456367d40260bd9c1d9ec93130d51abebd14e1dfb03784a2cd21c6c72bce645bd362f138e52e5d41182358ea4b4dad50f892025b6dad7
-EBUILD protux-0.50.100.ebuild 1038 BLAKE2B 3f726e49643bd9e1a5dbdac1d207b954691789862e9c5b72b090740ac8e087e3c8ed0b12f03f39483762cd830b1f5379f4b4b2c811b172c4a8bebbb14ee52186 SHA512 8c5096a8a58c29e05c35252f57fbd627406bef000af828c7f24bbd738827739dc1e250535f06c7a85893191eb7fe82482ea9e5e36ab1d8733671c9e6befda1fc
-MISC metadata.xml 448 BLAKE2B b42a47762da30e666d97523b56e33df98e97ddedab954c4e19add0cde52d7d8cd73409d723419363ddf683922d697f06d3b8077f78524e62b5ee008c9f5831fa SHA512 6db37340b09ea0b4f18892b7868aeabbc50f4a9d2505332d9f927a9299fd0d13178a8e351f6378f1f5c55b6a9862a08323213995027ebf9f9e2f235c6d857943
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
deleted file mode 100644
index d1b3ad750f41..000000000000
--- a/media-sound/protux/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">protux</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
deleted file mode 100644
index f4f130c2bd87..000000000000
--- a/media-sound/protux/protux-0.50.100.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="Professional Audio Tools for GNU/Linux"
-HOMEPAGE="http://protux.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="source"
-
-DEPEND=">=virtual/jdk-1.5
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	# bug #318589
-	sed -i '/com.sun.jmx.snmp.Enumerated/d' \
-		src/org/protux/core/GlobalProperties.java || die
-}
-
-src_compile() {
-	cd src || die
-	ejavac -encoding latin1 $(find . -name "*.java")
-	jar cf ${PN}.jar $(find . -name "*.class") || die
-}
-
-src_install() {
-	java-pkg_dojar src/${PN}.jar
-	dodoc AUTHORS BUGLIST ChangeLog COPYRIGHT INSTALL README TODO
-	use source && java-pkg_dosrc src/org
-	# pwd like this because it does not find resources otherwise
-	java-pkg_dolauncher ${PN} \
-		--main org.protux.Main \
-		--pwd /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r resources
-}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 182ab39ff541..d12c92c30713 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,3 +1,5 @@
 DIST rosegarden-20.12.tar.bz2 6438971 BLAKE2B f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28 SHA512 a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2
+DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
 EBUILD rosegarden-20.12.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
+EBUILD rosegarden-21.06.ebuild 1135 BLAKE2B 350774d8cd0f82e86e09db77fb81eb338cfafdad02b74afcd8cca5677bd65eb517bce08f8fdc1389836d0bddf75ce412cfcacd318281dfa7f3a5837c79a00159 SHA512 06d439b37e18cb255f3c0d591e71fab48e3646ff645ff01630c9a6e509bb7baf70dd1012da4c19251ef999f922b3a2dea7d01da0104a4ce1cfcad404fba66cd7
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-21.06.ebuild b/media-sound/rosegarden/rosegarden-21.06.ebuild
new file mode 100644
index 000000000000..6cc3ac2b875d
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-21.06.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg virtualx
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="https://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib:=
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_LIRC=$(usex !lirc)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# bug 701682, tries to open network socket and fails.
+	local myctestargs=(
+		-E "(test_notationview_selection)"
+	)
+	virtx cmake_src_test
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index bd63bb29492f..233de54ea494 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,5 +9,5 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r8.ebuild 8272 BLAKE2B aab42ce7f2c0c35c39e840f54d51f47d7648a0937ea15c6398a417a124ce63197cb82a0059408ef343075fcd318573e470d336a13c0018d4a8da23d9b7cced72 SHA512 a30285032c694e99b90ed8c2eef973f91b96603f35546c9ce58abef4131e4caaeaad2d94953a95185b2747f56f005811020b2c479cc57ac2f9ced02904583f9a
+EBUILD xmms2-0.8_p20161122-r8.ebuild 8264 BLAKE2B a602b991508a72aeef06ed67f9a3a2bae2eef870d529298b9470a31444a26d84593efd97ff3bcd38e9b07433b24c11d1e716ab8dc4f7998eaadff2831fa35a0c SHA512 bb738a5582c5178e76edfbc6595e42f01f24120f1591724985da29c74ec2b0163183728912f4332fb0afe53fadaf803771b7197f9f547cb3cdc4a3ca4492c6fd
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
index 11574d0fe0a9..a94f72c6506f 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
@@ -13,7 +13,7 @@ MY_P="${P%_p*}DrO_o-949-gca15e830"
 WAF_VER="2.0.19"
 
 DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+HOMEPAGE="https://github.com/XMMS2"
 #SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
 	https://waf.io/waf-${WAF_VER}.tar.bz2"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a5f583d315a7..9e08d32673dd 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d743904d5f2b..a8718b885f93 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,6 +11,6 @@ DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd2175
 EBUILD ffmpeg-4.2.4.ebuild 17661 BLAKE2B 4366ffd59e87da3187e619af6ad18b467f2991b53a229d05dd20ca6bfae9093d95ffcfd2eecabc542095cce2b182d03ae6bb2c682d8c9c76a23b9e557174403f SHA512 5b098a52a368f635aebf1d302ef9b84162e251d7aaf9ffe23963eeef731b92be3d397cf5f70f1f68028fc847a3ef4323c916d6c650a753e875725998fb4196ab
 EBUILD ffmpeg-4.3.1.ebuild 17765 BLAKE2B facecec39439dc19a9c2611cc3e902a84401b0ed8b5bcbb827fa38aaba7370f1ca21d4a8f1d4e22a2f9d8297b9024fe5dd654871968b4fb6589a03d69144a75d SHA512 411583535f592af3efcae090f0d820763f27f27b146694f55b1fd5798939463b2fd032801a9b3b14b5e6ce0fe89213bf5523e1c447af65790f5f565931814a5d
 EBUILD ffmpeg-4.3.2.ebuild 17748 BLAKE2B 49fb8aa388f9e2c999deefd0ab458f2c1d985bd0ab339bf60e07f2e96d1f5f0d6508d34980ebddc0347621ff49c0ca357ce535e4e76cffe27e861f2c5d43143a SHA512 858df025f7cfe5be9b318c1c51d23c2ea979cc1e699fd3f15c5a406f8464c06edb165bb586882a49bbb6d6704d4d6f4f0ad44afab67913f3ecd2bea86499d98f
-EBUILD ffmpeg-4.4.ebuild 17791 BLAKE2B 5e46e7614814e9e04817f5a61bff6be7420b8fae665d6e244487980a4d1b51daa5f5fa7fb28e29d3b834175d81485b47cfb82ba1d7f9043b98ea7054d40c98c8 SHA512 fcb5b19cc0bfdc3979fdacaf14627d9cad44091c0499f498d7b4c685d9ce163f79e148b508b009658f1c53c4af89e47e075c16e58f5c1b0abb9d3626078ef5f7
+EBUILD ffmpeg-4.4.ebuild 17790 BLAKE2B 68df4c2243237175a61897663c8ac980e3d3124e359bebbe2a0d483e06528db3821d751538a106e32b01cb0f06c4900a95164a68eb0237a70cec27ad8a8134f6 SHA512 a8300f81f4ccdaa01c0fec7f53c39942cc893387e20f46b91e0a20e84517e643c39a80ec0b89b317122c6e3e0ca673cec37610252b6491351c7fbe94a11e5f29
 EBUILD ffmpeg-9999.ebuild 17604 BLAKE2B 1d4741e290c75ad74b280020b2add43038dfb30627f3919d2458949ad99337d3d83f412695184cbb21cfa1cd3d834a84cd0acd7cc296c2085d6d482c13145edd SHA512 5497138d8204ae86a1dccf38d62cb9fd9ece00ca56056997efc1bd0c0bab3a7a7d8a2a017613b343ec1127c08522a33414e3dc245f8cd7ad0d833c9d2791ba40
 MISC metadata.xml 5955 BLAKE2B 59329980a1e72c3899f09ddc2ac217aed5c540e91c1f1e0636ac2f84986e20ea7cdd0e07c9e350aed664933a4b02cfed2001bcd1e47723fba913b24b0d35b3aa SHA512 9c4d77572b982475313acddc8cd0df16a121d3a5363335d4d2a1e3021b3dd4bcda5efec9f4a913349efc532919441852dfa702df22dceda62d6f8af5fd491666
diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
index aa2fd13df6eb..0b38621720e8 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 626f8219757c..2ed3b2f6660d 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,5 +1,5 @@
 AUX kaffeine-2.0.18-kwindowsystem-5.82.patch 885 BLAKE2B 4ea110e8ddf8fc1555953a9de61002ef3a0c2395eb0f5d1ce5516cf256ae0d4a1a92571c797ff1c48801c555073e3fda424aa180e73f4f1d4888023b6b491376 SHA512 0270e812a61669c6fe78061d2045319668d6d05f0181fb028318ad397dd230d4e21756fd304bcb0b46be4c342a1abed4c8cf046ab0b06bd4babb67c282d1ed89
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
-EBUILD kaffeine-2.0.18-r1.ebuild 1525 BLAKE2B 4b41f4b6114dab705871477d840fcf581f55a55af78e01ca0073ebacebe07f7db465d32d09d7c0ff24b1973d24dc5df44aa979b802f4acc1b1b3803e9545adc5 SHA512 c8a888e964a4e1e9e63b03bec4ed74bd146a040e707f3b1dc8b25190b166e4a697f4a95877478c844e1490c70fd56ce469104032b348da7d9132a1066137d834
+EBUILD kaffeine-2.0.18-r1.ebuild 1523 BLAKE2B 34353431c4762fb778b341bb7431e325aee9bb3c296427129953bcfef256823ffe2cdeae828f82830accbaff6b34fdb485fa261d1513f8180b4e0c15299a35cb SHA512 5c8843a715286fc1e3f34518ec629fc2276aba15d559810f25c74c0ceba5049c15681030e53d1d11f6431d307abfbf992365168ce66136c41f67037a4414a013
 EBUILD kaffeine-2.0.18.ebuild 1444 BLAKE2B ea8a713fc0aaa108c6e28db08a760a0271222318f615a67d006b7295f9f20ac04a14606540cd959773213ed3be28a27f69c9e01224b88542af0fa87a3e097d16 SHA512 34dfcd7123d8d19d3d8079242b89e88f416e7e374ba97751099adca93346ce8c0bbe02b739c3d2ffb6437dbbdf496d555114f50b8b2fced45d6af7122a171832
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
index 48b9edc935b3..0be321a4b6ff 100644
--- a/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Media player with digital TV support by KDE"
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 4b48ccd87281..1873f28d0ecf 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -2,6 +2,7 @@ AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a2
 AUX pipewire-0.3.25-fix-docdir-path.patch 1231 BLAKE2B 7e361262d4ccc6f21159dfce6b7e93c3e332b90ca75fb90f1a8a3edd8b4a813d78d5c4c61d89452f626c32206de9c6be075dc66e95c5cfc0e147bd08ace4db2e SHA512 8a4e0ebfc6e3776ca4e5b43f4b16828f72983053aa957368a36aa9dec12ebac32275261f67b5e4e63b7ad4580d61a6ee78327e08146ecc67ce84a493d49400bc
 AUX pipewire-0.3.25-non-systemd-integration.patch 822 BLAKE2B e80245300313151c01ec56a9be74590d6ee9211a78d9c16180ef1bfb1938a8ad9f8e00f2086d220ca6f8ad2d1c55508cfcc3c240467ed66239808f76029fdcae SHA512 0a7570e0dadd9119ba81b91fc0831ad511ed793f2f10f304547152448e0cf079118c595944e22f31cea94a92a0819524aad26c3fc2d17e73b622b43637cdf06a
 AUX pipewire-0.3.28-revert-openaptx-restriction.patch 955 BLAKE2B 17b6adc21205fd47a8759103d680976fff64ca4f5bb02a0ebbf5dba2115036710798dce5ca3b0964848c047eaf1790ab68e0c4e884544b9fea66cffea05aad0b SHA512 4b8e3330deac02ff5788fc26b63e19b2f6ecc82f156981321e6abc397c9b6e7111c5bff8107dc455d9246bf25fc9ed3b2d674335dda396d20c6387e1623dbcc7
+AUX pipewire-0.3.29-revert-openaptx-restriction.patch 1228 BLAKE2B a282cd6f678ecd5fd27076cd945b86a8139caf644fae5f6420f45e47cfa1f1ef7edacb6e5c6c0ae860bfaa016de902accb916159f90a85bddb0b26b73658e3ff SHA512 cadfe7c54eec23d2619faf274d2c5c95b4f430525c7fc0b84e667e3f90775d27dbb6682d200d3af5d48475a2b37ab0ff2dd6e8be4f2d69bead68f6f1efb7a7ad
 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
@@ -9,10 +10,12 @@ DIST pipewire-0.3.25.tar.gz 1351257 BLAKE2B 3c4d6d98e3255df8baf50eb548bcf77b5c02
 DIST pipewire-0.3.26.tar.gz 1447673 BLAKE2B 67feb1288fcdc9ac5578b97ab2567b46a7431921291584bc9db2c2e60db074c3a61c3af9859d3b2f9044cfba6c15e9bfde9edc001b753f8fc47965eb55d751c8 SHA512 d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178
 DIST pipewire-0.3.27.tar.gz 1459913 BLAKE2B b6db73de85c41932b630e62b3dcc589529ae5457cae6731a8ec5db50f20b541e7e9596976a368c4bb654b1443071c53f8fe4a9ddfc1ee8a0ecc04d69b683456a SHA512 a2df1df8e43846b91fbeedeb1cda9c73b970ac9de58d8b4e97ada54ee74a8f26a168504289c7392c94cc7ea54aa01ada4791c66a5d3159a2bc980df633f6bcfe
 DIST pipewire-0.3.28.tar.gz 1474219 BLAKE2B d20b39c8ed49cd44f2109aab6453aac547ff66dc2ef4a52fb71fea27eb07920efc58498e5ddd82e9f6d86981185e37313748d9157c9a09a3ae1e8ae48d5d45d6 SHA512 f2ed23609c6a45fb80f54caabaa304ba4f318c905a28350c89c65f179a95cc2022f1acbb0c2ec558baf4dc6bcc5623b8daa6678d52cdb9179a88c67b6c1fe0ff
+DIST pipewire-0.3.29.tar.gz 1504935 BLAKE2B fe3984ec4b02fe91683d382e3891e174748b52c5e2f609dc838837f1ac0fea736e06395a022b8ec152fe015cca24c54d4c1896acde3a2ac66eb700dc2336fe4f SHA512 bc163ad3e2d7696295fd3720e8f9cc4d478a55c0694c0faa03a40333e3b65fcbff27e4e296eb9dd0191ca2782e04934915c46e04a2444b458491cd2905823ddd
 EBUILD pipewire-0.3.22.ebuild 3177 BLAKE2B 712e773c42b0a89d482a1c38f1d5b2ad73bd9790173093813f257378e5bcda3aaaeedb2d215812637d14dccc4c57cb25ba3d4574d579821f7c09f8a110cac8ac SHA512 89583f0495c8a12598c829de80d2b515a1a37aecf51b4cb54c4988f0fc3aff2f5d9b7f4d23621678d5f1b2e67f145d941eacc0d9eca0281d9cf202ff109a7195
 EBUILD pipewire-0.3.25.ebuild 8576 BLAKE2B 8e84ae5b121a7755c247f6a140a9c72fbf69912edf84e2891f8c78944dccc6204f6f9c1a7ad211c51d87a09719750d9bd2de2ee1e993def4e66d04672a2eec86 SHA512 1de53f6529cdaed7194f6a05c0adf84e40dd8484f251b245fd3e036196d663a71450d7b53ffa64d06a9b805c23f08eebe8c06cc6490c84a5f5d5ecd37a6f1e47
 EBUILD pipewire-0.3.26.ebuild 8727 BLAKE2B f8562cef3ecb56394c026923f55c814c1ea66c7eafd40288e64737e7e9991be6c24eddbd3dbdb26053ad57454e178351e78dac810cf09b5c2c99bd7e6f24a002 SHA512 f75916fd73b14fa5f62c3ac6fb71dc31ad8cff4370cf23edd8ef3ca230f9000d07c21797d25cb39f21e012d62882e8b4d4c10c577e9847f83a455c28f4fd9db1
 EBUILD pipewire-0.3.27-r1.ebuild 9288 BLAKE2B 72bc43f46145edd6a35f58287487a79ee4c9ac66ae3867e18cf923b4e13af8ce72dec60aaced096b949cd06bfcdb18277b1d643dc5c8794a22b6ecb9a3264401 SHA512 ad0cece7220537ca783aca2f9e31b12744b220f960e15edd0caa93900902ad18bd3f32a0f6dfe8e5e175a8321fc1df68a4dfdc08d38e6a1138b61a4098ed8fea
 EBUILD pipewire-0.3.28.ebuild 9360 BLAKE2B 0f30cc2f8e4f81fb795f7fdba8006b0ef32c3ebfcafc85a1577a55d0087b80eadf2ca3dd64ce5e6dd5aa3f0383604655bda6412dc1d5ef15f78d5856ee9099aa SHA512 ed7959a414c9b54b243f7bb2db858236824c9fbe8c60014bb7029d74c0cfa395fff861c91217227d5f79bf5eca440cd404386538e4b0f3d664a1bb5cae0b27ed
+EBUILD pipewire-0.3.29.ebuild 9379 BLAKE2B ae52c26ea917da601bc1bc10f33300daecfd43e05d39a2ab54fc9d85f890981cccd41b68ee8b9bfbda196b622a56708069b6df767d52a6e57ce65e6db6720400 SHA512 8fd37361d0c3e0c7e2c08e392eda7604e449713869b1488b1c88dda60f3656ea5fdde4a817fc11cc45e1906c4e4164487fc76f7b81c4fcf96301651e9b8a4cde
 EBUILD pipewire-9999.ebuild 9360 BLAKE2B 0f30cc2f8e4f81fb795f7fdba8006b0ef32c3ebfcafc85a1577a55d0087b80eadf2ca3dd64ce5e6dd5aa3f0383604655bda6412dc1d5ef15f78d5856ee9099aa SHA512 ed7959a414c9b54b243f7bb2db858236824c9fbe8c60014bb7029d74c0cfa395fff861c91217227d5f79bf5eca440cd404386538e4b0f3d664a1bb5cae0b27ed
 MISC metadata.xml 1600 BLAKE2B 1138c789841fae8ea509ba2becdfef8376b87525b5b1822854ca083ab49e63124cbde6d8064849e0114a0e39269f63cf76d63f49396d709f6b3da865cf539487 SHA512 5ca5105edecf2515049b61e71327236c3e0fd949a25e91a9ed9dc0a9ad5d9d66f0b99329276c824e8840352b699bb9995b9ae073b43f30f87f4a8cc4bc4237a5
diff --git a/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
new file mode 100644
index 000000000000..9da495f12d0d
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.29-revert-openaptx-restriction.patch
@@ -0,0 +1,30 @@
+From 6d2e45a67cadd9498b24e8e4ea7adc6cf627333d Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 3 Jun 2021 14:15:44 +0200
+Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+---
+ spa/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spa/meson.build b/spa/meson.build
+index 263af4c2..7671c74b 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -23,7 +23,7 @@ if not get_option('spa-plugins').disabled()
+     sbc_dep = dependency('sbc', required: get_option('bluez5'))
+     ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac'))
+     ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
+-    aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
++    aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
+     fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
+   endif
+   avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg'))
+-- 
+2.32.0.rc3
+
diff --git a/media-video/pipewire/pipewire-0.3.29.ebuild b/media-video/pipewire/pipewire-0.3.29.ebuild
new file mode 100644
index 000000000000..ed54b0ec601f
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.29.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit meson-multilib optfeature udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	jack-sdk? ( !jack-client )
+	ldac? ( bluetooth )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses[unicode]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 20666e9c5ce1..2092d0af3c93 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
-EBUILD vcsi-7-r1.ebuild 695 BLAKE2B aafb22c5aca13f8705e9fc0222eec4fed3ab2e0831a4ef6f7881abaf7dc513415404c59b053435d1d3d61e1a5b1afc0ad60fb4c0832c6555b2fea01e1b08ef6c SHA512 a8f52fe48d40b5e8f2056ed03d47a5815decc1a57ac21f1799409e06a010e6a04f62094db88bf57f1b02949bb97f7f2795f0582ff245333dc6fd86f7770bb06c
+EBUILD vcsi-7-r1.ebuild 696 BLAKE2B 059eea456f096f6b08d5d592d407d56189107302bdfbf58c49b2829652e15a8aac93d75f87cf62fdae3573f09f1990c197b5717ef6e9629700e4fb8816dd177d SHA512 58bdebb69d2aa3cec628017ba196ead82bb1ba070d1a2767cdc8baf710914c173e35b9429417f5a0f2a1e61b08f6d70a967210736d5390ef781bf04f3754767c
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/media-video/vcsi/vcsi-7-r1.ebuild b/media-video/vcsi/vcsi-7-r1.ebuild
index e5ae4b42a493..a597fdeb48eb 100644
--- a/media-video/vcsi/vcsi-7-r1.ebuild
+++ b/media-video/vcsi/vcsi-7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a57f3236a132..b1dce1d532cc 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 1eeae90b630d..c8259c60f7ba 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Jun 2021 04:39:05 +0000
+Mon, 07 Jun 2021 14:08:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d96cb8cf8757..90be168cb51e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 509049 BLAKE2B e2b5c0e25d30cb613bf6b26a404bdd5c9ecf1ebe0f765c98e65b5c6abb8c3367dc1f4e8d19e68c1568e7e055e9c4617562aea2e0f52899586498178621fa32fa SHA512 460ef918d52020ec8e54fc6c17e54e0f11f0e50117f6c87479422f3fc3f4face3581664544e8cbcb8fc1265b88f7145a0e90a36cd8e1acef5b7908d625bdb379
-TIMESTAMP 2021-06-04T04:39:09Z
+TIMESTAMP 2021-06-07T14:08:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC5rm1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC+KHVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCiuBAAnjeDSTX57sjcPWBpZfyN1kLgv/AdWR+N6Shzj+nb2i4eOyiDWEJBDxJV
-SQHRpxYRmqGDP1h3iJx9QW1YRrHprBVnkFvBNX3odyBZkTS/i1YEoaCCv8U/1pwz
-Pbt8hsEqoBFBS4j3u1FDgsl9bvnqnMWv63DIFlVNRl4n+LyJM9sG+MGFKlu9rtjN
-T9gKdiDkwlQlkn64BSkkrjHpA/XNVJkjtbfSqqR8SjExgg++hSebM/IV4wEHk+H+
-V0qHxkL7qoe+x4SrW0JpsHl2xBVmnkJLM5XRqT59igglnaoYIQnYUGydFE63LQ4c
-oNA7bSEjp9SZJIeEcwvIGIaZjpDR9jhcrozxf/vSRhiaoOM6lmig6kafBGkF3WE4
-yGo3m+/C1APVonzAlJUPDL5c6takeyPqHOQxgNohH1Yifv8JNGFrG5fhtTK+QTMa
-xIQ5YgDvZaHZTMDJHj/gEOgSwvaSTqujA5izVUTKjfHz93Ij22TeSRJqW5KYXM58
-GteJOtHVmIH8NN0lwQ+if25UjJb+X7Z0EgQeKyL9jGN9NK8Uky7gTxFExP88FEKC
-POsz9b69MVDFvNV5n0fb09AzfZH3+7yrZP9lZJrARxsT4PIxbdjPek10UPKy6AcV
-8FkFsgMb5wuQw2MIjWUTKrNK9wGkQFF4kqADQ0ddSJKsL8bL7fQ=
-=yrdb
+klCyhBAAhD9oXHC00nMT/3hatFyEbz28hDRVp21UscIyo6ZMwadcY/Dk1cS/EQO7
+i373kausEz/Z60jl2zhjhehEctiC3CRFfFykroNK4r4g+s+TBsgDveNaAsp8ljB0
+ok9g9n8+hBYv/uQQN9att7nVB0zB1EaXzENSEilmT5yChe2zIor2elnIoqjcdEIN
+z97fxgEKhco2IeFVcrKPJQdtfLs9LBrB5wP39Bm/8iLzmVRCnqba1rFRLNaXh47/
+XEm7HyX/jLznvvUVxbioFkUNiuNy8DPsMpCWwNYU7i8hwL0YdDpZUU/1i0kAR3o9
+SUmE6t2ng5NCv1GYgBP7MLoG3rMz7c8QygcYmLhGazdeQd4A+RsUrwMcxoGoOxW6
+HbVuW3+xJ1W1xKmSRRmfYGqxjAo92zvZR4wBStt7iayALUU3V0zyv5Mq5qqo6Yqn
+6drHDppPrGUek1jPoz22ohxFRlBp/MQf+XKgvSXnfsklbahgqwC41pN07JLN4XIB
+0WtQs2ewKFflfsHLDMtCi4FFpA6DwZasp0FhMByMAX7EWtIoJpxfc7e2+l/J/pAt
+qOJNIQskRbTuXJ+f5Vyjj7HvhLHB8DwHGlQVhYtskF5dPr0tcXl8mOwBhS0ITgu7
+SzqN1jlHchgcpAneFHSSLZG2Cr5muLrs4oanUMlrF3w/cw1ttzk=
+=6GAr
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1eeae90b630d..c8259c60f7ba 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Jun 2021 04:39:05 +0000
+Mon, 07 Jun 2021 14:08:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index df5467497026..d712ae8d833c 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 1650caa0c835..870dc8668372 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
new file mode 100644
index 000000000000..bf45ca91c54f
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.62: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-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[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-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=D-Bus accessibility specifications and registration daemon
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Accessibility
+IUSE=X gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2.1+
+RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.62: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-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[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=2
+SRC_URI=mirror://gnome/sources/at-spi2-core/2.40/at-spi2-core-2.40.2.tar.xz
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1d601e97cdf09aaf78c536eff307001
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c1438cba15e2..915dfcb7ecef 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/ansible-2.11.1 b/metadata/md5-cache/app-admin/ansible-2.11.1
new file mode 100644
index 000000000000..6f5f2bcb28c6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.11.1
@@ -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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!app-admin/ansible-base >=dev-python/packaging-16.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !app-admin/ansible-base python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.11.1.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=65174ee205daee1123a42904a8ac8793
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 60f9065730dd..df7c4a0417da 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=71cd6146fa56cc96ae70b42cc415eab8
+_md5_=65174ee205daee1123a42904a8ac8793
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.4 b/metadata/md5-cache/app-admin/ansible-base-2.10.10
similarity index 98%
rename from metadata/md5-cache/app-admin/ansible-base-2.10.4
rename to metadata/md5-cache/app-admin/ansible-base-2.10.10
index 64a90b0d7c7a..2f08f54d5128 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.10.4
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.10
@@ -5,12 +5,12 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !<app-admin/ansible-2.10 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.4.tar.gz
+SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.10.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0f976f4d2feba2d7625b36f74dbe5e1d
+_md5_=605dd7c4e6b02071b5343afa9fbcb73b
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.87 b/metadata/md5-cache/app-admin/awscli-1.19.87
index f515c09a6215..604adeb4d014 100644
--- a/metadata/md5-cache/app-admin/awscli-1.19.87
+++ b/metadata/md5-cache/app-admin/awscli-1.19.87
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Universal Command Line Environment for AWS
 EAPI=7
 HOMEPAGE=https://pypi.org/project/awscli/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+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.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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.19.87.tar.gz -> awscli-1.19.87.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b276cb45715dd11215cafb0662382bce
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/awscli-1.19.88 b/metadata/md5-cache/app-admin/awscli-1.19.88
new file mode 100644
index 000000000000..7fa36824544e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.19.88
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/botocore-1.20.88[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=7
+HOMEPAGE=https://pypi.org/project/awscli/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.88[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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.19.88.tar.gz -> awscli-1.19.88.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=383108bd725409654cec81f2318676df
diff --git a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.25.1 b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.5
similarity index 96%
rename from metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.25.1
rename to metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.5
index 1aa8c74e59e7..15c7639ee43e 100644
--- a/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.25.1
+++ b/metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.5
@@ -6,6 +6,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-crypt/libsecret dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb 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/libXScrnSaver x11-libs/libXtst x11-libs/pango
 SLOT=0
-SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.25.1/Bitwarden-1.25.1-amd64.deb
+SRC_URI=https://github.com/bitwarden/desktop/releases/download/v1.26.5/Bitwarden-1.26.5-amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85895f8cffe69ca9574b65d11f52d6c2
diff --git a/metadata/md5-cache/app-admin/conky-1.11.6-r2 b/metadata/md5-cache/app-admin/conky-1.11.6-r2
index f60f4dfb8736..f7bb63efc937 100644
--- a/metadata/md5-cache/app-admin/conky-1.11.6-r2
+++ b/metadata/md5-cache/app-admin/conky-1.11.6-r2
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.11.6.tar.gz -> conky-1.11.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ceb4581b173f09733e4d2b72d13ea9cb
diff --git a/metadata/md5-cache/app-admin/conky-1.12.1 b/metadata/md5-cache/app-admin/conky-1.12.1
index 1f52699ae416..bc403bc8844e 100644
--- a/metadata/md5-cache/app-admin/conky-1.12.1
+++ b/metadata/md5-cache/app-admin/conky-1.12.1
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.1.tar.gz -> conky-1.12.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74d789c79720278cae158e3f14eae271
diff --git a/metadata/md5-cache/app-admin/conky-1.12.1-r1 b/metadata/md5-cache/app-admin/conky-1.12.1-r1
index ad7a665d7993..542254b571c0 100644
--- a/metadata/md5-cache/app-admin/conky-1.12.1-r1
+++ b/metadata/md5-cache/app-admin/conky-1.12.1-r1
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.1.tar.gz -> conky-1.12.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db0d7837ba767499ad961b8bc2f61172
diff --git a/metadata/md5-cache/app-admin/conky-1.12.2 b/metadata/md5-cache/app-admin/conky-1.12.2
index e99cda1c9a28..cc4f9cab8b11 100644
--- a/metadata/md5-cache/app-admin/conky-1.12.2
+++ b/metadata/md5-cache/app-admin/conky-1.12.2
@@ -11,5 +11,5 @@ RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libi
 REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.2.tar.gz -> conky-1.12.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f93d0f72ac9a01ac595e461f938bce0e
diff --git a/metadata/md5-cache/app-admin/exo-1.30.0 b/metadata/md5-cache/app-admin/exo-1.31.0
similarity index 77%
rename from metadata/md5-cache/app-admin/exo-1.30.0
rename to metadata/md5-cache/app-admin/exo-1.31.0
index 34b9ff37a0b5..4534ab198d39 100644
--- a/metadata/md5-cache/app-admin/exo-1.30.0
+++ b/metadata/md5-cache/app-admin/exo-1.31.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.30.0.tar.gz -> exo-1.30.0.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.31.0.tar.gz -> exo-1.31.0.tar.gz
 _md5_=a638813d2b712f85d21a976d47d1d5b9
diff --git a/metadata/md5-cache/app-admin/hcloud-1.23.0 b/metadata/md5-cache/app-admin/hcloud-1.23.0
new file mode 100644
index 000000000000..70b0f35a4dfc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/hcloud-1.23.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=A command-line interface for Hetzner Cloud
+EAPI=7
+HOMEPAGE=https://github.com/hetznercloud/cli
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.23.0.tar.xz
+_md5_=56012406d96b2c878b2bc62b17fa0dac
diff --git a/metadata/md5-cache/app-admin/lsyncd-2.2.3 b/metadata/md5-cache/app-admin/lsyncd-2.2.3
index dc724eef858a..b3b682b549ac 100644
--- a/metadata/md5-cache/app-admin/lsyncd-2.2.3
+++ b/metadata/md5-cache/app-admin/lsyncd-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_single_ta
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/axkibe/lsyncd/archive/release-2.2.3.tar.gz -> lsyncd-2.2.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e11327bbf274c968d10f1aa9bdc5581
diff --git a/metadata/md5-cache/app-admin/pydf-12-r1 b/metadata/md5-cache/app-admin/pydf-12-r1
deleted file mode 100644
index 012a78f6750f..000000000000
--- a/metadata/md5-cache/app-admin/pydf-12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DESCRIPTION=Enhanced df with colors
-EAPI=6
-HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=public-domain
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=593ee99bb57b176bcb1f707562bfc3ef
diff --git a/metadata/md5-cache/app-admin/pydf-12-r2 b/metadata/md5-cache/app-admin/pydf-12-r2
index ddb2a120d279..7c1e1495fbcb 100644
--- a/metadata/md5-cache/app-admin/pydf-12-r2
+++ b/metadata/md5-cache/app-admin/pydf-12-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Enhanced df with colors
 EAPI=7
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1e4701c89d1ff6679d649aa16430ae36
+_md5_=6b156eb4924370d9ef1ea78ebda41a4d
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2008.0 b/metadata/md5-cache/app-admin/rsyslog-8.2008.0
deleted file mode 100644
index 22369a89d5ea..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2008.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=amd64 arm ~arm64 ~hppa x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2008.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2008.0.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4ee8a1c002bbc843265e04d89871434c
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2010.0 b/metadata/md5-cache/app-admin/rsyslog-8.2010.0
deleted file mode 100644
index d34adf9f0832..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2010.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2010.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2010.0.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4431c00f3aaaadfa6b09aee4def9a7fd
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2012.0 b/metadata/md5-cache/app-admin/rsyslog-8.2012.0
deleted file mode 100644
index fae90af74ac3..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2012.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2012.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2012.0.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4431c00f3aaaadfa6b09aee4def9a7fd
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2012.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.2012.0-r1
deleted file mode 100644
index c85001ad53bd..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.2012.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] )
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( www-servers/civetweb ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2012.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2012.0.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=80f25ba10b82079a4656536dadb309d8
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 9baa8f09c539..a52c31238343 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/dpkg-1.20.7.1 b/metadata/md5-cache/app-arch/dpkg-1.20.7.1
index 64b87cc2e73b..cef3ecdd9a38 100644
--- a/metadata/md5-cache/app-arch/dpkg-1.20.7.1
+++ b/metadata/md5-cache/app-arch/dpkg-1.20.7.1
@@ -5,11 +5,11 @@ DESCRIPTION=Package maintenance system for Debian
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/dpkg
 IUSE=+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/perl-5.14.2:= bzip2? ( app-arch/bzip2 ) libmd? ( app-crypt/libmd ) lzma? ( app-arch/xz-utils ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) zlib? ( >=sys-libs/zlib-1.1.4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dpkg/dpkg_1.20.7.1.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=304e6247f970c018a0f424f321b3a12f
+_md5_=219d8c997f91f2d060ec71b5c4000f7a
diff --git a/metadata/md5-cache/app-arch/gnome-autoar-0.3.3 b/metadata/md5-cache/app-arch/gnome-autoar-0.3.3
new file mode 100644
index 000000000000..fe10037e31c8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.3.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/gtk-doc-am-1.14 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-arch/libarchive-3.4.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Automatic archives creating and extracting library
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-autoar
+IUSE=gtk +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=app-arch/libarchive-3.4.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-autoar/0.3/gnome-autoar-0.3.3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4aba070f61b487db0f30f47d67a4f5e7
diff --git a/metadata/md5-cache/app-arch/makeself-2.4.4 b/metadata/md5-cache/app-arch/makeself-2.4.4
new file mode 100644
index 000000000000..8a0247f16be4
--- /dev/null
+++ b/metadata/md5-cache/app-arch/makeself-2.4.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Shell script that generates a self-extractible tar.gz
+EAPI=7
+HOMEPAGE=http://www.megastep.org/makeself/
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/megastep/makeself/archive/refs/tags/release-2.4.4.tar.gz -> makeself-2.4.4.tar.gz
+_eclasses_=optfeature	e142388219c7fee6ff016fe1c78a10a5
+_md5_=6440452daa04f3603840e2ab8eed05ba
diff --git a/metadata/md5-cache/app-arch/rpm-4.16.0 b/metadata/md5-cache/app-arch/rpm-4.16.0
index 1417236b9662..ea9ba2ae2659 100644
--- a/metadata/md5-cache/app-arch/rpm-4.16.0
+++ b/metadata/md5-cache/app-arch/rpm-4.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 ) ) python? ( ^^ ( python_sing
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.16.x/rpm-4.16.0.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=446c6baf3b52e478cf3c48c7e0e00eec
diff --git a/metadata/md5-cache/app-arch/rpm-4.16.1.3 b/metadata/md5-cache/app-arch/rpm-4.16.1.3
index 3d4cd0bb1d82..bab942c612d3 100644
--- a/metadata/md5-cache/app-arch/rpm-4.16.1.3
+++ b/metadata/md5-cache/app-arch/rpm-4.16.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 ) ) python? ( ^^ ( python_sing
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.16.x/rpm-4.16.1.3.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0ba6555936564a55017768e6b9870ee5
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index a341215c5e31..e5e1fc9c63b9 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/bacula-11.0.5 b/metadata/md5-cache/app-backup/bacula-11.0.5
new file mode 100644
index 000000000000..b09b13d73b32
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-11.0.5
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-11.0.5.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a11a0179841d94bd1ca6a38501baf852
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1 b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
index 34efe4f7ca96..a74764cc5e74 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Local/remote mirroring+incremental backup
 EAPI=7
 HOMEPAGE=https://github.com/rdiff-backup/rdiff-backup
 IUSE=examples python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/pylibacl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyxattr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=net-libs/librsync-1.0:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v2.0.5/rdiff-backup-2.0.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1ce929adeeefaea6f36888d8ae8fedec
+_md5_=767c72913b2a0868f81ba238df8a5cf9
diff --git a/metadata/md5-cache/app-backup/snapper-0.5.6-r1 b/metadata/md5-cache/app-backup/snapper-0.5.6-r1
deleted file mode 100644
index 6d8d9dbc6138..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.5.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] 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 ) sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=6
-HOMEPAGE=http://snapper.io/
-IUSE=lvm pam xattr
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] 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 )
-SLOT=0
-SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.5.6.tar.bz2
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1d6529595e1d7862c0bf919e554a1364
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.15-r1 b/metadata/md5-cache/app-backup/snapper-0.8.15-r1
index f05c7dcb4d97..aa9dbe9e0d53 100644
--- a/metadata/md5-cache/app-backup/snapper-0.8.15-r1
+++ b/metadata/md5-cache/app-backup/snapper-0.8.15-r1
@@ -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 ~x86
+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	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3a30ea492a169b54796740ae237e81a9
+_md5_=a8f997eae83e619e55d2550020d63878
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.16 b/metadata/md5-cache/app-backup/snapper-0.8.16
new file mode 100644
index 000000000000..1071aef5c13e
--- /dev/null
+++ b/metadata/md5-cache/app-backup/snapper-0.8.16
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d62bc8ab3093bfe1dd4cd60490e36db2
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.9-r1 b/metadata/md5-cache/app-backup/snapper-0.8.9-r1
deleted file mode 100644
index 215e7e13ed36..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.8.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads] 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=lvm pam xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] 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 )
-SLOT=0
-SRC_URI=https://github.com/openSUSE/snapper/archive/v0.8.9.tar.gz -> snapper-0.8.9.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7083f61656c559ae206906e56a279a2c
diff --git a/metadata/md5-cache/app-backup/snapper-0.9.0 b/metadata/md5-cache/app-backup/snapper-0.9.0
new file mode 100644
index 000000000000..cb8520cbb5e7
--- /dev/null
+++ b/metadata/md5-cache/app-backup/snapper-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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.9.0.tar.gz -> snapper-0.9.0.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a30ea492a169b54796740ae237e81a9
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 095471756273..ad2511cb09ad 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
index 2cd3ad4f1ec2..e914e9f6b28f 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit ) ^^ ( python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.20.tar.gz -> sysbench-1.0.20.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4002a043473dbd55f06a29cf9c2bb520
diff --git a/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100 b/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
index 2f79fc00f3ed..874befc776fa 100644
--- a/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
+++ b/metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0= lua_single_target_luajit? ( dev-lang/luajit:= )
 REQUIRED_USE=^^ ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://www.github.com/wg/wrk/archive/4.1.0.tar.gz -> wrk-4.1.0.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a415c58b3033188d15547917d34fff37
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 8a53688f2d0c..6a742a2e4199 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-1.13.0 b/metadata/md5-cache/app-crypt/acme-1.13.0
deleted file mode 100644
index b96834dbeb78..000000000000
--- a/metadata/md5-cache/app-crypt/acme-1.13.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.13.0.tar.gz -> certbot-1.13.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=68dfdb3d537c2b088ba7872c7c6a049f
diff --git a/metadata/md5-cache/app-crypt/acme-1.15.0 b/metadata/md5-cache/app-crypt/acme-1.15.0
index 35772c4feb9e..7e25e82fac96 100644
--- a/metadata/md5-cache/app-crypt/acme-1.15.0
+++ b/metadata/md5-cache/app-crypt/acme-1.15.0
@@ -5,7 +5,7 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0ca60f68bf075ae66ed5376514e690b3
+_md5_=68dfdb3d537c2b088ba7872c7c6a049f
diff --git a/metadata/md5-cache/app-crypt/cardpeek-0.8.4 b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
index 6a6acf0af8bd..eb8e23310bd8 100644
--- a/metadata/md5-cache/app-crypt/cardpeek-0.8.4
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-li
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=http://downloads.pannetrat.com/install/cardpeek-0.8.4.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59defea7008fa7a8e27f16aa021b71af
diff --git a/metadata/md5-cache/app-crypt/certbot-1.13.0 b/metadata/md5-cache/app-crypt/certbot-1.13.0
deleted file mode 100644
index 4415af5d7bfb..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.13.0.tar.gz -> certbot-1.13.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=45c2e91ef91e308f74c7c4ec2d1add8a
diff --git a/metadata/md5-cache/app-crypt/certbot-1.15.0 b/metadata/md5-cache/app-crypt/certbot-1.15.0
index 11189b8d7095..ca4c18be1d78 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.15.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.15.0
@@ -4,11 +4,11 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/josepy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/parsedatetime-2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=78b546c4453bfb29b346e0d4d808dac5
+_md5_=45c2e91ef91e308f74c7c4ec2d1add8a
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.13.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.13.0
deleted file mode 100644
index 75296be402c1..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.13.0.tar.gz -> certbot-1.13.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=db3994821ec4a149bfb1f7b623b5a3fa
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.15.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.15.0
index 11b21f506d05..e3d2fbdcbddd 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.15.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.15.0
@@ -4,11 +4,11 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-augeas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-component[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=447a7040ddfb997bdd9270b4c9a58fcb
+_md5_=db3994821ec4a149bfb1f7b623b5a3fa
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.13.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.13.0
deleted file mode 100644
index 1a12900617e0..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.13.0.tar.gz -> certbot-1.13.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c9b592674587c175081f9b45a401b9c6
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
index 6f34f11901fb..a4314cc11d0e 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
@@ -4,11 +4,11 @@ DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=app-crypt/acme-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-17.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.15.0.tar.gz -> certbot-1.15.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a39abc80d8bcc71e129c5cdee2c76dff
+_md5_=c9b592674587c175081f9b45a401b9c6
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
index 638436229a57..05d21fc81aeb 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
@@ -11,5 +11,5 @@ RDEPEND=!minimal? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_ta
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=c1f03917b7fbb1ba160d981b510416df
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.3 b/metadata/md5-cache/app-crypt/libmd-1.0.3
index 364924661f60..60fb6988009f 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.3
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.3
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Message Digest functions from BSD systems
 EAPI=7
 HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.3.tar.xz
-_md5_=69f439f02f7ccc916003505f94fda2ec
+_md5_=b93255a7ecc0f42845a49f2b3aa66759
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 52beebc537b7..e285ec28d37a 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20180627 b/metadata/md5-cache/app-dicts/myspell-ru-20180627
index 4dae3af8f52c..8e7d8a7f1839 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20180627
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20180627
@@ -3,9 +3,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Russian spellcheck dictionary based on works of AOT group for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/russian-dictionary-pack
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/russian-dictionary-pack/0-4.3/@@download/file/dict_pack_ru-aot-0-4-3.oxt
 _eclasses_=myspell-r2	c3ce3195fd25a3958492bf548ef8b1f9
-_md5_=93c430c163d540a5a67b2b11f7f31abf
+_md5_=d50c1c4670bca70af1d0f786723c8a88
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 5686a81a9490..8f4d8c515b70 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/cantera-docs-2.4.0 b/metadata/md5-cache/app-doc/cantera-docs-2.4.0
deleted file mode 100644
index 1bae7cc8d995..000000000000
--- a/metadata/md5-cache/app-doc/cantera-docs-2.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Documentation API reference for Cantera package libraries
-EAPI=6
-HOMEPAGE=https://cantera.org
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://github.com/band-a-prend/gentoo-overlay/releases/download/ct-docs-2.4.0/cantera-docs-2.4.0_modified_menu.tar.xz -> cantera-docs-2.4.0.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=d3f2affd758f19c25283ef641594f6aa
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.9 b/metadata/md5-cache/app-doc/kicad-doc-5.1.10
similarity index 98%
rename from metadata/md5-cache/app-doc/kicad-doc-5.1.9
rename to metadata/md5-cache/app-doc/kicad-doc-5.1.10
index 3c83d95c916b..4cf21376459a 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.9
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.1.10
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.9/kicad-doc-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.10/kicad-doc-5.1.10.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82ca2b4dc0caa3be42560a50f67c0b1d
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 97e1f23c3ea6..52cdc2d7d5e1 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1 b/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
index 9acdb5597926..69dde23bbd06 100644
--- a/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
+++ b/metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure prepare
 DEPEND=sys-libs/ncurses:=
 DESCRIPTION=full screen curses hex editor (with insert/delete support)
 EAPI=7
-HOMEPAGE=http://www.rogoyski.com/adam/programs/hexedit/
+HOMEPAGE=https://www.rogoyski.com/adam/programs/hexedit/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
-SRC_URI=http://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz
+SRC_URI=https://www.rogoyski.com/adam/programs/hexedit/hexedit-0.9.7.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=152eef1a6c596f63d652834665e71901
+_md5_=4dba41e242eaf3207715f6e5d982d308
diff --git a/metadata/md5-cache/app-editors/emacs-27.2 b/metadata/md5-cache/app-editors/emacs-27.2
index 0e7d7a2a3a26..6f86e8ee38bc 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2
+++ b/metadata/md5-cache/app-editors/emacs-27.2
@@ -5,11 +5,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a171ad5e86956363b4704706c48c7f91
+_md5_=5d90be084da4689c45fcdb31a6e445b3
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100 b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
index 6ec20104e00c..77eff6293d35 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b51f18b7978cf74c13bedd915e1e367
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index f08b37829555..36d5731c8324 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -11,5 +11,5 @@ RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurs
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60610e944439e69d74ec5c6a9c03cd53
diff --git a/metadata/md5-cache/app-editors/neovim-0.4.4-r100 b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
index 6dd912c874e2..04f46d494d47 100644
--- a/metadata/md5-cache/app-editors/neovim-0.4.4-r100
+++ b/metadata/md5-cache/app-editors/neovim-0.4.4-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.4.4.tar.gz -> neovim-0.4.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=488fe7da4b7bbb6355182b8723f81bc1
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 0c3c5ba9f499..721f7fc585a3 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) dev-lua/luv[lua_single_target_luajit(-)?,lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?] lua_single_target_luajit? ( dev-lua/lpeg[lua_targets_luajit(-)] dev-lua/mpack[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lpeg[lua_targets_lua5-1(-)] dev-lua/mpack[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lpeg[lua_targets_lua5-2(-)] dev-lua/mpack[lua_targets_lua5-2(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-libs/tree-sitter:= net-libs/libnsl tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6f05e7a0409debd8d628940190f6e94
diff --git a/metadata/md5-cache/app-editors/scite-4.4.4-r10 b/metadata/md5-cache/app-editors/scite-4.4.4-r10
index ff1b5dfc76ec..16d6fd14921f 100644
--- a/metadata/md5-cache/app-editors/scite-4.4.4-r10
+++ b/metadata/md5-cache/app-editors/scite-4.4.4-r10
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-l
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://www.scintilla.org/scite444.tgz -> scite-4.4.4.tgz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01eabc4aade0d1de85aa895b5283ed43
diff --git a/metadata/md5-cache/app-editors/texworks-0.6.5-r100 b/metadata/md5-cache/app-editors/texworks-0.6.5-r100
index 6238b6fcee1a..beaf58921464 100644
--- a/metadata/md5-cache/app-editors/texworks-0.6.5-r100
+++ b/metadata/md5-cache/app-editors/texworks-0.6.5-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TeXworks/texworks/archive/release-0.6.5.tar.gz -> texworks-0.6.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98711ad85e3b1882ca3f04064cbe59ff
diff --git a/metadata/md5-cache/app-editors/texworks-0.6.6 b/metadata/md5-cache/app-editors/texworks-0.6.6
index 1b8fa940967b..5a1832626c0e 100644
--- a/metadata/md5-cache/app-editors/texworks-0.6.6
+++ b/metadata/md5-cache/app-editors/texworks-0.6.6
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TeXworks/texworks/archive/release-0.6.6.tar.gz -> texworks-0.6.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d011d4930479290bde8cac531818ab46
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0814-r100 b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
index e8b182a3eedd..41fb62d3d325 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14baba8e6b5d7c99c75b228a6c4df9b3
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index 933d06cfb25c..94a9146eed38 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vim-doc	dd0828b15877b2a09c07f4719e45891f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c87c1c7a2e079f189dbf98f0b4caa2df
diff --git a/metadata/md5-cache/app-editors/vis-0.7 b/metadata/md5-cache/app-editors/vis-0.7
index 3d182ccfc85a..2aeed322bd01 100644
--- a/metadata/md5-cache/app-editors/vis-0.7
+++ b/metadata/md5-cache/app-editors/vis-0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.7/vis-0.7.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.5/vis-test-0.5.tar.gz )
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e24c495503de8177b64d5b778e19d712
diff --git a/metadata/md5-cache/app-editors/vis-9999 b/metadata/md5-cache/app-editors/vis-9999
index c16bb19134f9..a0891aaa19cd 100644
--- a/metadata/md5-cache/app-editors/vis-9999
+++ b/metadata/md5-cache/app-editors/vis-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) lua? ( lua_single_t
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ffd5bf87d8774c9306883bce09661f68
diff --git a/metadata/md5-cache/app-editors/vscodium-1.56.2 b/metadata/md5-cache/app-editors/vscodium-1.56.2
new file mode 100644
index 000000000000..18bfaaedc3a0
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscodium-1.56.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
+EAPI=7
+HOMEPAGE=https://vscodium.com/
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=app-accessibility/at-spi2-atk app-crypt/libsecret[crypt] dev-libs/nss media-libs/alsa-lib media-libs/libpng:0/16 net-print/cups x11-libs/cairo x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.56.2/VSCodium-linux-x64-1.56.2.tar.gz -> vscodium-1.56.2-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.56.2/VSCodium-linux-armhf-1.56.2.tar.gz -> vscodium-1.56.2-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.56.2/VSCodium-linux-arm64-1.56.2.tar.gz -> vscodium-1.56.2-arm64.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=784419342a1516dd1d8019f328c5c506
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 38404507d70a..ef72503dfb3a 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515 b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515
new file mode 100644
index 000000000000..ccfd4862fd33
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=app-editors/emacs-26:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/libgit2-1.0.0
+DESCRIPTION=Emacs bindings for libgit2
+EAPI=7
+HOMEPAGE=https://github.com/magit/libegit2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libgit2-1.0.0 >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/magit/libegit2/archive/0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a.tar.gz -> libegit2-0.0.20200515.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8d41193227fc27c56371b201ec7d861c	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0caece6e0270a144822eafb42e952ebe
diff --git a/metadata/md5-cache/app-emacs/magit-3.0.0 b/metadata/md5-cache/app-emacs/magit-3.0.0
new file mode 100644
index 000000000000..5a1aab456f8e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/magit-3.0.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-25:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.3 >=app-emacs/with-editor-3.0.4 sys-apps/texinfo
+DESCRIPTION=A Git porcelain inside Emacs
+EAPI=7
+HOMEPAGE=https://magit.vc/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.3 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
+SLOT=0
+SRC_URI=https://github.com/magit/magit/archive/v3.0.0.tar.gz -> magit-3.0.0.tar.gz
+_eclasses_=elisp	8d41193227fc27c56371b201ec7d861c	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349
+_md5_=237a0c4830823833425be6f1feff0dc9
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 320a22663382..dc62aeb05be4 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/libguestfs-1.38.6-r103 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
index e43453c7e219..7259fc4b1fc1 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a5d9f4c5c64f7cba573f79c7227fea7
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index ad4a6e213fc0..e8b11755d479 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=8a449c13f06584b2cd583ff36b2469c2
+_md5_=06d9316fc6d0541891d5c58622e2ace4
diff --git a/metadata/md5-cache/app-emulation/qemu-6.0.0 b/metadata/md5-cache/app-emulation/qemu-6.0.0
index 41910c416e22..5ba1202432c6 100644
--- a/metadata/md5-cache/app-emulation/qemu-6.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-6.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test udev usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_hexagon qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus kernel_linux python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 ~x86
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing:= ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) udev? ( virtual/libudev ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-1.14.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] >=sys-firmware/seabios-1.14.0[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.14.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.14.0[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) vhost-user-fs? ( caps seccomp ) virgl? ( opengl ) virtfs? ( caps xattr ) vte? ( gtk ) multipath? ( udev ) plugins? ( !static !static-user )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.0.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b8af871b354de4da285ed13052b402d
+_md5_=42884836e466eb6e315f4bdc1afefd1d
diff --git a/metadata/md5-cache/app-emulation/ski-1.3.2-r4 b/metadata/md5-cache/app-emulation/ski-1.3.2-r4
index aef7ed3f264a..b0b63fb48f66 100644
--- a/metadata/md5-cache/app-emulation/ski-1.3.2-r4
+++ b/metadata/md5-cache/app-emulation/ski-1.3.2-r4
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure prepare
 DEPEND=dev-libs/libltdl:0= sys-libs/ncurses:0= virtual/libelf debug? ( sys-libs/binutils-libs:0= ) motif? ( x11-libs/motif:0= ) sys-devel/bison sys-devel/flex dev-util/gperf
 DESCRIPTION=ia64 instruction set simulator
 EAPI=7
-HOMEPAGE=http://ski.sourceforge.net/ http://www.gelato.unsw.edu.au/IA64wiki/SkiSimulator
+HOMEPAGE=http://ski.sourceforge.net/
 IUSE=debug motif
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libltdl:0= sys-libs/ncurses:0= virtual/libelf debug? ( sys-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/ski/ski-1.3.2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f245d8330238c062c62b500cb42f4b67
+_md5_=9c3249c0ec6548bbb8775bbf89565008
diff --git a/metadata/md5-cache/app-emulation/snapd-2.47.1-r1 b/metadata/md5-cache/app-emulation/snapd-2.51
similarity index 78%
rename from metadata/md5-cache/app-emulation/snapd-2.47.1-r1
rename to metadata/md5-cache/app-emulation/snapd-2.51
index 8db7015fd74b..d90bd509dfe0 100644
--- a/metadata/md5-cache/app-emulation/snapd-2.47.1-r1
+++ b/metadata/md5-cache/app-emulation/snapd-2.51
@@ -1,6 +1,6 @@
-BDEPEND=>=dev-lang/go-1.9 dev-python/docutils 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 >=dev-lang/go-1.10 virtual/pkgconfig
+BDEPEND=>=dev-lang/go-1.9 dev-python/docutils sys-devel/gettext sys-fs/xfsprogs 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-lang/go-1.10 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] ) sys-libs/libcap:= sys-fs/squashfs-tools
+DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
 DESCRIPTION=Service and tools for management of snap packages
 EAPI=7
 HOMEPAGE=http://snapcraft.io/
@@ -8,10 +8,10 @@ IUSE=apparmor +cgroup-hybrid +forced-devmode gtk kde systemd kernel_linux
 KEYWORDS=~amd64
 LICENSE=GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
 PDEPEND=sys-auth/polkit[gtk?,kde?]
-RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] ) sys-libs/libcap:= sys-fs/squashfs-tools
+RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
 REQUIRED_USE=!forced-devmode? ( apparmor cgroup-hybrid ) systemd
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/snapcore/snapd/releases/download/2.47.1/snapd_2.47.1.vendor.tar.xz -> snapd-2.47.1.tar.xz
+SRC_URI=https://github.com/snapcore/snapd/releases/download/2.51/snapd_2.51.vendor.tar.xz -> snapd-2.51.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	golang-base	b8fb27dacacea08140c53857f439fc7d	golang-vcs-snapshot	ff485cabd3f37b060f110b0be95092ec	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=427a36701f4f5769038cb0a9be3c1209
+_md5_=74067ca897f2a642f386674c1fcadf80
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 62ec9495b92b..d04bee1c43ca 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) dev-python/docutils dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-vcs/git-1.8.2.1[curl]
+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] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/tqdm[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/tqdm[python_targets_python3_9(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) dev-python/docutils dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
 IUSE=gtk policykit sasl python_single_target_python3_8 python_single_target_python3_9
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/tqdm[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/tqdm[python_targets_python3_9(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] net-misc/x11-ssh-askpass x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] policykit? ( sys-auth/polkit[introspection] ) ) 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 )
 SLOT=0
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad3234ef8908d4e3e4267ae641e79241
+_md5_=6b4e0e308578bd56eddd36009b892970
diff --git a/metadata/md5-cache/app-emulation/virt-what-1.21 b/metadata/md5-cache/app-emulation/virt-what-1.21
new file mode 100644
index 000000000000..f5b0257b8c6a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virt-what-1.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-lang/perl
+DESCRIPTION=Detects if the current machine is running in a virtual machine
+EAPI=7
+HOMEPAGE=https://people.redhat.com/~rjones/virt-what/
+IUSE=dmi
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-shells/bash dmi? ( sys-apps/dmidecode )
+SLOT=0
+SRC_URI=https://people.redhat.com/~rjones/virt-what/files/virt-what-1.21.tar.gz
+_md5_=750b1b236b56e1ad4b858f6f1a295ba3
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.6.4 b/metadata/md5-cache/app-emulation/wine-mono-4.6.4
deleted file mode 100644
index fcef90e2f1f5..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.6.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A replacement for the .NET runtime and class libraries in Wine
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.6.4
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi
-_md5_=307159a9b3699b411a9145e18aefc105
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.7.0 b/metadata/md5-cache/app-emulation/wine-mono-4.7.0
deleted file mode 100644
index fdc542f48f65..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.7.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A replacement for the .NET runtime and class libraries in Wine
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.7.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.7.0/wine-mono-4.7.0.msi
-_md5_=b900962590ea2465a8d10a1591255ca5
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.7.1 b/metadata/md5-cache/app-emulation/wine-mono-4.7.1
deleted file mode 100644
index 0cb8d8c74eb1..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.7.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A replacement for the .NET runtime and class libraries in Wine
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.7.1
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.7.1/wine-mono-4.7.1.msi
-_md5_=307159a9b3699b411a9145e18aefc105
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.7.3 b/metadata/md5-cache/app-emulation/wine-mono-4.7.3
deleted file mode 100644
index 34dac312de39..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.7.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A replacement for the .NET runtime and class libraries in Wine
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.7.3
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.7.3/wine-mono-4.7.3.msi
-_md5_=b900962590ea2465a8d10a1591255ca5
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.7.5 b/metadata/md5-cache/app-emulation/wine-mono-4.7.5
deleted file mode 100644
index 8b30f2c9c8f8..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.7.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.7.5
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.7.5/wine-mono-4.7.5.msi
-_md5_=938061c4045e9477f0cf90ee8778bc7c
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.8.0 b/metadata/md5-cache/app-emulation/wine-mono-4.8.0
deleted file mode 100644
index 0c5f62fe3099..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.8.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.8.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.8.0/wine-mono-4.8.0.msi
-_md5_=2d87d9e061786e9ce355241858924da6
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.8.1 b/metadata/md5-cache/app-emulation/wine-mono-4.8.1
deleted file mode 100644
index 4f79e98112e8..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.8.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.8.1
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.8.1/wine-mono-4.8.1.msi
-_md5_=2d87d9e061786e9ce355241858924da6
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.8.3 b/metadata/md5-cache/app-emulation/wine-mono-4.8.3
deleted file mode 100644
index 445899585226..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.8.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.8.3
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.8.3/wine-mono-4.8.3.msi
-_md5_=2d87d9e061786e9ce355241858924da6
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.9.0 b/metadata/md5-cache/app-emulation/wine-mono-4.9.0
deleted file mode 100644
index 43a86618cf37..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.9.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.9.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.9.0/wine-mono-4.9.0.msi
-_md5_=2d87d9e061786e9ce355241858924da6
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.9.2 b/metadata/md5-cache/app-emulation/wine-mono-4.9.2
deleted file mode 100644
index a13a4d7ffa01..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.9.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.9.2
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.9.2/wine-mono-4.9.2.msi
-_md5_=2d87d9e061786e9ce355241858924da6
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.9.3 b/metadata/md5-cache/app-emulation/wine-mono-4.9.3
deleted file mode 100644
index 58e7717cac4b..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.9.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.9.3
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.9.3/wine-mono-4.9.3.msi
-_md5_=2d87d9e061786e9ce355241858924da6
diff --git a/metadata/md5-cache/app-emulation/wine-mono-4.9.4 b/metadata/md5-cache/app-emulation/wine-mono-4.9.4
deleted file mode 100644
index c9797d6e3c8f..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-4.9.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=4.9.4
-SRC_URI=https://dl.winehq.org/wine/wine-mono/4.9.4/wine-mono-4.9.4.msi
-_md5_=16ee02cad524d2358d589395f9761a82
diff --git a/metadata/md5-cache/app-emulation/wine-mono-5.0.0 b/metadata/md5-cache/app-emulation/wine-mono-5.0.0
deleted file mode 100644
index 464fc1a1c516..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-5.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=5.0.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/5.0.0/wine-mono-5.0.0-x86.msi
-_md5_=f5a4cd479af3d8284e56bc5b9c26028e
diff --git a/metadata/md5-cache/app-emulation/wine-mono-5.1.0 b/metadata/md5-cache/app-emulation/wine-mono-5.1.0
deleted file mode 100644
index 34272b0ed8d7..000000000000
--- a/metadata/md5-cache/app-emulation/wine-mono-5.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=5.1.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/5.1.0/wine-mono-5.1.0-x86.msi
-_md5_=f5a4cd479af3d8284e56bc5b9c26028e
diff --git a/metadata/md5-cache/app-emulation/wine-mono-6.0.0 b/metadata/md5-cache/app-emulation/wine-mono-6.2.0
similarity index 79%
rename from metadata/md5-cache/app-emulation/wine-mono-6.0.0
rename to metadata/md5-cache/app-emulation/wine-mono-6.2.0
index 139361757c9b..c281945ae373 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-6.0.0
+++ b/metadata/md5-cache/app-emulation/wine-mono-6.2.0
@@ -5,6 +5,6 @@ EAPI=7
 HOMEPAGE=https://www.winehq.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
-SLOT=6.0.0
-SRC_URI=https://dl.winehq.org/wine/wine-mono/6.0.0/wine-mono-6.0.0-x86.msi
+SLOT=6.2.0
+SRC_URI=https://dl.winehq.org/wine/wine-mono/6.2.0/wine-mono-6.2.0-x86.msi
 _md5_=304f1e427ca5128d3db2978a1b69a457
diff --git a/metadata/md5-cache/app-emulation/wine-staging-6.6 b/metadata/md5-cache/app-emulation/wine-staging-6.10
similarity index 98%
rename from metadata/md5-cache/app-emulation/wine-staging-6.6
rename to metadata/md5-cache/app-emulation/wine-staging-6.10
index 82764766251f..57d8945d0bb6 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-6.6
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.10
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
 RESTRICT=test
-SLOT=6.6
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.6.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.6.tar.gz -> wine-staging-6.6.tar.gz )
+SLOT=6.10
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.10.tar.gz -> wine-staging-6.10.tar.gz )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	pax-utils	d3fc79d3d50544347e324864f95206e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce666b2058cd6cac6e5dfdaa2c58539d
+_md5_=f04ed5d98455f699a05d920876bbc26f
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 90999a5304a3..291b66a49b3d 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5: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(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	pax-utils	d3fc79d3d50544347e324864f95206e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce666b2058cd6cac6e5dfdaa2c58539d
+_md5_=f04ed5d98455f699a05d920876bbc26f
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-6.6 b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
similarity index 98%
rename from metadata/md5-cache/app-emulation/wine-vanilla-6.6
rename to metadata/md5-cache/app-emulation/wine-vanilla-6.10
index 2c1ddc1d6e84..4ca0b7057063 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.6
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.10
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
 RESTRICT=test
-SLOT=6.6
-SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.6.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
+SLOT=6.10
+SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	pax-utils	d3fc79d3d50544347e324864f95206e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0fa36324a7b99ba42941bc41855927a
+_md5_=3e1a74a853e0f56646520c54e613d7dc
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index a8e2473a068a..b6a009cd446b 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.1.1 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms: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(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb: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(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-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(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:6.2.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	pax-utils	d3fc79d3d50544347e324864f95206e2	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0fa36324a7b99ba42941bc41855927a
+_md5_=3e1a74a853e0f56646520c54e613d7dc
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index e025c3fd8f7a..543be3fd0804 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-repository-11 b/metadata/md5-cache/app-eselect/eselect-repository-11
new file mode 100644
index 000000000000..343c25636a0a
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-repository-11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Manage repos.conf via eselect
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/eselect-repository
+IUSE=test 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 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) app-admin/eselect python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/eselect-repository/archive/v11.tar.gz -> eselect-repository-11.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f9ef5df340b12a74a636b7cc21e0939b
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 9d32febf890e..1ea77033c692 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/fcitx-4.2.9.8 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.8
index b14caf2a9445..8c1788da5e76 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.8
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.8
@@ -12,5 +12,5 @@ REQUIRED_USE=cairo? ( X ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.8_dict.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e2fde40c47e6dcdfda4127e95ba10e9
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index b27c6ad5b6c8..6b0759bd6e3f 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=cairo? ( X ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b888f905ac0dd7dfa439ab3b86bc5e0
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
index b61cdc256d54..966c328dca7a 100644
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.11.92.tar.gz -> ibus-libpinyin-1.11.92.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b05a7bcd88e1cacc7714c1c9ca82aeb
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
index ae2aaba3deb8..962d74a99c7f 100644
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=198926e6111408300f1c3c31995f4141
diff --git a/metadata/md5-cache/app-i18n/librime-1.7.3 b/metadata/md5-cache/app-i18n/librime-1.7.3
index 7c727289bbb3..229a9c6629dd 100644
--- a/metadata/md5-cache/app-i18n/librime-1.7.3
+++ b/metadata/md5-cache/app-i18n/librime-1.7.3
@@ -1,15 +1,15 @@
 BDEPEND=dev-libs/capnproto:0 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/opencc:0= !sparc? ( >=dev-cpp/glog-0.3.5:0= ) dev-cpp/yaml-cpp:0= dev-libs/boost:0=[threads] dev-libs/capnproto:0= dev-libs/leveldb:0= dev-libs/marisa:0= dev-libs/darts dev-libs/utfcpp x11-base/xorg-proto test? ( dev-cpp/gtest )
+DEPEND=app-i18n/opencc:0= >=dev-cpp/glog-0.3.5:0= dev-cpp/yaml-cpp:0= dev-libs/boost:0=[threads] dev-libs/capnproto:0= dev-libs/leveldb:0= dev-libs/marisa:0= dev-libs/darts dev-libs/utfcpp x11-base/xorg-proto test? ( dev-cpp/gtest )
 DESCRIPTION=RIME (Rime Input Method Engine) core library
 EAPI=7
 HOMEPAGE=https://rime.im/ https://github.com/rime/librime
 IUSE=debug test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=app-i18n/opencc:0= !sparc? ( >=dev-cpp/glog-0.3.5:0= ) dev-cpp/yaml-cpp:0= dev-libs/boost:0=[threads] dev-libs/capnproto:0= dev-libs/leveldb:0= dev-libs/marisa:0=
+RDEPEND=app-i18n/opencc:0= >=dev-cpp/glog-0.3.5:0= dev-cpp/yaml-cpp:0= dev-libs/boost:0=[threads] dev-libs/capnproto:0= dev-libs/leveldb:0= dev-libs/marisa:0=
 RESTRICT=!test? ( test )
 SLOT=0/1-1.7.3
 SRC_URI=https://github.com/rime/librime/archive/1.7.3.tar.gz -> librime-1.7.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc7565d2d41e0bf98668efdb42aa3a34
+_md5_=9e6b0f6cbe600d911103f00ff5dcdfba
diff --git a/metadata/md5-cache/app-i18n/librime-lua-20201011103348 b/metadata/md5-cache/app-i18n/librime-lua-20201011103348
index 4b3ed4f00909..1ae790dc6d79 100644
--- a/metadata/md5-cache/app-i18n/librime-lua-20201011103348
+++ b/metadata/md5-cache/app-i18n/librime-lua-20201011103348
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/librime-1.6:0= lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/hchunhui/librime-lua/archive/d45a41af2f9d731e3c1516a191cc3160e3cb8377.tar.gz -> librime-lua-20201011103348.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=904b4755bf334eb8dbad7968de4f20d2
diff --git a/metadata/md5-cache/app-i18n/librime-lua-99999999999999 b/metadata/md5-cache/app-i18n/librime-lua-99999999999999
index 14a4f32991d2..051387f58413 100644
--- a/metadata/md5-cache/app-i18n/librime-lua-99999999999999
+++ b/metadata/md5-cache/app-i18n/librime-lua-99999999999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-i18n/librime-1.6:0= lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ff1e85d6189888559a9ee95b57b0bda
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index bd4383f207b3..b35bfe8a4c1a 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/collectd-5.12.0-r1 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
index b71488182b67..f9e2db2b1a95 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/lib
 REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cc34a1cc462650d3f1a0702959eba52d
diff --git a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100 b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
index 58e27982f0e8..167495a2e45a 100644
--- a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
+++ b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) www-servers/nginx[nginx_
 REQUIRED_USE=^^ ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/knyar/nginx-lua-prometheus/archive/0.1-20170610.tar.gz -> nginx-lua-prometheus-0.1_pre20170610.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bc6e04e52b24e72df7cf82e41beb617d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 7d86d32b0a82..ab1ae67a39ec 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/cmatrix-2.0-r2 b/metadata/md5-cache/app-misc/cmatrix-2.0-r3
similarity index 84%
rename from metadata/md5-cache/app-misc/cmatrix-2.0-r2
rename to metadata/md5-cache/app-misc/cmatrix-2.0-r3
index 18b78946e43a..c52b6acca3cb 100644
--- a/metadata/md5-cache/app-misc/cmatrix-2.0-r2
+++ b/metadata/md5-cache/app-misc/cmatrix-2.0-r3
@@ -1,14 +1,14 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 ) dev-util/ninja dev-util/cmake X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=dev-util/ninja dev-util/cmake X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=sys-libs/ncurses:0=[unicode?]
 DESCRIPTION=An ncurses based app to show a scrolling screen from the Matrix
 EAPI=7
 HOMEPAGE=https://www.asty.org/cmatrix/ https://github.com/abishekvashok/cmatrix
-IUSE=X +unicode X
+IUSE=+unicode X
 KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/abishekvashok/cmatrix/archive/v2.0.tar.gz -> cmatrix-2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	font	0667878c2b594871023dd1833d05996f	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a24d2a679d865189a5605db057c4d26
+_md5_=1edde73b72d2a4de1e042ad445a99229
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630 b/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630
index ac1a34529a15..cc4fd0fa4218 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 app-arch/xz-utils gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils ) dev-perl/XML-Parser dev-util/intltool sys-kernel/linux-headers doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy )
-DESCRIPTION=DDCControl allows control of monitor parameters via DDC
+DESCRIPTION=control monitor parameters, like brightness, contrast, RGB color levels via DDC
 EAPI=7
 HOMEPAGE=http://ddccontrol.sourceforge.net/
 IUSE=doc gtk nls +pci static-libs
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 app-arch/xz-utils gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils )
 SLOT=0
 SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/f3d003f63aaa0407d3147b04848e0722f78695d5.tar.gz -> ddccontrol-0.4.4_p20200630.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a52c446c7f39aa6900ae6cb5628cf97
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5f20759780cff04b489199606bc9132e
diff --git a/metadata/md5-cache/app-misc/filebus-0.3.0 b/metadata/md5-cache/app-misc/filebus-0.3.0
new file mode 100644
index 000000000000..1d3a87a96c7b
--- /dev/null
+++ b/metadata/md5-cache/app-misc/filebus-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] inotify? ( dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) )
+DEFINED_PHASES=compile install prepare test
+DESCRIPTION=A user space multicast named pipe implementation backed by a regular file
+EAPI=7
+HOMEPAGE=https://github.com/zmedico/filebus
+IUSE=+inotify python test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] inotify? ( dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/filebus/filebus-0.3.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=87b3d3b44ac22a80afe38c9d63d41c6c
diff --git a/metadata/md5-cache/app-misc/geekcode-1.7.3-r1 b/metadata/md5-cache/app-misc/geekcode-1.7.3-r1
index a57ceff23b64..f1a9e1201e63 100644
--- a/metadata/md5-cache/app-misc/geekcode-1.7.3-r1
+++ b/metadata/md5-cache/app-misc/geekcode-1.7.3-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Geek code generator
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/geekcode
 KEYWORDS=~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
+LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/geekcode/geekcode-1.7.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d13e26ab09327b96509a4cbed7d9494
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4fb91ae61054dbffc35fdeb6aa898b89
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.18 b/metadata/md5-cache/app-misc/hivex-1.3.18
index ece7adae84ba..0888d21fee7c 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.18
+++ b/metadata/md5-cache/app-misc/hivex-1.3.18
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libguestfs.org/download/hivex/hivex-1.3.18.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53b03a721afdf40747162ec65f390f18
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bd062b790d66404751849694cccaa14c
diff --git a/metadata/md5-cache/app-misc/jail-2.0-r4 b/metadata/md5-cache/app-misc/jail-2.0-r4
index bf0269275872..212680260dfb 100644
--- a/metadata/md5-cache/app-misc/jail-2.0-r4
+++ b/metadata/md5-cache/app-misc/jail-2.0-r4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-util/strace
 SLOT=0
 SRC_URI=https://github.com/spiculator/jail/archive/v2.0.tar.gz -> jail-2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b2b1928b9a0d40f3c5fe358cd512f77
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8ed4f390135708ab31e07e8b6b6bf8e5
diff --git a/metadata/md5-cache/app-misc/jitac-0.3.0 b/metadata/md5-cache/app-misc/jitac-0.3.0
deleted file mode 100644
index e0c32d6ce857..000000000000
--- a/metadata/md5-cache/app-misc/jitac-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=dev-java/sun-jimi:0 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=An image to ASCII converter written in Java
-EAPI=5
-HOMEPAGE=http://www.roqe.org/jitac/
-IUSE=doc elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-java/sun-jimi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.roqe.org/jitac/jitac-0.3.0.src.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a572ecc0006ce9ce59fe1a569dd1d766
diff --git a/metadata/md5-cache/app-misc/mkcert-1.4.1 b/metadata/md5-cache/app-misc/mkcert-1.4.1
index 10442b9f63d4..c7dd290ef88d 100644
--- a/metadata/md5-cache/app-misc/mkcert-1.4.1
+++ b/metadata/md5-cache/app-misc/mkcert-1.4.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=A zero-config tool to make locally trusted development certificates
 EAPI=7
 HOMEPAGE=https://github.com/FiloSottile/mkcert
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/FiloSottile/mkcert/archive/v1.4.1.tar.gz -> mkcert-1.4.1.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jessevdk/go-flags/@v/v1.4.0.mod -> github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191022074931-774d2ec196ee.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191022074931-774d2ec196ee.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20191107024926-a9480a3ec3bc.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20191107024926-a9480a3ec3bc.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20191107024926-a9480a3ec3bc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20191107024926-a9480a3ec3bc.mod mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.zip -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip mirror://goproxy//howett.net/plist/@v/v0.0.0-20181124034731-591f970eefbb.mod -> howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod mirror://goproxy//software.sslmate.com/src/go-pkcs12/@v/v0.0.0-20180114231543-2291e8f0f237.zip -> software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20180114231543-2291e8f0f237.zip mirror://goproxy//software.sslmate.com/src/go-pkcs12/@v/v0.0.0-20180114231543-2291e8f0f237.mod -> software.sslmate.com%2Fsrc%2Fgo-pkcs12%2F@v%2Fv0.0.0-20180114231543-2291e8f0f237.mod
 _eclasses_=go-module	bf028003684a8b018e4de9e3c272ed33
-_md5_=9493e23a84cb36d64f80c563978e69d3
+_md5_=c1bc53ca0c245b916159877cde1a3ab7
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.9 b/metadata/md5-cache/app-misc/pax-utils-1.2.9
deleted file mode 100644
index 91a4e8978d68..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) 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_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp ) kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) )
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug kernel_linux python seccomp python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) 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_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.9.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.9.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0d44ea616c8b041a19fc50d54b35fb57
diff --git a/metadata/md5-cache/app-misc/socnetv-2.2 b/metadata/md5-cache/app-misc/socnetv-2.2
index 5b57f0a4c8dc..e4c2f83b487d 100644
--- a/metadata/md5-cache/app-misc/socnetv-2.2
+++ b/metadata/md5-cache/app-misc/socnetv-2.2
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 SLOT=0
 SRC_URI=mirror://sourceforge/socnetv/SocNetV-2.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a5d35e8874d9da6b8ce2fc8d80e2b7f9
+_md5_=55426b4d01d90de04eece56d749517a5
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.20.11.23-r1 b/metadata/md5-cache/app-misc/trash-cli-0.21.5.25
similarity index 65%
rename from metadata/md5-cache/app-misc/trash-cli-0.20.11.23-r1
rename to metadata/md5-cache/app-misc/trash-cli-0.21.5.25
index 09e7dcdf3c10..f8a0ef6d2a37 100644
--- a/metadata/md5-cache/app-misc/trash-cli-0.20.11.23-r1
+++ b/metadata/md5-cache/app-misc/trash-cli-0.21.5.25
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python scripts to manipulate trash cans via the command line
 EAPI=7
 HOMEPAGE=https://github.com/andreafrancia/trash-cli
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/andreafrancia/trash-cli/archive/0.20.11.23.tar.gz -> trash-cli-0.20.11.23.tar.gz
+SRC_URI=https://github.com/andreafrancia/trash-cli/archive/0.21.5.25.tar.gz -> trash-cli-0.21.5.25.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e740296e24b9507c7cf18033200b16ed
+_md5_=8171312a771a3bdda328450aea5e2839
diff --git a/metadata/md5-cache/app-misc/worker-4.6.1-r100 b/metadata/md5-cache/app-misc/worker-4.6.1-r100
index e36a36040439..e54088fdbc82 100644
--- a/metadata/md5-cache/app-misc/worker-4.6.1-r100
+++ b/metadata/md5-cache/app-misc/worker-4.6.1-r100
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( sys-apps/dbus ) lu
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
 SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-4.6.1.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a8a4867a675c9571870d3045a0e8e37a
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index be20016ae493..07e69f15458d 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/hourglass-0.7.2-r1 b/metadata/md5-cache/app-office/hourglass-0.7.2-r1
deleted file mode 100644
index bad6c670d9ca..000000000000
--- a/metadata/md5-cache/app-office/hourglass-0.7.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/jcommon:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A PSP (personal software process) time tracking utility written in Java
-EAPI=5
-HOMEPAGE=http://hourglass.wiki.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/jcommon:1.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=361d092e395902c252874f6c2c852034
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 9c64e712ed8a..e3dfdaacc5fb 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/demerge-0.047-r3 b/metadata/md5-cache/app-portage/demerge-0.047-r3
deleted file mode 100644
index 52c4420741dd..000000000000
--- a/metadata/md5-cache/app-portage/demerge-0.047-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=dev-lang/perl >=dev-perl/PortageXS-0.02.10-r3 virtual/perl-Term-ANSIColor dev-perl/TermReadKey dev-perl/Shell-EnvImporter
-DESCRIPTION=demerge - revert to previous installation states
-EAPI=6
-HOMEPAGE=http://download.mpsna.de/opensource/demerge/
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=dev-perl/PortageXS-0.02.10-r3 virtual/perl-Term-ANSIColor dev-perl/TermReadKey dev-perl/Shell-EnvImporter sys-apps/portage
-SLOT=0
-SRC_URI=http://download.mpsna.de/opensource/demerge/demerge-0.047.tar.gz
-_md5_=c7d6c1d3fe8cf70cbe5661c920d2a9d8
diff --git a/metadata/md5-cache/app-portage/eix-0.35.0 b/metadata/md5-cache/app-portage/eix-0.35.0
new file mode 100644
index 000000000000..c5dccaa54f32
--- /dev/null
+++ b/metadata/md5-cache/app-portage/eix-0.35.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= )
+DESCRIPTION=Search and query ebuilds
+EAPI=7
+HOMEPAGE=https://github.com/vaeth/eix/
+IUSE=debug doc nls sqlite
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/vaeth/eix/releases/download/v0.35.0/eix-0.35.0.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9d5765c1143b032a7de5f391dbc994f0
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.3 b/metadata/md5-cache/app-portage/gentoopm-0.3.3
index d2ea52dca1e4..ccc96bca7a13 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.3
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.3
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gentoopm/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~mips ~sparc x86 ~x64-macos
 LICENSE=BSD-2
 PDEPEND=app-eselect/eselect-package-manager
-RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/portage-2.1.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=sys-apps/portage-2.1.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.3.tar.gz -> gentoopm-0.3.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=71b7de6b3881f4dfda785119b5d0beb5
+_md5_=cde0ff8296a0e84f28baefbc96419a07
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index 3eb929e959d0..9fdb472a1c48 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A common interface to Gentoo package managers
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gentoopm/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD-2
 PDEPEND=app-eselect/eselect-package-manager
 PROPERTIES=live
-RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/portage-2.1.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=sys-apps/portage-2.1.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6803793ca5c0eafd15d9436663acb299
+_md5_=802f90d2e7d05b28eeffb580bcbeacd7
diff --git a/metadata/md5-cache/app-portage/kuroneko-0.1.0 b/metadata/md5-cache/app-portage/kuroneko-0.1.0
new file mode 100644
index 000000000000..dddd416f2ad9
--- /dev/null
+++ b/metadata/md5-cache/app-portage/kuroneko-0.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] scraper? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Vulnerability checker using data scraped from Gentoo Bugzilla
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/kuroneko/
+IUSE=scraper test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-apps/pkgcore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] scraper? ( dev-python/bracex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/mgorny/kuroneko/archive/v0.1.0.tar.gz -> kuroneko-0.1.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ec7619c11e7ca093f990a0dda9e827d1
diff --git a/metadata/md5-cache/app-portage/perl-info-0.16 b/metadata/md5-cache/app-portage/perl-info-0.16
deleted file mode 100644
index cd46fac2c06b..000000000000
--- a/metadata/md5-cache/app-portage/perl-info-0.16
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tool to gather relevant perl data useful for bugreport; 'emerge --info' for perl
-EAPI=7
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Term-ANSIColor >=dev-perl/PortageXS-0.02.04
-SLOT=0
-SRC_URI=mirror://gentoo/perl-info-0.16.tar.gz https://dev.gentoo.org/~tove/files/perl-info-0.16.tar.gz
-_md5_=f35fb4d96e0e49454bec65f9ea78567d
diff --git a/metadata/md5-cache/app-portage/repoman-3.0.3-r1 b/metadata/md5-cache/app-portage/repoman-3.0.3-r1
index 1853eb1fda27..05eac75469a4 100644
--- a/metadata/md5-cache/app-portage/repoman-3.0.3-r1
+++ b/metadata/md5-cache/app-portage/repoman-3.0.3-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-3.0.3.tar.bz2 https://github.com/gentoo/portage/compare/285d3ae987a079f32b909c6e6eddde9bc45a4a25...b09b4071151d8e3a81f3576843d00f88eb407799.patch -> repoman-3.0.3-unit-test-bug-779055.patch https://github.com/gentoo/portage/commit/e29177fcd2950199afa4f83673c0771afb261123.patch -> repoman-3.0.3-version-bug-779508.patch https://github.com/gentoo/portage/commit/2eb3ca092a528e0722e0ca32f616836ed8039936.patch -> repoman-3.0.3-unit-test-bug-779967.patch
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=04517f15273facb1ae485e2af9a4cca9
+_md5_=a96c25fa4ff1d81ec30dd2c3bbfd50be
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index 562b31cfadcf..bd5451c475fa 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-apps/portage-3.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-apps/portage-3.0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=sys-apps/portage-3.0.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/lxml-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=30f9e66d463dd159c9ab19eb927dc712
+_md5_=7844e6bdcb2ea516658e92b55ba9df01
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
index d6517206bec5..9925cdd03d3f 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~mips ~sparc x86 ~x64-macos
 LICENSE=BSD-2
-RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgorny/smart-live-rebuild/archive/v1.3.7.tar.gz -> smart-live-rebuild-1.3.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3835907582530c5aa62b971cf28d640d
+_md5_=df0376ecb98dcd82b9b869418b254dad
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 9097c1049189..fd3d52b2874e 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -1,13 +1,13 @@
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5ad067f03610dd462fa4aae681296a78
+_md5_=3ea481b8719a64d539748dda4c2ad2cc
diff --git a/metadata/md5-cache/app-portage/tatt-0.7-r1 b/metadata/md5-cache/app-portage/tatt-0.7-r1
deleted file mode 100644
index 297010df8f0b..000000000000
--- a/metadata/md5-cache/app-portage/tatt-0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=arch testing tool
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/tatt
-IUSE=+templates python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-2
-RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-client/pybugz python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/gentoo/tatt/archive/v0.7.tar.gz -> tatt-0.7.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=63b2f53ca9668bf53789838e87fbd00f
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 328bfc64a6bc..3eb9c424cc57 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.4 b/metadata/md5-cache/app-shells/dash-0.5.11.4
new file mode 100644
index 000000000000..a10f98c48fbd
--- /dev/null
+++ b/metadata/md5-cache/app-shells/dash-0.5.11.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( libedit? ( dev-libs/libedit ) ) libedit? ( static? ( dev-libs/libedit[static-libs] ) )
+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 ~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.4.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c2e48b5cdc4bd2331d1da308bb09fa9f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 23bfcdf807cc..4529f7151555 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/aiksaurus-1.2.1-r1 b/metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
similarity index 71%
rename from metadata/md5-cache/app-text/aiksaurus-1.2.1-r1
rename to metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
index 638d9eb8ef54..9d81072b3e16 100644
--- a/metadata/md5-cache/app-text/aiksaurus-1.2.1-r1
+++ b/metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815
+BDEPEND=gtk? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) gtk? ( virtual/pkgconfig )
+DEPEND=gtk? ( x11-libs/gtk+:2 )
 DESCRIPTION=A thesaurus lib, tool and database
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/aiksaurus
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 )
 SLOT=0
-SRC_URI=mirror://sourceforge/aiksaurus/aiksaurus-1.2.1.tar.gz
+SRC_URI=mirror://sourceforge/aiksaurus/aiksaurus-1.2.1.tar.gz https://dev.gentoo.org/~soap/distfiles/aiksaurus-1.2.1-patches.txz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dfcdbd0affd59d42dec2a794f7152162
+_md5_=7fbc8c98d1331be1d58c36afef87bdda
diff --git a/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325 b/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325
index 05ef51047fc8..66ff6a211a58 100644
--- a/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325
+++ b/metadata/md5-cache/app-text/dvipsk-2021.1_p20210325
@@ -5,9 +5,9 @@ DESCRIPTION=DVI-to-PostScript translator
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvips-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvips.doc-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665
-_md5_=5ebc8f37545d29aba2fc81b9ebeb477d
+_md5_=7d13364a0d321033923e0e69c5bdce30
diff --git a/metadata/md5-cache/app-text/highlight-3.57-r100 b/metadata/md5-cache/app-text/highlight-3.57-r100
index a423bfc22e2d..aea20441948b 100644
--- a/metadata/md5-cache/app-text/highlight-3.57-r100
+++ b/metadata/md5-cache/app-text/highlight-3.57-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.57.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=56db539cba6db05f3e85912241d71c0c
diff --git a/metadata/md5-cache/app-text/highlight-3.60 b/metadata/md5-cache/app-text/highlight-3.60
index a425f76a9003..66a29f2b605e 100644
--- a/metadata/md5-cache/app-text/highlight-3.60
+++ b/metadata/md5-cache/app-text/highlight-3.60
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-3.60.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=56db539cba6db05f3e85912241d71c0c
diff --git a/metadata/md5-cache/app-text/highlight-4.1 b/metadata/md5-cache/app-text/highlight-4.1
index 2ca718785a85..5244157ba040 100644
--- a/metadata/md5-cache/app-text/highlight-4.1
+++ b/metadata/md5-cache/app-text/highlight-4.1
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-4.1.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=61a6a278ce2d7e15422160d8d837eaa2
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
index 73f2a7a34785..157728afa097 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3255e0a9d8a67c737767567d215a569
diff --git a/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325 b/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325
index 5dd4acd4a310..6c2e9266642a 100644
--- a/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325
+++ b/metadata/md5-cache/app-text/ps2pkm-1.8_p20210325
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/kpathsea-6.2.1
 DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/kpathsea-6.2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz
-_md5_=5ab600b50918adf0e4f8c8055fbd490d
+_md5_=d0eb1f489b20d256cfda8139f9018764
diff --git a/metadata/md5-cache/app-text/texlive-2021 b/metadata/md5-cache/app-text/texlive-2021
index 72fe01505c9a..c206e73ca02a 100644
--- a/metadata/md5-cache/app-text/texlive-2021
+++ b/metadata/md5-cache/app-text/texlive-2021
@@ -4,8 +4,8 @@ DESCRIPTION=A complete TeX distribution
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
 IUSE=cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl 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_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=app-text/texlive-core-2021 app-text/psutils >=dev-texlive/texlive-fontutils-2021 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) app-text/ps2eps png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-fontsrecommended-2021 >=dev-texlive/texlive-latex-2021 luatex? ( >=dev-texlive/texlive-luatex-2021 ) >=dev-texlive/texlive-latexrecommended-2021 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2021 ) >=dev-texlive/texlive-plaingeneric-2021 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=dev-texlive/texlive-bibtexextra-2021 >=dev-texlive/texlive-fontsextra-2021 >=dev-texlive/texlive-formatsextra-2021 >=dev-texlive/texlive-latexextra-2021 >=dev-tex/glossaries-2.07 ) xetex? ( >=dev-texlive/texlive-xetex-2021 ) graphics? ( >=dev-texlive/texlive-pictures-2021 ) science? ( >=dev-texlive/texlive-mathscience-2021 ) publishers? ( >=dev-texlive/texlive-publishers-2021 ) music? ( >=dev-texlive/texlive-music-2021 ) pstricks? ( >=dev-texlive/texlive-pstricks-2021 ) context? ( >=dev-texlive/texlive-context-2021 ) games? ( >=dev-texlive/texlive-games-2021 ) humanities? ( >=dev-texlive/texlive-humanities-2021 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-texlive/texlive-formatsextra-2021 ) l10n_af? ( >=dev-texlive/texlive-langother-2021 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2021 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2021 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2021 ) cjk? ( >=dev-texlive/texlive-langcjk-2021 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2021 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2021 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2021 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2021 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2021 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2021 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2021 ) l10n_he? ( >=dev-texlive/texlive-langother-2021 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_as? ( >=dev-texlive/texlive-langother-2021 ) l10n_bn? ( >=dev-texlive/texlive-langother-2021 ) l10n_gu? ( >=dev-texlive/texlive-langother-2021 ) l10n_hi? ( >=dev-texlive/texlive-langother-2021 ) l10n_kn? ( >=dev-texlive/texlive-langother-2021 ) l10n_ml? ( >=dev-texlive/texlive-langother-2021 ) l10n_mr? ( >=dev-texlive/texlive-langother-2021 ) l10n_or? ( >=dev-texlive/texlive-langother-2021 ) l10n_pa? ( >=dev-texlive/texlive-langother-2021 ) l10n_sa? ( >=dev-texlive/texlive-langother-2021 ) l10n_ta? ( >=dev-texlive/texlive-langother-2021 ) l10n_te? ( >=dev-texlive/texlive-langother-2021 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2021 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2021 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2021 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2021 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_eo? ( >=dev-texlive/texlive-langother-2021 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2021 ) l10n_ia? ( >=dev-texlive/texlive-langother-2021 ) l10n_id? ( >=dev-texlive/texlive-langother-2021 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_lo? ( >=dev-texlive/texlive-langother-2021 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2021 >=dev-texlive/texlive-langcyrillic-2021 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2021 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2021 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2021 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2021 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2021 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2021 ) l10n_vi? ( >=dev-texlive/texlive-langother-2021 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2021 )
 SLOT=0
-_md5_=d27d9872fa6832e4b8077c1342f897a3
+_md5_=91c91b6402df5dbe064b59cbbe5f29f9
diff --git a/metadata/md5-cache/app-text/texlive-core-2021 b/metadata/md5-cache/app-text/texlive-core-2021
index f289d83098d1..d659a845ff18 100644
--- a/metadata/md5-cache/app-text/texlive-core-2021
+++ b/metadata/md5-cache/app-text/texlive-core-2021
@@ -5,10 +5,10 @@ DESCRIPTION=A complete TeX distribution
 EAPI=7
 HOMEPAGE=https://tug.org/texlive/
 IUSE=cjk X doc source tk +luajittex xetex xindy
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/epspdf !app-text/pdfjam sys-libs/zlib >=media-libs/harfbuzz-1.4.5[icu,graphite] >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] media-gfx/graphite2 >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib:= app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= >=dev-libs/ptexenc-1.3.8 xetex? ( >=app-text/teckit-2.5.3 media-libs/fontconfig ) xindy? ( dev-lisp/clisp:= ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.3.2 >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long dev-perl/File-HomeDir dev-perl/Log-Dispatch dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny tk? ( dev-lang/tk dev-perl/Tk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-core-patches-2021-1.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfjam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlcockpit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-binextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsftopk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive.infra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a2ping.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bundledoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chklref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan_chk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cluttex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanify.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctan-o-mat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctanupload.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-de-macro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvi2tty.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviasm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvicopy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvidvi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviinfox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviljk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviout-util.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-findhyph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragmaster.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hook-pre-commit-pkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-installfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ketcindy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lacheck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-git-log.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-papersize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2man.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2nemeth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileversion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexpand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexindent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxfileinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltximg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-make4ht.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-match_parens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfbook2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcrop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfjam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflatexpicscale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-quiet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfxup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftosrc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkfix-helper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-purifyeps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seetexk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcredact.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sty2dtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synctex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdiff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdirflatten.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texfot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texliveonfly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-scripts-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texloganalyser.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlcockpit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpic2pdftex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeoutfileinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-web.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpdfopen.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adhocfilelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arara.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checklistings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clojure-pamphlet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-ext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkjobtexmf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pfarrei.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythontex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texosquery.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texplate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlcockpit.source-2021.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88671d3fc0f1380775b919d95d4621e5
+_md5_=6730c59a08a3e1942b95b2f4f2de5857
diff --git a/metadata/md5-cache/sci-libs/libecpint-1.0.5 b/metadata/md5-cache/app-text/tidy-html5-5.7.28-r1
similarity index 57%
rename from metadata/md5-cache/sci-libs/libecpint-1.0.5
rename to metadata/md5-cache/app-text/tidy-html5-5.7.28-r1
index ae89102fd9a4..b34c12ccf19b 100644
--- a/metadata/md5-cache/sci-libs/libecpint-1.0.5
+++ b/metadata/md5-cache/app-text/tidy-html5-5.7.28-r1
@@ -1,15 +1,12 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml test? ( dev-cpp/gtest )
-DESCRIPTION=Efficient evaluation of integrals over ab initio effective core potentials
+DESCRIPTION=Tidy the layout and correct errors in HTML, HTML5 and XML documents
 EAPI=7
-HOMEPAGE=https://github.com/robashaw/libecpint
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/pugixml
-RESTRICT=!test? ( test )
+HOMEPAGE=https://www.html-tidy.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!app-text/htmltidy
 SLOT=0
-SRC_URI=https://github.com/robashaw/libecpint/archive/v1.0.5.tar.gz -> libecpint-1.0.5.tar.gz
+SRC_URI=https://github.com/htacg/tidy-html5/archive/5.7.28.tar.gz -> tidy-html5-5.7.28.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=070eb3cac5c692e4ec15c27cea5684e9
+_md5_=0eaee0690d34744dfeed84ab25602c4d
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
index d2906dcf4f40..1668dcb1fb49 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs
 DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/texlive/texlive-20210325-source.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f1926945f599781f6962e4384a3770c
+_md5_=6c91467568a0f69232648ca6391ff673
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r6 b/metadata/md5-cache/app-text/xmlto-0.0.28-r6
index 6943f9d237ce..e2f7eaffb004 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r6
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r6
@@ -5,10 +5,10 @@ DESCRIPTION=Script for converting XML and DocBook documents to a variety of outp
 EAPI=7
 HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
-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=GPL-2
 RDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt || ( sys-apps/util-linux app-misc/getopt ) text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b629edd1f04a2c72484a915802079809
+_md5_=a839fe7cd940a9173c38943f8f19d7bc
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 81d13b6a72b7..2daa125ec631 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/Vim-Jinja2-Syntax-0.0_pre20210604 b/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
new file mode 100644
index 000000000000..165f6a7c9b8c
--- /dev/null
+++ b/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Jinja2 syntax highlighting
+EAPI=7
+HOMEPAGE=https://github.com/Glench/Vim-Jinja2-Syntax/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/Glench/Vim-Jinja2-Syntax/archive/5d2496eb5fd4415c7ce062ccbcd53a3f0de93aa3.tar.gz -> Vim-Jinja2-Syntax-0.0_pre20210604.tar.gz
+_eclasses_=vim-doc	dd0828b15877b2a09c07f4719e45891f	vim-plugin	93be71a1efbbf62981fcd40ee0db6e3f
+_md5_=e41f3fb4712d79d42f430361c4474812
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index e1acf036d4fa..5a87f147577c 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/asis-2016-r1 b/metadata/md5-cache/dev-ada/asis-2016-r1
deleted file mode 100644
index 6e9f13903309..000000000000
--- a/metadata/md5-cache/dev-ada/asis-2016-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=dev-ada/gnat_util[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared] dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
-DESCRIPTION=To develop tools for Ada software
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/gnat_util[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared]
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71 -> asis-gpl-2016-src.tar.gz
-_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=c8ae162b158b1fb1820c278cce6ee959
diff --git a/metadata/md5-cache/dev-ada/aunit-2020 b/metadata/md5-cache/dev-ada/aunit-2020
index b2f6537af3de..43477eac7f1f 100644
--- a/metadata/md5-cache/dev-ada/aunit-2020
+++ b/metadata/md5-cache/dev-ada/aunit-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=aunit-2020-20200429-19B6C-src.tar.gz -> aunit-2020-20200429-19B6C-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=63fb19625eec83c4815e88c320e13f67
+_md5_=4b9fdc615fee74dfa9a8f304d66b87bb
diff --git a/metadata/md5-cache/dev-ada/aunit-2020-r1 b/metadata/md5-cache/dev-ada/aunit-2020-r1
deleted file mode 100644
index 88b87a9e26ab..000000000000
--- a/metadata/md5-cache/dev-ada/aunit-2020-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
-DESCRIPTION=Ada unit testing framework
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/6c8702d4a3c4a39f5da077716e44bef980377ba8?filename=aunit-2020-20200429-19B6C-src.tar.gz -> aunit-2020-20200429-19B6C-src.tar.gz
-_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=09e869ff718b529d16f905a5dbe7bee9
diff --git a/metadata/md5-cache/dev-ada/aunit-2021 b/metadata/md5-cache/dev-ada/aunit-2021
index 156658a4f39b..4101ed2c30ee 100644
--- a/metadata/md5-cache/dev-ada/aunit-2021
+++ b/metadata/md5-cache/dev-ada/aunit-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c8eadafc40c016859e127cd0e82411fcd8f3e749?filename=aunit-2021-20210518-19DC5-src.tar.gz -> aunit-2021-20210518-19DC5-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=76c0ba055a5faeb4c2181caf22f74f18
+_md5_=eaa9cfcb0779f24e873daa9ce8b2fd84
diff --git a/metadata/md5-cache/dev-ada/aws-2018-r2 b/metadata/md5-cache/dev-ada/aws-2018-r2
index ae35798f3bd0..9d993f8d8f64 100644
--- a/metadata/md5-cache/dev-ada/aws-2018-r2
+++ b/metadata/md5-cache/dev-ada/aws-2018-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/asis[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/asis[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs]
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=dev-ada/xmlada[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs]
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd -> aws-gpl-2018-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=ca703aaad4c227cbefd93f63040833fe
+_md5_=e03896feda10fb67b081f4d7209a5f61
diff --git a/metadata/md5-cache/dev-ada/aws-2020 b/metadata/md5-cache/dev-ada/aws-2020
index 8d138e85e320..4a36f92f128a 100644
--- a/metadata/md5-cache/dev-ada/aws-2020
+++ b/metadata/md5-cache/dev-ada/aws-2020
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/asis[ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Web development framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -11,4 +11,4 @@ REQUIRED_USE=ada_target_gnat_2019
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=aws-2020-20200429-19A9F-src.tar.gz -> aws-2020-20200429-19A9F-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=97d4f805de7244a99d45a8666896e5db
+_md5_=de0d23564201c0a2aef15735346c2e4e
diff --git a/metadata/md5-cache/dev-ada/aws-2020-r1 b/metadata/md5-cache/dev-ada/aws-2020-r1
new file mode 100644
index 000000000000..f6415060d1e0
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/aws-2020-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure setup
+DEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-)]
+DESCRIPTION=A complete Web development framework
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/tools/aws/
+IUSE=ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2018
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/xmlada[ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),shared,static-libs]
+REQUIRED_USE=^^ ( ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+SLOT=0
+SRC_URI=https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=aws-2020-20200429-19A9F-src.tar.gz -> aws-2020-20200429-19A9F-src.tar.gz
+_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=4290caa74eeefe6c67746d8d73fefcc2
diff --git a/metadata/md5-cache/dev-ada/aws-2021 b/metadata/md5-cache/dev-ada/aws-2021
new file mode 100644
index 000000000000..3a8f567760a7
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/aws-2021
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure setup
+DEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-)]
+DESCRIPTION=A complete Web development framework
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/tools/aws/
+IUSE=ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-ada/xmlada[ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),shared,static-libs]
+REQUIRED_USE=^^ ( ada_target_gnat_2020 ada_target_gnat_2021 )
+SLOT=0
+SRC_URI=https://community.download.adacore.com/v1/5b0fa09df8ac0c717abdf4ede9e08efe5fd98984?filename=aws-2021-20210518-19F65-src.tar.gz -> aws-2021-20210518-19F65-src.tar.gz
+_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=5cb4a512a59cf688a75d0651573ea1ce
diff --git a/metadata/md5-cache/dev-ada/gnat-suite-bin-2019-r1 b/metadata/md5-cache/dev-ada/gnat-suite-bin-2019-r1
deleted file mode 100644
index a2bdaaabcd89..000000000000
--- a/metadata/md5-cache/dev-ada/gnat-suite-bin-2019-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=GNAT Ada suite
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2 GPL-3
-RDEPEND=sys-devel/binutils sys-devel/gdb sys-libs/gdbm sys-libs/ncurses-compat
-SLOT=2019
-SRC_URI=https://dev.gentoo.org/~tupone/distfiles/gnat-suite-bin-2019.txz
-_md5_=3bc8fa0769b2f92116834acda779bb40
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2017-r2 b/metadata/md5-cache/dev-ada/gnat_util-2017-r2
index f6e71bcb35fb..f59089d7b791 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2017-r2
+++ b/metadata/md5-cache/dev-ada/gnat_util-2017-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2018(-),-ada_target_gnat_2019(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 -ada_target_gnat_2016 -ada_target_gnat_2018 -ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+REQUIRED_USE=ada_target_gnat_2017
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 -> gnat_util-gpl-2017-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=184def6a74a873a944473daa826cc4ea
+_md5_=3ea90db021236d2822797e92b72bde21
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
index 9fc276cea5dc..b426cf9f7c46 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c3a08e07e3b08d7ca42f466105d789d9
+_md5_=5421198adf64fbd923012424162ee0d4
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
index 892877581d9d..f67dd699b3ad 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=gmp iconv readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3ba238e49743cd0c893dd911a8ddd2
+_md5_=0d19f410597d1b325233b10c50e716a0
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
new file mode 100644
index 000000000000..c0cd5c515fd9
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+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] ) ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)]
+DESCRIPTION=GNAT Component Collection
+EAPI=7
+HOMEPAGE=http://libre.adacore.com
+IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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] ) ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gnatcoll-core[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-),shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+SLOT=0
+SRC_URI=https://community.download.adacore.com/v1/d93655ced17f15c5f376b6861825df3f9c183980?filename=gnatcoll-bindings-2021-20210518-19B15-src.tar.gz -> gnatcoll-bindings-2021-20210518-19B15-src.tar.gz
+_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=df380786b640843c43e2aaf08891a45e
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2020 b/metadata/md5-cache/dev-ada/gnatcoll-core-2020
index 8858b618d7e0..9d4b8e920b83 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2020
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=gnatcoll-core-2020-20200429-19B7C-src.tar.gz -> gnatcoll-core-2020-20200429-19B7C-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=183802b52bb4d55c36a07c3463eaf197
+_md5_=bb6ca4e6c69a0a0ee5d662954157d593
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
index b8d4de621af6..e896c9ce419a 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2016 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=>=dev-ada/libgpr-2020[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-),shared?,static-libs?,static-pic?]
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=gnatcoll-core-2020-20200429-19B7C-src.tar.gz -> gnatcoll-core-2020-20200429-19B7C-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=15b94de2e7526b376e83de2e4ab4d755
+_md5_=f08ecc586ddae89d81ee5d46aaa5639f
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2019-r1 b/metadata/md5-cache/dev-ada/gnatmem-2019-r1
index b700eb7c9646..fd41b3f5576b 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnatmem-2019-r1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089 -> gnatmem-2019-20190429-19745-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6f138f524d2a45d9ba7ef037b6db7891
+_md5_=c996df3ac97f68e11a21f7290bb710b6
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2020 b/metadata/md5-cache/dev-ada/gnatmem-2020
index e85fea52d7ea..66108e9d7729 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2020
+++ b/metadata/md5-cache/dev-ada/gnatmem-2020
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/77354fedca0441f882e17b6a73ac5631bff26237?filename=gnatmem-2020-20200429-19911-src.tar.gz -> gnatmem-2020-20200429-19911-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=046e27396e58f497a81337583f6436d8
+_md5_=2119f08744a4b5d60cbdc477a3e8a739
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2021 b/metadata/md5-cache/dev-ada/gnatmem-2021
index 1db181bb987a..ad8bcab7038a 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2021
+++ b/metadata/md5-cache/dev-ada/gnatmem-2021
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?] sys-libs/binutils-libs:=
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)] sys-libs/binutils-libs:=
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/3ddb98c0c8854dc7631bebd673ac7bc53038d4b7?filename=gnatmem-2021-20210518-19F7B-src.tar.gz -> gnatmem-2021-20210518-19F7B-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=585be489239eefbb608f23cf6972a9ad
+_md5_=2e38c0bde03bfc3e4aaa03bbbd3beb84
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2017-r2 b/metadata/md5-cache/dev-ada/gprbuild-2017-r2
deleted file mode 100644
index 702c243e0e03..000000000000
--- a/metadata/md5-cache/dev-ada/gprbuild-2017-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-DESCRIPTION=Multi-Language Management
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-IUSE=ada_target_gnat_2016 ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> gprbuild-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2017-src.tar.gz
-_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8d7487c79c3ad471ba55f24fa2a5fafa
diff --git a/metadata/md5-cache/dev-ada/gtkada-2019-r1 b/metadata/md5-cache/dev-ada/gtkada-2019-r1
index 3656f85271fb..067d689f0b1e 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2019-r1
+++ b/metadata/md5-cache/dev-ada/gtkada-2019-r1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53 -> gtkada-2019-20190424-19D98-src.tgz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d3aabd42bc4c48e9f5e15cfc9232f13e
+_md5_=446d212c40d0f456402dbace50ef56a1
diff --git a/metadata/md5-cache/dev-ada/gtkada-2019-r2 b/metadata/md5-cache/dev-ada/gtkada-2019-r2
index eb13d63febb9..a7fb5c6594c9 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2019-r2
+++ b/metadata/md5-cache/dev-ada/gtkada-2019-r2
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2016 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53 -> gtkada-2019-20190424-19D98-src.tgz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=54447373066c43a9635f6f7b725801ea
+_md5_=08593028e81d6feadfd637f66f6327a7
diff --git a/metadata/md5-cache/dev-ada/gtkada-2020 b/metadata/md5-cache/dev-ada/gtkada-2020
index 3f3b09859fa3..a86290c5fc5f 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2020
+++ b/metadata/md5-cache/dev-ada/gtkada-2020
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=+shared static-libs ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/96f85c875c161c36e7d0edb19aa4dbddf41ea671?filename=gtkada-2020-20200429-19B96-src.tar.gz -> gtkada-2020-20200429-19B96-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2960fca4e3efc952cb4fb22c14e6ad1d
+_md5_=ae17b54824401417270e686549d432ad
diff --git a/metadata/md5-cache/dev-ada/gtkada-2021 b/metadata/md5-cache/dev-ada/gtkada-2021
new file mode 100644
index 000000000000..d0ddf6be8540
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gtkada-2021
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)]
+DESCRIPTION=A complete Ada graphical toolkit
+EAPI=7
+HOMEPAGE=http://libre.adacore.com//tools/gtkada/
+IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+SLOT=0
+SRC_URI=https://community.download.adacore.com/v1/8f1daefcb56e3ee7feaad67bac66deb0f7c37a82?filename=gtkada-2021-20210518-1A011-src.tar.gz -> gtkada-2021-20210518-1A011-src.tar.gz
+_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ffa228ba94ea172c19e6526420c31ee0
diff --git a/metadata/md5-cache/dev-ada/libgpr-2020 b/metadata/md5-cache/dev-ada/libgpr-2020
index 968440ff8416..d736db684b4f 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2020
+++ b/metadata/md5-cache/dev-ada/libgpr-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) || ( shared static-libs static-pic )
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)] !net-libs/grpc
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) || ( shared static-libs static-pic )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=23f952804ab98536db904ce2f4327b26
+_md5_=e240edae015df9ab91166607919ce717
diff --git a/metadata/md5-cache/dev-ada/libgpr-2020-r1 b/metadata/md5-cache/dev-ada/libgpr-2020-r1
index 7e0902127ad5..e27aac97a1d5 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2020-r1
+++ b/metadata/md5-cache/dev-ada/libgpr-2020-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 -ada_target_gnat_2016 -ada_target_gnat_2021
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2021(-)] !net-libs/grpc
-REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ) || ( shared static-libs static-pic )
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2021(-)] !net-libs/grpc
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ) || ( shared static-libs static-pic )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz -> gprbuild-2020-20200429-19BD2-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4aeab87b0c2937250bf46779a466f1f
+_md5_=82f83c5e947ea74f7bb817a13662343c
diff --git a/metadata/md5-cache/dev-ada/xmlada-2020 b/metadata/md5-cache/dev-ada/xmlada-2020
index f412a3220177..768f6a563cec 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2020
+++ b/metadata/md5-cache/dev-ada/xmlada-2020
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2020(-),-ada_target_gnat_2021(-)]
 DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2020 -ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2020 -ada_target_gnat_2021
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=a0ef6fa5fc32c5d85abf896f2f8657ba
+_md5_=a41145693eaa47a01a20029b358500b3
diff --git a/metadata/md5-cache/dev-ada/xmlada-2020-r1 b/metadata/md5-cache/dev-ada/xmlada-2020-r1
deleted file mode 100644
index d94a09ed5309..000000000000
--- a/metadata/md5-cache/dev-ada/xmlada-2020-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
-DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz -> xmlada-2020-20200429-19A99-src.tar.gz
-_eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=a07c600413e6a952f1026bd2638d5ee2
diff --git a/metadata/md5-cache/dev-ada/xmlada-2021 b/metadata/md5-cache/dev-ada/xmlada-2021
index 1b27d3ae8c0a..787c18d997d8 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2021
+++ b/metadata/md5-cache/dev-ada/xmlada-2021
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?]
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 ) dev-ada/gprbuild[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,ada_target_gnat_2020(-)?,ada_target_gnat_2021(-)?,-ada_target_gnat_2016(-)]
 DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021
+IUSE=+shared static-libs static-pic ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 -ada_target_gnat_2016
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
-REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) ada_target_gnat_2020? ( dev-lang/gnat-gpl:9.3.1 ) ada_target_gnat_2021? ( dev-lang/gnat-gpl:10 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ada_target_gnat_2020 ada_target_gnat_2021 )
 SLOT=0
 SRC_URI=https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=xmlada-2021-20210518-19D50-src.tar.gz -> xmlada-2021-20210518-19D50-src.tar.gz
 _eclasses_=ada	c852ba21ef92cc906f4f2431c39e5daa	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=2872618b1d5b0a3eca6bf9a50f646b98
+_md5_=7091754385883a3817b2fd682f1a99d1
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index a25953b317df..13d0b40edcfa 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/x11-wm/herbstluftwm-0.9.1 b/metadata/md5-cache/dev-cpp/abseil-cpp-20210324.2
similarity index 52%
rename from metadata/md5-cache/x11-wm/herbstluftwm-0.9.1
rename to metadata/md5-cache/dev-cpp/abseil-cpp-20210324.2
index 1d1701d48c2b..c9d075831010 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.1
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20210324.2
@@ -1,14 +1,13 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig doc? ( app-text/asciidoc ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) test? ( sys-libs/timezone-data ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
-DESCRIPTION=A manual tiling window manager for X
+DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
 EAPI=7
-HOMEPAGE=https://herbstluftwm.org/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr app-shells/bash
-SLOT=0
-SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.1.tar.gz
+HOMEPAGE=https://abseil.io
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 test? ( BSD )
+RESTRICT=!test? ( test )
+SLOT=0/20210324
+SRC_URI=https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz -> abseil-cpp-20210324.2.tar.gz test? ( https://github.com/google/googletest/archive/aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz -> gtest-1.10.0_p20200702.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2346f1fba5c5e331445ac26200c5d20
+_md5_=4c1495749b5c3fb5aabb5dbdaaddc210
diff --git a/metadata/md5-cache/dev-cpp/glog-0.3.4-r1 b/metadata/md5-cache/dev-cpp/glog-0.3.4-r1
deleted file mode 100644
index 367e51470f08..000000000000
--- a/metadata/md5-cache/dev-cpp/glog-0.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libunwind? ( sys-libs/libunwind[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? ( >=dev-cpp/gtest-1.8.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Google's C++ logging library
-EAPI=6
-HOMEPAGE=https://github.com/google/glog
-IUSE=gflags +libunwind static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libunwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/glog/archive/v0.3.4.tar.gz -> glog-0.3.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=41251859e3327760cd06f04cccc1a7ef
diff --git a/metadata/md5-cache/dev-cpp/glog-0.5.0 b/metadata/md5-cache/dev-cpp/glog-0.5.0
new file mode 100644
index 000000000000..ff356c331af9
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/glog-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gflags? ( dev-cpp/gflags: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(-)?] ) libunwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind: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(-)?] ) !llvm-libunwind? ( sys-libs/libunwind: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(-)?] ) ) test? ( >=dev-cpp/gtest-1.8.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(-)?] )
+DESCRIPTION=Google Logging library
+EAPI=7
+HOMEPAGE=https://github.com/google/glog
+IUSE=gflags +libunwind llvm-libunwind test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=gflags? ( dev-cpp/gflags: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(-)?] ) libunwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind: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(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/glog/archive/v0.5.0.tar.gz -> glog-0.5.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=58f1afa0cf448dce3d80c8ecd5618ddf
diff --git a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2 b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
index c0a8043e7996..7e764b48c390 100644
--- a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
+++ b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20
 EAPI=7
 HOMEPAGE=https://github.com/martinus/robin-hood-hashing
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/martinus/robin-hood-hashing/archive/3.11.2.tar.gz -> robin-hood-hashing-3.11.2.tar.gz
-_md5_=61d57f7b33aeebae946378213134312a
+_md5_=6d9046e38a05b9832a35977a3fdba8a4
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index c4fe24eadc92..f2570d44c193 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/redis-6.0.12 b/metadata/md5-cache/dev-db/redis-6.0.12
index fd260cc75b0a..6f5831f7a39f 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.12
+++ b/metadata/md5-cache/dev-db/redis-6.0.12
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.12.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6b1ff78ab7497135defe6c6adcc9dad9
diff --git a/metadata/md5-cache/dev-db/redis-6.0.13-r1 b/metadata/md5-cache/dev-db/redis-6.0.13-r1
index 3c446c49b44b..1d1046f40909 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.13-r1
+++ b/metadata/md5-cache/dev-db/redis-6.0.13-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.13.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5f7a1d24f9c230497c482ba5d1cd425f
diff --git a/metadata/md5-cache/dev-db/redis-6.0.14 b/metadata/md5-cache/dev-db/redis-6.0.14
index 9f7d4e244669..2080444f7cc4 100644
--- a/metadata/md5-cache/dev-db/redis-6.0.14
+++ b/metadata/md5-cache/dev-db/redis-6.0.14
@@ -5,12 +5,12 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
 EAPI=7
 HOMEPAGE=https://redis.io
 IUSE=+jemalloc ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.0.14.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=825f3eed23484473da32dbd0be858971
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5f7a1d24f9c230497c482ba5d1cd425f
diff --git a/metadata/md5-cache/dev-db/redis-6.2.1 b/metadata/md5-cache/dev-db/redis-6.2.1
index 6cd1cefed18b..b26ab67d6c1f 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.1
+++ b/metadata/md5-cache/dev-db/redis-6.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0e03d4b45bc130d09614466ad403016c
diff --git a/metadata/md5-cache/dev-db/redis-6.2.3-r1 b/metadata/md5-cache/dev-db/redis-6.2.3-r1
index 061a8c17ef0e..04836f7f1333 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.3-r1
+++ b/metadata/md5-cache/dev-db/redis-6.2.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.3.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3383d15e17dcc70b98ffe8dd67a8e1a
diff --git a/metadata/md5-cache/dev-db/redis-6.2.4 b/metadata/md5-cache/dev-db/redis-6.2.4
index bc78b447c35c..9d7cab82c440 100644
--- a/metadata/md5-cache/dev-db/redis-6.2.4
+++ b/metadata/md5-cache/dev-db/redis-6.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-6.2.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c3383d15e17dcc70b98ffe8dd67a8e1a
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.9 b/metadata/md5-cache/dev-db/unixODBC-2.3.9
index 2525dc92467b..0068d5517db7 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.9
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.9
@@ -1,7 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install test
 DEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.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(-)?] ) >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/flex
-DESCRIPTION=A complete ODBC driver manager
+DESCRIPTION=complete ODBC driver manager
 EAPI=7
 HOMEPAGE=http://www.unixodbc.org/
 IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
@@ -10,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.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(-)?] ) >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d44a465461fab992744955ec54b40649
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7f9a7403f3687e5753eb10961cc18d52
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 4cc0e25e4c5b..8fe2fbfc20d5 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.7-r100 b/metadata/md5-cache/dev-games/cegui-0.8.7-r100
index 834bb0baf9e9..aa96da1dca5c 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.7-r100
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( me
 REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8affaf51a4b75533705e085336756cf2
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
index 0e1784218491..e3f9908a5d44 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
@@ -11,5 +11,5 @@ RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs
 REQUIRED_USE=dicom? ( zlib ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) openexr? ( zlib ) sdl2? ( sdl )
 SLOT=0/161
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a61120bb66b92cfee187c5b7cad8ca0
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
index 1307f4055bfb..47a2f06f4c70 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
@@ -11,5 +11,5 @@ RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl?] virtual/glu virtual/open
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) sdl2? ( sdl ) openexr? ( zlib )
 SLOT=0/132
 SRC_URI=https://github.com/OpenMW/osg/archive/8b07809fa674ecffe77338aaea2e223b3aadff0e.tar.gz -> openscenegraph-openmw-3.4_p20200425.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7573b8d5f71db90e8c599f3d9ba65290
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f5109c5ce72b0aae7a6389844db4c10c
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 664839b588e4..5d4b7666e5cc 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1 b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
new file mode 100644
index 000000000000..fd4d7514424f
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Integer logarithms
+EAPI=7
+HOMEPAGE=https://github.com/haskellari/integer-logarithms
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-8.4.3:=
+RESTRICT=test
+SLOT=0/1.0.3.1
+SRC_URI=https://hackage.haskell.org/package/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ac88ca4bbeba76b204d4d350b76ef620
diff --git a/metadata/md5-cache/dev-haskell/language-c-0.8.3 b/metadata/md5-cache/dev-haskell/language-c-0.8.3
deleted file mode 100644
index 4c3521ddf829..000000000000
--- a/metadata/md5-cache/dev-haskell/language-c-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:= dev-haskell/alex >=dev-haskell/cabal-1.22.2.0 dev-haskell/happy hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Analysis and generation of C code
-EAPI=7
-HOMEPAGE=http://visq.github.io/language-c/
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.3
-SRC_URI=https://hackage.haskell.org/package/language-c-0.8.3/language-c-0.8.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1794b851dfea4c53f7ed77894344b15
diff --git a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7 b/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
deleted file mode 100644
index 9bbd58642d2b..000000000000
--- a/metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15 >=dev-haskell/split-0.1 <dev-haskell/split-0.3 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Unicode normalization
-EAPI=7
-HOMEPAGE=https://github.com/harendra-kumar/unicode-transforms
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.3.7
-SRC_URI=https://hackage.haskell.org/package/unicode-transforms-0.3.7/unicode-transforms-0.3.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	2f31876646b777a7851b22816735765c	haskell-cabal	781f607e5fa6b3d28f694be10c79646b	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3893baaef3646a8e7c99d96c3c980a58
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index fe51192a6410..0d252f1c1b07 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/bcmail-1.38-r6 b/metadata/md5-cache/dev-java/bcmail-1.38-r6
deleted file mode 100644
index daa47534325b..000000000000
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/junit:0 dev-java/oracle-javamail:0 dev-java/bcprov:1.38 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 dev-java/oracle-javamail:0 dev-java/bcprov:1.38 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.38
-SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9907da61d8afbeb40059eb22c9d09c3
diff --git a/metadata/md5-cache/dev-java/bcmail-1.52-r3 b/metadata/md5-cache/dev-java/bcmail-1.52-r3
deleted file mode 100644
index 71992421e05f..000000000000
--- a/metadata/md5-cache/dev-java/bcmail-1.52-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/junit:0 dev-java/bcprov:1.52 dev-java/bcpkix:1.52 dev-java/oracle-javamail:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/junit:0 dev-java/bcprov:1.52 dev-java/bcpkix:1.52 dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-152.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18521644792d8962c2568481599cc8e9
diff --git a/metadata/md5-cache/dev-java/bcpg-1.52-r1 b/metadata/md5-cache/dev-java/bcpg-1.52-r1
deleted file mode 100644
index e24340d349d6..000000000000
--- a/metadata/md5-cache/dev-java/bcpg-1.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip test? ( dev-java/ant-junit:0 ) dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-152.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=16e0bb07eadc3a3533ce82d66eb38f89
diff --git a/metadata/md5-cache/dev-java/bcpg-1.52-r2 b/metadata/md5-cache/dev-java/bcpg-1.52-r2
deleted file mode 100644
index f49b9bff31c3..000000000000
--- a/metadata/md5-cache/dev-java/bcpg-1.52-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/bcprov:1.52 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=6
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-java/bcprov:1.52 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://polydistortion.net/bc/download/bcpg-jdk15on-152.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3d4c36f84ca9cf12c47e8abd647d7f30
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.52-r1 b/metadata/md5-cache/dev-java/bcpkix-1.52-r1
deleted file mode 100644
index 12e7d5e3cf1e..000000000000
--- a/metadata/md5-cache/dev-java/bcpkix-1.52-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.52
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd9dafd559b19f90933be3d4c029e5d8
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r4 b/metadata/md5-cache/dev-java/bcprov-1.38-r4
deleted file mode 100644
index 6e8e6450383c..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.38-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.38
-SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.38/bcprov-jdk16-1.38-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f01d12cb7cbc7b8c8ba251d1b890b7c1
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45-r2 b/metadata/md5-cache/dev-java/bcprov-1.45-r2
index 2b4a2d9365a1..6818468de1cb 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.45-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.45-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java cryptography APIs
 EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
+HOMEPAGE=https://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=1.45
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45-sources.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53b2e15a23512f30451f7e4cc1d0e585
+_md5_=a97066508d760f0eed0014cbb4fcf061
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r2 b/metadata/md5-cache/dev-java/bcprov-1.50-r2
index 707ba69be62a..58bb98a47df8 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup test unpack
 DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java cryptography APIs
 EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
+HOMEPAGE=https://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64164c1241d4778dfe5753c5fbc7c46a
+_md5_=81649955cbf9be2d0cca8acac0d23f8e
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r4 b/metadata/md5-cache/dev-java/bcprov-1.50-r4
index 74fa9afb0f30..3f2b0e9f7952 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup test unpack
 DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java cryptography APIs
 EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
+HOMEPAGE=https://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=920746cc69bacb09ddcace181096bbc3
+_md5_=35f83f5719d86dba796eb9643fcb4c03
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r1 b/metadata/md5-cache/dev-java/bcprov-1.52-r1
deleted file mode 100644
index 465fa6f9d07d..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe63485315ef42a1f5b10e57dc04d666
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r2 b/metadata/md5-cache/dev-java/bcprov-1.52-r2
index 91fa6a5f311f..e4dcc3fb859c 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install preinst prepare setup test unpack
 DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java cryptography APIs
 EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
+HOMEPAGE=https://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://polydistortion.net/bc/download/bcprov-jdk15on-152.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1adf6548a4fe5ba81d8cc9388ba988d5
+_md5_=9d1d05aa4d46860aeaabb3824a4e873a
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r3 b/metadata/md5-cache/dev-java/bcprov-1.52-r3
deleted file mode 100644
index b1f82ad7664b..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.52
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8f68a4357eb0621d1b2622073cc8b58c
diff --git a/metadata/md5-cache/dev-java/bcprov-1.54 b/metadata/md5-cache/dev-java/bcprov-1.54
deleted file mode 100644
index e118bac44728..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.54
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=5
-HOMEPAGE=http://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.54
-SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-154.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e40291bbf9a5181e9a4dbda6975d9253
diff --git a/metadata/md5-cache/dev-java/bcprov-1.66 b/metadata/md5-cache/dev-java/bcprov-1.66
deleted file mode 100644
index e1690e9b62d7..000000000000
--- a/metadata/md5-cache/dev-java/bcprov-1.66
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java cryptography APIs
-EAPI=7
-HOMEPAGE=https://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.66
-SRC_URI=https://www.bouncycastle.org/download/bcprov-jdk15on-166.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=734bb4a5c7705c4747d3a85ac2261b96
diff --git a/metadata/md5-cache/dev-java/bcprov-1.68 b/metadata/md5-cache/dev-java/bcprov-1.68-r2
similarity index 61%
rename from metadata/md5-cache/dev-java/bcprov-1.68
rename to metadata/md5-cache/dev-java/bcprov-1.68-r2
index 9c79b9c97859..23e27583983d 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.68
+++ b/metadata/md5-cache/dev-java/bcprov-1.68-r2
@@ -1,14 +1,14 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Java cryptography APIs
 EAPI=7
 HOMEPAGE=https://www.bouncycastle.org/java.html
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.68
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
 SRC_URI=https://www.bouncycastle.org/download/bcprov-jdk15on-168.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=c07bfa230580dc68dfa68f71e0d0faff
+_md5_=69c23153e418aa277b4a802b78bd3f3d
diff --git a/metadata/md5-cache/dev-java/cldc-api-1.1-r1 b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
deleted file mode 100644
index b04526ed0dba..000000000000
--- a/metadata/md5-cache/dev-java/cldc-api-1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Java ME Connected Limited Device Configuration API
-EAPI=5
-HOMEPAGE=http://java.sun.com/javame/reference/apis.jsp
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8b1c7a55f93192fb6c6f126589ab74b3
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.13.0 b/metadata/md5-cache/dev-java/protobuf-java-3.13.0
deleted file mode 100644
index 027a895e6807..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.13.0 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/24
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=79f5d329179e268bfdd39f13bf74788b
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.14.0 b/metadata/md5-cache/dev-java/protobuf-java-3.14.0
deleted file mode 100644
index 1c285a0ea9f5..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.14.0 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/25
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=c3476713cc6cc07863b3cbac750a07a2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.3 b/metadata/md5-cache/dev-java/protobuf-java-3.15.3
deleted file mode 100644
index 7f8034b249fd..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.15.3 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz -> protobuf-3.15.3.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.4 b/metadata/md5-cache/dev-java/protobuf-java-3.15.4
deleted file mode 100644
index 47e8be1c16de..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.15.4 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.4.tar.gz -> protobuf-3.15.4.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.5 b/metadata/md5-cache/dev-java/protobuf-java-3.15.5
deleted file mode 100644
index a64e022151cb..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.15.5 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz -> protobuf-3.15.5.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.6 b/metadata/md5-cache/dev-java/protobuf-java-3.15.6
deleted file mode 100644
index eb8b28768032..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.15.6 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.6.tar.gz -> protobuf-3.15.6.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.7 b/metadata/md5-cache/dev-java/protobuf-java-3.15.7
deleted file mode 100644
index bcfb11278dbd..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.15.7 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.7.tar.gz -> protobuf-3.15.7.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.8 b/metadata/md5-cache/dev-java/protobuf-java-3.15.8
index 2352a723d484..6c30aa060ef3 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.8
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.15.8
@@ -7,8 +7,8 @@ HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/prot
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/26
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz -> protobuf-3.15.8.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=1c163340a833be121202579f9c77e949
+_md5_=96cd8fd919e12f674f81249e3d40a1bd
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.16.0 b/metadata/md5-cache/dev-java/protobuf-java-3.16.0
index 5e8dabf941d9..71def1fe909d 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.16.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.16.0
@@ -7,8 +7,8 @@ HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/prot
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/27
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz -> protobuf-3.16.0.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=d060b657e7649b793f35d2abd1162614
+_md5_=6d11349ca18d4ea5987051d8867fcf5c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.0 b/metadata/md5-cache/dev-java/protobuf-java-3.17.0
similarity index 62%
rename from metadata/md5-cache/dev-java/protobuf-java-3.15.0
rename to metadata/md5-cache/dev-java/protobuf-java-3.17.0
index d4df24588283..5394dc3626b5 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.17.0
@@ -1,14 +1,14 @@
-BDEPEND=~dev-libs/protobuf-3.15.0 >=virtual/jdk-1.7
+BDEPEND=~dev-libs/protobuf-3.17.0 >=virtual/jdk-1.8:*
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.0.tar.gz -> protobuf-3.15.0.tar.gz
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.0.tar.gz -> protobuf-3.17.0.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
+_md5_=a3af808b1157396842fdd7fcc9e5b1b2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.2 b/metadata/md5-cache/dev-java/protobuf-java-3.17.1
similarity index 62%
rename from metadata/md5-cache/dev-java/protobuf-java-3.15.2
rename to metadata/md5-cache/dev-java/protobuf-java-3.17.1
index 146110eddc08..cfa6188b7a29 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.17.1
@@ -1,14 +1,14 @@
-BDEPEND=~dev-libs/protobuf-3.15.2 >=virtual/jdk-1.7
+BDEPEND=~dev-libs/protobuf-3.17.1 >=virtual/jdk-1.8:*
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.2.tar.gz -> protobuf-3.15.2.tar.gz
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.1.tar.gz -> protobuf-3.17.1.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
+_md5_=a3af808b1157396842fdd7fcc9e5b1b2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.15.1 b/metadata/md5-cache/dev-java/protobuf-java-3.17.2
similarity index 62%
rename from metadata/md5-cache/dev-java/protobuf-java-3.15.1
rename to metadata/md5-cache/dev-java/protobuf-java-3.17.2
index 28f1420eb133..3cc2ee64b5b1 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.15.1
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.17.2
@@ -1,14 +1,14 @@
-BDEPEND=~dev-libs/protobuf-3.15.1 >=virtual/jdk-1.7
+BDEPEND=~dev-libs/protobuf-3.17.2 >=virtual/jdk-1.8:*
 DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.1.tar.gz -> protobuf-3.15.1.tar.gz
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.2.tar.gz -> protobuf-3.17.2.tar.gz
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=775cb1ecc2749909836a022e5c65196c
+_md5_=a3af808b1157396842fdd7fcc9e5b1b2
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index 26c72b6bac4b..61b5da0c6399 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -7,7 +7,7 @@ HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/prot
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=virtual/jre-1.8:* !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/28
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-pkg-simple	c85bf2d75a5f53e7b39fc9104701ebfb	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=ef50b5b0521f5143753a8b4c22599560
+_md5_=d5bd7ea2282b32f0c1d37f3d41b77550
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
index a265bc6a632e..a71bb26c6422 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=JAI is a class library for managing images
 EAPI=7
 HOMEPAGE=https://jai.dev.java.net/
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=sun-bcla-jai
 RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=!amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( https://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
 _eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=1bdb94ef11f470d74a7ada67ccaf9fd2
+_md5_=d4d7eae7eb3f395b3d0480d80d898079
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2.1 b/metadata/md5-cache/dev-java/tagsoup-1.2.1
deleted file mode 100644
index 3f2bcf518dc8..000000000000
--- a/metadata/md5-cache/dev-java/tagsoup-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/saxon:9 >=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A SAX-compliant parser written in Java
-EAPI=7
-HOMEPAGE=http://mercury.ccil.org/~cowan/XML/tagsoup/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
-_eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=90c8273dbd0d42b5a68ee86c298c4e64
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index db10ed8cb28b..ea8943ff2c2a 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/R-4.0.5 b/metadata/md5-cache/dev-lang/R-4.0.5-r1
similarity index 96%
rename from metadata/md5-cache/dev-lang/R-4.0.5
rename to metadata/md5-cache/dev-lang/R-4.0.5-r1
index 403d8d3cd805..0d4802313855 100644
--- a/metadata/md5-cache/dev-lang/R-4.0.5
+++ b/metadata/md5-cache/dev-lang/R-4.0.5-r1
@@ -7,10 +7,10 @@ HOMEPAGE=http://www.r-project.org/
 IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X
 KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
-RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre2:= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) sys-libs/zlib:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl dev-libs/libpcre2:= net-libs/libtirpc net-misc/curl virtual/blas:0 || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) sys-libs/zlib:0[minizip] java? ( >=virtual/jre-1.8:* ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) ) test? ( profile )
 RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.0.5.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be8487732ea005dd13624a382833bf2e
+_md5_=45b44a65913fd438f0df8c4800e58edc
diff --git a/metadata/md5-cache/dev-lang/erlang-24.0.2 b/metadata/md5-cache/dev-lang/erlang-24.0.2
new file mode 100644
index 000000000000..75e90f31523c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-24.0.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/24.0.2
+SRC_URI=https://github.com/erlang/otp/archive/OTP-24.0.2.tar.gz -> erlang-24.0.2.tar.gz http://erlang.org/download/otp_doc_man_24.0.tar.gz -> erlang_doc_man_24.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_24.0.tar.gz -> erlang_doc_html_24.0.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_md5_=171aa77cdea1c5bcc89e3483739d2072
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4 b/metadata/md5-cache/dev-lang/ghc-8.10.4
index 013426340bf7..8d8ac80329e9 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.10.4
 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 ) )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	ghc-package	2f31876646b777a7851b22816735765c	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5096f3f5b41d0b3d836b410667448e42
+_md5_=4103ce3ed97ec1cc9d14a3b9b89e8589
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.5 b/metadata/md5-cache/dev-lang/ghc-8.10.5
new file mode 100644
index 000000000000..493da2ea0912
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=7
+HOMEPAGE=https://www.haskell.org/ghc/
+IUSE=big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
+RESTRICT=!test? ( test )
+SLOT=0/8.10.5
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.5/ghc-8.10.5-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.5/ghc-8.10.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.5-i686-pc-linux-gnu.tbz2 ) )
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	ghc-package	2f31876646b777a7851b22816735765c	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1f469cdfbe182a1dc40b1ef96797cf94
diff --git a/metadata/md5-cache/dev-lang/go-1.15.13 b/metadata/md5-cache/dev-lang/go-1.15.13
new file mode 100644
index 000000000000..e6d72677765e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.15.13
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.15.13
+SRC_URI=https://storage.googleapis.com/golang/go1.15.13.src.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=677d24033b9667a8580209084940181b
diff --git a/metadata/md5-cache/dev-lang/go-1.16.5 b/metadata/md5-cache/dev-lang/go-1.16.5
new file mode 100644
index 000000000000..7f2c20c1adb2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.16.5
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install postinst test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=cpu_flags_x86_sse2
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.16.5
+SRC_URI=https://storage.googleapis.com/golang/go1.16.5.src.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9390ab40d7536a01bd5372e5326ca8de
diff --git a/metadata/md5-cache/dev-lang/nim-1.4.6 b/metadata/md5-cache/dev-lang/nim-1.4.6
deleted file mode 100644
index c7da63aadac5..000000000000
--- a/metadata/md5-cache/dev-lang/nim-1.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( net-libs/nodejs )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=7
-HOMEPAGE=https://nim-lang.org/
-IUSE=+readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-1.4.6.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0cbbba59704ca78143b32b8d7ed9d514
diff --git a/metadata/md5-cache/dev-lang/php-7.4.20 b/metadata/md5-cache/dev-lang/php-7.4.20
new file mode 100644
index 000000000000..7bff1257d417
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.4.20
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=7.4
+SRC_URI=https://www.php.net/distributions/php-7.4.20.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=78d0ba1a3edf393c4de8c0b93b8c7c6c
diff --git a/metadata/md5-cache/dev-lang/php-8.0.7 b/metadata/md5-cache/dev-lang/php-8.0.7
new file mode 100644
index 000000000000..bbda654ca9d2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.7
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.7.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5f7393e4fa2f5b57c9c3d5f0191e2dd1
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p10 b/metadata/md5-cache/dev-lang/python-2.7.18_p10
index b5e40e7ab4a4..b4e46e44f0de 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p10
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p10
@@ -5,11 +5,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p10.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb86ca8e456f290817168aed17dbe82c
+_md5_=eb4a0d68f3632eecf4707f911a205e10
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13_p5 b/metadata/md5-cache/dev-lang/python-3.6.13_p5
index 175f5bb1f4c5..9346581d5735 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13_p5
+++ b/metadata/md5-cache/dev-lang/python-3.6.13_p5
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test +threads tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=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:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13_p5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3bf0046140bd9b70842ccd7343d6cb77
+_md5_=b026b223172fcd9111f9909e5e9d5167
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10_p6 b/metadata/md5-cache/dev-lang/python-3.7.10_p6
index c9114f6fed4c..d051b2442fbd 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.10_p6
+++ b/metadata/md5-cache/dev-lang/python-3.7.10_p6
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 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:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b4344252e81e51ee537f8318e66cd89e
+_md5_=146fe1310ac301cbf127c4192ae15dec
diff --git a/metadata/md5-cache/dev-lang/python-3.8.10_p2 b/metadata/md5-cache/dev-lang/python-3.8.10_p2
index ffd254aad07d..f4a7db4d7435 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.10_p2
+++ b/metadata/md5-cache/dev-lang/python-3.8.10_p2
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 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:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.10_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz.asc )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=234e975812951a912f1c6f1b895d64c8
+_md5_=9ee971b8125029a29a77971cde22af9a
diff --git a/metadata/md5-cache/dev-lang/python-3.9.5_p2 b/metadata/md5-cache/dev-lang/python-3.9.5_p2
index a5afa88ba78e..02295a4f314d 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.5_p2
+++ b/metadata/md5-cache/dev-lang/python-3.9.5_p2
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 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:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.5_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz.asc )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=874e6485dc00d0e7017aa5a561e3b41c
+_md5_=56b9377cf358f009d7941f17be06ce5d
diff --git a/metadata/md5-cache/dev-lang/typescript-4.3.2 b/metadata/md5-cache/dev-lang/typescript-4.3.2
new file mode 100644
index 000000000000..b9cc2fddbe4d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/typescript-4.3.2
@@ -0,0 +1,11 @@
+BDEPEND=>=net-libs/nodejs-16[npm]
+DEFINED_PHASES=compile install
+DESCRIPTION=Superset of JavaScript with optional static typing, classes and interfaces
+EAPI=7
+HOMEPAGE=https://www.typescriptlang.org
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=net-libs/nodejs
+SLOT=0
+SRC_URI=https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz
+_md5_=0837742d925772bc8f375291ed864bcc
diff --git a/metadata/md5-cache/dev-lang/vala-0.52.4 b/metadata/md5-cache/dev-lang/vala-0.52.4
new file mode 100644
index 000000000000..581bc37c5673
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.52.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.52.4 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.52.4 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+RESTRICT=!test? ( test )
+SLOT=0.52
+SRC_URI=mirror://gnome/sources/vala/0.52/vala-0.52.4.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44222c7a9fd2a69af26b600188d3b805
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5 b/metadata/md5-cache/dev-libs/Ice-3.6.5
deleted file mode 100644
index 0d55872bf171..000000000000
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5
+++ /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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( dev-lang/ruby:2.5 ) mono? ( dev-lang/mono ) readline? ( sys-libs/readline:0= ) test? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DESCRIPTION=ICE middleware C++ library and generator tools
-EAPI=7
-HOMEPAGE=https://zeroc.com/products/ice
-IUSE=debug doc examples +readline mono php python ruby test php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby25
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( dev-lang/ruby:2.5 ) mono? ( dev-lang/mono ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) php? ( || ( php_targets_php7-4 ) )
-RESTRICT=test
-SLOT=0/36
-SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=690f597f9e87cd7a02a4498161f1c5c9
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.5-r1 b/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
index e32c49e57010..af5e68275fed 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.5-r1
@@ -5,7 +5,7 @@ DESCRIPTION=ICE middleware C++ library and generator tools
 EAPI=7
 HOMEPAGE=https://zeroc.com/products/ice
 IUSE=debug doc examples +readline mono php python ruby test php_targets_php7-4 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby26
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 dev-libs/openssl:0= || ( sys-libs/db:6.2[cxx] sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( dev-lang/ruby:2.6 ) mono? ( dev-lang/mono ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) php? ( || ( php_targets_php7-4 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.5.tar.gz -> Ice-3.6.5.tar.gz doc? ( https://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95057ecc7dae39602eabc1c0182eef5f
+_md5_=846358576df3bec24dcf390ad03033d8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7c17903990be..cecacd58f56e 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/appstream-0.14.3 b/metadata/md5-cache/dev-libs/appstream-0.14.3
index e3544aa4f495..a7b39b2069dc 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.14.3
+++ b/metadata/md5-cache/dev-libs/appstream-0.14.3
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
 IUSE=apt doc +introspection qt5 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.58:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer net-misc/curl introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 RESTRICT=test
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.14.3.tar.xz
 _eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c453b0fa0023a9eca7a1f85604efb185
+_md5_=1190fed4e647b8df2feeaf59937cfbd6
diff --git a/metadata/md5-cache/dev-libs/editline-1.17.1 b/metadata/md5-cache/dev-libs/editline-1.17.1
index 31db6d9cac32..93e591f02520 100644
--- a/metadata/md5-cache/dev-libs/editline-1.17.1
+++ b/metadata/md5-cache/dev-libs/editline-1.17.1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=line editing library for UNIX call compatible with the FSF readline
 EAPI=7
-HOMEPAGE=http://troglobit.com/projects/editline/
+HOMEPAGE=https://troglobit.com/projects/editline/
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/troglobit/editline/releases/download/1.17.1/editline-1.17.1.tar.xz
-_md5_=883c623842e5b7dc604f37ad85109327
+_md5_=052ba86fd6c4b7daae46a15effde576b
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.1-r11 b/metadata/md5-cache/dev-libs/efl-1.25.1-r11
index 6bc127b6bd73..a4d3e8f13d93 100644
--- a/metadata/md5-cache/dev-libs/efl-1.25.1-r11
+++ b/metadata/md5-cache/dev-libs/efl-1.25.1-r11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.1.tar.xz
-_eclasses_=docs	1541edddf7c7971612b5b9cec370f875	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=docs	1541edddf7c7971612b5b9cec370f875	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2dcf2ce31d0444de7e124e87c9dd44d
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.185 b/metadata/md5-cache/dev-libs/elfutils-0.185
index fd99e6cff223..1c170c2f0923 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.185
+++ b/metadata/md5-cache/dev-libs/elfutils-0.185
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.185/elfutils-0.185.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aa8c553848ebd2fa19b0e56af9a50c46
+_md5_=353972facb72e9503e7e4390e0bc57f9
diff --git a/metadata/md5-cache/dev-libs/gf2x-1.3.0 b/metadata/md5-cache/dev-libs/gf2x-1.3.0
index 93d10979da18..cf4b28cd0858 100644
--- a/metadata/md5-cache/dev-libs/gf2x-1.3.0
+++ b/metadata/md5-cache/dev-libs/gf2x-1.3.0
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0/3
 SRC_URI=https://gforge.inria.fr/frs/download.php/38243/gf2x-1.3.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c0a75ff740371567bd31bcd4b6b540b3
+_md5_=c76be3e9723b5e90b4496e6122be1703
diff --git a/metadata/md5-cache/dev-libs/isl-0.24 b/metadata/md5-cache/dev-libs/isl-0.24
index a17559110243..9bd4de3b793a 100644
--- a/metadata/md5-cache/dev-libs/isl-0.24
+++ b/metadata/md5-cache/dev-libs/isl-0.24
@@ -5,10 +5,10 @@ DESCRIPTION=A library for manipulating integer points bounded by linear constrai
 EAPI=7
 HOMEPAGE=http://isl.gforge.inria.fr/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/23
 SRC_URI=http://isl.gforge.inria.fr/isl-0.24.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5887744d0d2ffb6f82bfccd95b826c0c
+_md5_=d488f97907831abbd0deea42961fce1d
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325 b/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
index 8b2b300d9c46..8700ad2997ef 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
@@ -4,10 +4,10 @@ DESCRIPTION=Path searching library for TeX-related files
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=virtual/tmpfiles
 SLOT=0/6.3.3
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/kpathsea-texmf.d-11.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpathsea.doc-2021.tar.xz )
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=76caad4ebc0adea3ba3325c85c77f92a
+_md5_=745b9304f4d9b249e5d50be12523659f
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.2 b/metadata/md5-cache/dev-libs/libofx-0.10.2
index dba3afad5adc..5a828281c937 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.10.2
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library to support the Open Financial eXchange XML format
 EAPI=7
 HOMEPAGE=https://github.com/libofx/libofx
 IUSE=doc test
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/libofx/libofx/archive/0.10.2.tar.gz -> libofx-0.10.2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b9b0c0137f69a82a2a8cf7d5ca5145ad
+_md5_=4dd432c09670b21a6f4f3d4f774f5ac0
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.30.0 b/metadata/md5-cache/dev-libs/libpeas-1.30.0
index dcdb338b0d44..022e938fbe34 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.30.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.30.0
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.30/libpeas-1.30.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e4ca784c95a10fdfc30a6c41a4ce0dd
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10 b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
index 2dfcbc490425..de99b7867269 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+++ b/metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
@@ -11,5 +11,5 @@ RDEPEND=net-libs/gnutls:= lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) python? ( || ( python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.2.0/libprelude-5.2.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=45aca8915c200145c863bf5e7b4a173b
diff --git a/metadata/md5-cache/dev-libs/librelp-1.7.0 b/metadata/md5-cache/dev-libs/librelp-1.7.0
deleted file mode 100644
index c4164b2cce83..000000000000
--- a/metadata/md5-cache/dev-libs/librelp-1.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/openssl:0= ) ) test? ( || ( dev-lang/python:3.8 ) ) virtual/pkgconfig
-DESCRIPTION=An easy to use library for the RELP protocol
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/librelp/
-IUSE=debug doc +ssl +gnutls openssl static-libs test
-KEYWORDS=amd64 arm arm64 ~hppa sparc x86
-LICENSE=GPL-3+ doc? ( FDL-1.3 )
-RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/openssl:0= ) )
-REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0/0.5.0
-SRC_URI=https://download.rsyslog.com/librelp/librelp-1.7.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=514ddb491414b8894773740431cc10c8
diff --git a/metadata/md5-cache/dev-libs/librelp-1.8.0 b/metadata/md5-cache/dev-libs/librelp-1.8.0
deleted file mode 100644
index c90f6b28e5ab..000000000000
--- a/metadata/md5-cache/dev-libs/librelp-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/openssl:0= ) ) test? ( || ( dev-lang/python:3.8 ) ) virtual/pkgconfig
-DESCRIPTION=An easy to use library for the RELP protocol
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/librelp/
-IUSE=debug doc +ssl +gnutls openssl static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=GPL-3+ doc? ( FDL-1.3 )
-RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/openssl:0= ) )
-REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0/0.5.0
-SRC_URI=https://download.rsyslog.com/librelp/librelp-1.8.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f0499905ea93b49adeb79b569e46b9b
diff --git a/metadata/md5-cache/dev-libs/librelp-1.9.0 b/metadata/md5-cache/dev-libs/librelp-1.9.0
deleted file mode 100644
index 255d5e06e438..000000000000
--- a/metadata/md5-cache/dev-libs/librelp-1.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/openssl:0= ) ) test? ( || ( dev-lang/python:3.8 ) ) virtual/pkgconfig
-DESCRIPTION=An easy to use library for the RELP protocol
-EAPI=7
-HOMEPAGE=https://www.rsyslog.com/librelp/
-IUSE=debug doc +ssl +gnutls openssl static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=GPL-3+ doc? ( FDL-1.3 )
-RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( dev-libs/openssl:0= ) )
-REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0/0.5.0
-SRC_URI=https://download.rsyslog.com/librelp/librelp-1.9.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f0499905ea93b49adeb79b569e46b9b
diff --git a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
index a6439e57ea5d..9fc0de7aadbe 100644
--- a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=71d8ad695b7e804e4ad7dd77a544233f
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index 8d059654657d..ec273c0fb6e7 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -11,5 +11,5 @@ RDEPEND=!!dev-libs/ucl lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=71d8ad695b7e804e4ad7dd77a544233f
diff --git a/metadata/md5-cache/dev-libs/libuv-1.41.0 b/metadata/md5-cache/dev-libs/libuv-1.41.0
index 2d350c3df075..b37b2b5c2153 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.41.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.41.0
@@ -4,9 +4,9 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.41.0.tar.gz -> libuv-1.41.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=27a4338091e0e7de5967ddecbfff09dd
+_md5_=4e4263aba3fadba484c8023d00edb142
diff --git a/metadata/md5-cache/dev-libs/nettle-3.7.3 b/metadata/md5-cache/dev-libs/nettle-3.7.3
new file mode 100644
index 000000000000..152e305416e0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nettle-3.7.3
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( sys-apps/texinfo ) 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=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Low-level cryptographic library
+EAPI=7
+HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
+IUSE=+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-3 LGPL-2.1 )
+RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/8-6
+SRC_URI=mirror://gnu/nettle/nettle-3.7.3.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9563f3baa9c5a14009b861c76e3b3bdf
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.3.0 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.3.0
index 8f2b83c08793..10bbb9ab3665 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.3.0
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma Specific Protocols for Wayland
 EAPI=7
 HOMEPAGE=https://invent.kde.org/libraries/plasma-wayland-protocols
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb9c304b507faeaad731eef797a5a95c
+_md5_=be9542ccf01650980782212013ae1908
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.13.0 b/metadata/md5-cache/dev-libs/protobuf-3.13.0
deleted file mode 100644
index 3842c6569ca5..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/24
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=12781bef23e7bb9c022fbb6b75d88c38
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.14.0 b/metadata/md5-cache/dev-libs/protobuf-3.14.0
deleted file mode 100644
index d0cc02e9ee23..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/25
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55b572d0fe16e9a3a19a30a4ecce70aa
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.3 b/metadata/md5-cache/dev-libs/protobuf-3.15.3
deleted file mode 100644
index d14f8d65e8f6..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz -> protobuf-3.15.3.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.4 b/metadata/md5-cache/dev-libs/protobuf-3.15.4
deleted file mode 100644
index ac3be0fbf5d6..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.4.tar.gz -> protobuf-3.15.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.5 b/metadata/md5-cache/dev-libs/protobuf-3.15.5
deleted file mode 100644
index a03e96393b0f..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz -> protobuf-3.15.5.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.6 b/metadata/md5-cache/dev-libs/protobuf-3.15.6
deleted file mode 100644
index 85aaf7d2ac8b..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.6.tar.gz -> protobuf-3.15.6.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.7 b/metadata/md5-cache/dev-libs/protobuf-3.15.7
deleted file mode 100644
index 6089d3071d76..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( app-editors/emacs:* ) 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 postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.7.tar.gz -> protobuf-3.15.7.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.2 b/metadata/md5-cache/dev-libs/protobuf-3.17.0
similarity index 95%
rename from metadata/md5-cache/dev-libs/protobuf-3.15.2
rename to metadata/md5-cache/dev-libs/protobuf-3.17.0
index 629791f2bcd1..c2f885a50a20 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.2
+++ b/metadata/md5-cache/dev-libs/protobuf-3.17.0
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.2.tar.gz -> protobuf-3.15.2.tar.gz
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.0.tar.gz -> protobuf-3.17.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
+_md5_=ec98db8f31feedcbf23f0eefd9eacf30
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.1 b/metadata/md5-cache/dev-libs/protobuf-3.17.1
similarity index 95%
rename from metadata/md5-cache/dev-libs/protobuf-3.15.1
rename to metadata/md5-cache/dev-libs/protobuf-3.17.1
index 9c68285d62ed..d81ebf208f02 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.17.1
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.1.tar.gz -> protobuf-3.15.1.tar.gz
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.1.tar.gz -> protobuf-3.17.1.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
+_md5_=ec98db8f31feedcbf23f0eefd9eacf30
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.15.0 b/metadata/md5-cache/dev-libs/protobuf-3.17.2
similarity index 95%
rename from metadata/md5-cache/dev-libs/protobuf-3.15.0
rename to metadata/md5-cache/dev-libs/protobuf-3.17.2
index a2dd24c87bc2..4c1e56e823d5 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.15.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.17.2
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.0.tar.gz -> protobuf-3.15.0.tar.gz
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.2.tar.gz -> protobuf-3.17.2.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=869b5ba277c86bdc454378a10b1ec9d2
+_md5_=ec98db8f31feedcbf23f0eefd9eacf30
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index c3867d737ea2..aceefeea4b80 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -11,4 +11,4 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/28
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1ef54e5763bb01a428525f1aba16c13b
+_md5_=46ff42d5576eac9685fef9bb19d336c8
diff --git a/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325 b/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
index 8b3e796c8845..2715091ce85b 100644
--- a/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
+++ b/metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
@@ -5,10 +5,10 @@ DESCRIPTION=Library for Japanese pTeX providing a better way of handling charact
 EAPI=7
 HOMEPAGE=http://tutimura.ath.cx/ptexlive/?ptexenc
 IUSE=iconv static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos
 LICENSE=BSD
 RDEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=36f9581280f27f8a3f56dcf15b47e065
+_md5_=8572e13ad1302a937667e8151f9dff07
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.11.01 b/metadata/md5-cache/dev-libs/re2-0.2020.11.01
deleted file mode 100644
index 675a3d98d627..000000000000
--- a/metadata/md5-cache/dev-libs/re2-0.2020.11.01
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=icu? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=icu? ( dev-libs/icu: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(-)?] )
-DESCRIPTION=An efficient, principled regular expression library
-EAPI=7
-HOMEPAGE=https://github.com/google/re2
-IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=BSD
-RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/9
-SRC_URI=https://github.com/google/re2/archive/2020-11-01.tar.gz -> re2-2020-11-01.tar.gz
-_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=53bd2c07614ae6227e9fe0cdb9e87c78
diff --git a/metadata/md5-cache/dev-libs/re2-0.2021.02.02 b/metadata/md5-cache/dev-libs/re2-0.2021.06.01
similarity index 91%
rename from metadata/md5-cache/dev-libs/re2-0.2021.02.02
rename to metadata/md5-cache/dev-libs/re2-0.2021.06.01
index 5efc3bd5ab03..5e0b15552c84 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2021.02.02
+++ b/metadata/md5-cache/dev-libs/re2-0.2021.06.01
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/9
-SRC_URI=https://github.com/google/re2/archive/2021-02-02.tar.gz -> re2-2021-02-02.tar.gz
+SRC_URI=https://github.com/google/re2/archive/2021-06-01.tar.gz -> re2-2021-06-01.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b91b28884802f9231c648eeaeece7f92
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
index 650d4dc2a5d7..2342cba8ca71 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=083e65f108d98d6b5d8fc3039ec19ed1
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.5
similarity index 82%
rename from metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1
rename to metadata/md5-cache/dev-libs/tree-sitter-0.19.5
index b1ba834f606d..3a509cf2c51f 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.19.5
@@ -5,6 +5,6 @@ HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.4.tar.gz -> tree-sitter-0.19.4-r1.tar.gz
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.5.tar.gz -> tree-sitter-0.19.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9ba5846f1245d54540aa06904dd0320c
+_md5_=7a277086a90620b839235846d4532625
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.52.4 b/metadata/md5-cache/dev-libs/vala-common-0.52.4
new file mode 100644
index 000000000000..4c0fb8445cec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.52.4
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.52/vala-0.52.4.tar.xz
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
+_md5_=04f608204a1ae3a54b9c12d5f847513a
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
index 211a050fac3a..9e3ad24df233 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( lua_targets_luajit? ( dev-lang/luajit:=
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e6f67ab4e8d68be3fbad39c34f61c3d6
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
index 398f54cfe59c..129f6f7049da 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c47fd5aa00963ca789ad03fd6018efad
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 3346800cf01a..ad78ca5d24ee 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/busted-2.0.0-r101 b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
index d75d51b1deb0..e8c69d28bbca 100644
--- a/metadata/md5-cache/dev-lua/busted-2.0.0-r101
+++ b/metadata/md5-cache/dev-lua/busted-2.0.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/busted/archive/v2.0.0.tar.gz -> busted-2.0.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=543008a8af2127d62007a5e9085d8261
diff --git a/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100 b/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
index 1529b3d3dfc1..ad936b9244de 100644
--- a/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
+++ b/metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
@@ -10,5 +10,5 @@ RDEPEND=dev-lua/busted[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/hishamhm/busted-htest/archive/1.0.0.tar.gz -> busted-htest-1.0.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d17e892003300251e28858ca19b29ed3
diff --git a/metadata/md5-cache/dev-lua/dkjson-2.5-r100 b/metadata/md5-cache/dev-lua/dkjson-2.5-r100
index 48269b4ac32c..e604601e09f1 100644
--- a/metadata/md5-cache/dev-lua/dkjson-2.5-r100
+++ b/metadata/md5-cache/dev-lua/dkjson-2.5-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://dkolf.de/src/dkjson-lua.fsl/tarball/dkjson-2.5.tar.gz?uuid=release_2_5 -> dkjson-2.5.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d48072778200622f55be365df68254f9
diff --git a/metadata/md5-cache/dev-lua/inifile-1.0-r100 b/metadata/md5-cache/dev-lua/inifile-1.0-r100
index b736686420a0..0921116913af 100644
--- a/metadata/md5-cache/dev-lua/inifile-1.0-r100
+++ b/metadata/md5-cache/dev-lua/inifile-1.0-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/bartbes/inifile/archive/v1.0.tar.gz -> inifile-1.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=44fcae67cc632ed1f8bba3ecc11adb09
diff --git a/metadata/md5-cache/dev-lua/lanes-3.13.0-r100 b/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
index bbbf48ed2d0c..c46c49ed8d67 100644
--- a/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
+++ b/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/LuaLanes/lanes/archive/v3.13.0.tar.gz -> lanes-3.13.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=dfbe0375d528cb51bfdc1164ff8bd215
diff --git a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100 b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
index 45fd7e079ff6..db17bebbf590 100644
--- a/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
+++ b/metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d5a67d308bb72589a9cc5fee787e34ea
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100 b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
index 7bb5a5c2cc40..f8774ab84b27 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=ab98022277e61687626609bf61385f75
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101 b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
index 3bf25bc7e235..555e65621efb 100644
--- a/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=278220309207a347872b3db511fb26fa
diff --git a/metadata/md5-cache/dev-lua/lua-argparse-0.7.1 b/metadata/md5-cache/dev-lua/lua-argparse-0.7.1
index e01e4e1be7a7..212df08d6123 100644
--- a/metadata/md5-cache/dev-lua/lua-argparse-0.7.1
+++ b/metadata/md5-cache/dev-lua/lua-argparse-0.7.1
@@ -11,5 +11,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/luarocks/argparse/archive/0.7.1.tar.gz -> lua-argparse-0.7.1.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4439ef5341d0a803b652819ce470ee37
diff --git a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1 b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
index 8d32e4f72ba4..f49a2adcba3a 100644
--- a/metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
+++ b/metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat53-0.10.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=be9b245942058cb3d9afd5e384c073b1
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
index d9f20ad8be34..8e8b6becec16 100644
--- a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=threads? ( internal-fpconv ) || ( lua_targets_luajit lua_targets_lu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openresty/lua-cjson/archive/2.1.0.8.tar.gz -> lua-cjson-2.1.0.8.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=07b99feccc9fb972c11d3e8fce3391ae
diff --git a/metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6 b/metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
index 0443a5752708..6b36395c9945 100644
--- a/metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
+++ b/metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zhaozg/lua-openssl/archive/refs/tags/0.8.0-6.tar.gz -> lua-openssl-0.8.0_p6.tar.gz https://github.com/zhaozg/lua-auxiliar/archive/8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz -> lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=dc322315c78765450dffde037de2c646
diff --git a/metadata/md5-cache/dev-lua/lua-term-0.7-r101 b/metadata/md5-cache/dev-lua/lua-term-0.7-r101
index cbd109b24933..e92d003e33d9 100644
--- a/metadata/md5-cache/dev-lua/lua-term-0.7-r101
+++ b/metadata/md5-cache/dev-lua/lua-term-0.7-r101
@@ -11,5 +11,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/hoelzro/lua-term/archive/0.07.tar.gz -> lua-term-0.7.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3a5f3bf4fcc01e36fcc1c19db3658f89
diff --git a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100 b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
index 25de99fae912..e45a39aa21c7 100644
--- a/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
+++ b/metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/starwing/luautf8/archive/0.1.3.tar.gz -> lua-utf8-0.1.3.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8cc8a0ee434324cde467beb59713fca5
diff --git a/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100 b/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
index ec42ccbbd569..f1544a97a75f 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/brimworks/lua-zlib/archive/v1.2.tar.gz -> lua-zlib-1.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7dacfc7f578d25e9532bf7b25b2e0ae0
diff --git a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100 b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
index 490b9b5fdcca..6dd91327295f 100644
--- a/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
+++ b/metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/amireh/lua_cliargs/archive/v3.0-2.tar.gz -> lua_cliargs-3.0_p2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=681e78ee03e3746ad7454135214222a4
diff --git a/metadata/md5-cache/dev-lua/luacheck-0.24.0 b/metadata/md5-cache/dev-lua/luacheck-0.24.0
index e41a258027f3..5549ec8879e4 100644
--- a/metadata/md5-cache/dev-lua/luacheck-0.24.0
+++ b/metadata/md5-cache/dev-lua/luacheck-0.24.0
@@ -11,5 +11,5 @@ RDEPEND=dev-lua/lua-argparse[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luarocks/luacheck/archive/0.24.0.tar.gz -> luacheck-0.24.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a7a87a00587353a7e14151ca54c90934
diff --git a/metadata/md5-cache/dev-lua/luacov-0.14.0-r100 b/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
index defb1c16687f..80b720996f51 100644
--- a/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
+++ b/metadata/md5-cache/dev-lua/luacov-0.14.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/luacov/archive/v0.14.0.tar.gz -> luacov-0.14.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=73be63cbf8043ca027cb10cad21ac103
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102 b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
index d520fb256bc0..a203db03aab0 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
+++ b/metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mwild1/luadbi/archive/v0.7.2.tar.gz -> luadbi-0.7.2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c957b92321e378d80d96e7cca2378e3f
diff --git a/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100 b/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
index 3ffd28dda07c..c72c33aaf0ec 100644
--- a/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
+++ b/metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/harningt/luaevent/archive/v0.4.6.tar.gz -> luaevent-0.4.6.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bb1e4519a64aceca5be69971d87c60fd
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r103 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r103
index 2d875908676f..193668824761 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r103
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r103
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1ac1c4e99589600307ba4b640309ab71
diff --git a/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101 b/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
index f3d92740bcf5..3fbe29bfeebd 100644
--- a/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
+++ b/metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/luafilesystem/archive/v1_8_0.tar.gz -> luafilesystem-1.8.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=73535f2b9f6e104df28dfce47e0d463d
diff --git a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100 b/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
index 66f088ec8862..551de65d8c08 100644
--- a/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
+++ b/metadata/md5-cache/dev-lua/luajson-1.3.4-r100
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/harningt/luajson/archive/1.3.4.tar.gz -> luajson-1.3.4.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b5feaec3427b34677a6ccd23f8d5049e
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.2.6 b/metadata/md5-cache/dev-lua/lualdap-1.2.6
index c24085078e6c..b8e848755a75 100644
--- a/metadata/md5-cache/dev-lua/lualdap-1.2.6
+++ b/metadata/md5-cache/dev-lua/lualdap-1.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lualdap/lualdap/archive/v1.2.6.tar.gz -> lualdap-1.2.6.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> lua-compat-5.3-0.10.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c3446e43b65db74662849369c2747d68
diff --git a/metadata/md5-cache/dev-lua/luaossl-20200709-r100 b/metadata/md5-cache/dev-lua/luaossl-20200709-r100
index 5d2a29462a1a..42db5be86b68 100644
--- a/metadata/md5-cache/dev-lua/luaossl-20200709-r100
+++ b/metadata/md5-cache/dev-lua/luaossl-20200709-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl !dev-lua/luasec lua_ta
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/wahern/luaossl/archive/rel-20200709.tar.gz -> luaossl-rel-20200709.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b410089fe55aafe084ab84ec1c4e5538
diff --git a/metadata/md5-cache/dev-lua/luaposix-35.0-r102 b/metadata/md5-cache/dev-lua/luaposix-35.0-r102
index 613400cd3572..320d6f8f3b20 100644
--- a/metadata/md5-cache/dev-lua/luaposix-35.0-r102
+++ b/metadata/md5-cache/dev-lua/luaposix-35.0-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/luaposix/luaposix/archive/v35.0.tar.gz -> luaposix-35.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d7e5899016a100f0fec1b6ad6c86bff2
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.7.0 b/metadata/md5-cache/dev-lua/luarocks-3.7.0
index a61e9c6f9cbd..4ff14b5cdc10 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.7.0
+++ b/metadata/md5-cache/dev-lua/luarocks-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.7.0.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=31bd140546aa7bcf48d94687354eb72e
diff --git a/metadata/md5-cache/dev-lua/luasec-1.0 b/metadata/md5-cache/dev-lua/luasec-1.0
deleted file mode 100644
index 267f5fdf18ae..000000000000
--- a/metadata/md5-cache/dev-lua/luasec-1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) lua_targets_lua5-4? ( dev-lang/lua:5.4[deprecated(+)] )
-DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
-EAPI=7
-HOMEPAGE=https://github.com/brunoos/luasec
-IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) lua_targets_lua5-4? ( dev-lang/lua:5.4[deprecated(+)] )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
-SLOT=0
-SRC_URI=https://github.com/brunoos/luasec/archive/v1.0.tar.gz -> luasec-1.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3181b5f8dc38041e2b5477c284cb5953
diff --git a/metadata/md5-cache/dev-lua/luasec-1.0.1 b/metadata/md5-cache/dev-lua/luasec-1.0.1
index 5be235941e2b..e4bba2011a83 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.0.1
+++ b/metadata/md5-cache/dev-lua/luasec-1.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
 EAPI=7
 HOMEPAGE=https://github.com/brunoos/luasec
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) lua_targets_lua5-4? ( dev-lang/lua:5.4[deprecated(+)] )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v1.0.1.tar.gz -> luasec-1.0.1.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8aa991054859289d5050c43a4088dcc1
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3181b5f8dc38041e2b5477c284cb5953
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
index eaffc6309a64..8aa9efb7c887 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef1f5458e2e3b6a84108b32d1d732569
diff --git a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101 b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
index 0cb60fd6a0df..0b670e0f60f3 100644
--- a/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
+++ b/metadata/md5-cache/dev-lua/luassert-1.8.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/luassert/archive/v1.8.0.tar.gz -> luassert-1.8.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7ed2bcd6edf5c240ec57de689175fefe
diff --git a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102 b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
index 9d9ab2f7ef13..169f7045d50b 100644
--- a/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
+++ b/metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/o-lim/luasystem/archive/v0.2.1-0.tar.gz -> luasystem-0.2.1_p0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b28048e61605fb6f6b96baa41c98955a
diff --git a/metadata/md5-cache/dev-lua/lutok-0.4-r10 b/metadata/md5-cache/dev-lua/lutok-0.4-r10
index e65cbd99c470..23743cf8bb04 100644
--- a/metadata/md5-cache/dev-lua/lutok-0.4-r10
+++ b/metadata/md5-cache/dev-lua/lutok-0.4-r10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmmv/lutok/releases/download/lutok-0.4/lutok-0.4.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1568e156ac52d30aa872dfaf24237e43
diff --git a/metadata/md5-cache/dev-lua/luv-1.36.0.0 b/metadata/md5-cache/dev-lua/luv-1.36.0.0
index 0c506635019c..8354d716703d 100644
--- a/metadata/md5-cache/dev-lua/luv-1.36.0.0
+++ b/metadata/md5-cache/dev-lua/luv-1.36.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.36.0-0.tar.gz -> luv-1.36.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.tar.gz -> luv-lua-compat-0.10.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7889959a3a78e26884fd663fa9b2ea0
diff --git a/metadata/md5-cache/dev-lua/md5-1.3 b/metadata/md5-cache/dev-lua/md5-1.3
index 066fb87b0a5c..25b8ba07fbf7 100644
--- a/metadata/md5-cache/dev-lua/md5-1.3
+++ b/metadata/md5-cache/dev-lua/md5-1.3
@@ -10,5 +10,5 @@ RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/keplerproject/md5/archive/refs/tags/1.3.tar.gz -> md5-1.3.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=06e3ed783d773832ac63cabee1f5fad5
diff --git a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101 b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
index a30c6682aa7b..606fa8cc22ea 100644
--- a/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
+++ b/metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz -> mediator_lua-1.1.2_p0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b724af3d14c809a06ca34241d070bb63
diff --git a/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100 b/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
index da3fe93ae05f..ca1de4f7acba 100644
--- a/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
+++ b/metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig test? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) )
 DEFINED_PHASES=compile install
-DESCRIPTION=A pure Lua implementation of the MessagePack serialization format
+DESCRIPTION=pure Lua implementation of the MessagePack serialization format
 EAPI=7
 HOMEPAGE=https://fperrad.frama.io/lua-MessagePack
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://framagit.org/fperrad/lua-MessagePack/-/archive/18f316b3f62c02bf2b7a3096701780f78a4d2c67/lua-MessagePack-18f316b3f62c02bf2b7a3096701780f78a4d2c67.tar.gz -> messagepack-0.5.2_p20201025.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=31f9433af82c4bcd5379284d677d6103
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2976f2aed2a4bae268682a4fb3921c92
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100 b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
index 1c7030837f52..d66cf48243c6 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.8-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.8.tar.gz -> mpack-1.0.8.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=455665b2e35547be059b2023cd276a70
diff --git a/metadata/md5-cache/dev-lua/penlight-1.10.0 b/metadata/md5-cache/dev-lua/penlight-1.10.0
index f0517a346556..fb6274b6190e 100644
--- a/metadata/md5-cache/dev-lua/penlight-1.10.0
+++ b/metadata/md5-cache/dev-lua/penlight-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Tieske/Penlight/archive/1.10.0.tar.gz -> penlight-1.10.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bb2ccba480db404d134f5783a590150b
diff --git a/metadata/md5-cache/dev-lua/say-1.3_p1-r101 b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
index 52ca8070f072..0371b0f750a9 100644
--- a/metadata/md5-cache/dev-lua/say-1.3_p1-r101
+++ b/metadata/md5-cache/dev-lua/say-1.3_p1-r101
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz -> say-1.3_p1.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=40bd718e8283fc68dbdccbc30c2f83e1
diff --git a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100 b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
index 4952c146080c..2166941ba6c8 100644
--- a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
+++ b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://github.com/LuaDist/toluapp/archive/b34075b76835b778bb6b2ce0aa224afd9d182887.tar.gz -> toluapp-1.0.93_p20190513.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=090a112957ced11f9d0aaa56164595bc
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index a2d80c98fec2..338967ba75ee 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/dose3-6.0.1_p2 b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2
new file mode 100644
index 000000000000..9e9f6df72eb5
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/findlib dev-ml/ocamlbuild dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm test? ( dev-python/pyyaml[libyaml] ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Library to perform analysis on package repositories
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
+IUSE=+ocamlopt test
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/6.0.1_p2
+SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1-2.debian.tar.xz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=78ddb540b5355c77a5bed251d6bbf274
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-2.0.8-r2
new file mode 100644
index 000000000000..a5a37d5353df
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A source-based package manager for OCaml
+EAPI=7
+HOMEPAGE=http://opam.ocaml.org/
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=d63e997094f82869bd798de418c6341f
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
new file mode 100644
index 000000000000..ca67661ef658
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam client libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=a62b0c372ac773b320db0125f8c9dff2
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
new file mode 100644
index 000000000000..bd9050239b03
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Core libraries for opam
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=7f6b712cd4f17b525ee5d0697f5149c1
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3 b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
new file mode 100644
index 000000000000..3a30a9bb252c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ocaml
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 dev-ml/findlib >=dev-lang/ocaml-4:=
+DESCRIPTION=Core installer for opam packages
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev-lang/ocaml-4:=
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.8/opam-full-2.0.8.tar.gz
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
+_md5_=e04969399ddbec199b62265b92af2395
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
new file mode 100644
index 000000000000..9158efbf099e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam repository libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=8da30b507976d4daabc5a08b6eb53660
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
new file mode 100644
index 000000000000..3870b1f6336f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= >=dev-ml/dose3-6.0:= dev-ml/cudf:= test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam solver
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= >=dev-ml/dose3-6.0:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=4cc0bd4447a90a768abb369af020f63d
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
new file mode 100644
index 000000000000..acc3d4102b29
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam state libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/2.0.8
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=614db1ef485139dbd1e275479678ed16
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
index cad9a8d23123..e424bab57a8b 100644
--- a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
@@ -5,11 +5,11 @@ DESCRIPTION=A module to implement some of AutoConf macros in pure perl
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Config-AutoConf
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=75eea839b18bdf442bff76323709d3b8
+_md5_=809bbdae3d939371216c85e9ad65663c
diff --git a/metadata/md5-cache/dev-perl/DBI-Shell-11.970.0 b/metadata/md5-cache/dev-perl/DBI-Shell-11.970.0
index 5c3cd521453c..7acba059baaf 100644
--- a/metadata/md5-cache/dev-perl/DBI-Shell-11.970.0
+++ b/metadata/md5-cache/dev-perl/DBI-Shell-11.970.0
@@ -5,11 +5,11 @@ DESCRIPTION=Interactive command shell for the DBI
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBI-Shell
 IUSE=minimal test
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( virtual/perl-IO dev-perl/TermReadKey virtual/perl-Text-ParseWords virtual/perl-Text-Tabs+Wrap ) virtual/perl-Carp dev-perl/DBI virtual/perl-Data-Dumper virtual/perl-Exporter >=dev-perl/File-HomeDir-0.500.0 virtual/perl-File-Spec dev-perl/IO-Interactive dev-perl/IO-Tee virtual/perl-Term-ReadLine dev-perl/Text-CSV_XS dev-perl/Text-Reform dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DL/DLAMBLEY/DBI-Shell-11.97.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=26b55e87f6132f97c1a81ff5660b3f8f
+_md5_=04d826c19eaabc39081a86eb63c205fe
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckOS-1.860.0 b/metadata/md5-cache/dev-perl/Devel-CheckOS-1.860.0
index 2683533fa8e9..3cd972113c4c 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckOS-1.860.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckOS-1.860.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check what OS we're running on
 EAPI=7
 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.86.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=774d414286a451a2eac375bbaec6ee09
+_md5_=0af1428edea50d1e21f609a9607ed926
diff --git a/metadata/md5-cache/dev-perl/File-HomeDir-1.6.0 b/metadata/md5-cache/dev-perl/File-HomeDir-1.6.0
index 482e314e9937..42d1811fb75b 100644
--- a/metadata/md5-cache/dev-perl/File-HomeDir-1.6.0
+++ b/metadata/md5-cache/dev-perl/File-HomeDir-1.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=Get home directory for self or other user
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-HomeDir
 IUSE=+xdg test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~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 hppa ~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=virtual/perl-Carp >=virtual/perl-File-Path-2.10.0 >=virtual/perl-File-Spec-3.120.0 >=virtual/perl-File-Temp-0.190.0 >=dev-perl/File-Which-0.50.0 xdg? ( x11-misc/xdg-user-dirs ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.006.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=316a9ac16413049ab98cc54900c58a8b
+_md5_=59d00218ea7d7000fde8059f1ebce98e
diff --git a/metadata/md5-cache/dev-perl/File-LibMagic-1.230.0 b/metadata/md5-cache/dev-perl/File-LibMagic-1.230.0
index 635d9014f48a..37acf2b72064 100644
--- a/metadata/md5-cache/dev-perl/File-LibMagic-1.230.0
+++ b/metadata/md5-cache/dev-perl/File-LibMagic-1.230.0
@@ -5,11 +5,11 @@ DESCRIPTION=Perl wrapper for libmagic
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-LibMagic
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-apps/file virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=2402894e58590feabc1333ad76150c4e
+_md5_=8bc89cf37b1fc2eb343bd99aa46cdda5
diff --git a/metadata/md5-cache/dev-perl/File-Remove-1.580.0 b/metadata/md5-cache/dev-perl/File-Remove-1.580.0
index 36b54fcdec9f..75c54ef42f61 100644
--- a/metadata/md5-cache/dev-perl/File-Remove-1.580.0
+++ b/metadata/md5-cache/dev-perl/File-Remove-1.580.0
@@ -5,11 +5,11 @@ DESCRIPTION=Remove files and directories
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Remove
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-3.290.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=8077468c78e1a19763676c9e6c45b5ce
+_md5_=4577266c392dd146014c427455015b22
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-1.116.0 b/metadata/md5-cache/dev-perl/File-ShareDir-1.116.0
index e7300cd173a8..a5eb1a7714b4 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-1.116.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-1.116.0
@@ -5,11 +5,11 @@ DESCRIPTION=Locate per-dist and per-module shared files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-ShareDir
 IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/List-MoreUtils-0.428.0 >=dev-perl/Params-Util-1.70.0 ) virtual/perl-Carp >=dev-perl/Class-Inspector-1.120.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=e8e23c050f91d4c1999c051f134124b4
+_md5_=bcabf4088a02d0f336570cec665b1952
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.130.0 b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.130.0
index cbbda25436c6..6ca3c926ed91 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.130.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-Install-0.130.0
@@ -5,11 +5,11 @@ DESCRIPTION=Install shared files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-ShareDir-Install
 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 virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=455d2e450e434c80b21d990b1932a387
+_md5_=87772b1f74216c8fdb6c06929eba5c6f
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0 b/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
index b5d72f7dae9a..4637c98447b9 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple and Efficient Reading/Writing/Modifying of Complete Files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Slurp
 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-5.570.0 >=virtual/perl-File-Spec-3.10.0 virtual/perl-File-Temp virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=3218c4e9898802d4d384d09df1867db1
+_md5_=a99a4e6dcaf02d87300d040c0cdeb11e
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.10.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
deleted file mode 100644
index a5b3a663fbd6..000000000000
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Test-Simple dev-perl/Test-Warnings ) dev-lang/perl
-DESCRIPTION=A simple, sane and efficient module to slurp a file
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/File-Slurper
-IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.010.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=455419d3ba12c39398a87a89720447f1
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
index f738f9c1967f..3d9e1c40c1a1 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=A simple, sane and efficient module to slurp a file
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Slurper
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp >=virtual/perl-Encode-2.110.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=557ad79e3dbeda6e5c032e2de0d7cebb
+_md5_=260c6fcc615169d73739b39a33455dab
diff --git a/metadata/md5-cache/dev-perl/File-Which-1.230.0 b/metadata/md5-cache/dev-perl/File-Which-1.230.0
index b1705aee9a08..43c239051f89 100644
--- a/metadata/md5-cache/dev-perl/File-Which-1.230.0
+++ b/metadata/md5-cache/dev-perl/File-Which-1.230.0
@@ -5,7 +5,7 @@ DESCRIPTION=Perl module implementing 'which' internally
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Which
 IUSE=test pwhich
-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+ )
 PDEPEND=pwhich? ( dev-perl/App-pwhich )
 RDEPEND=dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=d7e2066145e9099bbfc93c9cc1c8c8c8
+_md5_=8f9d9bae39969944245fcf7cf634d503
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.16.0 b/metadata/md5-cache/dev-perl/File-pushd-1.16.0
index fa20c6a0e894..b75920fe5a90 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.16.0
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.16.0
@@ -5,11 +5,11 @@ DESCRIPTION=Change directory temporarily for a limited scope
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-pushd
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=0dc81d2e8173806d2ec1778f8e7717cb
+_md5_=348021a4ea3824f1640058ffdbca0f35
diff --git a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400 b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400
index 0b6d70283a24..8756774db353 100644
--- a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400
+++ b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400
@@ -5,11 +5,11 @@ DESCRIPTION=A FileHandle which supports ungetting of multiple bytes
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/FileHandle-Unget
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1634.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=8279d6b27ebc79c8874996dedb403bc5
+_md5_=fdf8cab05dc777b9ffa8cc68b5ef1654
diff --git a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.140.0 b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.140.0
index 2c9d52f4f04d..529198de3a3e 100644
--- a/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.140.0
+++ b/metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple and dumb file system watcher
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Filesys-Notify-Simple
 IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=3f005b7fca33aa59d60c0e5b736fe122
+_md5_=5491c6587ffbb5c905b33a0d3e0d8641
diff --git a/metadata/md5-cache/dev-perl/Filter-1.600.0 b/metadata/md5-cache/dev-perl/Filter-1.600.0
index b069b5e592bf..59ef59b9dbb8 100644
--- a/metadata/md5-cache/dev-perl/Filter-1.600.0
+++ b/metadata/md5-cache/dev-perl/Filter-1.600.0
@@ -5,10 +5,10 @@ DESCRIPTION=Interface for creation of Perl Filters
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Filter
 IUSE=examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=af1f5e3b79ee0d6ccd6d4c28b645a756
+_md5_=923dd8279193c8c5d90eab6834df13a7
diff --git a/metadata/md5-cache/dev-perl/Finance-YahooQuote-0.260.0 b/metadata/md5-cache/dev-perl/Finance-YahooQuote-0.260.0
index da5d33d69f49..803905ec3bbf 100644
--- a/metadata/md5-cache/dev-perl/Finance-YahooQuote-0.260.0
+++ b/metadata/md5-cache/dev-perl/Finance-YahooQuote-0.260.0
@@ -4,10 +4,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Get stock quotes from Yahoo! Finance
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Finance-YahooQuote
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-perl/HTML-Parser-2.200.0 >=dev-perl/HTTP-Message-1.230.0 >=dev-perl/libwww-perl-1.620.0 >=virtual/perl-Text-ParseWords-3.100.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ED/EDD/Finance-YahooQuote-0.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=e6c588b8fab26ac73310be498c8bbb73
+_md5_=c4b0345e406b3080a2048ae950f1feed
diff --git a/metadata/md5-cache/dev-perl/GD-2.730.0-r1 b/metadata/md5-cache/dev-perl/GD-2.730.0-r1
index c45bf68f921f..28792f109c07 100644
--- a/metadata/md5-cache/dev-perl/GD-2.730.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-2.730.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to Thomas Boutell's gd library
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/GD
 IUSE=animgif fcgi test truetype xpm examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/GD-2.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=2e5498d5e6876219ae825ea7d6333276
+_md5_=6509eafd284991bc7a71b3eb76fcfd77
diff --git a/metadata/md5-cache/dev-perl/Gearman-2.4.15 b/metadata/md5-cache/dev-perl/Gearman-2.4.15
new file mode 100644
index 000000000000..164c9bcacd04
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Gearman-2.4.15
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Which virtual/perl-Perl-OSType >=dev-perl/Proc-Guard-0.70.0 dev-perl/Test-Exception virtual/perl-Test-Simple >=dev-perl/Test-TCP-2.170.0 dev-perl/Test-Timer ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Gearman distributed job system, client and worker libraries
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Gearman
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-IO virtual/perl-IO-Socket-IP dev-perl/IO-Socket-SSL dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Socket virtual/perl-Storable dev-perl/String-CRC32 virtual/perl-Time-HiRes >=virtual/perl-version-0.770.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PA/PALIK/Gearman-2.004.015.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=fe6da018497e929bd79dbbc7cfcd55e2
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
deleted file mode 100644
index 6ec4e95baa50..000000000000
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
-DESCRIPTION=Look up country by IP Address
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Geo-IP
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c885079d836db74dd0af432a13b39388
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.510.0-r1 b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0-r1
new file mode 100644
index 000000000000..078ce23ceb3d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.510.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/geoip dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/geoip dev-lang/perl
+DESCRIPTION=Look up country by IP Address
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Geo-IP
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-libs/geoip dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=756ee67f0f0a17bd3e3fa79a8deb8160
diff --git a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1 b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
deleted file mode 100644
index 191ac324cf52..000000000000
--- a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=2-letter, 3-letter, and numerical codes for countries
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Geography-Countries
-KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6262f0deae202abf3d0eefb80b0b82e3
diff --git a/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r2 b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r2
new file mode 100644
index 000000000000..714514ed965d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=2-letter, 3-letter, and numerical codes for countries
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Geography-Countries
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=87cb08290854bc73efb5816f63583f82
diff --git a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1 b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
deleted file mode 100644
index 1dade4312752..000000000000
--- a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=This module is a simple supplement to other option handling modules
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Getopt-ArgvFile
-KEYWORDS=amd64 ~ia64 ppc ~ppc64 sparc x86
-LICENSE=|| ( Artistic Artistic-2 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8215bd51608b4b81314824871ccd8d1b
diff --git a/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r2 b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r2
new file mode 100644
index 000000000000..8c555677c4dc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=This module is a simple supplement to other option handling modules
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Getopt-ArgvFile
+KEYWORDS=amd64 ~ia64 ppc ~ppc64 sparc x86
+LICENSE=|| ( Artistic Artistic-2 )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=06fe9c4f807b7591fa00f467f5908a46
diff --git a/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0 b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
new file mode 100644
index 000000000000..e2dc891e9397
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
@@ -0,0 +1,15 @@
+BDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) >=dev-perl/CPAN-Meta-Check-0.11.0 virtual/perl-File-Spec dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 >=dev-perl/Test-Warnings-0.5.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Getopt::Long with usage text
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Getopt-Long-Descriptive
+IUSE=test minimal
+KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!<dev-perl/MooseX-Getopt-0.660.0 virtual/perl-Carp >=virtual/perl-Getopt-Long-2.330.0 >=dev-perl/Params-Validate-0.970.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Exporter-0.972.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.109.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=8f44dde90b9331067339d7b9ac4cdf45
diff --git a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0 b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
deleted file mode 100644
index 904109158404..000000000000
--- a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Getopt::Mixed is used for parsing mixed options
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Getopt-Mixed
-IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Getopt-Mixed-1.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1af721051355751b63f2bba89064a7ed
diff --git a/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0-r1 b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0-r1
new file mode 100644
index 000000000000..6b6a08d90736
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Getopt::Mixed is used for parsing mixed options
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Getopt-Mixed
+IUSE=test
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CJ/CJM/Getopt-Mixed-1.12.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=c232a7d0f111cabe599ade81a6663100
diff --git a/metadata/md5-cache/dev-perl/Git-Wrapper-0.48.0 b/metadata/md5-cache/dev-perl/Git-Wrapper-0.48.0
new file mode 100644
index 000000000000..e60d452d4f7c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Git-Wrapper-0.48.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-vcs/git virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-perl/Devel-CheckBin virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec test? ( virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO dev-perl/Test-Deep dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Wrap git(7) command-line interface
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Git-Wrapper
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-vcs/git virtual/perl-File-Temp dev-perl/File-chdir virtual/perl-IPC-Cmd virtual/perl-Scalar-List-Utils dev-perl/Sort-Versions dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/G/GE/GENEHACK/Git-Wrapper-0.048.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=a5714280f37af7052f8c3400ed3101c7
diff --git a/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0 b/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0
new file mode 100644
index 000000000000..221d6c43c5ce
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-perl/ExtUtils-Depends-0.300.0 >=dev-perl/ExtUtils-PkgConfig-1.0.0 >=dev-perl/glib-perl-1.320.0 >=dev-libs/gobject-introspection-1.0 >=dev-libs/libffi-3.0.0:0= >=dev-libs/glib-2.0.0 dev-lang/perl
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-perl/glib-perl-1.320.0 >=dev-libs/gobject-introspection-1.0 >=dev-libs/libffi-3.0.0:0= >=dev-libs/glib-2.0.0 dev-lang/perl
+DESCRIPTION=Dynamically create Perl language bindings
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Glib-Object-Introspection
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-perl/glib-perl-1.320.0 >=dev-libs/gobject-introspection-1.0 >=dev-libs/libffi-3.0.0:0= >=dev-libs/glib-2.0.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e96af92547e10d01dd3554d35da7c8b9
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2 b/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
deleted file mode 100644
index f3e8c73a9c41..000000000000
--- a/metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 >=virtual/perl-ExtUtils-MakeMaker-6.360.0 dev-lang/perl
-DESCRIPTION=Perl module interface to interacting with GnuPG
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/GnuPG-Interface
-IUSE=test
-KEYWORDS=amd64 ~hppa ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=app-crypt/gnupg-1.2.1-r1 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=df6d148e0778fa75768f1b204ea25283
diff --git a/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0 b/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0
new file mode 100644
index 000000000000..e9c1ac55953d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-crypt/gnupg-1.4 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 >=virtual/perl-ExtUtils-MakeMaker-6.360.0 dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl interface to GnuPG
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/GnuPG-Interface
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=app-crypt/gnupg-1.4 virtual/perl-autodie >=virtual/perl-Math-BigInt-1.780.0 >=dev-perl/Moo-0.91.11 >=dev-perl/MooX-HandlesVia-0.1.4 >=dev-perl/MooX-late-0.14.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.02.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=d28c60f657c8a817fa71e0868b3bac6f
diff --git a/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-5.8.2 b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-5.8.2
new file mode 100644
index 000000000000..a2ada63b1604
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-5.8.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Load dev-perl/Class-Std-Fast dev-perl/Crypt-OpenSSL-RSA dev-perl/Data-Uniqid dev-perl/TimeDate virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl virtual/perl-Scalar-List-Utils dev-perl/Log-Log4perl dev-perl/Math-Random-MT >=dev-perl/SOAP-WSDL-2.00.10 dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/XML-XPath >=dev-perl/Module-Build-0.400.0 test? ( dev-perl/Config-Properties virtual/perl-File-Temp dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-MockObject virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Google AdWords API Perl Client Library
+EAPI=7
+HOMEPAGE=https://github.com/googleads/googleads-perl-lib
+IUSE=test examples
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-perl/Class-Load dev-perl/Class-Std-Fast dev-perl/Crypt-OpenSSL-RSA dev-perl/Data-Uniqid dev-perl/TimeDate virtual/perl-Digest-SHA dev-perl/File-HomeDir virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/JSON-Parse dev-perl/LWP-Protocol-https dev-perl/libwww-perl virtual/perl-Scalar-List-Utils dev-perl/Log-Log4perl dev-perl/Math-Random-MT >=dev-perl/SOAP-WSDL-2.00.10 dev-perl/Template-Toolkit dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/XML-XPath dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SU/SUNDQUIST/Google-Ads-AdWords-Client-5.8.2.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=812ada266c7e86afa4c2bd7a79cbdbfd
diff --git a/metadata/md5-cache/dev-perl/Graph-0.972.100 b/metadata/md5-cache/dev-perl/Graph-0.972.100
new file mode 100644
index 000000000000..d0e89a33bf74
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Graph-0.972.100
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Heap-0.800.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Set-Object-1.400.0 >=virtual/perl-Storable-2.50.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Math-Complex >=virtual/perl-Test-Simple-0.820.0 ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Data structure and ops for directed graphs
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Graph
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Heap-0.800.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Set-Object-1.400.0 >=virtual/perl-Storable-2.50.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9721.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=0dba1bf1bf9aecb2c91821cc099e86ea
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0 b/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0
new file mode 100644
index 000000000000..7924a1228cdc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Module-Load-0.100.0 virtual/perl-Module-Loaded dev-perl/Color-Library dev-perl/Tie-Sub test? ( dev-perl/Test-Exception virtual/perl-Test-Simple dev-perl/Test-Most ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Defines RGB values for common color names
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Graphics-ColorNames
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Module-Load-0.100.0 virtual/perl-Module-Loaded dev-perl/Color-Library dev-perl/Tie-Sub dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RR/RRWO/Graphics-ColorNames-v3.5.0.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=33a8642e356818df72827c32545c4ed3
diff --git a/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0 b/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
index f6f6ee7019c8..0c0d47e37675 100644
--- a/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
+++ b/metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for interactive I/O
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/IO-Interactive
 IUSE=test
-KEYWORDS=amd64 ~ppc ~riscv x86
+KEYWORDS=amd64 ppc ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-version-0.780.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=50d3505c686b5c0115bfcc7fa138bf03
+_md5_=7d37e837b380b564f8a9690dbfc16bd4
diff --git a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1 b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
index 133634986aef..8cd0d2db9ca7 100644
--- a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
+++ b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Proc-ProcessTable-0.530.0 virtual/perl-Test-Simple dev-perl/Test-Deep dev-perl/Test-Number-Delta virtual/perl-Test ) dev-lang/perl
+BDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 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] ) virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Proc-ProcessTable-0.530.0 virtual/perl-Test-Simple dev-perl/Test-Deep dev-perl/Test-Number-Delta virtual/perl-Test ) dev-lang/perl
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-lang/perl
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-lang/perl
 DESCRIPTION=Easy implementation of Python extensions
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Inline-Python
-IUSE=test +python_single_target_python3_8
+IUSE=test python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-lang/perl:=
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-lang/perl:=
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Inline-Python-0.56.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4c967da531fb5c4c12538403e671ef2
+_md5_=ac2bd33bf88aa5e662f55eed32abba95
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
index 7124e1d69027..1812be908443 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
@@ -5,7 +5,7 @@ DESCRIPTION=Provide the missing functionality from List::Util
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/List-MoreUtils
 IUSE=test +xs
-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 ~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 ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.426.0 )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=36ec4d63ec2c5c1f1f74d3b7d869e59c
+_md5_=fdc7cd962c62de933fc8e90cafd99fa8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 26c1fb953be8..d1c9e459d771 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/PortageXS-0.02.10-r4 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
deleted file mode 100644
index ed9f63246cff..000000000000
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Portage abstraction layer for perl
-EAPI=5
-HOMEPAGE=http://download.mpsna.de/opensource/PortageXS/
-IUSE=minimal
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f461f1c0525c73357cf84b95d196695
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5 b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
deleted file mode 100644
index 4cc0c7c8174b..000000000000
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Portage abstraction layer for perl
-EAPI=5
-HOMEPAGE=http://download.mpsna.de/opensource/PortageXS/
-IUSE=minimal
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5294737c89fed3bcb567c1a863413707
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1 b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
deleted file mode 100644
index 4cffbfd7aaac..000000000000
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-perl/Module-Build virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Portage abstraction layer for perl
-EAPI=5
-HOMEPAGE=http://search.cpan.org/~kentnl/PortageXS
-IUSE=minimal
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/PortageXS-0.2.12.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf7580b6faaa8ff463d1feaac92627b8
diff --git a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1 b/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
deleted file mode 100644
index c4b7f2996d36..000000000000
--- a/metadata/md5-cache/dev-perl/Sane-0.50.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-gfx/sane-backends-1.0.19 dev-perl/ExtUtils-Depends dev-perl/ExtUtils-PkgConfig test? ( dev-perl/Test-Pod ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=The Sane module allows you to access SANE-compatible scanners in a Perl
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Sane
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=media-gfx/sane-backends-1.0.19 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RA/RATCLIFFE/Sane-0.05.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64e6438b2d27324eb80949c0b06891b6
diff --git a/metadata/md5-cache/dev-perl/Set-Object-1.410.0 b/metadata/md5-cache/dev-perl/Set-Object-1.410.0
new file mode 100644
index 000000000000..7a516c1014ab
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Set-Object-1.410.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=set of objects and strings
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Set-Object
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.41.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
+_md5_=c4bb4f742ba7914751b55ddf677e3fbe
diff --git a/metadata/md5-cache/dev-perl/Test-Compile-2.4.1 b/metadata/md5-cache/dev-perl/Test-Compile-2.4.1
index aecf47821e57..4cf873ec2ce0 100644
--- a/metadata/md5-cache/dev-perl/Test-Compile-2.4.1
+++ b/metadata/md5-cache/dev-perl/Test-Compile-2.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Check whether Perl files compile correctly
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test-Compile
 IUSE=minimal test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Devel-CheckOS ) >=virtual/perl-Exporter-5.680.0 dev-perl/UNIVERSAL-require >=virtual/perl-parent-0.225.0 virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.1.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=752994f100668d1f700da0a2ee689c2b
+_md5_=a55fe19d60be0d974b70473be50d19ee
diff --git a/metadata/md5-cache/dev-perl/Test-Fork-0.20.0 b/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
index f83fc8be34d8..2912cf3dd91b 100644
--- a/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
+++ b/metadata/md5-cache/dev-perl/Test-Fork-0.20.0
@@ -5,11 +5,11 @@ DESCRIPTION=test code which forks
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Test-Fork
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584
-_md5_=8d884182f085fe855bec5e0d051264ac
+_md5_=be252a0b505e85032e5693923af2f6f3
diff --git a/metadata/md5-cache/dev-perl/Tk-804.36.0 b/metadata/md5-cache/dev-perl/Tk-804.36.0
index 9df9c8287c21..682c3cc24169 100644
--- a/metadata/md5-cache/dev-perl/Tk-804.36.0
+++ b/metadata/md5-cache/dev-perl/Tk-804.36.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Perl Module for Tk
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Tk
 IUSE=examples test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) tcltk BSD
 RDEPEND=media-libs/freetype >=media-libs/libpng-1.4:0 virtual/jpeg x11-libs/libX11 x11-libs/libXft dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.036.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=e406c60892b5ad7ff01415d9c2ac1b81
+_md5_=18959e1e6791499f40023af52182116f
diff --git a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0 b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
index 7aa63b91d7e9..aad4782e5082 100644
--- a/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
+++ b/metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
@@ -4,11 +4,11 @@ DESCRIPTION=UNIVERSAL::require - require() modules from a variable
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/UNIVERSAL-require
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd3fd52d291470e3bfa2bf3fdb59a969
+_md5_=835b899f1bf0939fc84dea31bd26ffb4
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index d5c66518d838..666908fcb216 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/composer-2.1.1 b/metadata/md5-cache/dev-php/composer-2.1.1
new file mode 100644
index 000000000000..e67b17d8bc62
--- /dev/null
+++ b/metadata/md5-cache/dev-php/composer-2.1.1
@@ -0,0 +1,11 @@
+BDEPEND=dev-php/theseer-Autoload
+DEFINED_PHASES=install prepare
+DESCRIPTION=Dependency Manager for PHP
+EAPI=7
+HOMEPAGE=https://github.com/composer/composer
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0 dev-php/fedora-autoloader >=dev-php/jsonlint-1.4 >=dev-php/json-schema-5.2.10 >=dev-php/metadata-minifier-1.0 >=dev-php/phar-utils-1.0 >=dev-php/psr-log-1.0 >=dev-php/reactphp-promise-2.7 >=dev-php/semver-3.0 >=dev-php/spdx-licenses-1.2 >=dev-php/symfony-console-2.8.52 >=dev-php/symfony-filesystem-2.8.52 >=dev-php/symfony-finder-2.8.52 >=dev-php/symfony-process-2.8.52 >=dev-php/xdebug-handler-2
+SLOT=0
+SRC_URI=https://github.com/composer/composer/archive/2.1.1.tar.gz -> composer-2.1.1.tar.gz
+_md5_=aa0f2872423a4e4fb8c03b44314ed30b
diff --git a/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4 b/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
index d979c2dd6530..51566f2f20a9 100644
--- a/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
+++ b/metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ply
+DEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Parse C++ header files and generate a data structure
 EAPI=7
 HOMEPAGE=https://senexcanis.com/open-source/cppheaderparser
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/ply python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CppHeaderParser/CppHeaderParser-2.7.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f339c735d05bf5114b0087c79cc7896b
+_md5_=ba33eb19e5ec56d0982691ec7af9215a
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.17 b/metadata/md5-cache/dev-python/GitPython-3.1.17
index 4e931762aa70..1f5d530eb3c6 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.17
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.17
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library used to interact with Git repositories
 EAPI=7
 HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/G/GitPython/GitPython-3.1.17.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.17.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.7.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-4.0.0.gitbundle )
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=efd1bd6975ea696ee92bb351426d32f1
+_md5_=bfb9cd9d4ba877135284c77fd613ca94
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 377704435d99..c054161f2a95 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/PyGithub-1.54.1 b/metadata/md5-cache/dev-python/PyGithub-1.54.1
deleted file mode 100644
index 05d7e5e2d801..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-1.54.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httpretty-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/deprecated[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyjwt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to access the Github API v3
-EAPI=7
-HOMEPAGE=https://github.com/PyGithub/PyGithub/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/deprecated[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyjwt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.54.1.tar.gz -> PyGithub-1.54.1.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8a645e4b0862354eebd31c6199be4715
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.55 b/metadata/md5-cache/dev-python/PyGithub-1.55
index e81986ac9061..426dbeba78af 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.55
+++ b/metadata/md5-cache/dev-python/PyGithub-1.55
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to access the Github API v3
 EAPI=7
 HOMEPAGE=https://github.com/PyGithub/PyGithub/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/deprecated[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyjwt-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pynacl-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/PyGithub/PyGithub/archive/v1.55.tar.gz -> PyGithub-1.55.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0f3e4d60648061c5d8cdae1cbbe01210
+_md5_=b4b24758d41072b3fcee0f26177d8e73
diff --git a/metadata/md5-cache/dev-python/aiofiles-0.7.0 b/metadata/md5-cache/dev-python/aiofiles-0.7.0
index 73e8ccc236d2..e85f1275bf42 100644
--- a/metadata/md5-cache/dev-python/aiofiles-0.7.0
+++ b/metadata/md5-cache/dev-python/aiofiles-0.7.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=File support for asyncio
 EAPI=7
 HOMEPAGE=https://github.com/Tinche/aiofiles
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Tinche/aiofiles/archive/v0.7.0.tar.gz -> aiofiles-0.7.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7c94c594e13739f3aa2b899e36519e2e
+_md5_=7de45477b67aa7cc0c6902312855713b
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.22.0 b/metadata/md5-cache/dev-python/aiorpcX-0.22.0
index 2069be274f9e..cf05a007cce4 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.22.0
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=Generic async RPC implementation, including JSON-RPC
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiorpcX/ https://github.com/kyuupichan/aiorpcX/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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/kyuupichan/aiorpcX/archive/0.22.0.tar.gz -> aiorpcX-0.22.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fc2be45b373f0977648eff22d10279e0
+_md5_=2d49dc7e222c0082e8c9f4630a98ee33
diff --git a/metadata/md5-cache/dev-python/alembic-1.5.8 b/metadata/md5-cache/dev-python/alembic-1.5.8
deleted file mode 100644
index 7fbff8b88633..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.5.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
-EAPI=7
-HOMEPAGE=https://github.com/sqlalchemy/alembic
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.5.8.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c4701d7ee5405972849fbdc8e76edf9f
diff --git a/metadata/md5-cache/dev-python/alembic-1.6.0 b/metadata/md5-cache/dev-python/alembic-1.6.0
deleted file mode 100644
index 42213082abf5..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
-EAPI=7
-HOMEPAGE=https://github.com/sqlalchemy/alembic
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.6.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b6301299ee4a0ee8ddeaf3667d9e2c5e
diff --git a/metadata/md5-cache/dev-python/alembic-1.6.2 b/metadata/md5-cache/dev-python/alembic-1.6.2
index d8388d81c60e..1db46a5273f9 100644
--- a/metadata/md5-cache/dev-python/alembic-1.6.2
+++ b/metadata/md5-cache/dev-python/alembic-1.6.2
@@ -4,7 +4,7 @@ DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
 EAPI=7
 HOMEPAGE=https://github.com/sqlalchemy/alembic
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.6.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b6301299ee4a0ee8ddeaf3667d9e2c5e
+_md5_=aca07f6053f81c34ad776c0f12c5e832
diff --git a/metadata/md5-cache/dev-python/alembic-1.6.3 b/metadata/md5-cache/dev-python/alembic-1.6.3
deleted file mode 100644
index 7dbc07b8daa2..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
-EAPI=7
-HOMEPAGE=https://github.com/sqlalchemy/alembic
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.6.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b6301299ee4a0ee8ddeaf3667d9e2c5e
diff --git a/metadata/md5-cache/dev-python/alembic-1.6.4 b/metadata/md5-cache/dev-python/alembic-1.6.4
deleted file mode 100644
index 47b7a7031eb2..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.6.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
-EAPI=7
-HOMEPAGE=https://github.com/sqlalchemy/alembic
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.6.4.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b6301299ee4a0ee8ddeaf3667d9e2c5e
diff --git a/metadata/md5-cache/dev-python/alembic-1.6.5 b/metadata/md5-cache/dev-python/alembic-1.6.5
index 0ec93594231d..6a5c0389a5e6 100644
--- a/metadata/md5-cache/dev-python/alembic-1.6.5
+++ b/metadata/md5-cache/dev-python/alembic-1.6.5
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
 EAPI=7
 HOMEPAGE=https://github.com/sqlalchemy/alembic
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.6.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b6301299ee4a0ee8ddeaf3667d9e2c5e
+_md5_=2d7a2c7fda1c5c9749c9d215994209f5
diff --git a/metadata/md5-cache/dev-python/ansi-0.2.0 b/metadata/md5-cache/dev-python/ansi-0.2.0
index fcef5b66956a..f9ad152ed68f 100644
--- a/metadata/md5-cache/dev-python/ansi-0.2.0
+++ b/metadata/md5-cache/dev-python/ansi-0.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=ANSI cursor movement and graphics in Python
 EAPI=7
 HOMEPAGE=https://github.com/tehmaze/ansi
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/tehmaze/ansi/archive/ansi-0.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1ed1e9be21550e61087999618ce41c4c
+_md5_=9fbd3bd5e8ccab6bc041fdd514d524c6
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.6.0 b/metadata/md5-cache/dev-python/ansi2html-1.6.0
index 4e8d4f5099c6..4793f55dd6a0 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.6.0
+++ b/metadata/md5-cache/dev-python/ansi2html-1.6.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( app-text/asciidoc ) test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] doc? ( app-text/asciidoc ) test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Convert text with ANSI color codes to HTML
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ansi2html/ https://github.com/pycontribs/ansi2html
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm x86
 LICENSE=LGPL-3+
-RDEPEND=>=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/six-1.7.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.6.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cac7a808007e8e446f40b13b21c86941
+_md5_=e1069fa76d3d785a89a35eb752079eda
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1 b/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
deleted file mode 100644
index 8033332fef1a..000000000000
--- a/metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Produce ansi color output and colored highlighting and diffing
-EAPI=7
-HOMEPAGE=https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansicolor/ansicolor-0.2.6.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6fb3f74eb37eb69b61e07cd1db7cd199
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.3.2 b/metadata/md5-cache/dev-python/ansicolor-0.3.2
index 1a343e96a3e7..1f17b9fa0fc6 100644
--- a/metadata/md5-cache/dev-python/ansicolor-0.3.2
+++ b/metadata/md5-cache/dev-python/ansicolor-0.3.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Produce ansi color output and colored highlighting and diffing
 EAPI=7
 HOMEPAGE=https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/numerodix/ansicolor/archive/0.3.2.tar.gz -> ansicolor-0.3.2.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb4117280f59bcba75e7a3e5a695a26c
+_md5_=e6281d54ab6aa839db61d8a1f4f06a28
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index 52e22c635176..eae954dfa5db 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Produce ansi color output and colored highlighting and diffing
 EAPI=7
 HOMEPAGE=https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5be23c851fe978f6bfece032e154db42
+_md5_=b44b6837c89677d06ce23bb72e56d0dd
diff --git a/metadata/md5-cache/dev-python/apispec-4.5.0 b/metadata/md5-cache/dev-python/apispec-4.5.0
new file mode 100644
index 000000000000..105141e8b792
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apispec-4.5.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/bottle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/marshmallow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pluggable API specification generator.
+EAPI=7
+HOMEPAGE=https://github.com/marshmallow-code/apispec/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/marshmallow-code/apispec/archive/4.5.0.tar.gz -> apispec-4.5.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f4deb80134c68bdac216ff82e4a4a792
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.2-r1 b/metadata/md5-cache/dev-python/argcomplete-1.12.2-r1
deleted file mode 100644
index 5cc3c3984479..000000000000
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-shells/fish app-shells/tcsh dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pip-19 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bash tab completion for argparse
-EAPI=7
-HOMEPAGE=https://pypi.org/project/argcomplete/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-4[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.2.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d34c484a544f65afa541fb83897c4c82
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.3 b/metadata/md5-cache/dev-python/argcomplete-1.12.3
index 58abe9ae8647..0d0819dae7e4 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.12.3
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=Bash tab completion for argparse
 EAPI=7
 HOMEPAGE=https://pypi.org/project/argcomplete/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-5[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=06cce7c61b13167d37f259b8f3740594
+_md5_=bdfc7bd646f91447bf82fe7aa65fb706
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.10.0 b/metadata/md5-cache/dev-python/arpeggio-1.10.0
deleted file mode 100644
index 575c4056e3c4..000000000000
--- a/metadata/md5-cache/dev-python/arpeggio-1.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/memory_profiler[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Parser interpreter based on PEG grammars
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/textX/Arpeggio/archive/1.10.0.tar.gz -> Arpeggio-1.10.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3adaf7fc22a030ed920049007e2d6d73
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.10.2 b/metadata/md5-cache/dev-python/arpeggio-1.10.2
index 422fa2c454c8..5b5a6a843028 100644
--- a/metadata/md5-cache/dev-python/arpeggio-1.10.2
+++ b/metadata/md5-cache/dev-python/arpeggio-1.10.2
@@ -5,7 +5,7 @@ DESCRIPTION=Parser interpreter based on PEG grammars
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textX/Arpeggio/archive/1.10.2.tar.gz -> Arpeggio-1.10.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e37cda848e3bec2785045cbf9f245315
+_md5_=3adaf7fc22a030ed920049007e2d6d73
diff --git a/metadata/md5-cache/dev-python/arrow-1.1.0 b/metadata/md5-cache/dev-python/arrow-1.1.0
index 4744449d452e..af1b4f56c0db 100644
--- a/metadata/md5-cache/dev-python/arrow-1.1.0
+++ b/metadata/md5-cache/dev-python/arrow-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Better dates and times for Python
 EAPI=7
 HOMEPAGE=https://github.com/arrow-py/arrow/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+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/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-1.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ff37ad58e9a9b8db7fb7364277865143
+_md5_=4b08825e45c6e373834ef832ed0da4f2
diff --git a/metadata/md5-cache/dev-python/asn1crypto-1.4.0 b/metadata/md5-cache/dev-python/asn1crypto-1.4.0
index 1651b312a20c..efd42bcfa174 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-1.4.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-1.4.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python ASN.1 library with a focus on performance and a pythonic API
 EAPI=7
 HOMEPAGE=https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wbond/asn1crypto/archive/1.4.0.tar.gz -> asn1crypto-1.4.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=caa9b843f08d7a44edab15f06e5735b3
+_md5_=ae822eb695b24b1ed4c197d810060a19
diff --git a/metadata/md5-cache/dev-python/astroid-2.5 b/metadata/md5-cache/dev-python/astroid-2.5
deleted file mode 100644
index e90f0fbba722..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=7
-HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/astroid/astroid-2.5.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e01cfe12e44c75dbb3d1cc0cd4f39d2c
diff --git a/metadata/md5-cache/dev-python/astroid-2.5.3 b/metadata/md5-cache/dev-python/astroid-2.5.3
deleted file mode 100644
index 63ef116cfb70..000000000000
--- a/metadata/md5-cache/dev-python/astroid-2.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Abstract Syntax Tree for logilab packages
-EAPI=7
-HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/astroid/astroid-2.5.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=acde0bd3a2e4cc014c082bb1979a61db
diff --git a/metadata/md5-cache/dev-python/astroid-2.5.6 b/metadata/md5-cache/dev-python/astroid-2.5.6
index 0f75737167a9..36fb8315264d 100644
--- a/metadata/md5-cache/dev-python/astroid-2.5.6
+++ b/metadata/md5-cache/dev-python/astroid-2.5.6
@@ -4,7 +4,7 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wrapt-1.11.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/PyCQA/astroid/archive/astroid-2.5.6.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=066c95ba381c6aafd154bdf557494f19
+_md5_=7c41e1edf70637908fb0864c015120e1
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1 b/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
index 4d159c837d2e..d3e06cef5d1b 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Atomic file writes
 EAPI=7
 HOMEPAGE=https://github.com/untitaker/python-atomicwrites
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+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 ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cd57852ba02621a082e177e8bf6dc383
+_md5_=fdde1b2d319592cd65923a58d5da0a93
diff --git a/metadata/md5-cache/dev-python/attrs-20.3.0 b/metadata/md5-cache/dev-python/attrs-20.3.0
deleted file mode 100644
index e534d77abf5d..000000000000
--- a/metadata/md5-cache/dev-python/attrs-20.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-python/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Attributes without boilerplate
-EAPI=7
-HOMEPAGE=https://github.com/python-attrs/attrs https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/attrs/attrs-20.3.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dbbc0d684ebb9851d405b75d10841298
diff --git a/metadata/md5-cache/dev-python/attrs-20.3.0_p20210222 b/metadata/md5-cache/dev-python/attrs-20.3.0_p20210222
deleted file mode 100644
index aec61f078559..000000000000
--- a/metadata/md5-cache/dev-python/attrs-20.3.0_p20210222
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) 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/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Attributes without boilerplate
-EAPI=7
-HOMEPAGE=https://github.com/python-attrs/attrs/ https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-attrs/attrs/archive/03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b.tar.gz -> attrs-03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d0c77c6ad96b4ee8b03d8dbdadeb86b3
diff --git a/metadata/md5-cache/dev-python/attrs-21.1.0 b/metadata/md5-cache/dev-python/attrs-21.1.0
deleted file mode 100644
index b845cf0fcd55..000000000000
--- a/metadata/md5-cache/dev-python/attrs-21.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) 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/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Attributes without boilerplate
-EAPI=7
-HOMEPAGE=https://github.com/python-attrs/attrs/ https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/attrs/attrs-21.1.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3169072bca0c2f8f96ad020d00b806b2
diff --git a/metadata/md5-cache/dev-python/attrs-21.2.0 b/metadata/md5-cache/dev-python/attrs-21.2.0
index f352abc2196c..0037e591ff02 100644
--- a/metadata/md5-cache/dev-python/attrs-21.2.0
+++ b/metadata/md5-cache/dev-python/attrs-21.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Attributes without boilerplate
 EAPI=7
 HOMEPAGE=https://github.com/python-attrs/attrs/ https://attrs.readthedocs.io/ https://pypi.org/project/attrs/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-21.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3169072bca0c2f8f96ad020d00b806b2
+_md5_=173b07b700dc829c4cbeefeda0ddb9ed
diff --git a/metadata/md5-cache/dev-python/authres-1.2.0 b/metadata/md5-cache/dev-python/authres-1.2.0
index 4d893cc4d571..f5524d705dab 100644
--- a/metadata/md5-cache/dev-python/authres-1.2.0
+++ b/metadata/md5-cache/dev-python/authres-1.2.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parse and generate Authentication-Results headers
 EAPI=7
 HOMEPAGE=https://launchpad.net/authentication-results-python https://pypi.org/project/authres/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-1.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ac7e3501e132ae4b9c756bcd46659257
+_md5_=c147086041231419bfef375a221ef4ef
diff --git a/metadata/md5-cache/dev-python/autopep8-1.5.5 b/metadata/md5-cache/dev-python/autopep8-1.5.5
deleted file mode 100644
index 91e3bda7d4f1..000000000000
--- a/metadata/md5-cache/dev-python/autopep8-1.5.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
-EAPI=7
-HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/autopep8/autopep8-1.5.5.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=80d4c0b88526412ae05255d411b97f42
diff --git a/metadata/md5-cache/dev-python/autopep8-1.5.6 b/metadata/md5-cache/dev-python/autopep8-1.5.6
deleted file mode 100644
index 7724c9c48fea..000000000000
--- a/metadata/md5-cache/dev-python/autopep8-1.5.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
-EAPI=7
-HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/autopep8/autopep8-1.5.6.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7c928a62714caa6d66745c09945906e3
diff --git a/metadata/md5-cache/dev-python/autopep8-1.5.7 b/metadata/md5-cache/dev-python/autopep8-1.5.7
index d97cbdf83008..8209eb005500 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.5.7
+++ b/metadata/md5-cache/dev-python/autopep8-1.5.7
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guid
 EAPI=7
 HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.5.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0e9b906d046ed0ba40920db6f36a9eb0
+_md5_=8ab78f2d9da53dcfc908dba0f63598d6
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
index 70ba2849ae30..278344199de9 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
 EAPI=7
 HOMEPAGE=https://github.com/aws/serverless-application-model https://pypi.org/project/aws-sam-translator/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/boto3-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonschema-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/serverless-application-model/archive/v1.36.0.tar.gz -> aws-sam-translator-1.36.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=94d8022da5f4539588d84d446392d91e
+_md5_=715401056e1d840fe4d46114a34207ca
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.7.0 b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.7.0
deleted file mode 100644
index e28edbd8d508..000000000000
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/bottle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlalchemy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webtest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/botocore-1.12.122[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=AWS X-Ray SDK for Python
-EAPI=7
-HOMEPAGE=https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.12.122[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-xray-sdk-python/archive/2.7.0.tar.gz -> aws-xray-sdk-python-2.7.0.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1205e33b02996ba0ab3bda0cbc665961
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0 b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
index 1b06a3c42978..82533736f0da 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=AWS X-Ray SDK for Python
 EAPI=7
 HOMEPAGE=https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.122[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/aws/aws-xray-sdk-python/archive/2.8.0.tar.gz -> aws-xray-sdk-python-2.8.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=deeae4eeb321d49be9c516165baa52a1
+_md5_=d8d7a97efa2e67492d0ed43add318c6b
diff --git a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1 b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
index f464693330ce..32ed19539e2c 100644
--- a/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+++ b/metadata/md5-cache/dev-python/babelfish-0.5.5-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library to work with countries and languages
 EAPI=7
 HOMEPAGE=https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/babelfish/babelfish-0.5.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fdf660559dde069f61c01c9975a32b60
+_md5_=8b3b7c64e7efada05d022d5c9da39e5a
diff --git a/metadata/md5-cache/dev-python/babelfish-9999 b/metadata/md5-cache/dev-python/babelfish-9999
index 7a5f69f6bf41..c78e09498307 100644
--- a/metadata/md5-cache/dev-python/babelfish-9999
+++ b/metadata/md5-cache/dev-python/babelfish-9999
@@ -1,13 +1,13 @@
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Python library to work with countries and languages
 EAPI=7
 HOMEPAGE=https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD
 PROPERTIES=live
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b629f3ad713684955d47be5284b5a1c
+_md5_=3ec8f8b34c52e7e4305ff06e54b2e816
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.1.0 b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
index 56cff96a454a..466666c3a1eb 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-1.1.0
+++ b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A BibTeX parser written in python
 EAPI=7
 HOMEPAGE=https://github.com/sciunto-org/python-bibtexparser
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( BSD LGPL-3 )
-RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/sciunto-org/python-bibtexparser/archive/v1.1.0.tar.gz -> bibtexparser-1.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dc266e47c5d71cbaee034e8004b6a2d5
+_md5_=7a6116e1e33e0fea683a94cde80c1832
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2 b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
index 7f0ff394c899..f7c02af1909e 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/chardet-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/chardet-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ultra-lightweight pure Python package to guess whether a file is binary or text
 EAPI=7
 HOMEPAGE=https://github.com/audreyfeldroy/binaryornot
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/binaryornot/binaryornot-0.4.4.tar.gz -> binaryornot-0.4.4.r1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a1df50d42eec242af04a95ff78422422
+_md5_=9209af32a1bdd92bcfd34e914dd244b2
diff --git a/metadata/md5-cache/dev-python/bitarray-2.0.1 b/metadata/md5-cache/dev-python/bitarray-2.0.1
deleted file mode 100644
index 89529531897a..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Efficient arrays of booleans -- C extension
-EAPI=7
-HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.0.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2c92f86920a1351dfe9c5dd898a3c9ab
diff --git a/metadata/md5-cache/dev-python/bitarray-2.1.0 b/metadata/md5-cache/dev-python/bitarray-2.1.0
index c5740540400c..7f265a9f6a91 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.1.0
+++ b/metadata/md5-cache/dev-python/bitarray-2.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient arrays of booleans -- C extension
 EAPI=7
 HOMEPAGE=https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e2f4dfad72cf0589001bdea491d19e5
+_md5_=2c92f86920a1351dfe9c5dd898a3c9ab
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.7 b/metadata/md5-cache/dev-python/bitstring-3.1.7
index 4f316005eb69..aeae71e0620f 100644
--- a/metadata/md5-cache/dev-python/bitstring-3.1.7
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.7
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A pure Python module for creation and analysis of binary data
 EAPI=7
 HOMEPAGE=https://github.com/scott-griffiths/bitstring
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/scott-griffiths/bitstring/archive/bitstring-3.1.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=351f64bac75a232b4880cc958fc54625
+_md5_=73bf605a62e8d79b9b232d818c1ff958
diff --git a/metadata/md5-cache/dev-python/black-21.5_beta1 b/metadata/md5-cache/dev-python/black-21.5_beta1
index 71432feedf72..148234d95dcf 100644
--- a/metadata/md5-cache/dev-python/black-21.5_beta1
+++ b/metadata/md5-cache/dev-python/black-21.5_beta1
@@ -4,7 +4,7 @@ DESCRIPTION=The uncompromising Python code formatter
 EAPI=7
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toml-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/21.5b1.tar.gz -> black-21.5b1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=695ef8b7e382242aa2c463d807b5d7b0
+_md5_=cc8cf613b3441688685f671a27747772
diff --git a/metadata/md5-cache/dev-python/blessings-1.7-r1 b/metadata/md5-cache/dev-python/blessings-1.7-r1
index e65e5ad1dde6..3caa55667732 100644
--- a/metadata/md5-cache/dev-python/blessings-1.7-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.7-r1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A thin, practical wrapper around terminal coloring, styling, and positioning
 EAPI=7
 HOMEPAGE=https://github.com/erikrose/blessings https://pypi.org/project/blessings/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af4e9a9f02bd6b22e1b471944c544efa
+_md5_=517297253caa2d22e3ce68eca6933195
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.87 b/metadata/md5-cache/dev-python/boto3-1.17.87
index a183df0c7cec..dee651b06ade 100644
--- a/metadata/md5-cache/dev-python/boto3-1.17.87
+++ b/metadata/md5-cache/dev-python/boto3-1.17.87
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The AWS SDK for Python
 EAPI=7
 HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/botocore-1.20.87[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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.17.87.tar.gz -> boto3-1.17.87.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b8b4e2463dc5092ca9fa29e7bfeda4a0
+_md5_=e90203f2010b88fae5a31dfa6d45495a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.88 b/metadata/md5-cache/dev-python/boto3-1.17.88
new file mode 100644
index 000000000000..4d765080b02d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.88
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.20.88[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_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.20.88[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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.17.88.tar.gz -> boto3-1.17.88.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e90203f2010b88fae5a31dfa6d45495a
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index 21fa9f90fbbc..010afaed5de4 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=The AWS SDK for Python
 EAPI=7
 HOMEPAGE=https://github.com/boto/boto3
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/botocore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/botocore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b8b4e2463dc5092ca9fa29e7bfeda4a0
+_md5_=e90203f2010b88fae5a31dfa6d45495a
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.87 b/metadata/md5-cache/dev-python/botocore-1.20.87
index 9d03a659735e..6fe53c68abfd 100644
--- a/metadata/md5-cache/dev-python/botocore-1.20.87
+++ b/metadata/md5-cache/dev-python/botocore-1.20.87
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Low-level, data-driven core of boto 3
 EAPI=7
 HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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.20.87.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9cad6cd583014085b9aaa48c7bce4d67
+_md5_=5c55d79aa9bebb3a335ed3e54d7e5ac7
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.88 b/metadata/md5-cache/dev-python/botocore-1.20.88
new file mode 100644
index 000000000000..da36fc2e0355
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.88
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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.20.88.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5c55d79aa9bebb3a335ed3e54d7e5ac7
diff --git a/metadata/md5-cache/dev-python/botocore-9999 b/metadata/md5-cache/dev-python/botocore-9999
index 27c6d79494ec..e29631e5ce44 100644
--- a/metadata/md5-cache/dev-python/botocore-9999
+++ b/metadata/md5-cache/dev-python/botocore-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Low-level, data-driven core of boto 3
 EAPI=7
 HOMEPAGE=https://github.com/boto/botocore
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9cad6cd583014085b9aaa48c7bce4d67
+_md5_=5c55d79aa9bebb3a335ed3e54d7e5ac7
diff --git a/metadata/md5-cache/dev-python/breathe-4.28.0 b/metadata/md5-cache/dev-python/breathe-4.28.0
deleted file mode 100644
index 589276fe57c5..000000000000
--- a/metadata/md5-cache/dev-python/breathe-4.28.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx Doxygen renderer
-EAPI=7
-HOMEPAGE=https://breathe.readthedocs.io/en/latest/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/michaeljones/breathe/archive/v4.28.0.tar.gz -> breathe-4.28.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=08bdb9da04cbca062c94a8aa41dc99c5
diff --git a/metadata/md5-cache/dev-python/breathe-4.29.2 b/metadata/md5-cache/dev-python/breathe-4.29.2
deleted file mode 100644
index 2cd0220b0174..000000000000
--- a/metadata/md5-cache/dev-python/breathe-4.29.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx Doxygen renderer
-EAPI=7
-HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/michaeljones/breathe/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/michaeljones/breathe/archive/v4.29.2.tar.gz -> breathe-4.29.2.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2e61e82ffe19f883197fc6400e5b44d0
diff --git a/metadata/md5-cache/dev-python/breathe-4.30.0 b/metadata/md5-cache/dev-python/breathe-4.30.0
index a995930257ad..1c5164967b95 100644
--- a/metadata/md5-cache/dev-python/breathe-4.30.0
+++ b/metadata/md5-cache/dev-python/breathe-4.30.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx Doxygen renderer
 EAPI=7
 HOMEPAGE=https://breathe.readthedocs.io/en/latest/ https://github.com/michaeljones/breathe/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sphinx-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/michaeljones/breathe/archive/v4.30.0.tar.gz -> breathe-4.30.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2e61e82ffe19f883197fc6400e5b44d0
+_md5_=e338911788b0beee95a78cde02329f2f
diff --git a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2 b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
index b71666a6b319..f89ac9793475 100644
--- a/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
+++ b/metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python binding to the Brotli library
 EAPI=7
 HOMEPAGE=https://github.com/python-hyper/brotlicffi/ https://pypi.org/project/brotlicffi/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/brotlicffi/archive/v1.0.9.2.tar.gz -> brotlicffi-1.0.9.2.gh.tar.gz test? ( https://github.com/google/brotli/archive/46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz -> brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz )
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9f38c91dfdc624ba96909608f64d70d9
+_md5_=4d9a132cf44c4837e76dad9345e125ee
diff --git a/metadata/md5-cache/dev-python/cached-property-1.5.2 b/metadata/md5-cache/dev-python/cached-property-1.5.2
index 95e8cd5ae478..cfb484955fbd 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.2
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
 DESCRIPTION=A cached-property for decorating methods in classes
 EAPI=7
 HOMEPAGE=https://github.com/pydanny/cached-property
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.5.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8c74d28cf54baf00ac23eeae84862e3
+_md5_=61e5a97ae0352f78cb92d6b5bef40447
diff --git a/metadata/md5-cache/dev-python/cachetools-4.2.1 b/metadata/md5-cache/dev-python/cachetools-4.2.1
deleted file mode 100644
index d1fde3afeddf..000000000000
--- a/metadata/md5-cache/dev-python/cachetools-4.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensible memoizing collections and decorators
-EAPI=7
-HOMEPAGE=https://pypi.org/project/cachetools/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cachetools/cachetools-4.2.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6dfa568e494169f72dc76eed68cfa0bc
diff --git a/metadata/md5-cache/dev-python/cachetools-4.2.2 b/metadata/md5-cache/dev-python/cachetools-4.2.2
index b7d69f6c36ed..df06422c05df 100644
--- a/metadata/md5-cache/dev-python/cachetools-4.2.2
+++ b/metadata/md5-cache/dev-python/cachetools-4.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Extensible memoizing collections and decorators
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cachetools/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/c/cachetools/cachetools-4.2.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7ba17e5103b88496af8eba81ad0a3cbb
+_md5_=7f51e1bbaf00746fe4e4a460a7468377
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0-r1 b/metadata/md5-cache/dev-python/cbor-1.0.0-r1
index 100caf715ff6..638fb47ffaf2 100644
--- a/metadata/md5-cache/dev-python/cbor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/cbor-1.0.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=RFC 7049 - Concise Binary Object Representation
 EAPI=7
 HOMEPAGE=https://github.com/brianolson/cbor_py https://pypi.org/project/cbor/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/brianolson/cbor_py/archive/b3af679e7cf3e12d50acb83c3c591fc5db9a658d.tar.gz -> cbor-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4d87926778b37246b1b5c5530cb69ad5
+_md5_=f8fe173847bcfaa5e04465737fa47c03
diff --git a/metadata/md5-cache/dev-python/cbor2-5.4.0 b/metadata/md5-cache/dev-python/cbor2-5.4.0
new file mode 100644
index 000000000000..e945f8bf1193
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cbor2-5.4.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
+EAPI=7
+HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cbor2/cbor2-5.4.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=110658a9520310a335fdf928f017c0bc
diff --git a/metadata/md5-cache/dev-python/cftime-1.5.0 b/metadata/md5-cache/dev-python/cftime-1.5.0
index 06d8de6d9424..9aa6a3690f2f 100644
--- a/metadata/md5-cache/dev-python/cftime-1.5.0
+++ b/metadata/md5-cache/dev-python/cftime-1.5.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Time-handling functionality from netcdf4-python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cftime/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cftime/cftime-1.5.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=11c873f04c754d4c11b640f62575238b
+_md5_=9fdc74040b07a8e7ffa51fc9c3389cc5
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.1.1 b/metadata/md5-cache/dev-python/click-plugins-1.1.1
index 722dc5d9a87a..353d9c413aab 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.1.1
+++ b/metadata/md5-cache/dev-python/click-plugins-1.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Module for click to enable registering CLI commands via setuptools entry-points
 EAPI=7
 HOMEPAGE=https://github.com/click-contrib/click-plugins
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.1.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=73ecf8fe5082b84722dc8f9d3d52801d
+_md5_=8552ee792543d050ad39a69b77287001
diff --git a/metadata/md5-cache/dev-python/cmd2-2.0.1 b/metadata/md5-cache/dev-python/cmd2-2.0.1
new file mode 100644
index 000000000000..9e9a0e4f9e04
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cmd2-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extra features for standard library's cmd module
+EAPI=7
+HOMEPAGE=https://github.com/python-cmd2/cmd2
+IUSE=test python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cmd2/cmd2-2.0.1.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=e002d2edcaa50f9a062e1aa42590764e
diff --git a/metadata/md5-cache/dev-python/configclass-0.2.0 b/metadata/md5-cache/dev-python/configclass-0.2.0
index f9e75cb3f635..49703c0787f3 100644
--- a/metadata/md5-cache/dev-python/configclass-0.2.0
+++ b/metadata/md5-cache/dev-python/configclass-0.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/mergedict-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/mergedict-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python to class to hold configuration values
 EAPI=7
 HOMEPAGE=https://github.com/schettino72/configclass/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/mergedict-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/mergedict-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/schettino72/configclass/archive/0.2.0.tar.gz -> configclass-0.2.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b1d51eff5dd4138c1df0500a1d143d1b
+_md5_=029b32f42a76ea38b353990d788df2e7
diff --git a/metadata/md5-cache/dev-python/cppy-1.1.0 b/metadata/md5-cache/dev-python/cppy-1.1.0
index 495327060b87..4f93eb9e2a05 100644
--- a/metadata/md5-cache/dev-python/cppy-1.1.0
+++ b/metadata/md5-cache/dev-python/cppy-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=C++ header library which makes it easier to write Python extension modules
 EAPI=7
 HOMEPAGE=https://pypi.org/project/cppy
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cppy/cppy-1.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4bda24b3f754b620718baadf9f33fa7b
+_md5_=95395da87f13dea22e90c44cb33b1b60
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r4 b/metadata/md5-cache/dev-python/crcmod-1.7-r4
index d57dc0fee332..801d22e859a6 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r4
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r4
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python CRC Generator module
 EAPI=7
 HOMEPAGE=http://crcmod.sourceforge.net/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crcmod/crcmod-1.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=79f7ef3bf6a4c81de14f47e6a09bdade
+_md5_=9bf30d20187b56c2030e46d7be9aa786
diff --git a/metadata/md5-cache/dev-python/croniter-1.0.13 b/metadata/md5-cache/dev-python/croniter-1.0.13
index ae4bbcf882f4..a84a491cd161 100644
--- a/metadata/md5-cache/dev-python/croniter-1.0.13
+++ b/metadata/md5-cache/dev-python/croniter-1.0.13
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tzlocal[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/tzlocal[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python module to provide iteration for datetime object
 EAPI=7
 HOMEPAGE=https://github.com/kiorky/croniter https://pypi.org/project/croniter/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-1.0.13.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=63f23efddbca861bd67cce8970afd449
+_md5_=ea96ba6e1cc17f0699bc515f97f81f7e
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.4.1 b/metadata/md5-cache/dev-python/cssselect2-0.4.1
index fd342dfa000d..dc32f7d68c3b 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.4.1
+++ b/metadata/md5-cache/dev-python/cssselect2-0.4.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=7
 HOMEPAGE=https://cssselect2.readthedocs.io/en/latest/ https://pypi.org/project/cssselect2/ https://github.com/Kozea/cssselect2
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/webencodings[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.4.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=45684d0f2ad1bf7f207e58a58fd752f3
+_md5_=870c78c4cc41f2806bb822a4ea3f7294
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-0.5 b/metadata/md5-cache/dev-python/ctypescrypto-0.5
index f9778db101ed..5d3e1f771180 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-0.5
+++ b/metadata/md5-cache/dev-python/ctypescrypto-0.5
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python interface to some openssl function based on ctypes module
 EAPI=7
 HOMEPAGE=https://github.com/vbwagner/ctypescrypto
-IUSE=gost test python_targets_python3_8 python_targets_python3_9
+IUSE=gost test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=test? ( gost ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=test? ( gost ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vbwagner/ctypescrypto/archive/v0.5.tar.gz -> ctypescrypto-0.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bf1c686661f0d4a243a63bd5b7b25094
+_md5_=886fa7403c255894c7698672a3c8a9bf
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-9999 b/metadata/md5-cache/dev-python/ctypescrypto-9999
index cc76dcc99660..a74c88970df6 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-9999
+++ b/metadata/md5-cache/dev-python/ctypescrypto-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Python interface to some openssl function based on ctypes module
 EAPI=7
 HOMEPAGE=https://github.com/vbwagner/ctypescrypto
-IUSE=gost test python_targets_python3_8 python_targets_python3_9
+IUSE=gost test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=test? ( gost ) || ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=test? ( gost ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bf1c686661f0d4a243a63bd5b7b25094
+_md5_=886fa7403c255894c7698672a3c8a9bf
diff --git a/metadata/md5-cache/dev-python/cwcwidth-0.1.1 b/metadata/md5-cache/dev-python/cwcwidth-0.1.1
deleted file mode 100644
index 5578f67aa27f..000000000000
--- a/metadata/md5-cache/dev-python/cwcwidth-0.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for wc(s)width
-EAPI=7
-HOMEPAGE=https://github.com/sebastinas/cwcwidth/ https://pypi.org/project/cwcwidth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sebastinas/cwcwidth/archive/v0.1.1.tar.gz -> cwcwidth-0.1.1.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c50d129f6ad0d038755de4266cdd1d9
diff --git a/metadata/md5-cache/dev-python/cwcwidth-0.1.2 b/metadata/md5-cache/dev-python/cwcwidth-0.1.2
deleted file mode 100644
index 45964cd42409..000000000000
--- a/metadata/md5-cache/dev-python/cwcwidth-0.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for wc(s)width
-EAPI=7
-HOMEPAGE=https://github.com/sebastinas/cwcwidth/ https://pypi.org/project/cwcwidth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sebastinas/cwcwidth/archive/v0.1.2.tar.gz -> cwcwidth-0.1.2.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c50d129f6ad0d038755de4266cdd1d9
diff --git a/metadata/md5-cache/dev-python/cwcwidth-0.1.4 b/metadata/md5-cache/dev-python/cwcwidth-0.1.4
index c7d987e45b8b..cbf7a09246f5 100644
--- a/metadata/md5-cache/dev-python/cwcwidth-0.1.4
+++ b/metadata/md5-cache/dev-python/cwcwidth-0.1.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings for wc(s)width
 EAPI=7
 HOMEPAGE=https://github.com/sebastinas/cwcwidth/ https://pypi.org/project/cwcwidth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/sebastinas/cwcwidth/archive/v0.1.4.tar.gz -> cwcwidth-0.1.4.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=398e4e80267c64b25d235386c8dbecdd
+_md5_=d3f75d075a1b51ee9ba296ae1ae5e1aa
diff --git a/metadata/md5-cache/dev-python/dask-2021.6.0 b/metadata/md5-cache/dev-python/dask-2021.6.0
new file mode 100644
index 000000000000..b46463c2e7c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2021.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlalchemy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=7
+HOMEPAGE=https://dask.org/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dask/dask-2021.6.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e2d1ec14ae6d6678dad013eb98c7112b
diff --git a/metadata/md5-cache/dev-python/dbutils-2.0.1 b/metadata/md5-cache/dev-python/dbutils-2.0.1
index 692d0f96f816..6f6a36ac7948 100644
--- a/metadata/md5-cache/dev-python/dbutils-2.0.1
+++ b/metadata/md5-cache/dev-python/dbutils-2.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Database connections for multi-threaded environments
 EAPI=7
 HOMEPAGE=https://webwareforpython.github.io/DBUtils/ https://github.com/WebwareForPython/DBUtils/ https://pypi.org/project/DBUtils/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=OSL-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dbutils/DBUtils-2.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=885c1baa5cf83d0b986841830b0b5fd5
+_md5_=d9e6e1406170ea55407fb6c7dad126f2
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20200713 b/metadata/md5-cache/dev-python/diff-match-patch-20200713
index 909f9b681c15..a57300a7d5bd 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20200713
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20200713
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Diff, match and patch algorithms for plain text
 EAPI=7
 HOMEPAGE=https://pypi.org/project/diff-match-patch/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20200713.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=75d5342556a20c7540c58344d651200b
+_md5_=1eb271afc62ef5712bd437a38b497e2b
diff --git a/metadata/md5-cache/dev-python/distro-1.5.0-r1 b/metadata/md5-cache/dev-python/distro-1.5.0-r1
index ff99e9559137..ebab81b49ba6 100644
--- a/metadata/md5-cache/dev-python/distro-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/distro-1.5.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Reliable machine-readable Linux distribution information for Python
 EAPI=7
 HOMEPAGE=https://distro.readthedocs.io/en/latest/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.5.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c26e0ae9215ec4c0166201f1a0ab3123
+_md5_=4d53d614bcbcdb51adf636548d3fc795
diff --git a/metadata/md5-cache/dev-python/dj-database-url-0.5.0 b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
index c3249ea4b462..63044966eb37 100644
--- a/metadata/md5-cache/dev-python/dj-database-url-0.5.0
+++ b/metadata/md5-cache/dev-python/dj-database-url-0.5.0
@@ -1,15 +1,15 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Use Database URLs in your Django Application
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/dj-database-url/ https://github.com/jacobian/dj-database-url
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/jacobian/dj-database-url/archive/v0.5.0.tar.gz -> dj-database-url-0.5.0.gh.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ce0840fd9f4f4cfefc3038e299c77bd
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=ea1f16ec6ef635adf5d907f5f832e6e8
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.2 b/metadata/md5-cache/dev-python/django-otp-1.0.2
deleted file mode 100644
index 63289a5b6e6e..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=7
-HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/django-otp/django-otp/archive/v1.0.2.tar.gz -> django-otp-1.0.2.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6078bfa434f9211b088c4577f9695818
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.3 b/metadata/md5-cache/dev-python/django-otp-1.0.3
deleted file mode 100644
index f6135d7723e1..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=7
-HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/django-otp/django-otp/archive/v1.0.3.tar.gz -> django-otp-1.0.3.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c704d7741bf6b35a7ac8ba9e241b5f8
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.4 b/metadata/md5-cache/dev-python/django-otp-1.0.4
deleted file mode 100644
index 803b4fc0956e..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-1.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=7
-HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/django-otp/django-otp/archive/v1.0.4.tar.gz -> django-otp-1.0.4.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c704d7741bf6b35a7ac8ba9e241b5f8
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.5 b/metadata/md5-cache/dev-python/django-otp-1.0.5
deleted file mode 100644
index 196fde4193ec..000000000000
--- a/metadata/md5-cache/dev-python/django-otp-1.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
-EAPI=7
-HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/django-otp/django-otp/archive/v1.0.5.tar.gz -> django-otp-1.0.5.gh.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c704d7741bf6b35a7ac8ba9e241b5f8
diff --git a/metadata/md5-cache/dev-python/django-otp-1.0.6 b/metadata/md5-cache/dev-python/django-otp-1.0.6
index c8ece2949041..144c5f603662 100644
--- a/metadata/md5-cache/dev-python/django-otp-1.0.6
+++ b/metadata/md5-cache/dev-python/django-otp-1.0.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Django framework adding two-factor authentication using one-time passwords
 EAPI=7
 HOMEPAGE=https://github.com/django-otp/django-otp/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/django-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/django-otp/django-otp/archive/v1.0.6.tar.gz -> django-otp-1.0.6.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4c704d7741bf6b35a7ac8ba9e241b5f8
+_md5_=609ea9d1d9f4160c23ff24f1ed5ab662
diff --git a/metadata/md5-cache/dev-python/dnspython-2.1.0 b/metadata/md5-cache/dev-python/dnspython-2.1.0
index 10f9d39d25f8..aa5b92afa789 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.1.0
+++ b/metadata/md5-cache/dev-python/dnspython-2.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=DNS toolkit for Python
 EAPI=7
 HOMEPAGE=https://www.dnspython.org/ https://pypi.org/project/dnspython/
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=ISC
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v2.1.0.tar.gz -> dnspython-2.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ed2c2bea5c6fcdda676ca5aa5382505
+_md5_=93b3a93ee24ec04d83709c767f8b1a6c
diff --git a/metadata/md5-cache/dev-python/docker-py-5.0.0 b/metadata/md5-cache/dev-python/docker-py-5.0.0
index cd9cd30345d1..28005cfbf5a3 100644
--- a/metadata/md5-cache/dev-python/docker-py-5.0.0
+++ b/metadata/md5-cache/dev-python/docker-py-5.0.0
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-1.4.6[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/sphinx-1.4.6[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-),-python_single_target_python3_10(-)] >=dev-python/sphinx-1.4.6[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-1.4.6[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] >=dev-python/sphinx-1.4.6[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/paramiko-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=test? ( >=dev-python/mock-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/paramiko-2.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
 DESCRIPTION=Python client for Docker
 EAPI=7
 HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/5.0.0.tar.gz -> docker-py-5.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=905b1c4eea7e96db646562cfe6d788fe
+_md5_=131dbe9c622e807dd7722d5ca7952836
diff --git a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2 b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
index 5ba1dcae011f..2b80da3556f6 100644
--- a/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+++ b/metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Add flag to ignore unicode literal prefixes in doctests
 EAPI=7
 HOMEPAGE=https://pypi.org/project/doctest-ignore-unicode/ https://github.com/gnublade/doctest-ignore-unicode
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0563fc875f1c683d902c661600d39a8f
+_md5_=950f01273838c800adc2c50ba5b218fe
diff --git a/metadata/md5-cache/dev-python/docutils-0.16-r1 b/metadata/md5-cache/dev-python/docutils-0.16-r1
index 9374229b21dd..6c69f56e5817 100644
--- a/metadata/md5-cache/dev-python/docutils-0.16-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.16-r1
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python Documentation Utilities
 EAPI=7
 HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.16.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=59ee5dfcaab633304446c3c8dab4b7a6
+_md5_=9ba6c2d112ffc156172dc883f9a7ec5a
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.2 b/metadata/md5-cache/dev-python/docutils-glep-1.2
index 43b5e9d3c541..828bcdf2af9b 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.2
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.2
@@ -1,14 +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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Gentoo GLEP support for docutils
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mgorny/docutils-glep/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
-RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils_glep/docutils_glep-1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e134694cb94275b05131d79ca85ef8e3
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6f9b60555ef5857b901981933a3738cc
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
index 284a39298586..6057cf521e75 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Clone of EditorConfig core written in Python
 EAPI=7
 HOMEPAGE=https://editorconfig.org/
-IUSE=cli test python_targets_python3_8 python_targets_python3_9
+IUSE=cli test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=PYTHON BSD-4
-RDEPEND=!<app-vim/editorconfig-vim-0.3.3-r1 cli? ( !app-text/editorconfig-core-c[cli] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=!<app-vim/editorconfig-vim-0.3.3-r1 cli? ( !app-text/editorconfig-core-c[cli] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/editorconfig/editorconfig-core-py/archive/v0.12.3.tar.gz -> editorconfig-core-py-0.12.3.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d632402eb4779a033e61eb093750fa8
+_md5_=7de256f386f3153ec86ef07745d98023
diff --git a/metadata/md5-cache/dev-python/errorhandler-2.0.1 b/metadata/md5-cache/dev-python/errorhandler-2.0.1
index 420cf0912e93..669d29bac094 100644
--- a/metadata/md5-cache/dev-python/errorhandler-2.0.1
+++ b/metadata/md5-cache/dev-python/errorhandler-2.0.1
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pkginfo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/pkginfo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Logging framework handler
 EAPI=7
 HOMEPAGE=https://pypi.org/project/errorhandler/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/errorhandler/errorhandler-2.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5101f630436e6f9a343fb94faf376beb
+_md5_=6e8b0a2ef7c14a0dbb7bc6b4cae3e9d3
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1 b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
deleted file mode 100644
index 407be31594a1..000000000000
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of lxml.xmlfile for the standard library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/et_xmlfile/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b0f9cbd03fc5d32179fe884f5494d443
diff --git a/metadata/md5-cache/dev-python/et_xmlfile-1.1.0 b/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
index 76283180eb91..8c5ba90d018b 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of lxml.xmlfile for the standard library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/et-xmlfile/ https://foss.heptapod.net/openpyxl/et_xmlfile/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/1.1/et_xmlfile-1.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=07ab1728f3bba6b9f609e131f95ddde3
+_md5_=c3fe08cb7e28666c7b5ecb2b399b1a18
diff --git a/metadata/md5-cache/dev-python/eventlet-0.31.0 b/metadata/md5-cache/dev-python/eventlet-0.31.0
index 70e4df955166..6f538f043d43 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.31.0
+++ b/metadata/md5-cache/dev-python/eventlet-0.31.0
@@ -4,7 +4,7 @@ DESCRIPTION=Highly concurrent networking library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
 IUSE=doc examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/dnspython-1.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.31.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c09c12320a7c350748809a92570428e6
+_md5_=b0b6aa81b020c9d6071b1892b41f2e2b
diff --git a/metadata/md5-cache/dev-python/fasteners-0.16.1 b/metadata/md5-cache/dev-python/fasteners-0.16.1
new file mode 100644
index 000000000000..6b269a647401
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fasteners-0.16.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/diskcache[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testtools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python package that provides useful locks
+EAPI=7
+HOMEPAGE=https://github.com/harlowja/fasteners/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/harlowja/fasteners/archive/0.16.1.tar.gz -> fasteners-0.16.1.gh.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bc0460c65bdfab0b454a780fc1cd0e36
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.15.0 b/metadata/md5-cache/dev-python/fastjsonschema-2.15.0
deleted file mode 100644
index f6ac068e6d81..000000000000
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fast JSON schema validator for Python
-EAPI=7
-HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/horejsek/python-fastjsonschema/archive/v2.15.0.tar.gz -> python-fastjsonschema-2.15.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d78210f27ccd7d6e25b23d827b4803c2
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.15.1 b/metadata/md5-cache/dev-python/fastjsonschema-2.15.1
index 057b350a3676..e21eb7d04383 100644
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.15.1
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.15.1
@@ -4,7 +4,7 @@ DESCRIPTION=Fast JSON schema validator for Python
 EAPI=7
 HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/horejsek/python-fastjsonschema/archive/v2.15.1.tar.gz -> python-fastjsonschema-2.15.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6df2d6ba319d0678cfe4bfcab242ee04
+_md5_=d78210f27ccd7d6e25b23d827b4803c2
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1 b/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
index aa27fb8858e8..42c3a12b1191 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Standalone version of django.utils.feedgenerator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/feedgenerator/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/f/feedgenerator/feedgenerator-1.9.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=14be6107406744dbf4927ab06ba86bde
+_md5_=c4c46176aa63178bc859f549e8dedf9e
diff --git a/metadata/md5-cache/dev-python/fitsio-0.9.11 b/metadata/md5-cache/dev-python/fitsio-0.9.11
index e99482e9bce8..f1571e59c53a 100644
--- a/metadata/md5-cache/dev-python/fitsio-0.9.11
+++ b/metadata/md5-cache/dev-python/fitsio-0.9.11
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/numpy-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/cfitsio:0=
+DEPEND=>=dev-python/numpy-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sci-libs/cfitsio:0=
 DESCRIPTION=Python library to read from and write to FITS files
 EAPI=7
 HOMEPAGE=https://github.com/esheldon/fitsio
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-python/numpy-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/cfitsio:0= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/numpy-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sci-libs/cfitsio: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_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/esheldon/fitsio/archive/v0.9.11.tar.gz -> fitsio-0.9.11.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=81912f5ed75b052d9b18b313044a6363
+_md5_=efcc5d34b87403f696e9e22d5abc395f
diff --git a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2 b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
index d46ed3da2b90..5291b212147c 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pycodestyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Polyfill package for Flake8 plugins
 EAPI=7
 HOMEPAGE=https://gitlab.com/pycqa/flake8-polyfill
-IUSE=test test python_targets_python3_8
+IUSE=test test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-polyfill/flake8-polyfill-1.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e22230ac289c89f736ab87d4cd2d9f6b
+_md5_=6269041cab503e25b4dc877e4a5968d6
diff --git a/metadata/md5-cache/dev-python/flask-babel-2.0.0 b/metadata/md5-cache/dev-python/flask-babel-2.0.0
index 5e65b37dde65..d3c89d7913e1 100644
--- a/metadata/md5-cache/dev-python/flask-babel-2.0.0
+++ b/metadata/md5-cache/dev-python/flask-babel-2.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/flask-sphinx-themes[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/flask-sphinx-themes[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/flask-sphinx-themes[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/flask-sphinx-themes[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/flask-sphinx-themes[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/flask-sphinx-themes[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/flask-sphinx-themes[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=i18n and l10n support for Flask based on Babel and pytz
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-Babel/ https://pypi.org/project/Flask-Babel/ https://github.com/python-babel/flask-babel/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/F/Flask-Babel/Flask-Babel-2.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b78a88661d99b5b1163baacd23124f8c
+_md5_=9d981fa54a94a44dc15266a4ae8d13be
diff --git a/metadata/md5-cache/dev-python/flask-cors-3.0.10 b/metadata/md5-cache/dev-python/flask-cors-3.0.10
index 7a8240e91425..c8387647d9e1 100644
--- a/metadata/md5-cache/dev-python/flask-cors-3.0.10
+++ b/metadata/md5-cache/dev-python/flask-cors-3.0.10
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Flask extension for Cross Origin Resource Sharing (CORS)
 EAPI=7
 HOMEPAGE=https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/corydolphin/flask-cors/archive/3.0.10.tar.gz -> flask-cors-3.0.10.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=34376e65c9346e8983299ac20f4015d1
+_md5_=1979bf1265be051e5dbb34888855987c
diff --git a/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1 b/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
index 730c008fb154..0af137da7dbd 100644
--- a/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/inflection[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/inflection[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Flask extension that displays various debugging insights during development
 EAPI=7
 HOMEPAGE=https://github.com/mbr/Flask-Debug
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/inflection[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/inflection[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/Flask-Debug/archive/0.4.3.tar.gz -> flask-debug-0.4.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7cb69a5a9152d1a7d3a264e90ab36513
+_md5_=17030cdca34ef19b273a93a7e3cebb9a
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
index 10d671edfb36..b3e85f850599 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -1,15 +1,15 @@
+BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Small extension for Flask to make usage of Gravatar service easy
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/zzzsochi/Flask-Gravatar/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=804293fb47cfa767271b50b5964449f8
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c2047bc3e0da521bade26cd0b1ed855a
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.8.1 b/metadata/md5-cache/dev-python/flask-paginate-0.8.1
index c493261c85d0..c8bedf786578 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.8.1
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.8.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pagination support for flask
 EAPI=7
 HOMEPAGE=https://flask-paginate.readthedocs.io
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lixxu/flask-paginate/archive/0.8.1.tar.gz -> flask-paginate-0.8.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e172b8a519a6d51872484a0cf2adb095
+_md5_=2d41270484276886149e8e59fde5d45a
diff --git a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2 b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
index e947f1cbd28f..3e9f6269ec78 100644
--- a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+++ b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx Themes for Flask related projects and Flask itself
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95bf4a6102d1126816c74a6548efe683
+_md5_=5c60705166ea8452a3bb93178427f5cf
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.15.1 b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
index 478bd70a0e44..452187a257ba 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.15.1
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.15.1
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple integration of Flask and WTForms
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/Babel-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/flask-babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/F/Flask-WTF/Flask-WTF-0.15.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e390acdeb982b5dc76097d3171b78a13
+_md5_=d44fdeb293e5b2493966aaef4ad3167f
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.4 b/metadata/md5-cache/dev-python/flexmock-0.10.4
index 95558cc6c720..a7ff687be3c3 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.4
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Testing library to create mocks, stubs and fakes
 EAPI=7
 HOMEPAGE=https://flexmock.readthedocs.org/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/f/flexmock/flexmock-0.10.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b7df3ec6ff08dbf1994ad8bf5ce3482
+_md5_=6d52be48f4f478770ec8ac25a3f45915
diff --git a/metadata/md5-cache/dev-python/fonttools-4.22.0 b/metadata/md5-cache/dev-python/fonttools-4.22.0
deleted file mode 100644
index abea7447810f..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.22.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/zopfli ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=7
-HOMEPAGE=https://github.com/fonttools/fonttools/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.22.0.tar.gz -> fonttools-4.22.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=3bf589af0e633156073a3fa9a9fc08e8
diff --git a/metadata/md5-cache/dev-python/fonttools-4.22.1 b/metadata/md5-cache/dev-python/fonttools-4.22.1
deleted file mode 100644
index 589590526691..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.22.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/zopfli ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=7
-HOMEPAGE=https://github.com/fonttools/fonttools/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.22.1.tar.gz -> fonttools-4.22.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=353dffe9314d9903c1394f0a1dd3ec0c
diff --git a/metadata/md5-cache/dev-python/fonttools-4.23.1 b/metadata/md5-cache/dev-python/fonttools-4.23.1
index a22e8739fdd8..46cea8a0802f 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.23.1
+++ b/metadata/md5-cache/dev-python/fonttools-4.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
 EAPI=7
 HOMEPAGE=https://github.com/fonttools/fonttools/
 IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.23.1.tar.gz -> fonttools-4.23.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=206f746006b413ac614989cf1b59f006
+_md5_=aa22d214d26cd2e15e1aa987f6948a26
diff --git a/metadata/md5-cache/dev-python/fonttools-4.24.0 b/metadata/md5-cache/dev-python/fonttools-4.24.0
deleted file mode 100644
index 18669a9fb0e7..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.24.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/zopfli ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=7
-HOMEPAGE=https://github.com/fonttools/fonttools/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.24.0.tar.gz -> fonttools-4.24.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=206f746006b413ac614989cf1b59f006
diff --git a/metadata/md5-cache/dev-python/fonttools-4.24.3 b/metadata/md5-cache/dev-python/fonttools-4.24.3
deleted file mode 100644
index 0b664ffead97..000000000000
--- a/metadata/md5-cache/dev-python/fonttools-4.24.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/zopfli ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for manipulating TrueType, OpenType, AFM and Type1 fonts
-EAPI=7
-HOMEPAGE=https://github.com/fonttools/fonttools/
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fonttools/fonttools/archive/4.24.3.tar.gz -> fonttools-4.24.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=206f746006b413ac614989cf1b59f006
diff --git a/metadata/md5-cache/dev-python/fqdn-1.5.0-r1 b/metadata/md5-cache/dev-python/fqdn-1.5.0-r1
deleted file mode 100644
index b0520a6b5c6f..000000000000
--- a/metadata/md5-cache/dev-python/fqdn-1.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=RFC-compliant FQDN validation and manipulation for Python
-EAPI=7
-HOMEPAGE=https://github.com/guyhughes/fqdn
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/guyhughes/fqdn/archive/v1.5.0.tar.gz -> fqdn-1.5.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b38513d198ffe859b6665a47009f84b
diff --git a/metadata/md5-cache/dev-python/fqdn-1.5.1 b/metadata/md5-cache/dev-python/fqdn-1.5.1
index 765473587dbe..4a5f3061c81a 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.5.1
+++ b/metadata/md5-cache/dev-python/fqdn-1.5.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=RFC-compliant FQDN validation and manipulation for Python
 EAPI=7
 HOMEPAGE=https://github.com/ypcrts/fqdn
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( dev-python/cached-property[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ypcrts/fqdn/archive/v1.5.1.tar.gz -> fqdn-1.5.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a4f0d6130846a0b1db14b2646d6cb28d
+_md5_=28872a6d625fc324fd4f5f6b25195c20
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.1 b/metadata/md5-cache/dev-python/fudge-1.1.1
index c83fd7db1eba..75836f8f405c 100644
--- a/metadata/md5-cache/dev-python/fudge-1.1.1
+++ b/metadata/md5-cache/dev-python/fudge-1.1.1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Replace real objects with fakes (mocks, stubs, etc) while testing
 EAPI=7
 HOMEPAGE=http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-1.1.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7553630de690163697aec26b595040c5
+_md5_=0849b139cabf62c5bdd2a14f391c322b
diff --git a/metadata/md5-cache/dev-python/genson-1.1.0 b/metadata/md5-cache/dev-python/genson-1.1.0
index 584b0ba7a3f9..18b164faa13c 100644
--- a/metadata/md5-cache/dev-python/genson-1.1.0
+++ b/metadata/md5-cache/dev-python/genson-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=GenSON is a powerful, user-friendly JSON Schema generator built in Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/genson/ https://github.com/wolverdude/GenSON/
-IUSE=test test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/g/genson/genson-1.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9b510c72dff4f70e02286347d59061ce
+_md5_=8cf4a567f29240701e91fa57b6982e7b
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1 b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
index 9a9607b73429..4b7706e497ec 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-libs/geoip-1.4.8 >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-libs/geoip-1.4.8 >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/geoip-1.4.8
 DESCRIPTION=Python bindings for GeoIP
 EAPI=7
 HOMEPAGE=https://github.com/maxmind/geoip-api-python
-IUSE=examples test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=>=dev-libs/geoip-1.4.8 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-python/archive/v1.3.2.tar.gz -> geoip-api-python-1.3.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=71376f3e869b03619c3978e1c0db6e2a
+_md5_=0fa485e9552e90216bc8f56d9723ef9e
diff --git a/metadata/md5-cache/dev-python/gevent-21.1.2 b/metadata/md5-cache/dev-python/gevent-21.1.2
index 03625ac96c41..655ff396ab36 100644
--- a/metadata/md5-cache/dev-python/gevent-21.1.2
+++ b/metadata/md5-cache/dev-python/gevent-21.1.2
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[ssl(+),threads(+)] dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[ssl(+),threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0[ssl(+),threads(+)] dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
 DESCRIPTION=Coroutine-based network library
 EAPI=7
 HOMEPAGE=https://www.gevent.org/ https://pypi.org/project/gevent/
-IUSE=doc examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0: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(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/g/gevent/gevent-21.1.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37ad49c74aacd2fbca6b7127a7f1dc88
+_md5_=e33b558009da1c7c0cf9a1f29543effd
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.2.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.2.0
deleted file mode 100644
index 08e4c2dfbc74..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.2.0.tar.gz -> google-api-python-client-2.2.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=48ee0a6f88b5965fab9c3db9ffe31f4a
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.3.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.3.0
deleted file mode 100644
index f7c68d025ac9..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.3.0.tar.gz -> google-api-python-client-2.3.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdb1a3a4ac5569407f658f70f782e5f6
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.4.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.4.0
index 537ba6bc5905..2d19465f1b2b 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.4.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Google API Client for Python
 EAPI=7
 HOMEPAGE=https://github.com/googleapis/google-api-python-client
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/googleapis/google-api-python-client/archive/v2.4.0.tar.gz -> google-api-python-client-2.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37c5564974daedb7baeb90a8bf99a0a8
+_md5_=bfc9791546ba5b623d23e5812d9c413e
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.5.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.5.0
deleted file mode 100644
index 6aded18821b3..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.5.0.tar.gz -> google-api-python-client-2.5.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37c5564974daedb7baeb90a8bf99a0a8
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.6.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.6.0
deleted file mode 100644
index 68d5ceb1f894..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google API Client for Python
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-api-python-client
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/google-api-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/uritemplate-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/six-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.6.0.tar.gz -> google-api-python-client-2.6.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37c5564974daedb7baeb90a8bf99a0a8
diff --git a/metadata/md5-cache/dev-python/google-auth-1.29.0 b/metadata/md5-cache/dev-python/google-auth-1.29.0
deleted file mode 100644
index 77c71cf5e423..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-1.29.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=7
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-1.29.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=90a136f2787d777b07d665cf7c9ee791
diff --git a/metadata/md5-cache/dev-python/google-auth-1.30.0 b/metadata/md5-cache/dev-python/google-auth-1.30.0
index 0a37f6b0c7ff..d12297eb3e99 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.30.0
+++ b/metadata/md5-cache/dev-python/google-auth-1.30.0
@@ -4,7 +4,7 @@ DESCRIPTION=Google Authentication Library
 EAPI=7
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.30.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a486959a30a9f384cb68fd058a1cf72e
+_md5_=5446b4e8705e5b876d6f23fdb5898128
diff --git a/metadata/md5-cache/dev-python/graphviz-0.16 b/metadata/md5-cache/dev-python/graphviz-0.16
index 14effdee1153..eb67a38c49dd 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.16
+++ b/metadata/md5-cache/dev-python/graphviz-0.16
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip test? ( media-gfx/graphviz >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-mock-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz[gts,pdf] ) test? ( media-gfx/graphviz >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=app-arch/unzip test? ( media-gfx/graphviz >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-mock-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz[gts,pdf] ) test? ( media-gfx/graphviz >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple Python interface for Graphviz
 EAPI=7
 HOMEPAGE=https://graphviz.readthedocs.io/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/g/graphviz/graphviz-0.16.zip
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8a7325596ba3b0f7f41c926902e8dd2
+_md5_=a5d26479214ee1220046b1050a8a6bea
diff --git a/metadata/md5-cache/dev-python/grpcio-1.32.0-r1 b/metadata/md5-cache/dev-python/grpcio-1.32.0-r1
deleted file mode 100644
index 3b4efaa9ff8d..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.32.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-dns/c-ares:= sys-libs/zlib:=
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-dns/c-ares:= sys-libs/zlib:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.32.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=534773f649312898eaf0d09dd2344743
diff --git a/metadata/md5-cache/dev-python/grpcio-1.37.1 b/metadata/md5-cache/dev-python/grpcio-1.37.1
index 961072668461..ce49d888554d 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.37.1
+++ b/metadata/md5-cache/dev-python/grpcio-1.37.1
@@ -5,11 +5,11 @@ DESCRIPTION=High-performance RPC framework (python libraries)
 EAPI=7
 HOMEPAGE=https://grpc.io
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/re2-0.2021.04.01:= >=dev-python/cython-0.28.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-dns/c-ares:= sys-libs/zlib:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.37.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d7a4f9610d585eed8cba2516a4176bee
+_md5_=5296891e4bf2c476abfe3b8174069ee2
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.32.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
deleted file mode 100644
index 2f91206ad435..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/grpcio-1.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/grpcio-1.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.32.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a01b81426e874a4808fb639f991cee49
diff --git a/metadata/md5-cache/dev-python/guessit-3.3.1 b/metadata/md5-cache/dev-python/guessit-3.3.1
index f69e266c4eba..cbb9b12c8e03 100644
--- a/metadata/md5-cache/dev-python/guessit-3.3.1
+++ b/metadata/md5-cache/dev-python/guessit-3.3.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/babelfish-0.5.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/babelfish-0.5.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/rebulk-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for guessing information from video filenames
 EAPI=7
 HOMEPAGE=https://github.com/guessit-io/guessit https://pypi.org/project/guessit/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rebulk-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/rebulk-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/g/guessit/guessit-3.3.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1a8f2332edfb94dbc655b648c9dbc413
+_md5_=b070cdd99b98220b6a620be8a07d9fd7
diff --git a/metadata/md5-cache/dev-python/hiredis-1.1.0 b/metadata/md5-cache/dev-python/hiredis-1.1.0
index b667afe4ecf9..ba442575018a 100644
--- a/metadata/md5-cache/dev-python/hiredis-1.1.0
+++ b/metadata/md5-cache/dev-python/hiredis-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=system-libs? ( dev-libs/hiredis:0/0.14 )
 DESCRIPTION=Python extension that wraps hiredis
 EAPI=7
 HOMEPAGE=https://github.com/redis/hiredis-py/
-IUSE=system-libs python_targets_python3_8 python_targets_python3_9
+IUSE=system-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=BSD
-RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=system-libs? ( dev-libs/hiredis:0/0.14 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-1.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8c410949a3b7ae774dffd0287bbed850
+_md5_=82381a1c90135e583bd513f966204d8c
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.9 b/metadata/md5-cache/dev-python/html5-parser-0.4.9
index b1505ca0e34b..4b9fac0e09d8 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.9
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.9
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] virtual/pkgconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/libxml2:=
 DESCRIPTION=Fast C based HTML 5 parsing for python
 EAPI=7
 HOMEPAGE=https://github.com/kovidgoyal/html5-parser/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.9.tar.gz -> html5-parser-0.4.9.tar.gz
+SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.9.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5f786871e871fc39262c0a11ae532254
+_md5_=0b039ef5924c20ed10ce73bfab4dab96
diff --git a/metadata/md5-cache/dev-python/httmock-1.4.0 b/metadata/md5-cache/dev-python/httmock-1.4.0
index 0ee9a202117b..1d93091484ee 100644
--- a/metadata/md5-cache/dev-python/httmock-1.4.0
+++ b/metadata/md5-cache/dev-python/httmock-1.4.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A mocking library for requests
 EAPI=7
 HOMEPAGE=https://github.com/patrys/httmock
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/requests-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/patrys/httmock/archive/1.4.0.tar.gz -> httmock-1.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0cab2018826ce5eddeedeb3c1b46a75a
+_md5_=f45f4b4f4bdcaa0adbca41ef6cb72b86
diff --git a/metadata/md5-cache/dev-python/http-parser-0.9.0 b/metadata/md5-cache/dev-python/http-parser-0.9.0
index 888e38aaf887..ff64c45fa9f6 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.9.0
+++ b/metadata/md5-cache/dev-python/http-parser-0.9.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=HTTP request/response parser for python in C
 EAPI=7
 HOMEPAGE=https://github.com/benoitc/http-parser
-IUSE=examples test python_targets_python3_8 python_targets_python3_9
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/benoitc/http-parser/archive/0.9.0.tar.gz -> http-parser-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8249fefb0893f02d3f64c684e779e9fb
+_md5_=8be7d75a1fd42f82e43871412c6dee6f
diff --git a/metadata/md5-cache/dev-python/humanize-3.4.1 b/metadata/md5-cache/dev-python/humanize-3.4.1
deleted file mode 100644
index f9df28c6126f..000000000000
--- a/metadata/md5-cache/dev-python/humanize-3.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Common humanization utilities
-EAPI=7
-HOMEPAGE=https://github.com/jmoiron/humanize/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/humanize/humanize-3.4.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=986df6f4100ad8c71d9c180ba05f3666
diff --git a/metadata/md5-cache/dev-python/humanize-3.5.0 b/metadata/md5-cache/dev-python/humanize-3.5.0
index d5c41e3f5797..d3004d57306f 100644
--- a/metadata/md5-cache/dev-python/humanize-3.5.0
+++ b/metadata/md5-cache/dev-python/humanize-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Common humanization utilities
 EAPI=7
 HOMEPAGE=https://github.com/jmoiron/humanize/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanize/humanize-3.5.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fea5f96fabf06b1db55bb30e053f30ca
+_md5_=4d45a4f9b0123b0197e63f48593a700e
diff --git a/metadata/md5-cache/dev-python/humanize-3.6.0 b/metadata/md5-cache/dev-python/humanize-3.7.1
similarity index 98%
rename from metadata/md5-cache/dev-python/humanize-3.6.0
rename to metadata/md5-cache/dev-python/humanize-3.7.1
index 68e526e68ade..7ccce2b280f4 100644
--- a/metadata/md5-cache/dev-python/humanize-3.6.0
+++ b/metadata/md5-cache/dev-python/humanize-3.7.1
@@ -10,6 +10,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_pyt
 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/h/humanize/humanize-3.6.0.tar.gz
+SRC_URI=mirror://pypi/h/humanize/humanize-3.7.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=fea5f96fabf06b1db55bb30e053f30ca
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.13.13 b/metadata/md5-cache/dev-python/hypothesis-6.13.13
new file mode 100644
index 000000000000..1d60e28c227a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.13.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !!dev-python/pytest-describe !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.13.13.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=29e2ca8ce739ea3992cf4a7f01be259e
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.13.14 b/metadata/md5-cache/dev-python/hypothesis-6.13.14
new file mode 100644
index 000000000000..33ba926c16ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.13.14
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !!dev-python/pytest-describe !!<dev-python/typing-3.7.4.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.13.14.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=29e2ca8ce739ea3992cf4a7f01be259e
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.7 b/metadata/md5-cache/dev-python/icalendar-4.0.7
index c7df5d8030c1..dd1ef40ecf49 100644
--- a/metadata/md5-cache/dev-python/icalendar-4.0.7
+++ b/metadata/md5-cache/dev-python/icalendar-4.0.7
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Package used for parsing and generating iCalendar files (RFC 2445)
 EAPI=7
 HOMEPAGE=https://github.com/collective/icalendar
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-4.0.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=53918d84a06ef46bd28146976a70f4a5
+_md5_=63d15e476e6ecbaff4528c9219e1312b
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.29.0 b/metadata/md5-cache/dev-python/identify-2.2.9
similarity index 80%
rename from metadata/md5-cache/dev-python/zeroconf-0.29.0
rename to metadata/md5-cache/dev-python/identify-2.2.9
index 7a0dea04f0a9..69c5b9af13f7 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.29.0
+++ b/metadata/md5-cache/dev-python/identify-2.2.9
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+BDEPEND=test? ( dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+DESCRIPTION=File identification library for Python
 EAPI=7
-HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
+HOMEPAGE=https://github.com/pre-commit/identify
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/editdistance-s[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/jstasiak/python-zeroconf/archive/0.29.0.tar.gz -> python-zeroconf-0.29.0.gh.tar.gz
+SRC_URI=https://github.com/pre-commit/identify/archive/refs/tags/v2.2.9.tar.gz -> identify-2.2.9.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5e96e4bf28ea2bf3aec2ad7aa576aeed
+_md5_=4422a1a70c5e97b863fef2f631f5be9a
diff --git a/metadata/md5-cache/dev-python/immutables-0.15 b/metadata/md5-cache/dev-python/immutables-0.15
index a1bfa66f33f5..11976c794420 100644
--- a/metadata/md5-cache/dev-python/immutables-0.15
+++ b/metadata/md5-cache/dev-python/immutables-0.15
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A high-performance immutable mapping type for Python
 EAPI=7
 HOMEPAGE=https://github.com/MagicStack/immutables
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/MagicStack/immutables/archive/v0.15.tar.gz -> immutables-0.15.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b48ab6e9144594f367b0b9186795bd0f
+_md5_=f55c1019774a4acf5839e677cb3a1435
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.5.0 b/metadata/md5-cache/dev-python/importlib_metadata-4.5.0
new file mode 100644
index 000000000000..43039e44a975
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_resources[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=7
+HOMEPAGE=https://github.com/python/importlib_metadata
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/i/importlib_metadata/importlib_metadata-4.5.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a599bb89fa5865f3d83d1e13e7445407
diff --git a/metadata/md5-cache/dev-python/iniparse-0.5 b/metadata/md5-cache/dev-python/iniparse-0.5
index 928ae92c822f..56297c41009f 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.5
+++ b/metadata/md5-cache/dev-python/iniparse-0.5
@@ -1,15 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Better INI parser for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/iniparse/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 x86
 LICENSE=MIT PSF-2
-RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=33bea70fa0c836c8eee452b45e69ce49
+_md5_=2f4e60182840fe5140ef83b830d96f9c
diff --git a/metadata/md5-cache/dev-python/intervaltree-3.0.2 b/metadata/md5-cache/dev-python/intervaltree-3.0.2
deleted file mode 100644
index 67843ba42b2c..000000000000
--- a/metadata/md5-cache/dev-python/intervaltree-3.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Editable interval tree data structure for Python 2 and 3
-EAPI=7
-HOMEPAGE=https://pypi.org/project/intervaltree/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/intervaltree/intervaltree-3.0.2.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=76a313e04de46138285aa112f176f4da
diff --git a/metadata/md5-cache/dev-python/intervaltree-3.1.0 b/metadata/md5-cache/dev-python/intervaltree-3.1.0
index a9d62c100670..272e26b97812 100644
--- a/metadata/md5-cache/dev-python/intervaltree-3.1.0
+++ b/metadata/md5-cache/dev-python/intervaltree-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Editable interval tree data structure for Python 2 and 3
 EAPI=7
 HOMEPAGE=https://pypi.org/project/intervaltree/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intervaltree/intervaltree-3.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cdc0d33b66d233d8f8a0a7569012cbcf
+_md5_=76a313e04de46138285aa112f176f4da
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1 b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
index 4e7dbf27050d..f2b5d90b4238 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python IP address manipulation library
 EAPI=7
 HOMEPAGE=https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7f902b0726a214bfe43ed4f3ed4804ca
+_md5_=2b9ffa56d1da3d71c80bf31d010ebdf7
diff --git a/metadata/md5-cache/dev-python/ipy-1.01 b/metadata/md5-cache/dev-python/ipy-1.01
index c4c8a7b6e566..d4180039e096 100644
--- a/metadata/md5-cache/dev-python/ipy-1.01
+++ b/metadata/md5-cache/dev-python/ipy-1.01
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Class and tools for handling of IPv4 and IPv6 addresses and networks
 EAPI=7
 HOMEPAGE=https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/
-IUSE=examples python_targets_python3_8 python_targets_python3_9
+IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-1.01.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=be5df81b70799f9742022d5205d25afa
+_md5_=3e908543e9af425d0516f8767e55b783
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.5.3-r1 b/metadata/md5-cache/dev-python/ipykernel-5.5.3-r1
deleted file mode 100644
index 63ddaffd2f0f..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-5.5.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jupyter_client-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose_warnings_filters[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jupyter_client-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=7
-HOMEPAGE=https://github.com/ipython/ipykernel
-IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jupyter_client-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.5.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=096fdd593f43809347bc09ba305c20fd
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1 b/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
index bf27eff1b9f2..a541999d592d 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
+++ b/metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=IPython Kernel for Jupyter
 EAPI=7
 HOMEPAGE=https://github.com/ipython/ipykernel
 IUSE=test test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jupyter_client-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.5.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb50a5c8951da4c8df460692e017971b
+_md5_=a87a8a305c07a2e4da16e1d7a90a8cc1
diff --git a/metadata/md5-cache/dev-python/ipython-7.23.1 b/metadata/md5-cache/dev-python/ipython-7.23.1
index ec0f390b4c47..b48a2c4675f0 100644
--- a/metadata/md5-cache/dev-python/ipython-7.23.1
+++ b/metadata/md5-cache/dev-python/ipython-7.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=7
 HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
 IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.23.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=b1cb4c5960733abfefe08537a304e6a7
+_md5_=d435f1ecba337948a0aa70e6f5937491
diff --git a/metadata/md5-cache/dev-python/jinja2-time-0.2.0 b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
index 0040825d0e5a..65d3fa0f1754 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jinja2 Extension for Dates and Times
 EAPI=7
 HOMEPAGE=https://github.com/hackebrot/jinja2-time
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/jinja2-time/jinja2-time-0.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7e8ed80b98bf5b825e75b8fba79848b1
+_md5_=6cc75022660d43fa29aa66128260cc6f
diff --git a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0 b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
index e9acd5cdf1f9..9e93d90768f5 100644
--- a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+++ b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
@@ -1,14 +1,15 @@
+BDEPEND=test? ( dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Jinja2 pluralize filters
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/audreyr/jinja2_pluralize
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/inflect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/jinja2_pluralize/jinja2_pluralize-0.3.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d97fc9c7b041327f7d6a7ae0251c7b58
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1db670eb9f89d353f078de045b16985a
diff --git a/metadata/md5-cache/dev-python/jmespath-0.10.0 b/metadata/md5-cache/dev-python/jmespath-0.10.0
index dd777ea0b1c8..a364830c2273 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.10.0
+++ b/metadata/md5-cache/dev-python/jmespath-0.10.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON Matching Expressions
 EAPI=7
 HOMEPAGE=https://github.com/jmespath/jmespath.py https://pypi.org/project/jmespath/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmespath/jmespath.py/archive/0.10.0.tar.gz -> jmespath.py-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=82f80a2aeffda26761cd872f7e082570
+_md5_=2615849b21002f62ba32be78cf224013
diff --git a/metadata/md5-cache/dev-python/josepy-1.8.0 b/metadata/md5-cache/dev-python/josepy-1.8.0
index 31753b2f7acf..61ae58bfa4ce 100644
--- a/metadata/md5-cache/dev-python/josepy-1.8.0
+++ b/metadata/md5-cache/dev-python/josepy-1.8.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JOSE protocol implementation in Python
 EAPI=7
 HOMEPAGE=https://github.com/certbot/josepy
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/josepy/josepy-1.8.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b23fa7d647f44ab715215a62eb37830c
+_md5_=e6126733cbe12b009f89d68d1dbdee8f
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.2 b/metadata/md5-cache/dev-python/jsmin-2.2.2
index ae1ace5a21b1..a3f34e13aeea 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.2.2
+++ b/metadata/md5-cache/dev-python/jsmin-2.2.2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JavaScript minifier
 EAPI=7
 HOMEPAGE=https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.2.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f4006d1525e769f1c523a627e6d5a7a1
+_md5_=98d80f98387b8e9e517cd0ef4365b3c2
diff --git a/metadata/md5-cache/dev-python/json-rpc-1.13.0 b/metadata/md5-cache/dev-python/json-rpc-1.13.0
index f2aefedfe2e5..deab6af81375 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.13.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.13.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON-RPC transport implementation for python
 EAPI=7
 HOMEPAGE=https://github.com/pavlov99/json-rpc
-IUSE=test test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/json-rpc/json-rpc-1.13.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b7c761680eec909963b6871f2a657e2f
+_md5_=2ed2887c9ba3d03158fdcd9ddc4a9a51
diff --git a/metadata/md5-cache/dev-python/jsonext-0.4.2 b/metadata/md5-cache/dev-python/jsonext-0.4.2
index 864748337ea5..2ce50935543c 100644
--- a/metadata/md5-cache/dev-python/jsonext-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonext-0.4.2
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=Well-structured helpers for serializing commonly encountered structures to JSON.
 EAPI=7
 HOMEPAGE=https://github.com/mbr/jsonext
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/arrow[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/arrow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonext/jsonext-0.4.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f67e32847b0f4c41985498a0407fd905
+_md5_=5ca9961c5cd4372cfe73ed443528a83e
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.6.0 b/metadata/md5-cache/dev-python/jsonmerge-1.6.0
deleted file mode 100644
index c5d707a275da..000000000000
--- a/metadata/md5-cache/dev-python/jsonmerge-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Merge a series of JSON documents
-EAPI=7
-HOMEPAGE=https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-1.6.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=330d8065a978e0eae9788b242c0ebd41
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.8.0 b/metadata/md5-cache/dev-python/jsonmerge-1.8.0
index eca26d626028..7ead6cd3f65b 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.8.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.8.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Merge a series of JSON documents
 EAPI=7
 HOMEPAGE=https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/jsonmerge/jsonmerge-1.8.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2027ff6e9cec2a1e4a30503ac3b7dcde
+_md5_=1c1c3cc741ceec10f34a08f7ce54569d
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index e75b90653de0..63e56b4d4de8 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An implementation of JSON Reference for Python
 EAPI=7
 HOMEPAGE=https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/jsonref/jsonref-0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=299fa732dbb380d139502317d0f25ede
+_md5_=b57fec4c61a8bfa056d213b850cc3d10
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.4.2 b/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
index a2a3d4419b6f..4840bbf4d5ae 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.4.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=python implementation of the JSON-RPC spec (1.0 and 2.0)
 EAPI=7
 HOMEPAGE=https://github.com/tcalmant/jsonrpclib
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~mips x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/tcalmant/jsonrpclib/archive/v0.4.2.tar.gz -> jsonrpclib-0.4.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4bcd2da229cbd43011027621d65598eb
+_md5_=6d6845d715afcd5955030842da25772a
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-9999 b/metadata/md5-cache/dev-python/jsonrpclib-9999
index b2edaef32837..df20a8f888ee 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-9999
+++ b/metadata/md5-cache/dev-python/jsonrpclib-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=python implementation of the JSON-RPC spec (1.0 and 2.0)
 EAPI=7
 HOMEPAGE=https://github.com/tcalmant/jsonrpclib
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c2938492e77b5d27f0924b890afb845e
+_md5_=d56d13254b82af26e27d592e377b8279
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index 250fc96e2c0f..a8339e54d25b 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webcolors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/webcolors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An implementation of JSON-Schema validation for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema
-IUSE=test test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webcolors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonpointer-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/webcolors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rfc3986-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rfc3339-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/j/jsonschema/jsonschema-3.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a227d7638ed4505526a9ede1e4115fd8
+_md5_=1282fe6a48f8bf8cf6452b36f7b613c8
diff --git a/metadata/md5-cache/dev-python/jsonxs-0.6 b/metadata/md5-cache/dev-python/jsonxs-0.6
index ee04f38d132c..af1be1a7579b 100644
--- a/metadata/md5-cache/dev-python/jsonxs-0.6
+++ b/metadata/md5-cache/dev-python/jsonxs-0.6
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Get/set values in JSON and Python datastructures
 EAPI=7
 HOMEPAGE=https://github.com/fboender/jsonxs
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonxs/jsonxs-0.6.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bde6441f286b37ab2b8b6cc7572873b8
+_md5_=bc02ca1d670597553ecdb506ce0cc955
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.3.1 b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
index d91a9f127f7e..89d9bf1cc23f 100644
--- a/metadata/md5-cache/dev-python/kiwisolver-1.3.1
+++ b/metadata/md5-cache/dev-python/kiwisolver-1.3.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An efficient C++ implementation of the Cassowary constraint solving algorithm
 EAPI=7
 HOMEPAGE=https://github.com/nucleic/kiwi
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=Clear-BSD
-RDEPEND=>=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/cppy-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/nucleic/kiwi/archive/1.3.1.tar.gz -> kiwisolver-1.3.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=94d536ef68b69e55eb70d41018011749
+_md5_=1da419ba3f4c6aa50e2cc8a6bfda4c13
diff --git a/metadata/md5-cache/dev-python/latexcodec-2.0.1 b/metadata/md5-cache/dev-python/latexcodec-2.0.1
index 7f8c22e18921..b14b1db81c7d 100644
--- a/metadata/md5-cache/dev-python/latexcodec-2.0.1
+++ b/metadata/md5-cache/dev-python/latexcodec-2.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Lexer and codec to work with LaTeX code in Python
 EAPI=7
 HOMEPAGE=https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/latexcodec/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/l/latexcodec/latexcodec-2.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e1a521fb3196987d9354517f40c1c047
+_md5_=a7f2e6670f1a747042fd2630ee9abe95
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.2 b/metadata/md5-cache/dev-python/lazr-config-2.2.2
index 330a7c28909d..63558ac308f5 100644
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.2
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.2
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=Create configuration schemas, and process and validate configurations.
 EAPI=7
 HOMEPAGE=https://code.launchpad.net/lazr.config
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/lazr-delegates[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazr-delegates[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.2.tar.gz -> lazr-config-2.2.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3c8cafdfa70396792de482920646ca22
+_md5_=42adad04cb8e234b5fac62a121ddc6c5
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.32.0 b/metadata/md5-cache/dev-python/lazr-config-2.2.3
similarity index 52%
rename from metadata/md5-cache/dev-python/grpcio-testing-1.32.0
rename to metadata/md5-cache/dev-python/lazr-config-2.2.3
index 063ae25a8447..57b7f7b602a6 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.32.0
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.3
@@ -1,15 +1,14 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Testing utilities for gRPC Python
+DESCRIPTION=Create configuration schemas, and process and validate configurations.
 EAPI=7
-HOMEPAGE=https://grpc.io
+HOMEPAGE=https://code.launchpad.net/lazr.config
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazr-delegates[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.32.0.tar.gz
+SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.3.tar.gz -> lazr-config-2.2.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=60e15bcc08fb07d559e8f3f53208e32b
+_md5_=42adad04cb8e234b5fac62a121ddc6c5
diff --git a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4 b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
index 72371513f3f1..ec581200373d 100644
--- a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+++ b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
@@ -1,14 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easily write objects that delegate behavior
 EAPI=7
 HOMEPAGE=https://code.launchpad.net/lazr.delegates
-IUSE=python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/zope-interface[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazr.delegates/lazr.delegates-2.0.4.tar.gz -> lazr-delegates-2.0.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=67ded9a7a67736de6c178bdec7a77491
+_md5_=d2885fb266ecc5538fe5a32257ae056f
diff --git a/metadata/md5-cache/dev-python/liblarch-3.0.1 b/metadata/md5-cache/dev-python/liblarch-3.0.1
index 0cea5dc22cd0..bb79e97b8098 100644
--- a/metadata/md5-cache/dev-python/liblarch-3.0.1
+++ b/metadata/md5-cache/dev-python/liblarch-3.0.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] x11-libs/gtk+:3[introspection] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection]
+DEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] x11-libs/gtk+:3[introspection]
 DESCRIPTION=Library to handle directed acyclic graphs
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/liblarch
-IUSE=test python_targets_python3_8 python_targets_python3_9 test
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] x11-libs/gtk+:3[introspection] python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/getting-things-gnome/liblarch/archive/v3.0.1.tar.gz -> liblarch-3.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=e911bbba317a2ad154e71ae163d76ebf
+_md5_=2cd71f275a9fb6cf4356a05d27b5fa64
diff --git a/metadata/md5-cache/dev-python/libnacl-1.7.2-r1 b/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
index a1015f433dc5..69477f089673 100644
--- a/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
+++ b/metadata/md5-cache/dev-python/libnacl-1.7.2-r1
@@ -1,14 +1,14 @@
-BDEPEND=dev-libs/libsodium python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-libs/libsodium python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python ctypes wrapper for libsodium
 EAPI=7
 HOMEPAGE=https://libnacl.readthedocs.org/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/libsodium python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-libs/libsodium python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/libnacl/archive/v1.7.2.tar.gz -> libnacl-1.7.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=22709fa816ed4278a84b1f4df89dd3ed
+_md5_=1f50796c515a38ea611dd438a8f143ca
diff --git a/metadata/md5-cache/dev-python/libsass-0.21.0 b/metadata/md5-cache/dev-python/libsass-0.21.0
index a0f7364cba8f..6db0c0b4a434 100644
--- a/metadata/md5-cache/dev-python/libsass-0.21.0
+++ b/metadata/md5-cache/dev-python/libsass-0.21.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sass/libsass-python/archive/0.21.0.tar.gz -> libsass-python-0.21.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1b5ec1755ec97ae6b02d1efaf5d6ab50
+_md5_=2d0bccbd0fb64fad648955679a7e03e2
diff --git a/metadata/md5-cache/dev-python/line_profiler-3.3.0 b/metadata/md5-cache/dev-python/line_profiler-3.3.0
new file mode 100644
index 000000000000..5787b462b53e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/line_profiler-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scikit-build[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ubelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-util/ninja dev-util/cmake python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Line-by-line profiler
+EAPI=7
+HOMEPAGE=https://github.com/pyutils/line_profiler/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyutils/line_profiler/archive/3.3.0.tar.gz -> line_profiler-3.3.0.gh.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62693cd5db34b58d2bafb3cbef7b5fc5
diff --git a/metadata/md5-cache/dev-python/lit-12.0.0 b/metadata/md5-cache/dev-python/lit-12.0.0
index 792602944eb7..4981cd15ec31 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.0
+++ b/metadata/md5-cache/dev-python/lit-12.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/llvm/llvm-project/archive/llvmorg-12.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=01e27bb13cf1c829df8f17fc790d7c6a
+_md5_=26d5a8028365bd3f1219b503572d455a
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1.9999 b/metadata/md5-cache/dev-python/lit-12.0.1.9999
index d747cff8e342..32c0de63887c 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.1.9999
+++ b/metadata/md5-cache/dev-python/lit-12.0.1.9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2ffe9bf06be0a156cf2a06b6d2b59280
+_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-12.0.1_rc1 b/metadata/md5-cache/dev-python/lit-12.0.1_rc1
index 7efac3a25424..ca45730aeaee 100644
--- a/metadata/md5-cache/dev-python/lit-12.0.1_rc1
+++ b/metadata/md5-cache/dev-python/lit-12.0.1_rc1
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/llvm/llvm-project/archive/llvmorg-12.0.1-rc1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2ffe9bf06be0a156cf2a06b6d2b59280
+_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lit-13.0.0.9999 b/metadata/md5-cache/dev-python/lit-13.0.0.9999
index d747cff8e342..32c0de63887c 100644
--- a/metadata/md5-cache/dev-python/lit-13.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-13.0.0.9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-devel/llvm ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2ffe9bf06be0a156cf2a06b6d2b59280
+_md5_=462a67dde2b631dd12fbe4721da9f2f8
diff --git a/metadata/md5-cache/dev-python/lmdb-1.2.1 b/metadata/md5-cache/dev-python/lmdb-1.2.1
index 84cfa96c6b54..c712a9d86de1 100644
--- a/metadata/md5-cache/dev-python/lmdb-1.2.1
+++ b/metadata/md5-cache/dev-python/lmdb-1.2.1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-db/lmdb-0.9.28:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-db/lmdb-0.9.28:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/lmdb-0.9.28:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] )
+DEPEND=>=dev-db/lmdb-0.9.28:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] )
 DESCRIPTION=Python bindings for the Lightning Database
 EAPI=7
 HOMEPAGE=https://github.com/jnwatson/py-lmdb/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=OPENLDAP
-RDEPEND=>=dev-db/lmdb-0.9.28:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-db/lmdb-0.9.28:= python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/l/lmdb/lmdb-1.2.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3c0618c486bfb1be9b33aa7524d6642c
+_md5_=ab240e2214a6f93f1862dc166b7f90df
diff --git a/metadata/md5-cache/dev-python/locket-0.2.1 b/metadata/md5-cache/dev-python/locket-0.2.1
index bab1580351f6..ede250c89f2c 100644
--- a/metadata/md5-cache/dev-python/locket-0.2.1
+++ b/metadata/md5-cache/dev-python/locket-0.2.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/spur[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/spur[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=File-based locks for Python
 EAPI=7
 HOMEPAGE=https://github.com/mwilliamson/locket.py
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/mwilliamson/locket.py/archive/0.2.1.tar.gz -> locket.py-0.2.1.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=845b67e1853fd3a9789bad0e8397684d
+_md5_=59fe5b437b72d955f9ef109f4ac90cce
diff --git a/metadata/md5-cache/dev-python/logutils-0.3.5 b/metadata/md5-cache/dev-python/logutils-0.3.5
index 01166fe43898..e4409e172496 100644
--- a/metadata/md5-cache/dev-python/logutils-0.3.5
+++ b/metadata/md5-cache/dev-python/logutils-0.3.5
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The logutils package provides a set of handlers for the Python standard
 EAPI=7
 HOMEPAGE=https://bitbucket.org/vinay.sajip/logutils
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d981a40fbe3adff59cf355f0100e1416
+_md5_=164ee79a6e5f6c2b750b8fe66a0a290b
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.4 b/metadata/md5-cache/dev-python/markdown-3.3.4
index 3ec85c9d76d1..fd310df018f0 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.4
+++ b/metadata/md5-cache/dev-python/markdown-3.3.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of the markdown markup language
 EAPI=7
 HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/M/Markdown/Markdown-3.3.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e51cb952a692cad32cc8fdd8ac6220dc
+_md5_=32deee212b58d7fe7b9be8eae529f330
diff --git a/metadata/md5-cache/dev-python/markdown2-2.4.0 b/metadata/md5-cache/dev-python/markdown2-2.4.0
index 6cda76fe8ea8..7f5047ec5d4d 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.4.0
+++ b/metadata/md5-cache/dev-python/markdown2-2.4.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python Markdown language reimplementation
 EAPI=7
 HOMEPAGE=https://github.com/trentm/python-markdown2
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/m/markdown2/markdown2-2.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4f809160cbdd5f71c6135a51b7b6048e
+_md5_=236b98faf0b07c045d6334137499c9f5
diff --git a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2 b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
index 12a139c56b9c..07ca098f44e3 100644
--- a/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
+++ b/metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Inline Matplotlib backend for Jupyter
 EAPI=7
 HOMEPAGE=https://github.com/ipython/matplotlib-inline/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/ipython/matplotlib-inline/archive/0.1.2.tar.gz -> matplotlib-inline-0.1.2.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bb604841f009beca9efc10456036ce75
+_md5_=fe0c8f38e70b76a661b1959abbaeddbf
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.2 b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
index 73094ab4d9c8..771cced4d5da 100644
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.2
+++ b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An extension which adds links to GitHub users, repositories, issues and commits
 EAPI=7
 HOMEPAGE=https://github.com/Python-Markdown/github-links
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdx_gh_links/mdx_gh_links-0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0bd096856309300bcfdc3e90826d7a0d
+_md5_=07df1cb2a28bbdaaceb8b43f15fb1906
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.57 b/metadata/md5-cache/dev-python/memory_profiler-0.57
index 51e8ddbbe6b5..2f18d9ff017b 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.57
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.57
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-lang/mercury >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !dev-lang/mercury >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A module for monitoring memory usage of a python program
 EAPI=7
 HOMEPAGE=https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler
-IUSE=examples test python_targets_python3_8 python_targets_python3_9
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-lang/mercury python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !dev-lang/mercury python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/pythonprofilers/memory_profiler/archive/v0.57.tar.gz -> memory_profiler-0.57.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=47507bf15438fa5b56aff1d3da2ee19e
+_md5_=8cbd1bf4f6cbb98278458a282a2e4705
diff --git a/metadata/md5-cache/dev-python/mergedict-1.0.0 b/metadata/md5-cache/dev-python/mergedict-1.0.0
index 49b9f0c48650..a2daf63a102d 100644
--- a/metadata/md5-cache/dev-python/mergedict-1.0.0
+++ b/metadata/md5-cache/dev-python/mergedict-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python 'dict' with a merge() method
 EAPI=7
 HOMEPAGE=https://github.com/schettino72/mergedict/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-1.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b8998e40fa9b9ff9549c6ff4f59857c5
+_md5_=48e186a9275b6461d8dbfc87b26fce30
diff --git a/metadata/md5-cache/dev-python/micawber-0.5.3 b/metadata/md5-cache/dev-python/micawber-0.5.3
index 099e73e7850c..3a8fb93cb56f 100644
--- a/metadata/md5-cache/dev-python/micawber-0.5.3
+++ b/metadata/md5-cache/dev-python/micawber-0.5.3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/beautifulsoup:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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/beautifulsoup:4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A small library for extracting rich content from urls
 EAPI=7
 HOMEPAGE=https://github.com/coleifer/micawber/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/coleifer/micawber/archive/0.5.3.tar.gz -> micawber-0.5.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=02bb713d43762985f622154a1a6f0466
+_md5_=c0beb99d02e3117e9b340854d4182c5f
diff --git a/metadata/md5-cache/dev-python/mimerender-0.6.0 b/metadata/md5-cache/dev-python/mimerender-0.6.0
index ac178d0a895d..9a109cb9fe04 100644
--- a/metadata/md5-cache/dev-python/mimerender-0.6.0
+++ b/metadata/md5-cache/dev-python/mimerender-0.6.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/python-mimeparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/python-mimeparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2
 EAPI=7
 HOMEPAGE=https://pypi.org/project/mimerender/ https://github.com/martinblech/mimerender/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/python-mimeparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/python-mimeparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/martinblech/mimerender/archive/v0.6.0.tar.gz -> mimerender-0.6.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=59d6dc66a11a5ccd5b3a12f15def1865
+_md5_=c0d549e787ecdebb030263bfc11e32ab
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.5 b/metadata/md5-cache/dev-python/minidb-2.0.5
new file mode 100644
index 000000000000..34e978a3b319
--- /dev/null
+++ b/metadata/md5-cache/dev-python/minidb-2.0.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple SQLite-based object store
+EAPI=7
+HOMEPAGE=https://thp.io/2010/minidb/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/minidb/minidb-2.0.5.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7534d9092872a11333c737414ad8aa4b
diff --git a/metadata/md5-cache/dev-python/mkautodoc-0.1.0 b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
index 69f4391e304a..ab3429783765 100644
--- a/metadata/md5-cache/dev-python/mkautodoc-0.1.0
+++ b/metadata/md5-cache/dev-python/mkautodoc-0.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Auto documentation for MkDocs
 EAPI=7
 HOMEPAGE=https://github.com/tomchristie/mkautodoc/ https://pypi.org/project/mkautodoc/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/tomchristie/mkautodoc/archive/0.1.0.tar.gz -> mkautodoc-0.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5912f023c5adbd1ef6a2484d83da5e5f
+_md5_=36cc5c62cd591db590072f7726d54258
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.23.0 b/metadata/md5-cache/dev-python/mongoengine-0.23.0
deleted file mode 100644
index adc0cfcf3643..000000000000
--- a/metadata/md5-cache/dev-python/mongoengine-0.23.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-db/mongodb dev-python/mongomock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Python Object-Document-Mapper for working with MongoDB
-EAPI=7
-HOMEPAGE=https://github.com/MongoEngine/mongoengine/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64
-LICENSE=BSD
-RDEPEND=dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/MongoEngine/mongoengine/archive/v0.23.0.tar.gz -> mongoengine-0.23.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=db5509062d1eb728663f0a7304890019
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.23.1 b/metadata/md5-cache/dev-python/mongoengine-0.23.1
index 977511f540bb..e3f8d30cdf59 100644
--- a/metadata/md5-cache/dev-python/mongoengine-0.23.1
+++ b/metadata/md5-cache/dev-python/mongoengine-0.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=A Python Object-Document-Mapper for working with MongoDB
 EAPI=7
 HOMEPAGE=https://github.com/MongoEngine/mongoengine/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-python/blinker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pymongo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/MongoEngine/mongoengine/archive/v0.23.1.tar.gz -> mongoengine-0.23.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8822fd330b1f82344fbdade588b35847
+_md5_=db5509062d1eb728663f0a7304890019
diff --git a/metadata/md5-cache/dev-python/mongomock-3.23.0 b/metadata/md5-cache/dev-python/mongomock-3.23.0
new file mode 100644
index 000000000000..37f326e5bffd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mongomock-3.23.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-5.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pymongo-3.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sentinels-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library to help testing Python code that interacts with MongoDB via Pymongo
+EAPI=7
+HOMEPAGE=https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/pymongo-3.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sentinels-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/mongomock/mongomock-3.23.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=437d414619f4d02a465b41c446ffbbf8
diff --git a/metadata/md5-cache/dev-python/mss-6.1.0 b/metadata/md5-cache/dev-python/mss-6.1.0
index 5e914cc283b3..a1b61db4fcdd 100644
--- a/metadata/md5-cache/dev-python/mss-6.1.0
+++ b/metadata/md5-cache/dev-python/mss-6.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-process/lsof ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] sys-process/lsof ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An ultra fast cross-platform multiple screenshots module in python using ctypes
 EAPI=7
 HOMEPAGE=https://github.com/BoboTiG/python-mss
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 test
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/BoboTiG/python-mss/archive/v6.1.0.tar.gz -> mss-6.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=1209d001149039874b52197cc62a1277
+_md5_=6d33ef155ec31650eea1f7d86c838f4f
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
index cec6c73f42c7..098a24cd73c7 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
@@ -1,16 +1,15 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( !!<dev-python/ndg-httpsclient-0.4.2-r1 dev-libs/openssl:0 ) test? ( dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !!<dev-python/ndg-httpsclient-0.4.2-r1 dev-libs/openssl:0 )
 DESCRIPTION=Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL
 EAPI=7
 HOMEPAGE=https://github.com/cedadev/ndg_httpsclient/ https://pypi.org/project/ndg-httpsclient/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
-RDEPEND=dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pyaes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/n/ndg-httpsclient/ndg_httpsclient-0.5.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ce9e85390022e3acffca2c588bf9264
+_md5_=5f842f11d8f90187a86d6c497993e60f
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.6.0 b/metadata/md5-cache/dev-python/nodeenv-1.6.0
index 2616c3b16da0..8fe1f4516327 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.6.0
+++ b/metadata/md5-cache/dev-python/nodeenv-1.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=Node.js virtual environment builder
 EAPI=7
 HOMEPAGE=https://github.com/ekalinin/nodeenv
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.6.0.tar.gz -> nodeenv-1.6.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=476acb759758ce54b89c2d664ef59898
+_md5_=7a30b4c4dfb2f1f28a00405eafd27c03
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r7 b/metadata/md5-cache/dev-python/nose-1.3.7-r7
deleted file mode 100644
index 8215ad76e799..000000000000
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=coverage? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( !hppa? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/twisted[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/twisted[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) )
-DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
-EAPI=7
-HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
-IUSE=coverage examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-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=LGPL-2.1
-RDEPEND=coverage? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=144d4fae2c3515115862d3e6765cd8e9
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r8 b/metadata/md5-cache/dev-python/nose-1.3.7-r8
index cb3fd88ce6a7..0921527132bc 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r8
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r8
@@ -4,7 +4,7 @@ DESCRIPTION=Unittest extension with automatic test suite discovery and easy test
 EAPI=7
 HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=LGPL-2.1
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a62ab4de0f9a96b8899408ab793d7e62
+_md5_=26133a79d4de1c68e16b3b3748f33c77
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.15.3 b/metadata/md5-cache/dev-python/nuitka-0.6.15.3
new file mode 100644
index 000000000000..175d798069ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.15.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=7
+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_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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.15.3.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7918f53248cdc0df1d4e5f3e968da238
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.2_p1 b/metadata/md5-cache/dev-python/numexpr-2.7.2_p1
index c49cc01da201..29732036e570 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.7.2_p1
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.2_p1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
 EAPI=7
 HOMEPAGE=https://github.com/pydata/numexpr
-IUSE=mkl python_targets_python3_8 python_targets_python3_9
+IUSE=mkl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] mkl? ( sci-libs/mkl ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] mkl? ( sci-libs/mkl ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.2.tar.gz -> numexpr-2.7.2.r1.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8b6b4355c9927431493efcd8c3524682
+_md5_=7bb098d3afc6ba081656ce88204cbfc6
diff --git a/metadata/md5-cache/dev-python/numexpr-2.7.3 b/metadata/md5-cache/dev-python/numexpr-2.7.3
new file mode 100644
index 000000000000..3278c4135a59
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numexpr-2.7.3
@@ -0,0 +1,14 @@
+BDEPEND=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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
+EAPI=7
+HOMEPAGE=https://github.com/pydata/numexpr
+IUSE=mkl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] mkl? ( sci-libs/mkl ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/pydata/numexpr/archive/v2.7.3.tar.gz -> numexpr-2.7.3.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=057ae7ac0a34f889e7cba18c28bccde7
diff --git a/metadata/md5-cache/dev-python/objgraph-3.5.0 b/metadata/md5-cache/dev-python/objgraph-3.5.0
index 6572ac73de27..85b704599fd0 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.5.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.5.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( media-gfx/xdot ) test? ( media-gfx/graphviz dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( media-gfx/xdot ) test? ( media-gfx/graphviz dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Draws Python object reference graphs with graphviz
 EAPI=7
 HOMEPAGE=https://mg.pov.lt/objgraph/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=media-gfx/graphviz python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/o/objgraph/objgraph-3.5.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3d3e260e5afc0f72268caf9a5dac3152
+_md5_=e816103c9f31f911678b6751d58f5225
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
index d9faf9bd10b1..8ce1796234d4 100644
--- a/metadata/md5-cache/dev-python/odfpy-1.3.6
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python API and tools to manipulate OpenDocument files
 EAPI=7
 HOMEPAGE=https://github.com/eea/odfpy https://pypi.org/project/odfpy/
-IUSE=examples test python_targets_python3_8 python_targets_python3_9
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/odfpy/odfpy-1.3.6.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=42e43d52fbef12cc9ac1018f78805a9b
+_md5_=f3d2507649273527ba9a9e4dab985c87
diff --git a/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20180905 b/metadata/md5-cache/dev-python/ovs-2.13.3
similarity index 68%
rename from metadata/md5-cache/dev-python/pymdown-lexers-0_pre20180905
rename to metadata/md5-cache/dev-python/ovs-2.13.3
index 66a36fd5d24d..d16ddf0f5073 100644
--- a/metadata/md5-cache/dev-python/pymdown-lexers-0_pre20180905
+++ b/metadata/md5-cache/dev-python/ovs-2.13.3
@@ -1,14 +1,15 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Additional lexers for use in Pygments
+DEPEND=dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=OVS bindings for python.
 EAPI=7
-HOMEPAGE=https://github.com/facelessuser/pymdown-lexers
+HOMEPAGE=https://github.com/openvswitch/ovs/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pygments-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/sortedcontainers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-lexers/archive/fa422cb95b794157760259c5c20a1235e4a459be.tar.gz -> pymdown-lexers-0_pre20180905.tar.gz
+SRC_URI=mirror://pypi/o/ovs/ovs-2.13.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a181d26421f50f7aa8197f06c9aa1a9
+_md5_=ffb450d734cefd4c7fd4b408085893de
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.3 b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
index d549a4b7f8f5..fdd29959cba2 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.3
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utilities for writing pandoc filters in python
 EAPI=7
 HOMEPAGE=https://github.com/jgm/pandocfilters
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1d5cb6facb3a07d83863ef82f7053774
+_md5_=0e1988f2efd6ec89d7fb844ce19c0208
diff --git a/metadata/md5-cache/dev-python/paramiko-2.7.2 b/metadata/md5-cache/dev-python/paramiko-2.7.2
index 18f3e4bd2aa1..3f33596b65ab 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.7.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.7.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pynacl-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10[threads(+)] dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cryptography-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pynacl-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SSH2 protocol library
 EAPI=7
 HOMEPAGE=https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
-IUSE=examples server doc test python_targets_python3_8 python_targets_python3_9
+IUSE=examples server doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pynacl-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cryptography-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pynacl-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/paramiko/paramiko/archive/2.7.2.tar.gz -> paramiko-2.7.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7d47d5ba03cfc6b918209b301c3663b8
+_md5_=ec26a4bf3651fb5791b19b5775a9547f
diff --git a/metadata/md5-cache/dev-python/parsedatetime-2.6 b/metadata/md5-cache/dev-python/parsedatetime-2.6
index ecf11916159d..4c9dfaa3e92e 100644
--- a/metadata/md5-cache/dev-python/parsedatetime-2.6
+++ b/metadata/md5-cache/dev-python/parsedatetime-2.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parse human-readable date/time strings
 EAPI=7
 HOMEPAGE=https://github.com/bear/parsedatetime
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bear/parsedatetime/archive/v2.6.tar.gz -> parsedatetime-2.6.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=35907719bded4f0ebd204eabf7957bba
+_md5_=a938e5abc09f5204d26fe9486c371dea
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1 b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
index 10c9fe1704aa..6d95240486f7 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implementation of PBKDF2, specified in RSA PKCS#5 v2.0
 EAPI=7
 HOMEPAGE=https://www.dlitz.net/software/python-pbkdf2/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbkdf2/pbkdf2-1.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4e663591a5391bc2f2a3484d5d1d5d13
+_md5_=e0f0876e0a3333b643bf9e913b96e74c
diff --git a/metadata/md5-cache/dev-python/pbr-5.5.1 b/metadata/md5-cache/dev-python/pbr-5.5.1
deleted file mode 100644
index 3d770de5ef28..000000000000
--- a/metadata/md5-cache/dev-python/pbr-5.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/wheel-0.32.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fixtures-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.12.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testresources-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testscenarios-0.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testtools-2.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-20.0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stestr-2.1.0 dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
-EAPI=7
-HOMEPAGE=https://github.com/openstack-dev/pbr
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pbr/pbr-5.5.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2f1b579ace22e32cbf8de7845c623d9a
diff --git a/metadata/md5-cache/dev-python/pbr-5.6.0 b/metadata/md5-cache/dev-python/pbr-5.6.0
index b70070d156a3..8406d2b03d1d 100644
--- a/metadata/md5-cache/dev-python/pbr-5.6.0
+++ b/metadata/md5-cache/dev-python/pbr-5.6.0
@@ -4,7 +4,7 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=7
 HOMEPAGE=https://github.com/openstack/pbr/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.6.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cd49c500cad40c1c45adf846b523b37d
+_md5_=12a5c8cb95bcc634a5a8a45b61495315
diff --git a/metadata/md5-cache/dev-python/pebble-4.6.1 b/metadata/md5-cache/dev-python/pebble-4.6.1
index a261a60fdc15..05354a110837 100644
--- a/metadata/md5-cache/dev-python/pebble-4.6.1
+++ b/metadata/md5-cache/dev-python/pebble-4.6.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Threading and multiprocessing eye-candy
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Pebble/ https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pebble/Pebble-4.6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a59bc63981c3cb3d2690069cfbc2d438
+_md5_=d2b29f7e3bfb71d197455c5f909776f9
diff --git a/metadata/md5-cache/dev-python/peewee-3.14.4 b/metadata/md5-cache/dev-python/peewee-3.14.4
index fd7e04d40548..349dc6361d11 100644
--- a/metadata/md5-cache/dev-python/peewee-3.14.4
+++ b/metadata/md5-cache/dev-python/peewee-3.14.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psycopg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/psycopg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10[sqlite] dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small Python ORM
 EAPI=7
 HOMEPAGE=https://github.com/coleifer/peewee/
-IUSE=examples test doc python_targets_python3_8 python_targets_python3_9
+IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/coleifer/peewee/archive/3.14.4.tar.gz -> peewee-3.14.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=02ccf3639668ccf46a8534a1ef15cf62
+_md5_=07a9d9ec3d7ee29644e2b49cab493f6b
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3-r1 b/metadata/md5-cache/dev-python/piexif-1.1.3-r1
index 8d333dc78aa0..84aa96bb4005 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.3-r1
+++ b/metadata/md5-cache/dev-python/piexif-1.1.3-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/unzip test? ( dev-python/pillow[jpeg,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] app-arch/unzip test? ( dev-python/pillow[jpeg,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
 DESCRIPTION=Exif manipulation with pure Python
 EAPI=7
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.1.3.zip
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dbc1adba4c6b10637d343c50173614b6
+_md5_=612b9ce695c4cf3c46b1515f0c2bd9ce
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.12.1 b/metadata/md5-cache/dev-python/pikepdf-2.12.1
index 18965fbe1b26..65ff3d311aa9 100644
--- a/metadata/md5-cache/dev-python/pikepdf-2.12.1
+++ b/metadata/md5-cache/dev-python/pikepdf-2.12.1
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools_scm-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools_scm-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-),jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/qpdf:0=
 DESCRIPTION=Python library to work with pdf files based on qpdf
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/pikepdf/pikepdf/archive/v2.12.1.tar.gz -> pikepdf-2.12.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87655fb474ef10260f86f42ff90617ee
+_md5_=75d042f1399c478cdc8f3100268059e4
diff --git a/metadata/md5-cache/dev-python/pikepdf-2.12.2 b/metadata/md5-cache/dev-python/pikepdf-2.12.2
new file mode 100644
index 000000000000..d673c7566dd8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-2.12.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools_scm-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-),jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/qpdf:0=
+DESCRIPTION=Python library to work with pdf files based on qpdf
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/pikepdf/pikepdf/archive/v2.12.2.tar.gz -> pikepdf-2.12.2.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=75d042f1399c478cdc8f3100268059e4
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
index a1d75696ca33..c161717b1dd6 100644
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ b/metadata/md5-cache/dev-python/pilkit-2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)?,-python_single_target_python3_8(-),jpeg,zlib] ) test? ( dev-python/pillow[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-),jpeg,zlib] ) test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A collection of utilities and processors for the Python Imaging Libary
 EAPI=7
 HOMEPAGE=https://github.com/matthewwithanm/pilkit
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4a93dd0d817255e18bf3cabc18c12c53
+_md5_=a561f998c3184b0b1d111ec8ed94a434
diff --git a/metadata/md5-cache/dev-python/plotly-4.14.3 b/metadata/md5-cache/dev-python/plotly-4.14.3
index 8b757abb17e3..72afc01ed42f 100644
--- a/metadata/md5-cache/dev-python/plotly-4.14.3
+++ b/metadata/md5-cache/dev-python/plotly-4.14.3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Browser-based graphing library for Python
 EAPI=7
 HOMEPAGE=https://plot.ly/python/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/retrying[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/retrying[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-4.14.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f9e65994650debd4049aaab50f64f16e
+_md5_=44834e157560ea7cfe2c80b50bd744f8
diff --git a/metadata/md5-cache/dev-python/prettytable-2.1.0 b/metadata/md5-cache/dev-python/prettytable-2.1.0
index 88aa9d216931..cc3de30ca5cb 100644
--- a/metadata/md5-cache/dev-python/prettytable-2.1.0
+++ b/metadata/md5-cache/dev-python/prettytable-2.1.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) ) test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) 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] ) ) test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easily displaying tabular data in a visually appealing ASCII table format
 EAPI=7
 HOMEPAGE=https://github.com/jazzband/prettytable/ https://pypi.org/project/prettytable/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prettytable/prettytable-2.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=abb9e863b921d34c88700b60c481b0c2
+_md5_=572e7e97ee08a57a0f30ae155b182086
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.1 b/metadata/md5-cache/dev-python/process-tests-2.1.1
deleted file mode 100644
index 5cbe92f12e07..000000000000
--- a/metadata/md5-cache/dev-python/process-tests-2.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tools for testing processes
-EAPI=7
-HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e2e7cb102920a446b28c22a397704a6a
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.2 b/metadata/md5-cache/dev-python/process-tests-2.1.2
index 7ffd7c761bb5..0be52837a595 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.2
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for testing processes
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=36d7a7bb8c358ce40b01f2a91e3d9f16
+_md5_=e2e7cb102920a446b28c22a397704a6a
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
deleted file mode 100644
index 2402223cca02..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/24
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=635aa96f533d704810af18fc87e558a6
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.14.0 b/metadata/md5-cache/dev-python/protobuf-python-3.14.0
deleted file mode 100644
index 7b692ecf3e6c..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.14.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.14.0
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.14.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/25
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.14.0.tar.gz -> protobuf-3.14.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c5f61275fdc79e9b54f3d8da49d5c75d
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.3 b/metadata/md5-cache/dev-python/protobuf-python-3.15.3
deleted file mode 100644
index b10aed2c79bd..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.3 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.3
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.3 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.3.tar.gz -> protobuf-3.15.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.4 b/metadata/md5-cache/dev-python/protobuf-python-3.15.4
deleted file mode 100644
index c5f8e72ccdbc..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.4 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.4
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.4 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.4.tar.gz -> protobuf-3.15.4.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.5 b/metadata/md5-cache/dev-python/protobuf-python-3.15.5
deleted file mode 100644
index 77b462284962..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.5 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.5
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.5 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz -> protobuf-3.15.5.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.6 b/metadata/md5-cache/dev-python/protobuf-python-3.15.6
deleted file mode 100644
index 643e576ae0c0..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.6 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.6
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.6 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.6.tar.gz -> protobuf-3.15.6.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.7 b/metadata/md5-cache/dev-python/protobuf-python-3.15.7
deleted file mode 100644
index 11a2380adc85..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.7 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.7
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.7 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.7.tar.gz -> protobuf-3.15.7.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.8 b/metadata/md5-cache/dev-python/protobuf-python-3.15.8
index 9da392df6e52..1d15e3ed36c0 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.8
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.15.8
@@ -7,9 +7,9 @@ HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/prot
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.8 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.8 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/26
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz -> protobuf-3.15.8.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ef44d2d6cc9aae2face3edf0d742db0c
+_md5_=c480f708c40fd7d31af84f502471940f
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.16.0 b/metadata/md5-cache/dev-python/protobuf-python-3.16.0
index b1cc0d5d91f0..44734f889991 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.16.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.16.0
@@ -7,9 +7,9 @@ HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/prot
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.16.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.16.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/27
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz -> protobuf-3.16.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4e5600e2f51813ae8bfd509aeda79079
+_md5_=feea8a4bbb4a0edea438435fcc1de3c1
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.0 b/metadata/md5-cache/dev-python/protobuf-python-3.17.0
similarity index 82%
rename from metadata/md5-cache/dev-python/protobuf-python-3.15.0
rename to metadata/md5-cache/dev-python/protobuf-python-3.17.0
index aed8c469db06..a724acc7db8a 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.0
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.0
 DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.0 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.0.tar.gz -> protobuf-3.15.0.tar.gz
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.0.tar.gz -> protobuf-3.17.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
+_md5_=13dbeebeb86f8355a03948e1eefcbd85
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.1 b/metadata/md5-cache/dev-python/protobuf-python-3.17.1
similarity index 82%
rename from metadata/md5-cache/dev-python/protobuf-python-3.15.1
rename to metadata/md5-cache/dev-python/protobuf-python-3.17.1
index 6e3cbad44f19..9751f879216c 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.1 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.1 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.1
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.1
 DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.1 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.1 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.1.tar.gz -> protobuf-3.15.1.tar.gz
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.1.tar.gz -> protobuf-3.17.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
+_md5_=13dbeebeb86f8355a03948e1eefcbd85
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.15.2 b/metadata/md5-cache/dev-python/protobuf-python-3.17.2
similarity index 82%
rename from metadata/md5-cache/dev-python/protobuf-python-3.15.2
rename to metadata/md5-cache/dev-python/protobuf-python-3.17.2
index d4ce3ca503df..3e6e470f1cfe 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.15.2
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.17.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.2 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.2 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.2
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.2
 DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.15.2 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.17.2 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/26
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.15.2.tar.gz -> protobuf-3.15.2.tar.gz
+SLOT=0/28
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.17.2.tar.gz -> protobuf-3.17.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3f3abc331e5d7728f4745e95fb5d477b
+_md5_=13dbeebeb86f8355a03948e1eefcbd85
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index 041d83012727..f9ec1a56864f 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/prot
 IUSE=python_targets_python3_8 python_targets_python3_9
 LICENSE=BSD
 PROPERTIES=live
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/28
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=00667064453fdc5fd78cf82f56c42bce
+_md5_=cf294badf816c5058299a11354a8ebad
diff --git a/metadata/md5-cache/dev-python/pulsectl-21.5.14 b/metadata/md5-cache/dev-python/pulsectl-21.5.18
similarity index 97%
rename from metadata/md5-cache/dev-python/pulsectl-21.5.14
rename to metadata/md5-cache/dev-python/pulsectl-21.5.18
index 2424b94fe42e..709bcc1f73f0 100644
--- a/metadata/md5-cache/dev-python/pulsectl-21.5.14
+++ b/metadata/md5-cache/dev-python/pulsectl-21.5.18
@@ -10,6 +10,6 @@ RDEPEND=media-sound/pulseaudio python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.5.14.tar.gz
+SRC_URI=mirror://pypi/p/pulsectl/pulsectl-21.5.18.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c8271237beeff3bcdbce8838ff697876
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0 b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
index 721d94b2c114..b8a510ab0c3a 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Get CPU info with pure Python 2 & 3
 EAPI=7
 HOMEPAGE=https://github.com/workhorsy/py-cpuinfo/ https://pypi.org/project/py-cpuinfo/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-8.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0790a2392a72d48443f1ba143ed154d4
+_md5_=6a6d8b6b551bba10051fe2889d8fe507
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2 b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
index d8a4615a80bc..b92e9444285b 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.1-r2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pycryptodome[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=test? ( dev-python/pycryptodome[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
 DESCRIPTION=Pure-Python Implementation of the AES block-cipher and common modes of operation
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyaes/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaes/pyaes-1.6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=71b83d0db73fa531c299e264ff4c9215
+_md5_=488c7b1d1513d8e15ac362130b17394a
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1 b/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
index 9e836f4722a5..2ff50edf1f9a 100644
--- a/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
+++ b/metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/alsa-lib dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings for ALSA library
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.1.6.tar.bz2
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=17a50dae04fd534c8ccc8b4375e0b4bd
+_md5_=c12e3c94fdcf8effa1ed950ed583cf2b
diff --git a/metadata/md5-cache/dev-python/pybtex-0.24.0 b/metadata/md5-cache/dev-python/pybtex-0.24.0
index 1caa1e1123d4..6d0345424dbf 100644
--- a/metadata/md5-cache/dev-python/pybtex-0.24.0
+++ b/metadata/md5-cache/dev-python/pybtex-0.24.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/latexcodec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/latexcodec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BibTeX-compatible bibliography processor
 EAPI=7
 HOMEPAGE=https://pybtex.org https://pypi.org/project/pybtex/
-IUSE=test test python_targets_python3_8 python_targets_python3_9
+IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/latexcodec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/latexcodec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.24.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=87c8acef7ee47ef2025f240394b8c12d
+_md5_=f7dd10a98498583cc51cc1e256b7613b
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-0.2.2 b/metadata/md5-cache/dev-python/pybtex-docutils-0.2.2
deleted file mode 100644
index 422c67f9f23c..000000000000
--- a/metadata/md5-cache/dev-python/pybtex-docutils-0.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybtex[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A docutils backend for pybtex
-EAPI=7
-HOMEPAGE=https://github.com/mcmtroffaes/pybtex-docutils
-IUSE=test doc python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybtex[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-0.2.2.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0a28b1bdd566d525175aaf5882bf4901
diff --git a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0 b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
index 60337521e33a..1498c1368fa7 100644
--- a/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
+++ b/metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A docutils backend for pybtex
 EAPI=7
 HOMEPAGE=https://github.com/mcmtroffaes/pybtex-docutils
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pybtex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pybtex-docutils/pybtex-docutils-1.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=213d9c89711e81aca1eb99e85e45e1dd
+_md5_=20d87d4565967f3ef6dc857156e52bb4
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.7.0 b/metadata/md5-cache/dev-python/pycodestyle-2.7.0
index 8d4984a9b1f3..bc846da3120a 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.7.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.7.0
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python style guide checker (fka pep8)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pycodestyle/
-IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.7.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2ca4bad49ad4863c1f7b4865362e32a0
+_md5_=26bbf307dc5607f91d2dd39fb50e0303
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.5.2 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.5.2
deleted file mode 100644
index 6132ea9492de..000000000000
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/beautifulsoup[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/docutils-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bootstrap-based Sphinx theme from the PyData community
-EAPI=7
-HOMEPAGE=https://github.com/pandas-dev/pydata-sphinx-theme
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD-with-disclosure
-RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/docutils-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pandas-dev/pydata-sphinx-theme/archive/v0.5.2.tar.gz -> pydata-sphinx-theme-0.5.2.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=313c35b5203ca87387c9c478e8d4c14b
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
index af355375af8a..208113a17a4c 100644
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Bootstrap-based Sphinx theme from the PyData community
 EAPI=7
 HOMEPAGE=https://github.com/pydata/pydata-sphinx-theme
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-with-disclosure
 RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/docutils-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/pydata/pydata-sphinx-theme/archive/v0.6.3.tar.gz -> pydata-sphinx-theme-0.6.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ef31a49e26ffaa25134b43f49d6e5a7d
+_md5_=f88ad066d362cd74930ee644e5e3363b
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.2 b/metadata/md5-cache/dev-python/pydot-1.4.2
index fb1dd3380514..4e84370a4e72 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.2
+++ b/metadata/md5-cache/dev-python/pydot-1.4.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pyparsing-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pyparsing-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=7
 HOMEPAGE=https://github.com/pydot/pydot https://pypi.org/project/pydot/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=MIT
-RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/pydot/pydot/archive/v1.4.2.tar.gz -> pydot-1.4.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=66779a3abe34621ba7f2b8951b9d329a
+_md5_=77e68551281d1430a9d60930d703db57
diff --git a/metadata/md5-cache/dev-python/pydotplus-2.0.2 b/metadata/md5-cache/dev-python/pydotplus-2.0.2
index 10f1d1b19ef1..6e9ef7b45032 100644
--- a/metadata/md5-cache/dev-python/pydotplus-2.0.2
+++ b/metadata/md5-cache/dev-python/pydotplus-2.0.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Improved version of the old pydot project
 EAPI=7
 HOMEPAGE=https://pydotplus.readthedocs.org/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydotplus/pydotplus-2.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c3ce39e3eb5df6a13576cda8beee6c5
+_md5_=010392e3a4088ffe9c74f53c4b511174
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.27 b/metadata/md5-cache/dev-python/pyelftools-0.27
index a3cd7c7cded8..a7eb493cd132 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.27
+++ b/metadata/md5-cache/dev-python/pyelftools-0.27
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pure-Python library for analyzing ELF files and DWARF debugging information
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools
-IUSE=examples python_targets_python3_8 python_targets_python3_9
+IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/eliben/pyelftools/archive/v0.27.tar.gz -> pyelftools-0.27.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=031ccfeab7f3802d9daf092d7791b905
+_md5_=a7d19ea261acf616820a054c749c88e4
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.2.0 b/metadata/md5-cache/dev-python/pyenchant-3.2.0
index d111e3074124..dd006ec36c44 100644
--- a/metadata/md5-cache/dev-python/pyenchant-3.2.0
+++ b/metadata/md5-cache/dev-python/pyenchant-3.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( app-dicts/myspell-en ) test? ( app-text/enchant:* >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( app-dicts/myspell-en ) test? ( app-text/enchant:* >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings for the Enchant spellchecking system
 EAPI=7
 HOMEPAGE=https://github.com/pyenchant/pyenchant https://pypi.org/project/pyenchant/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=app-text/enchant:* python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/enchant:* python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyenchant/pyenchant/archive/v3.2.0.tar.gz -> pyenchant-3.2.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fb4d030230d9bb9735e2f59cff06e0f5
+_md5_=1f2f80b88021233dc8af2cdc408a4828
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.5.0 b/metadata/md5-cache/dev-python/pyfakefs-4.5.0
new file mode 100644
index 000000000000..fb3728f0f9b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a fake file system that mocks the Python file system modules
+EAPI=7
+HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.5.0.tar.gz -> pyfakefs-4.5.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=cf4526543a54a445a069e8cc6108d4b7
diff --git a/metadata/md5-cache/dev-python/pygit2-1.6.0 b/metadata/md5-cache/dev-python/pygit2-1.6.0
index 6c4105e7970f..afc6d9b10114 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.6.0
+++ b/metadata/md5-cache/dev-python/pygit2-1.6.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( =dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( =dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings for libgit2
 EAPI=7
 HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND==dev-libs/libgit2-1.1* dev-python/cached-property[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cffi-1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.6.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9bb6b521aad62f4d31cc27dfa96e16e8
+_md5_=158a1d6ca3bcd76cf9163026553e8b2f
diff --git a/metadata/md5-cache/dev-python/pygments-2.8.1 b/metadata/md5-cache/dev-python/pygments-2.8.1
deleted file mode 100644
index c612620723d5..000000000000
--- a/metadata/md5-cache/dev-python/pygments-2.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( virtual/ttf-fonts ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pygments is a syntax highlighting package written in Python
-EAPI=7
-HOMEPAGE=https://pygments.org/ https://github.com/pygments/pygments/ https://pypi.org/project/Pygments/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/Pygments/Pygments-2.8.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f2470f5c4fb50d9cfa8e5b80ec3e74b4
diff --git a/metadata/md5-cache/dev-python/pygments-2.9.0 b/metadata/md5-cache/dev-python/pygments-2.9.0
index e4f7f498417d..51cdbcc32da2 100644
--- a/metadata/md5-cache/dev-python/pygments-2.9.0
+++ b/metadata/md5-cache/dev-python/pygments-2.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=7
 HOMEPAGE=https://pygments.org/ https://github.com/pygments/pygments/ https://pypi.org/project/Pygments/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.9.0.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2b9174ff09148aa2e3bd737763a14caa
+_md5_=1bb14a2e9e6da5515130bb6d4c990d5f
diff --git a/metadata/md5-cache/dev-python/pyh2o-1 b/metadata/md5-cache/dev-python/pyh2o-1
index e780de480046..81549d24316b 100644
--- a/metadata/md5-cache/dev-python/pyh2o-1
+++ b/metadata/md5-cache/dev-python/pyh2o-1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=sci-libs/libh2o-0.2.1:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=sci-libs/libh2o-0.2.1:= >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sci-libs/libh2o-0.2.1:=
 DESCRIPTION=Python API for sci-libs/libh2o
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pyh2o/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=sci-libs/libh2o-0.2.1:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=sci-libs/libh2o-0.2.1:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/mgorny/pyh2o/archive/v1.tar.gz -> pyh2o-1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f243393da727cbc299259f5859ed54c1
+_md5_=16c168b3baad37a2974596c5db20a3da
diff --git a/metadata/md5-cache/dev-python/pyjwt-2.0.1 b/metadata/md5-cache/dev-python/pyjwt-2.0.1
deleted file mode 100644
index 3688b820a0e7..000000000000
--- a/metadata/md5-cache/dev-python/pyjwt-2.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=JSON Web Token implementation in Python
-EAPI=7
-HOMEPAGE=https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyJWT/PyJWT-2.0.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0424058a9dd3fd0b1df9a4e26fc3b3c9
diff --git a/metadata/md5-cache/dev-python/pyjwt-2.1.0 b/metadata/md5-cache/dev-python/pyjwt-2.1.0
index 7a95d6ccb556..408d95fc82f4 100644
--- a/metadata/md5-cache/dev-python/pyjwt-2.1.0
+++ b/metadata/md5-cache/dev-python/pyjwt-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=JSON Web Token implementation in Python
 EAPI=7
 HOMEPAGE=https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/
 IUSE=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
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!dev-python/python-jwt python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-2.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d971ce93c688675b976933a7d5e1dc25
+_md5_=e124113d12b57c937adc93e4ef23416c
diff --git a/metadata/md5-cache/dev-python/pykka-3.0.1 b/metadata/md5-cache/dev-python/pykka-3.0.1
index 74bc271da491..b1034444ba61 100644
--- a/metadata/md5-cache/dev-python/pykka-3.0.1
+++ b/metadata/md5-cache/dev-python/pykka-3.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python implementation of the actor model
 EAPI=7
 HOMEPAGE=https://www.pykka.org/en/latest/ https://github.com/jodal/pykka/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/jodal/pykka/archive/v3.0.1.tar.gz -> pykka-3.0.1.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cf09753bab956204848bf3c971723ec2
+_md5_=2343551a042b8a31fab0c893aa019ae0
diff --git a/metadata/md5-cache/dev-python/pylast-4.2.0 b/metadata/md5-cache/dev-python/pylast-4.2.0
deleted file mode 100644
index 4d269cc04683..000000000000
--- a/metadata/md5-cache/dev-python/pylast-4.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to last.fm and other api-compatible websites
-EAPI=7
-HOMEPAGE=https://github.com/pylast/pylast
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pylast/pylast/archive/4.2.0.tar.gz -> pylast-4.2.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=82fcbf2f71f53ad6c786557fe107be10
diff --git a/metadata/md5-cache/dev-python/pylast-4.2.1 b/metadata/md5-cache/dev-python/pylast-4.2.1
index ba71eb539d6c..ad75441b02a4 100644
--- a/metadata/md5-cache/dev-python/pylast-4.2.1
+++ b/metadata/md5-cache/dev-python/pylast-4.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to last.fm and other api-compatible websites
 EAPI=7
 HOMEPAGE=https://github.com/pylast/pylast
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylast/pylast/archive/4.2.1.tar.gz -> pylast-4.2.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bded4e93816d050e3654911e108ae3e9
+_md5_=06d86c35b7eeabc56461655cb79eb70a
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1 b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
index df1e39dc2e79..976c816a8ff8 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( net-misc/memcached dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( net-misc/memcached ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-libs/libmemcached-0.32 >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/libmemcached-0.32
 DESCRIPTION=Libmemcached wrapper written as a Python extension
 EAPI=7
 HOMEPAGE=https://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/ https://github.com/lericson/pylibmc/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/lericson/pylibmc/archive/1.6.1.tar.gz -> pylibmc-1.6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b58a4476d4f6595d8a78fc612087e607
+_md5_=1389584addd74f650931eb62faea2762
diff --git a/metadata/md5-cache/dev-python/pylint-2.7.4 b/metadata/md5-cache/dev-python/pylint-2.7.4
deleted file mode 100644
index b0942db7a138..000000000000
--- a/metadata/md5-cache/dev-python/pylint-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( dev-python/sphinx ) test? ( <dev-python/astroid-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/astroid-2.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python code static checker
-EAPI=7
-HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=<dev-python/astroid-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/astroid-2.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pylint/pylint-2.7.4.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bce239442dfe7b88c3f609605792cecb
diff --git a/metadata/md5-cache/dev-python/pylint-2.8.2 b/metadata/md5-cache/dev-python/pylint-2.8.2
index 8999b68bf543..e50c3a7e72e2 100644
--- a/metadata/md5-cache/dev-python/pylint-2.8.2
+++ b/metadata/md5-cache/dev-python/pylint-2.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python code static checker
 EAPI=7
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/astroid-2.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.8.2.tar.gz -> pylint-2.8.2.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=afbfe8207b93d662fa6610f64bf76cea
+_md5_=b7e630a77df0067f4c9b3dbc56c933cc
diff --git a/metadata/md5-cache/dev-python/pyls-black-0.4.7 b/metadata/md5-cache/dev-python/pyls-black-0.4.7
new file mode 100644
index 000000000000..fa49ea2bea41
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyls-black-0.4.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Black plugin for the Python Language Server
+EAPI=7
+HOMEPAGE=https://github.com/rupert/pyls-black https://pypi.org/project/pyls-black/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-language-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/black-21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rupert/pyls-black/archive/v0.4.7.tar.gz -> pyls-black-0.4.7.gh.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6d44b1c0718aec8fb9836ae73d4ea9d8
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.4 b/metadata/md5-cache/dev-python/pymongo-3.11.4
index b5d6fb73aea1..c927fc99b49e 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.11.4
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.4
@@ -4,7 +4,7 @@ DESCRIPTION=Python driver for MongoDB
 EAPI=7
 HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/
 IUSE=doc kerberos doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm64 ~hppa x86
 LICENSE=Apache-2.0
 RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_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/mongodb/mongo-python-driver/archive/3.11.4.tar.gz -> mongo-python-driver-3.11.4.tar.gz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a76ca13b7e5dbcf736ee582a5aef7bc7
+_md5_=d1b78685e3434eeae15f548491ddc56d
diff --git a/metadata/md5-cache/dev-python/pymysql-1.0.2 b/metadata/md5-cache/dev-python/pymysql-1.0.2
index 17a33bed0700..808af81aa958 100644
--- a/metadata/md5-cache/dev-python/pymysql-1.0.2
+++ b/metadata/md5-cache/dev-python/pymysql-1.0.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-db/mariadb[server] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-db/mariadb[server] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure-Python MySQL Driver
 EAPI=7
 HOMEPAGE=https://github.com/PyMySQL/PyMySQL
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v1.0.2.tar.gz -> pymysql-1.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f1989cdc3a24d9329f656eb34982b92a
+_md5_=95e522cd4d334752b1244e6c0e3f317f
diff --git a/metadata/md5-cache/dev-python/pynacl-1.4.0 b/metadata/md5-cache/dev-python/pynacl-1.4.0
index f5b430edcec1..60a2f11ac8a7 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.4.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.4.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-libs/libsodium:0/23 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-libs/libsodium:0/23 >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/hypothesis-3.27.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/hypothesis-3.27.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
 DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=7
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-libs/libsodium:0/23 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/cffi-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-libs/libsodium:0/23 python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/pyca/pynacl/archive/1.4.0.tar.gz -> pynacl-1.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e3b51bb7f3922fe538de34c9c0fdfd3b
+_md5_=ff4c14f44ba4a073815fa907c03cb451
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.1.3 b/metadata/md5-cache/dev-python/pyopencl-2021.1.3
index 4dab48f3fa6f..f204ee2b6995 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2021.1.3
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.1.3
@@ -1,6 +1,6 @@
 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] opengl? ( media-libs/libglvnd )
 DESCRIPTION=Python wrapper for OpenCL
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.1.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57017d4f130ad0d49041c433bc9b7c14
+_md5_=d125c70a4c1a0db1523fd1dd60da8c89
diff --git a/metadata/md5-cache/dev-python/pyopencl-2021.2.2 b/metadata/md5-cache/dev-python/pyopencl-2021.2.2
index 78174e1f566f..a45c39302fb8 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2021.2.2
+++ b/metadata/md5-cache/dev-python/pyopencl-2021.2.2
@@ -1,6 +1,6 @@
 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=virtual/opencl-2 dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] opengl? ( media-libs/libglvnd )
 DESCRIPTION=Python wrapper for OpenCL
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2021.2.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37f1de68c13150e79308b801f55b6195
+_md5_=12c7ba2a3db57a15210c07c639192a55
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.8.2 b/metadata/md5-cache/dev-python/pyperclip-1.8.2
index 20b2d07f4e39..bb496a92f786 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.8.2
+++ b/metadata/md5-cache/dev-python/pyperclip-1.8.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( || ( ( x11-misc/xsel sys-apps/which ) ( x11-misc/xclip sys-apps/which ) ( kde-plasma/plasma-workspace sys-apps/which ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( || ( ( x11-misc/xsel sys-apps/which ) ( x11-misc/xclip sys-apps/which ) ( kde-plasma/plasma-workspace sys-apps/which ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A cross-platform clipboard module for Python.
 EAPI=7
 HOMEPAGE=https://github.com/asweigart/pyperclip
-IUSE=python_targets_python3_8 python_targets_python3_9 test
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=|| ( ( x11-misc/xsel sys-apps/which ) ( x11-misc/xclip sys-apps/which ) ( kde-plasma/plasma-workspace sys-apps/which ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=|| ( ( x11-misc/xsel sys-apps/which ) ( x11-misc/xclip sys-apps/which ) ( kde-plasma/plasma-workspace sys-apps/which ) dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.8.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=d906595325eed50caf306a7a7674be8a
+_md5_=6c63c63706fd9f927c499cf0a14160e5
diff --git a/metadata/md5-cache/dev-python/pyphen-0.10.0 b/metadata/md5-cache/dev-python/pyphen-0.10.0
index 28ede6906b35..f51dc4badf9d 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.10.0
+++ b/metadata/md5-cache/dev-python/pyphen-0.10.0
@@ -1,16 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Python module for hyphenation using hunspell dictionaries
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/Pyphen
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MPL-1.1
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Kozea/Pyphen/archive/0.10.0.tar.gz -> pyphen-0.10.0.tar.gz
+SRC_URI=https://github.com/Kozea/Pyphen/archive/0.10.0.tar.gz -> Pyphen-0.10.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a554c57283eef5be3102c87421dc84ff
+_md5_=3a32c6856f53e9b40658edef9f89fe78
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.1 b/metadata/md5-cache/dev-python/pyrfc3339-1.1
index 0f9a7a8a906e..a5416cb3ccdf 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.1
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Generates and parses RFC 3339 timestamps
 EAPI=7
 HOMEPAGE=https://github.com/kurtraschke/pyRFC3339
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1c0bc2f0b6f0863024d6f8600720c2ac
+_md5_=5bf3f823938d81784c3ab5ab8b22d0f4
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.5.1 b/metadata/md5-cache/dev-python/pytest-mock-3.5.1
deleted file mode 100644
index a286c0c6cdb5..000000000000
--- a/metadata/md5-cache/dev-python/pytest-mock-3.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.5.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0459106263bfa82d6fe3558fb8c2639b
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.6.0 b/metadata/md5-cache/dev-python/pytest-mock-3.6.0
deleted file mode 100644
index 88b2c9a97dce..000000000000
--- a/metadata/md5-cache/dev-python/pytest-mock-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
-EAPI=7
-HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.6.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=292c6ee263f74aa662b8ab983282b2e7
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.6.1 b/metadata/md5-cache/dev-python/pytest-mock-3.6.1
index 280df6625a58..85c73da57414 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-3.6.1
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=db96abaa4c8ee44339685823bb9d6dae
+_md5_=02399bd23e08cde40e56b02f90674eea
diff --git a/metadata/md5-cache/dev-python/pytest-qt-3.3.0 b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
index d3bbe72f5b1e..d099edbf0884 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-3.3.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
@@ -1,16 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/PyQt5[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_python3_8? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) test? ( dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
+DESCRIPTION=pytest plugin for PyQt5 and PySide2 applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-qt/ https://github.com/pytest-dev/pytest-qt/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 test
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/p/pytest-qt/pytest-qt-3.3.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=cd5a62e9ab611038663ce60bee142680
+_md5_=a297a389258a5b47098362584cd4085f
diff --git a/metadata/md5-cache/dev-python/pytest-qt-4.0.0 b/metadata/md5-cache/dev-python/pytest-qt-4.0.0
new file mode 100644
index 000000000000..6aceb4cd1bcd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-qt-4.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/PyQt5[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_python3_8? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) test? ( dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pytest plugin for PyQt5 and PySide2 applications
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-qt/ https://github.com/pytest-dev/pytest-qt/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/p/pytest-qt/pytest-qt-4.0.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_md5_=cb9f8c64063becf02b85929f5271f801
diff --git a/metadata/md5-cache/dev-python/pytest-testmon-1.0.3 b/metadata/md5-cache/dev-python/pytest-testmon-1.0.3
deleted file mode 100644
index 61c042054eff..000000000000
--- a/metadata/md5-cache/dev-python/pytest-testmon-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-mixins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Take TDD to a new level with py.test and testmon
-EAPI=7
-HOMEPAGE=https://github.com/tarpas/pytest-testmon
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-testmon/pytest-testmon-1.0.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4ee247298784b508980045afe5348b2
diff --git a/metadata/md5-cache/dev-python/python-efl-1.25.0 b/metadata/md5-cache/dev-python/python-efl-1.25.0
index 675002372e0d..07e3a8553d36 100644
--- a/metadata/md5-cache/dev-python/python-efl-1.25.0
+++ b/metadata/md5-cache/dev-python/python-efl-1.25.0
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Python bindings for Enlightenment Foundation Libraries
 EAPI=7
 HOMEPAGE=https://phab.enlightenment.org/w/projects/python_bindings_for_efl/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.25.0.tar.xz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=247872b3291a73f953919d72f2fe6fe6
+_md5_=010a31abd750d9963f8a0f46ffc1a1b8
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.1.2 b/metadata/md5-cache/dev-python/python-email-validator-1.1.2
index aa35f69cced7..e8b6455af958 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.1.2
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.1.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A robust email syntax and deliverability validation library
 EAPI=7
 HOMEPAGE=https://github.com/JoshData/python-email-validator
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=CC0-1.0
-RDEPEND=>=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/idna-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/JoshData/python-email-validator/archive/v1.1.2.tar.gz -> python-email-validator-1.1.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=012397768c449bd0e967e2fb75780f6d
+_md5_=38741d31b6e2834446500c50cbae954f
diff --git a/metadata/md5-cache/dev-python/python-jose-3.3.0 b/metadata/md5-cache/dev-python/python-jose-3.3.0
new file mode 100644
index 000000000000..c4f2ef301741
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-jose-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pycryptodome-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A JavaScript Object Signing and Encryption (JOSE) implementation in Python
+EAPI=7
+HOMEPAGE=https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pycryptodome-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/mpdavis/python-jose/archive/3.3.0.tar.gz -> python-jose-3.3.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=76a824f0c4a7d84d604704a971212e58
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
index 95a049908256..40bc4caa6fae 100644
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python 2 and 3 asynchronous JSON RPC server
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-jsonrpc-server
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2db22ec49ef6ae9fc84b747e75681917
+_md5_=12ece748a0aca074f5f1351383b18cc4
diff --git a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0 b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
index 6d237d773eff..b0e7237cf277 100644
--- a/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
+++ b/metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pycodestyle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyflakes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON RPC 2.0 server library
 EAPI=7
 HOMEPAGE=https://github.com/python-lsp/python-lsp-jsonrpc
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ff6567110c841c1d4e4fbafdccec6f80
+_md5_=923574017dc9afb2628e5aba36458220
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.59-r1 b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
index d00a3881e765..092f220cebe0 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.59-r1
+++ b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/memcached ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] net-misc/memcached ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python memcached client
 EAPI=7
 HOMEPAGE=https://www.tummy.com/Community/software/python-memcached/ https://pypi.org/project/python-memcached/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=OSL-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linsomniac/python-memcached/archive/1.59.tar.gz -> python-memcached-1.59-gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=67070f86664083adbe0e7d4e21867f98
+_md5_=13d63d0477c631c93eacd8604a59ce20
diff --git a/metadata/md5-cache/dev-python/python-mpd-3.0.4 b/metadata/md5-cache/dev-python/python-mpd-3.0.4
index 809315d45421..dadbbc119e0d 100644
--- a/metadata/md5-cache/dev-python/python-mpd-3.0.4
+++ b/metadata/md5-cache/dev-python/python-mpd-3.0.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( dev-python/sphinx ) test? ( twisted? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( dev-python/sphinx ) test? ( twisted? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python MPD client library
 EAPI=7
 HOMEPAGE=https://github.com/Mic92/python-mpd2/ https://pypi.org/project/python-mpd2/
-IUSE=examples +twisted doc test python_targets_python3_8 python_targets_python3_9
+IUSE=examples +twisted doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=LGPL-3+
-RDEPEND=twisted? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=twisted? ( dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Mic92/python-mpd2/archive/v3.0.4.tar.gz -> python-mpd2-3.0.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0b3a81a4325c9632b203587d4cc8ba5a
+_md5_=b452d82c818573a09a45808a30b50990
diff --git a/metadata/md5-cache/dev-python/python-slugify-1.2.6 b/metadata/md5-cache/dev-python/python-slugify-1.2.6
deleted file mode 100644
index 261a5d9b846e..000000000000
--- a/metadata/md5-cache/dev-python/python-slugify-1.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=A Python Slugify application that handles Unicode
-EAPI=7
-HOMEPAGE=https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/un33k/python-slugify/archive/1.2.6.tar.gz -> python-slugify-1.2.6.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=dd999a039940b6fa1d2c77926f7f5852
diff --git a/metadata/md5-cache/dev-python/python-slugify-5.0.0 b/metadata/md5-cache/dev-python/python-slugify-5.0.0
index 068d4cd646b8..9778f3d8c1c5 100644
--- a/metadata/md5-cache/dev-python/python-slugify-5.0.0
+++ b/metadata/md5-cache/dev-python/python-slugify-5.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Python Slugify application that handles Unicode
 EAPI=7
 HOMEPAGE=https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/text-unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/un33k/python-slugify/archive/5.0.0.tar.gz -> python-slugify-5.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=94507eec08591644a770b16915777465
+_md5_=a38bdeadc3732cc1b573c329806a30ba
diff --git a/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1 b/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
index aeb1d8bc2836..f9ab98e378bc 100644
--- a/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
+++ b/metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OpenSSH public key parser for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/sshpubkeys/ https://github.com/ojarva/python-sshpubkeys
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/ojarva/python-sshpubkeys/archive/3.3.1.tar.gz -> python-sshpubkeys-3.3.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1fdad799ef4fd1d7186eb232667df5fc
+_md5_=6c0c58cd695a8fdc7d67a013f3915f69
diff --git a/metadata/md5-cache/dev-python/python-utils-2.5.6 b/metadata/md5-cache/dev-python/python-utils-2.5.6
index e8dbc0866599..2bc2285b362e 100644
--- a/metadata/md5-cache/dev-python/python-utils-2.5.6
+++ b/metadata/md5-cache/dev-python/python-utils-2.5.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-2.5.6.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f6561e8edc97e6658b5e6fbef80e8573
+_md5_=6ca5905b32766bfc76b4396a61f35762
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
index 3a7a4264acaf..f3c9be861e28 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/unittest2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/exempi )
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( media-libs/exempi )
 DESCRIPTION=Library for working with XMP metadata
 EAPI=7
 HOMEPAGE=https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi.org/project/python-xmp-toolkit/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=223e2fc1af0cb5d3da0b390cbb237db5
+_md5_=bcc69522de7f658ef4d02b7999892b4a
diff --git a/metadata/md5-cache/dev-python/python-zipstream-1.1.4 b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
index 154fba34e762..e035eafd8c5a 100644
--- a/metadata/md5-cache/dev-python/python-zipstream-1.1.4
+++ b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
@@ -1,15 +1,15 @@
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=A zip archive generator
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/allanlei/python-zipstream
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-1.1.4.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=363419e77f9c4d7adafd62ad924d8637
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0f0e96ed66cd5d49d343c9d7138a440a
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1 b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
index 8738a1728e07..1423729bf622 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-text/htmltidy >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( app-text/htmltidy >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/htmltidy
 DESCRIPTION=Python wrapper for HTML Tidy (tidylib)
 EAPI=7
 HOMEPAGE=http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=app-text/htmltidy python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=app-text/htmltidy python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.3.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9e4ad2a1daf39aeeb18ad570ddf0fb5b
+_md5_=57b32a2d57ce328d55f9e5d18014d08f
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.27 b/metadata/md5-cache/dev-python/pyxdg-0.27
index e00e6620bad0..88f5dd7bc110 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.27
+++ b/metadata/md5-cache/dev-python/pyxdg-0.27
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python module to deal with freedesktop.org specifications
 EAPI=7
 HOMEPAGE=https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/takluyver/pyxdg/archive/rel-0.27.tar.gz -> pyxdg-rel-0.27.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6b3667a24337e529192e83d21aaa57ec
+_md5_=138235f3c42e616da6c3ec2b45bb3d98
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.8 b/metadata/md5-cache/dev-python/pyzbar-0.1.8
index f2065aa88fba..041b5fa1afd7 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.8
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.8
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( dev-python/pillow[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] media-gfx/zbar dev-python/unittest-or-fail[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/zbar dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Read one-dimensional barcodes and QR codes from Python
 EAPI=7
 HOMEPAGE=https://github.com/NaturalHistoryMuseum/pyzbar/
-IUSE=test python_targets_python3_8
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] media-gfx/zbar python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/zbar python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/NaturalHistoryMuseum/pyzbar/archive/v0.1.8.tar.gz -> pyzbar-0.1.8.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=926cf14850d65b4073551e9eeeaa32f7
+_md5_=88bee3192a7c0044fb334e2ab641306d
diff --git a/metadata/md5-cache/dev-python/qrcode-6.1 b/metadata/md5-cache/dev-python/qrcode-6.1
index 736fcd956463..8ce1226f67f4 100644
--- a/metadata/md5-cache/dev-python/qrcode-6.1
+++ b/metadata/md5-cache/dev-python/qrcode-6.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=QR Code generator on top of PIL
 EAPI=7
 HOMEPAGE=https://pypi.org/project/qrcode/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/q/qrcode/qrcode-6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=616d1d6ad0dfae747df352d8cc8dc4e5
+_md5_=8ef408bef3785a33f99193bdf2160f7e
diff --git a/metadata/md5-cache/dev-python/qtawesome-1.0.2 b/metadata/md5-cache/dev-python/qtawesome-1.0.2
index 5f9142894e70..7be27f859ff8 100644
--- a/metadata/md5-cache/dev-python/qtawesome-1.0.2
+++ b/metadata/md5-cache/dev-python/qtawesome-1.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( media-fonts/fontawesome dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=test? ( <dev-python/pytest-qt-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=media-fonts/fontawesome dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=media-fonts/fontawesome dev-python/QtPy[pyqt5(+),gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-1.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
-_md5_=7f5f6c3f91feaab59157b591bdb7361e
+_md5_=9298c9b86ed2d66cc595f4b8cba587ed
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.0.3 b/metadata/md5-cache/dev-python/qtconsole-5.0.3
deleted file mode 100644
index 4d7821a5a265..000000000000
--- a/metadata/md5-cache/dev-python/qtconsole-5.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),svg,testlib] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Qt-based console for Jupyter with support for rich media output
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.0.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=004f7999efc3a3acaa2f86a8c32fde5b
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.1.0 b/metadata/md5-cache/dev-python/qtconsole-5.1.0
index 07c273a5ef10..cd63bb51a5ee 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.1.0
+++ b/metadata/md5-cache/dev-python/qtconsole-5.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Qt-based console for Jupyter with support for rich media output
 EAPI=7
 HOMEPAGE=https://jupyter.org
 IUSE=doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 PDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 RDEPEND=dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.1.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f79f50f38e9ea411c20942021a3835f1
+_md5_=004f7999efc3a3acaa2f86a8c32fde5b
diff --git a/metadata/md5-cache/dev-python/quantities-0.12.4 b/metadata/md5-cache/dev-python/quantities-0.12.4
index a7201f7b4b79..8961e7ccb427 100644
--- a/metadata/md5-cache/dev-python/quantities-0.12.4
+++ b/metadata/md5-cache/dev-python/quantities-0.12.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Support for physical quantities with units, based on numpy
 EAPI=7
 HOMEPAGE=https://github.com/python-quantities/python-quantities
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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-quantities/python-quantities/archive/v0.12.4.tar.gz -> python-quantities-0.12.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=915ab4927721be44632d63cd3bcfff8e
+_md5_=96f61eed9482a87a67cae94df37c0970
diff --git a/metadata/md5-cache/dev-python/radon-4.1.0 b/metadata/md5-cache/dev-python/radon-4.1.0
deleted file mode 100644
index 6f4de5f57562..000000000000
--- a/metadata/md5-cache/dev-python/radon-4.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-python/colorama[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mando[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-DESCRIPTION=Code Metrics in Python
-EAPI=7
-HOMEPAGE=https://radon.readthedocs.org/
-IUSE=doc test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mando[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/radon/radon-4.1.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=894da02dd837408105fa36be00134705
diff --git a/metadata/md5-cache/dev-python/radon-4.5.1 b/metadata/md5-cache/dev-python/radon-4.5.1
deleted file mode 100644
index 28564e98eda3..000000000000
--- a/metadata/md5-cache/dev-python/radon-4.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mando[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code Metrics in Python
-EAPI=7
-HOMEPAGE=https://radon.readthedocs.io/
-IUSE=doc test python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mando[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/radon/radon-4.5.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57d521ebb372210c0035162db05840ed
diff --git a/metadata/md5-cache/dev-python/radon-4.5.2 b/metadata/md5-cache/dev-python/radon-4.5.2
index f38d53006f61..886885fdd579 100644
--- a/metadata/md5-cache/dev-python/radon-4.5.2
+++ b/metadata/md5-cache/dev-python/radon-4.5.2
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mando[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Code Metrics in Python
 EAPI=7
 HOMEPAGE=https://radon.readthedocs.io/
-IUSE=doc test python_targets_python3_8
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mando[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flake8-polyfill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-4.5.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57d521ebb372210c0035162db05840ed
+_md5_=ffc5eef38f538da75900bc5d17bea1f8
diff --git a/metadata/md5-cache/dev-python/rarfile-3.1 b/metadata/md5-cache/dev-python/rarfile-3.1
index b6661e908e7b..99a7b1a9c9ed 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.1
+++ b/metadata/md5-cache/dev-python/rarfile-3.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( compressed? ( || ( app-arch/unrar app-arch/rar ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( compressed? ( || ( app-arch/unrar app-arch/rar ) ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Module for RAR archive reading
 EAPI=7
 HOMEPAGE=https://github.com/markokr/rarfile
-IUSE=+compressed test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=+compressed test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=ISC
-RDEPEND=compressed? ( || ( app-arch/unrar app-arch/rar ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=compressed? ( || ( app-arch/unrar app-arch/rar ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rarfile/rarfile-3.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b51c42790eb0613eb83da3dc39e710ec
+_md5_=8379545e9cc9d4755137c55d3e3c4c0c
diff --git a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4 b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
index 478b3cef50a9..436a7d520d8b 100644
--- a/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
+++ b/metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Code specific for Read the Docs and Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/readthedocs/readthedocs-sphinx-ext
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=>=dev-python/jinja-2.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3ce4bd7ef15c17ef05d9c29e8c0cfcb3
+_md5_=e3b9a42d7e79854cf38e399441c587dd
diff --git a/metadata/md5-cache/dev-python/rebulk-3.0.1 b/metadata/md5-cache/dev-python/rebulk-3.0.1
index 0952d13920dd..9b6e4314f0c4 100644
--- a/metadata/md5-cache/dev-python/rebulk-3.0.1
+++ b/metadata/md5-cache/dev-python/rebulk-3.0.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that performs advanced searches in strings
 EAPI=7
 HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Toilal/rebulk/archive/v3.0.1.tar.gz -> rebulk-3.0.1.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e307cf891658235bedcaaeb6054fff98
+_md5_=e9bbf4f90d707fe62675ff160af93b10
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.7.1 b/metadata/md5-cache/dev-python/recommonmark-0.7.1
index 36ea2e19e50d..e5d612c693a1 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.7.1
+++ b/metadata/md5-cache/dev-python/recommonmark-0.7.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/commonmark-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/commonmark-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/docutils-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python docutils-compatibility bridge to CommonMark
 EAPI=7
 HOMEPAGE=https://recommonmark.readthedocs.io/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-python/commonmark-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/commonmark-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/docutils-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/rtfd/recommonmark/archive/0.7.1.tar.gz -> recommonmark-0.7.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a84c5db8c5b99852517a866e1b57a2e
+_md5_=59cc073aadae798f8b3a64a4508be192
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.67 b/metadata/md5-cache/dev-python/reportlab-3.5.67
index c4ba81707769..9d38b97b7433 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.67
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.67
@@ -1,16 +1,16 @@
-BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=app-arch/unzip doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
 DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=7
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
-IUSE=doc test python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/r/reportlab/reportlab-3.5.67.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3d91893c940edf04427a07003c55570f
+_md5_=47747419ff9f9c11dceb13b72d6e634e
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.3 b/metadata/md5-cache/dev-python/requests-cache-0.6.3
index da7ae492b846..d106ceb308c3 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.6.3
+++ b/metadata/md5-cache/dev-python/requests-cache-0.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Persistent cache for requests library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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/reclosedev/requests-cache/archive/v0.6.3.tar.gz -> requests-cache-0.6.3.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=206826580fefea713ceab38020268091
+_md5_=d1a87778f72017384d19681712d7ace5
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.6.4 b/metadata/md5-cache/dev-python/requests-cache-0.6.4
new file mode 100644
index 000000000000..09941419767e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-cache-0.6.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Persistent cache for requests library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.6.4.tar.gz -> requests-cache-0.6.4.gh.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0fba60259d577af7bee7acf4b18d2a7b
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.8.0 b/metadata/md5-cache/dev-python/requests-mock-1.8.0
deleted file mode 100644
index 63d1cb9c085d..000000000000
--- a/metadata/md5-cache/dev-python/requests-mock-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock out responses from the requests package
-EAPI=7
-HOMEPAGE=https://github.com/jamielennox/requests-mock
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.8.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e61bbab2f55b3e5e8363f102d6320e90
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.9.0 b/metadata/md5-cache/dev-python/requests-mock-1.9.0
deleted file mode 100644
index dbab31f74cfb..000000000000
--- a/metadata/md5-cache/dev-python/requests-mock-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock out responses from the requests package
-EAPI=7
-HOMEPAGE=https://github.com/jamielennox/requests-mock
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.9.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b54f524f5cb793637f34a89576ac02dd
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.9.1 b/metadata/md5-cache/dev-python/requests-mock-1.9.1
deleted file mode 100644
index 6cffa2771baa..000000000000
--- a/metadata/md5-cache/dev-python/requests-mock-1.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock out responses from the requests package
-EAPI=7
-HOMEPAGE=https://github.com/jamielennox/requests-mock
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.9.1.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b54f524f5cb793637f34a89576ac02dd
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.9.2 b/metadata/md5-cache/dev-python/requests-mock-1.9.2
index f7b5a9cd9895..60d5b8ac98b3 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.9.2
+++ b/metadata/md5-cache/dev-python/requests-mock-1.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=Mock out responses from the requests package
 EAPI=7
 HOMEPAGE=https://github.com/jamielennox/requests-mock
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.9.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b54f524f5cb793637f34a89576ac02dd
+_md5_=45a905845befd9c516b11387a156f870
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.5.0 b/metadata/md5-cache/dev-python/rfc3986-1.5.0
index e3156ae1d6ce..f3dedfc4ff84 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.5.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.5.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Validating URI References per RFC 3986
 EAPI=7
 HOMEPAGE=https://tools.ietf.org/html/rfc3986 https://github.com/python-hyper/rfc3986 https://rfc3986.rtfd.org
-IUSE=idna test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=idna test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=idna? ( dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.5.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=81e3d6d4c819ee4677197a96d83818db
+_md5_=dad50075246a64d92bf7988a89d59fbc
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index 83f850374d37..5b35a15e3907 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python RFC3986 validator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/rfc3986-validator/ https://github.com/naimetti/rfc3986-validator
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/rfc3987[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cba3052ccdcc8732fad66e1553c63e03
+_md5_=8521dd6eee2952c924c83d42a46608e4
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
index bba3009391cd..dd74230ae039 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
 EAPI=7
 HOMEPAGE=https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=713fcc04361ea4ecafecab7a1e55fcbd
+_md5_=c4d4e95bd33b3d0d838463191c369c7d
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.4.2 b/metadata/md5-cache/dev-python/s3transfer-0.4.2
index 7ce429ddc75e..fb5de9d2cf54 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.4.2
+++ b/metadata/md5-cache/dev-python/s3transfer-0.4.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An Amazon S3 Transfer Manager
 EAPI=7
 HOMEPAGE=https://github.com/boto/s3transfer
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/s/s3transfer/s3transfer-0.4.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9c8a9b8ba66b912d54c0edd8606881a9
+_md5_=19e2fdc895bf8929b0fbec0a196fdb03
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r2 b/metadata/md5-cache/dev-python/scandir-1.10.0-r2
index cf23b48b71ed..cb2f3d861ba8 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0-r2
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r2
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A better directory iterator and faster os.walk()
 EAPI=7
 HOMEPAGE=https://github.com/benhoyt/scandir
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c2f2885c66ad71f15eb1db6fb3813be
+_md5_=43256c640fd91b1f0dd5b51ed249ae3a
diff --git a/metadata/md5-cache/dev-python/scipy-1.6.3 b/metadata/md5-cache/dev-python/scipy-1.6.3
index a28d3e24d0c0..ede9d901ed2d 100644
--- a/metadata/md5-cache/dev-python/scipy-1.6.3
+++ b/metadata/md5-cache/dev-python/scipy-1.6.3
@@ -5,7 +5,7 @@ DESCRIPTION=Scientific algorithms library for Python
 EAPI=7
 HOMEPAGE=https://www.scipy.org/
 IUSE=doc sparse test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.16.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/fortran python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.6.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.6.2/scipy-html-1.6.2.zip https://docs.scipy.org/doc/scipy-1.6.2/scipy-ref-1.6.2.pdf )
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44625c68e7ac8dc3f481bba4b974ca79
+_md5_=f2793173d2a436d38bc675e26c0e6d7a
diff --git a/metadata/md5-cache/dev-python/semver-2.13.0 b/metadata/md5-cache/dev-python/semver-2.13.0
index 4af6c9e3734e..ab364d69b8dc 100644
--- a/metadata/md5-cache/dev-python/semver-2.13.0
+++ b/metadata/md5-cache/dev-python/semver-2.13.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python module for semantic versioning
 EAPI=7
 HOMEPAGE=https://github.com/python-semver/python-semver
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-semver/python-semver/archive/2.13.0.tar.gz -> semver-2.13.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fd12e7e7756b805e217ed1ae12b20e20
+_md5_=c925558b46f776d94fd9179181efa7e1
diff --git a/metadata/md5-cache/dev-python/sentinels-1.0.0 b/metadata/md5-cache/dev-python/sentinels-1.0.0
index 93f2ba54699b..a27bdf2f8926 100644
--- a/metadata/md5-cache/dev-python/sentinels-1.0.0
+++ b/metadata/md5-cache/dev-python/sentinels-1.0.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python Sentinels class which are objects with special meanings.
 EAPI=7
 HOMEPAGE=https://pypi.org/project/sentinels
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/s/sentinels/sentinels-1.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9f010717890e23bd0f29c7f02d9d9a7a
+_md5_=ee70e68c122310861e5509cb64a56ba3
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.3.1 b/metadata/md5-cache/dev-python/serverfiles-0.3.1
index ae760d176a3f..eb635cc73e85 100644
--- a/metadata/md5-cache/dev-python/serverfiles-0.3.1
+++ b/metadata/md5-cache/dev-python/serverfiles-0.3.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/requests-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/requests-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utility for accessing HTTP server and storing files locally for reuse
 EAPI=7
 HOMEPAGE=https://github.com/biolab/serverfiles
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-python/requests-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/requests-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/s/serverfiles/serverfiles-0.3.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=14fce51beec005fe7e6de4c982176c29
+_md5_=c4ba87816d6c326645510fcb00069f8e
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
index 2fba9aea84fd..b408ba60a8dd 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
@@ -1,16 +1,15 @@
-BDEPEND=test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=A setuptools_scm plugin for git archives
 EAPI=7
 HOMEPAGE=https://github.com/Changaco/setuptools_scm_git_archive
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm ~arm64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.1.tar.gz -> setuptools_scm_git_archive-1.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a10dd0c91821e6527160a598ef16fc74
+_md5_=0b773e0a58557050af65cb6a584d5e0a
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.10 b/metadata/md5-cache/dev-python/simpleeval-0.9.10
index 23e22034e2c7..e76b89177855 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.10
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.10
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=A simple, safe single expression evaluator library
 EAPI=7
 HOMEPAGE=https://github.com/danthedeckie/simpleeval
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.10.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0aa49d032aa8539adcbffa486966b846
+_md5_=f0ed64fd7722827e341b038544b1bc7a
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index 6277d85d5d32..04706cd0fb94 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -1,14 +1,14 @@
-BDEPEND=app-arch/unzip python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=app-arch/unzip python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple generic functions for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/simplegeneric/
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=ZPL
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=116f4b0138e42669bf36e7172ee5f2b9
+_md5_=d484057ff6acc420522b8823fcf720f7
diff --git a/metadata/md5-cache/dev-python/simpy-4.0.1 b/metadata/md5-cache/dev-python/simpy-4.0.1
new file mode 100644
index 000000000000..3dd8f061c0b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simpy-4.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk] ) python_targets_python3_9? ( dev-lang/python:3.9[tk] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Object-oriented, process-based discrete-event simulation language
+EAPI=7
+HOMEPAGE=https://simpy.readthedocs.org
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8[tk] ) python_targets_python3_9? ( dev-lang/python:3.9[tk] ) python_targets_python3_10? ( dev-lang/python:3.10[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/s/simpy/simpy-4.0.1.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8acd32432583f81066ab7d984139fb57
diff --git a/metadata/md5-cache/dev-python/six-1.15.0-r1 b/metadata/md5-cache/dev-python/six-1.15.0-r1
deleted file mode 100644
index ddacf53c22cb..000000000000
--- a/metadata/md5-cache/dev-python/six-1.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python 2 and 3 compatibility library
-EAPI=7
-HOMEPAGE=https://github.com/benjaminp/six https://pypi.org/project/six/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/six/six-1.15.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f9616b8e50ce4d632a101171346b57b2
diff --git a/metadata/md5-cache/dev-python/six-1.16.0 b/metadata/md5-cache/dev-python/six-1.16.0
index d30a1d75a783..f25c0b77bd86 100644
--- a/metadata/md5-cache/dev-python/six-1.16.0
+++ b/metadata/md5-cache/dev-python/six-1.16.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python 2 and 3 compatibility library
 EAPI=7
 HOMEPAGE=https://github.com/benjaminp/six https://pypi.org/project/six/
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.16.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4358e011dfe4f7267024f9feba824d56
+_md5_=f9616b8e50ce4d632a101171346b57b2
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.7.1 b/metadata/md5-cache/dev-python/slixmpp-1.7.1
index 7f65f15ebd66..3313028a3490 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.7.1
+++ b/metadata/md5-cache/dev-python/slixmpp-1.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python 3 library for XMPP
 EAPI=7
 HOMEPAGE=https://lab.louiz.org/poezio/slixmpp
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-dns/libidn python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.7.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0f81e50205f538c24da97cda29f1a16e
+_md5_=d2b663cfc2132dab221d5c0a83246b53
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.5 b/metadata/md5-cache/dev-python/snakeoil-0.9.5
index c5e153e04d4d..c0df3c7626c3 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.5
@@ -4,7 +4,7 @@ DESCRIPTION=misc common functionality and useful optimizations
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc ~x86 ~x64-macos
 LICENSE=BSD BSD-2 MIT
 RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2e26eaba525438ed929828b0b40a2b70
+_md5_=87f78b5e43c659166339bc24a5f0fd11
diff --git a/metadata/md5-cache/dev-python/snappy-0.6.0 b/metadata/md5-cache/dev-python/snappy-0.6.0
index 4259b983e2b9..02c50a18a039 100644
--- a/metadata/md5-cache/dev-python/snappy-0.6.0
+++ b/metadata/md5-cache/dev-python/snappy-0.6.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-arch/snappy-1.0.2:=
 DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-snappy/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.6.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b62631e7d3f8fed62ca9e3bd53655043
+_md5_=9c478b7695358f98498eb26698871c68
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 1134b97dafb1..1a06d3fa6a34 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Lazy strings for Python
 EAPI=7
 HOMEPAGE=https://github.com/mitsuhiko/speaklater
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=57f62b3276162560ce68c268f2401390
+_md5_=e1ddaca2f25c866143d9d5f25dda9104
diff --git a/metadata/md5-cache/dev-python/sphinx-4.0.2 b/metadata/md5-cache/dev-python/sphinx-4.0.2
index c10890c948b4..4a78ccb7a062 100644
--- a/metadata/md5-cache/dev-python/sphinx-4.0.2
+++ b/metadata/md5-cache/dev-python/sphinx-4.0.2
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python documentation generator
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx
-IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc latex test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-htmlhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ad65e770f08db0ee31799e4c5f5be8a7
+_md5_=f023d30104c0d1d2b1d937a843603c56
diff --git a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4 b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
index c98b4c0a0b09..dd15aa32fed0 100644
--- a/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
+++ b/metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Add support for multiple versions to sphinx
 EAPI=7
 HOMEPAGE=https://github.com/Holzhaus/sphinx-multiversion
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Holzhaus/sphinx-multiversion/archive/v0.2.4.tar.gz -> sphinx-multiversion-0.2.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=58d49685d24d2ff7960ca510cdc7f31f
+_md5_=557632b2ecda26256eb950b7292478f6
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
index 856fc04605d2..a7722a5636ff 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/readthedocs-sphinx-ext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( <dev-python/docutils-0.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/readthedocs-sphinx-ext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( <dev-python/docutils-0.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=ReadTheDocs.org theme for Sphinx
 EAPI=7
 HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
-PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=<dev-python/docutils-0.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=<dev-python/docutils-0.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9acde9dd49dd73938f25a360bd331123
+_md5_=b02d7c87fc4dc52d49826d192fde340f
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
index 997af53c386b..9c4b08a3c44f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs Apple help book
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-applehelp
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2fe02a17a5a6ec6317c26dacde3c11a0
+_md5_=d3bc43f40633cc3a113b4c418093202c
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7 b/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
index d876e55e6853..74315f760d9e 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-websupport[python_targets_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Documenting CLI programs
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-contrib/autoprogram
-IUSE=doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a787b3b30b6d52f1efece6ce40e7a206
+_md5_=8e428718068c975f0713e0412abaf793
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.0.0
deleted file mode 100644
index 7846ba7d17b7..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/oset[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybtex[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybtex-docutils[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extensions for BibTeX style citations
-EAPI=7
-HOMEPAGE=https://github.com/mcmtroffaes/sphinxcontrib-bibtex
-IUSE=test doc python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/oset[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybtex[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pybtex-docutils[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7b5c829a238db77b33d22530de5da21e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
index c2fff7f65b04..32ddd2346f62 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs Devhelp documents
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-devhelp
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=015e16d2cc084d0a13d5f9da600715b9
+_md5_=7553f3e792d46a2b6caf74fa9839b80a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
index 2cfa690498ee..677fe4f26213 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx docs
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~hppa ~s390 x86
 LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.2.tar.gz -> sphinxcontrib-github-alt-1.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c51fd4dbb3dad6ccf9121bd5b797f506
+_md5_=58c3e258d3d5cca9e05ed4486e145e10
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
index 29f1f83bfd11..a676a012a666 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs HTML help book
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0a8cb03671151e9054e4417f971080be
+_md5_=b19a96d3d931f29527bddead824c59a3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
index d185f791cb10..70f8283a9cbb 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which renders display math in HTML via JavaScript
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-jsmath
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=df92abfa4fc599492c78ec0cc9947f26
+_md5_=e5683ee6d6734b647d5f9a6c91b59f6a
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
index 6fe929d36546..f3114b29e984 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs QtHelp documents
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-qthelp
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fa5a2e06ceebdd48d3c99160dff7503b
+_md5_=4add293b7f0791deab0b673f0cf79a94
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
index 62f47ab35ac7..e268f53e3c82 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extension which outputs outputs serialized HTML files
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-serializinghtml
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b9356c973785ef114341d1dc52d0fe31
+_md5_=a78b1e018583b2fedffd389cf18dd3f8
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
deleted file mode 100644
index a8056dd608e7..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( app-dicts/myspell-en ) test? ( dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx spelling extension
-EAPI=7
-HOMEPAGE=https://github.com/sphinx-contrib/spelling
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a6964d3f0310b4d316ff01f5d0c2fd91
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
index 44a4ba2b55a4..01eb2a087e46 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx spelling extension
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-contrib/spelling
 IUSE=test python_targets_python3_8 python_targets_python3_9
-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=BSD-2
 RDEPEND=dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=50f1e7b0813acdce180d8b53820a9dac
+_md5_=144ea762878adbd47f1f801f52b8058f
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
index 9c156d1a1a36..95dd23243551 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/whoosh-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/sqlalchemy-0.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/whoosh-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx websupport extension
 EAPI=7
 HOMEPAGE=https://www.sphinx-doc.org https://github.com/sphinx-doc/sphinxcontrib-websupport
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=BSD-2
-PDEPEND=>=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-RDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+PDEPEND=>=dev-python/sphinx-1.5.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sphinxcontrib-serializinghtml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/1.2.4.tar.gz -> sphinxcontrib-websupport-1.2.4.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=68b90a21307721bb2063ee0fe9d69c8d
+_md5_=91222aaf9834ff6b9abb9d86ac6a567c
diff --git a/metadata/md5-cache/dev-python/spur-0.3.22 b/metadata/md5-cache/dev-python/spur-0.3.22
index a980597415fe..de35015fdc14 100644
--- a/metadata/md5-cache/dev-python/spur-0.3.22
+++ b/metadata/md5-cache/dev-python/spur-0.3.22
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Run commands locally or over SSH using the same interface
 EAPI=7
 HOMEPAGE=https://github.com/mwilliamson/spur.py
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
-RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/mwilliamson/spur.py/archive/0.3.22.tar.gz -> spur.py-0.3.22.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cb2351c6c505e5c1f06cb7d5015a44bc
+_md5_=b0fd5efcc681b5f2d567bd15f66475cf
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.3-r1 b/metadata/md5-cache/dev-python/spyder-5.0.3-r2
similarity index 77%
rename from metadata/md5-cache/dev-python/spyder-5.0.3-r1
rename to metadata/md5-cache/dev-python/spyder-5.0.3-r2
index 76c5ae3e51f7..c4844412f8b7 100644
--- a/metadata/md5-cache/dev-python/spyder-5.0.3-r1
+++ b/metadata/md5-cache/dev-python/spyder-5.0.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-black-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-spyder-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-language-server-0.36.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),pyqt5(+),svg,webengine] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/spyder-kernels-2.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/watchdog-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-lazy-fixture[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-ordering[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-qt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xvfb[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-black-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-spyder-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-language-server-0.36.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/spyder-kernels-2.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/watchdog-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The Scientific Python Development Environment
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https
 IUSE=test doc python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-black-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-spyder-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-language-server-0.36.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),pyqt5(+),svg,webengine] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/spyder-kernels-2.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/watchdog-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-black-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyls-spyder-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-language-server-0.36.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/spyder-kernels-2.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/spyder-kernels-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/watchdog-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyflakes-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.3.tar.gz -> spyder-5.0.3.tar.gz https://github.com/spyder-ide/spyder-docs/archive/588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz -> spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28e5540a18b8e957a33eca21aae6f65c
+_md5_=9b435cbfe17258111cd6f9d187f8c047
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.15 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.15
index 9cd061ae3ba2..95d44f30031d 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.15
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.15
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.15.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fdd2be1c04ca4d78cf66b9d51a57e951
+_md5_=728f185072e522e9c3d0af2dcadf1e56
diff --git a/metadata/md5-cache/dev-python/stripe-2.58.0 b/metadata/md5-cache/dev-python/stripe-2.58.0
new file mode 100644
index 000000000000..d03e4479a52a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stripe-2.58.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-util/stripe-mock-0.103.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] net-misc/curl )
+DESCRIPTION=Stripe python bindings
+EAPI=7
+HOMEPAGE=https://github.com/stripe/stripe-python
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/stripe/stripe-2.58.0.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4bfa4271e9fcd33deddc2fe0285bf2ea
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.4.1 b/metadata/md5-cache/dev-python/svgwrite-1.4.1
index 81d0c62698af..866df7410206 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.4.1
+++ b/metadata/md5-cache/dev-python/svgwrite-1.4.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python Package to write SVG files
 EAPI=7
 HOMEPAGE=https://github.com/mozman/svgwrite
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/mozman/svgwrite/archive/v1.4.1.tar.gz -> svgwrite-1.4.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=45e4258e231da5b4eb48a5b5b9a756a6
+_md5_=b8cb2d394619dc81bc1de2af667754db
diff --git a/metadata/md5-cache/dev-python/terminado-0.10.0 b/metadata/md5-cache/dev-python/terminado-0.10.0
index f691d3368624..eae836ce540b 100644
--- a/metadata/md5-cache/dev-python/terminado-0.10.0
+++ b/metadata/md5-cache/dev-python/terminado-0.10.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=7
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/t/terminado/terminado-0.10.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fe7dd588263acc29a63f20d6928413f9
+_md5_=6057b53e7c9410d14391ce3fddc6c87c
diff --git a/metadata/md5-cache/dev-python/three-merge-0.1.1 b/metadata/md5-cache/dev-python/three-merge-0.1.1
index 768332fae283..d8c212206f9e 100644
--- a/metadata/md5-cache/dev-python/three-merge-0.1.1
+++ b/metadata/md5-cache/dev-python/three-merge-0.1.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/diff-match-patch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/diff-match-patch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple Python library to perform a 3-way merge between strings
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/three-merge https://pypi.org/project/three-merge/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/diff-match-patch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/diff-match-patch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/spyder-ide/three-merge/archive/v0.1.1.tar.gz -> three-merge-0.1.1-gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b77d2b5ec6a52d6854fff5080468dcd7
+_md5_=cd10c9045b194d0bd65901e328850836
diff --git a/metadata/md5-cache/dev-python/timeout-decorator-0.5.0 b/metadata/md5-cache/dev-python/timeout-decorator-0.5.0
index 35874458e65f..3389684499cb 100644
--- a/metadata/md5-cache/dev-python/timeout-decorator-0.5.0
+++ b/metadata/md5-cache/dev-python/timeout-decorator-0.5.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Timeout decorator
 EAPI=7
 HOMEPAGE=https://pypi.org/project/timeout-decorator/ https://github.com/pnpnpn/timeout-decorator/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/pnpnpn/timeout-decorator/archive/9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz -> timeout-decorator-9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2fe948b98b91af74c517bd5dd9c5d72a
+_md5_=58db7a8d4547cb832508314b2e130aa6
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
index 756cdeb51872..5ba15bbd0cc1 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ b/metadata/md5-cache/dev-python/tinycss-0.4
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=7
 HOMEPAGE=https://github.com/SimonSapin/tinycss/ https://tinycss.readthedocs.io/en/latest/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/t/tinycss/tinycss-0.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fcb17730078c13006b19dee1eb9e2154
+_md5_=49560743908cb482414b95deb4ff4f03
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.1.0 b/metadata/md5-cache/dev-python/tinycss2-1.1.0
index 47e460fc5432..5b65075a70e9 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.1.0
+++ b/metadata/md5-cache/dev-python/tinycss2-1.1.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/webencodings-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/webencodings-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/tinycss2/ https://pypi.org/project/tinycss2/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/webencodings-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/webencodings-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Kozea/tinycss2/archive/v1.1.0.tar.gz -> tinycss2-1.1.0.gh.tar.gz test? ( https://github.com/SimonSapin/css-parsing-tests/archive/c5749e51dda3868b3e8062e65a36584c2fec8059.tar.gz -> css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz )
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=27dd7539e471b1f3113de52d83174339
+_md5_=1d2dc9bbaf2f6562fa908c109252d971
diff --git a/metadata/md5-cache/dev-python/tld-0.12.6 b/metadata/md5-cache/dev-python/tld-0.12.6
new file mode 100644
index 000000000000..98c91bb37cd7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tld-0.12.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/Faker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extract the top level domain (TLD) from the URL given
+EAPI=7
+HOMEPAGE=https://github.com/barseghyanartur/tld
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/barseghyanartur/tld/archive/0.12.6.tar.gz -> tld-0.12.6.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4618673f2c7b8cae1efa4249baded093
diff --git a/metadata/md5-cache/dev-python/towncrier-21.3.0 b/metadata/md5-cache/dev-python/towncrier-21.3.0
index 13b2ed65dfd5..b265bb7f5db1 100644
--- a/metadata/md5-cache/dev-python/towncrier-21.3.0
+++ b/metadata/md5-cache/dev-python/towncrier-21.3.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-vcs/git dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/twisted-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-vcs/git dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/twisted-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Building newsfiles for your project
 EAPI=7
 HOMEPAGE=https://github.com/twisted/towncrier
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/click-default-group[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/click-default-group[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/twisted/towncrier/archive/21.3.0.tar.gz -> towncrier-21.3.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9ba3e861fecd8c16875b0d87d03634fd
+_md5_=0549558196ad4ff910e1b58b70cbcba6
diff --git a/metadata/md5-cache/dev-python/tox-3.23.0 b/metadata/md5-cache/dev-python/tox-3.23.0
deleted file mode 100644
index a8752cef27fa..000000000000
--- a/metadata/md5-cache/dev-python/tox-3.23.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=7
-HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/3.23.0.tar.gz -> tox-3.23.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ebd72ee8d533c4e6fb1508575128f255
diff --git a/metadata/md5-cache/dev-python/tox-3.23.1 b/metadata/md5-cache/dev-python/tox-3.23.1
index 1be86fe93a38..668d1ea45642 100644
--- a/metadata/md5-cache/dev-python/tox-3.23.1
+++ b/metadata/md5-cache/dev-python/tox-3.23.1
@@ -4,7 +4,7 @@ DESCRIPTION=virtualenv-based automation of test activities
 EAPI=7
 HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.23.1.tar.gz -> tox-3.23.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=005780328deeaafedcaf0466973ed988
+_md5_=dc8506b6a786574dd8ad2ce12583a4af
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.4 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.4
deleted file mode 100644
index b2d9c1cd2110..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/phply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=7
-HOMEPAGE=https://github.com/translate/translate
-IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/releases/download/3.3.4/translate-toolkit-3.3.4.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=df931c58ffda624fe0e93d08d53406f2
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.6 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.6
index 96a4d3a5f5d5..39c3ccfe9017 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.6
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit to convert between many translation formats
 EAPI=7
 HOMEPAGE=https://github.com/translate/translate
 IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/refs/tags/3.3.6.tar.gz -> translate-3.3.6.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ca9de18af27cf8363a3184dc601e29e
+_md5_=5903b4ef210e8ec7856da5dcac72a747
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506
new file mode 100644
index 000000000000..4c11d08a8e26
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506
@@ -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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python bindings to the Tree-sitter parsing library
+EAPI=7
+HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/tree-sitter/py-tree-sitter/archive/b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz -> py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz https://github.com/tree-sitter/tree-sitter/archive/v0.19.5.tar.gz -> tree-sitter-0.19.5.gh.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.19.0.tar.gz -> tree-sitter-javascript-0.19.0.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/v0.19.0.tar.gz -> tree-sitter-python-0.19.0.tar.gz )
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d6a22e770e76c5f1958034b84c01f270
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
new file mode 100644
index 000000000000..c26251d2ac2c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/tree-sitter:= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/tree-sitter:=
+DESCRIPTION=Python bindings to the Tree-sitter parsing library
+EAPI=7
+HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/tree-sitter:= python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/tree-sitter/py-tree-sitter/archive/b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz -> py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz test? ( https://github.com/tree-sitter/tree-sitter-javascript/archive/v0.19.0.tar.gz -> tree-sitter-javascript-0.19.0.tar.gz https://github.com/tree-sitter/tree-sitter-python/archive/v0.19.0.tar.gz -> tree-sitter-python-0.19.0.tar.gz )
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a8efa79838bee2af6d41915a7606d50b
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0 b/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
index 051dc5f6da34..5f43fa503a83 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Type Hint extensions from Python 3.8 backported
 EAPI=7
 HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.10.0.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=971a989e55e5c1388fb313662f0246fc
+_md5_=2079c9c2008a8420b881b1ce9efa7254
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
deleted file mode 100644
index 8d978864fb5e..000000000000
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Type Hint extensions from Python 3.8 backported
-EAPI=7
-HOMEPAGE=https://pypi.org/project/typing-extensions/ https://github.com/python/typing/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=PSF-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.3.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=783360e4cf5d6fed62141e19cadf9495
diff --git a/metadata/md5-cache/dev-python/ujson-4.0.2 b/metadata/md5-cache/dev-python/ujson-4.0.2
index 131fbffd69fb..e472fadf7d5a 100644
--- a/metadata/md5-cache/dev-python/ujson-4.0.2
+++ b/metadata/md5-cache/dev-python/ujson-4.0.2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/u/ujson/ujson-4.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5ba0e2fc314e0557302d57bc5e6634f7
+_md5_=7c838529fc16a248d27cf7b3ed9f125b
diff --git a/metadata/md5-cache/dev-python/unidecode-1.2.0 b/metadata/md5-cache/dev-python/unidecode-1.2.0
index a0f7ac5ab11a..db285dffd9ec 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.2.0
+++ b/metadata/md5-cache/dev-python/unidecode-1.2.0
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[wide-unicode(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Module providing ASCII transliterations of Unicode text
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Unidecode/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[wide-unicode(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[wide-unicode(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[wide-unicode(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[wide-unicode(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ea6679716708838a398e688c2950af4
+_md5_=cd4d47ae9e1c4ad590971509f7b52fbe
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1 b/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
index 1371213cfd22..2ba83d9b78a8 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A set of mixin classes and other helpers for unittest test case classes
 EAPI=7
 HOMEPAGE=https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nedbat/unittest-mixins/archive/v1.6.tar.gz -> unittest-mixins-1.6.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3e8258e3cb476715e233450bfa8ba920
+_md5_=8acec7f6412e1e8419b8f9c959a8e242
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1 b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
index 16cdc9f65a36..622b74ea3e77 100644
--- a/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<=dev-python/google-api-python-client-1.3 test? ( dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<=dev-python/google-api-python-client-1.3 >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !<=dev-python/google-api-python-client-1.3 test? ( dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !<=dev-python/google-api-python-client-1.3 >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of RFC6570, URI Template
 EAPI=7
 HOMEPAGE=https://pypi.org/project/uritemplate/
-IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<=dev-python/google-api-python-client-1.3 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] !<=dev-python/google-api-python-client-1.3 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=48c03fbe8a015c9fefd7ee426b8af3c5
+_md5_=6032685cbf3c37c6d8ebc7e781d51903
diff --git a/metadata/md5-cache/dev-python/url-normalize-1.4.3 b/metadata/md5-cache/dev-python/url-normalize-1.4.3
index 61029190be06..687e56f68df0 100644
--- a/metadata/md5-cache/dev-python/url-normalize-1.4.3
+++ b/metadata/md5-cache/dev-python/url-normalize-1.4.3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=URL normalization for Python
 EAPI=7
 HOMEPAGE=https://github.com/niksite/url-normalize/ https://pypi.org/project/url-normalize/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/niksite/url-normalize/archive/1.4.3.tar.gz -> url-normalize-1.4.3.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a0dbcc178a80edcae9aa9fd2b646f2e
+_md5_=a3547c1245a4d0a2ec5b49837aa82bb5
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2 b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
index ede7e7a30903..cff759bf92b9 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
+++ b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
 EAPI=7
 HOMEPAGE=https://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vobject/vobject-0.9.6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=015d0f116e7612605f9a00953423e232
+_md5_=f5f8e173faf5c2ae0555d8ee499b5a5f
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.12.1 b/metadata/md5-cache/dev-python/voluptuous-0.12.1
index 80aeb2b230b0..25f23f0edef7 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.12.1
+++ b/metadata/md5-cache/dev-python/voluptuous-0.12.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python data validation library.
 EAPI=7
 HOMEPAGE=https://github.com/alecthomas/voluptuous
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/v/voluptuous/voluptuous-0.12.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=001c9b66707837e53f181c469e761fe7
+_md5_=180aa9f4107e46fbe8dc56464867c890
diff --git a/metadata/md5-cache/dev-python/warlock-1.3.3 b/metadata/md5-cache/dev-python/warlock-1.3.3
index 081f5ec9e549..18d55b53c247 100644
--- a/metadata/md5-cache/dev-python/warlock-1.3.3
+++ b/metadata/md5-cache/dev-python/warlock-1.3.3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpatch-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jsonpatch-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jsonschema-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonpatch-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] <dev-python/jsonpatch-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonschema-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] <dev-python/jsonschema-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python object model built on JSON schema and JSON patch
 EAPI=7
 HOMEPAGE=https://github.com/bcwaldon/warlock
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonpatch-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jsonpatch-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jsonschema-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonpatch-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] <dev-python/jsonpatch-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/jsonschema-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] <dev-python/jsonschema-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/bcwaldon/warlock/archive/1.3.3.tar.gz -> warlock-1.3.3.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7eceeacdae86a1ac4cbd78b4306818ec
+_md5_=93e9ab20fd5edff5c8e29fd80d870c39
diff --git a/metadata/md5-cache/dev-python/webcolors-1.11.1 b/metadata/md5-cache/dev-python/webcolors-1.11.1
index 9077013fa827..c1a33ada59d5 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.11.1
+++ b/metadata/md5-cache/dev-python/webcolors-1.11.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Color names and value formats defined by the HTML and CSS specifications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/webcolors/webcolors-1.11.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0dd0032fb9ea3eed043a20ae762fad8e
+_md5_=d57e958093c1a9786a753b47bd992724
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.58.0-r1 b/metadata/md5-cache/dev-python/websocket-client-0.58.0-r1
deleted file mode 100644
index 9556dfca3092..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-0.58.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=7
-HOMEPAGE=https://github.com/websocket-client/websocket-client
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.58.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ba38a95bea6eba8c487255479fabdf1d
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.59.0 b/metadata/md5-cache/dev-python/websocket-client-0.59.0
index 533a76392628..ccd219fa4378 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.59.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.59.0
@@ -4,7 +4,7 @@ DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=7
 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 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket-client-0.59.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=541bcc04a903d1be478284b122938f75
+_md5_=adf0e2ccada141678aaa080535dec477
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.0.0 b/metadata/md5-cache/dev-python/websocket-client-1.0.0
deleted file mode 100644
index c3ac9b1ce564..000000000000
--- a/metadata/md5-cache/dev-python/websocket-client-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WebSocket client for python with hybi13 support
-EAPI=7
-HOMEPAGE=https://github.com/websocket-client/websocket-client
-IUSE=examples python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.0.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f80d661e4d782515574757e313f3d559
diff --git a/metadata/md5-cache/dev-python/whichcraft-0.6.1 b/metadata/md5-cache/dev-python/whichcraft-0.6.1
index afb38be72fd5..cee294e01660 100644
--- a/metadata/md5-cache/dev-python/whichcraft-0.6.1
+++ b/metadata/md5-cache/dev-python/whichcraft-0.6.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform cross-python shutil.which functionality
 EAPI=7
 HOMEPAGE=https://github.com/cookiecutter/whichcraft
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/cookiecutter/whichcraft/archive/0.6.1.tar.gz -> whichcraft-0.6.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1d8dcc4f6db479f60c47c288ab1dec31
+_md5_=724cc2f5f83f43773802b34e529f119d
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4-r1 b/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
index 766f96dcd021..8b1c5416aa7d 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4-r1
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fast, pure-Python full text indexing, search and spell checking library
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Whoosh/
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=BSD-2
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/Whoosh/Whoosh-2.7.4.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=84fc7da50fafb69bc32b1108241f46f0
+_md5_=b67d50dd8fa80962031773b6930834cd
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.3 b/metadata/md5-cache/dev-python/wsaccel-0.6.3
index f7838d901e25..19fcaa28320b 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.3
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.3
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Accelerator for ws4py, autobahn and tornado
 EAPI=7
 HOMEPAGE=https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/methane/wsaccel/archive/v0.6.3.tar.gz -> wsaccel-0.6.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f298bc113736a9d05c6df74c9bcd5c02
+_md5_=04b49fff43486e91a1e6997f60a7e5f3
diff --git a/metadata/md5-cache/dev-python/wtforms-2.3.3 b/metadata/md5-cache/dev-python/wtforms-2.3.3
index bf77d0323c6a..4fdc6311c272 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.3.3
+++ b/metadata/md5-cache/dev-python/wtforms-2.3.3
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-email-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/python-email-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Flexible forms validation and rendering library for python web development
 EAPI=7
 HOMEPAGE=https://wtforms.readthedocs.io/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/WTForms/WTForms-2.3.3.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=db5da409fe0d1bc3568e485d3425acef
+_md5_=e549599b19539096516e36ca3b00d3c2
diff --git a/metadata/md5-cache/dev-python/www-authenticate-0.9.2 b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
index 7a30f27d680b..53105cc74d1b 100644
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=WWW-Authenticate header parser
 EAPI=7
 HOMEPAGE=https://github.com/alexsdutton/www-authenticate
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e68982f0d26c80913859bb772b4d360d
+_md5_=08b4d33cca0635a52267784573f6ab70
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
index 0f7f850cc71f..f16b2782fff0 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/libxcb >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] x11-libs/libxcb >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/libxcb
 DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
 EAPI=7
 HOMEPAGE=https://github.com/tych0/xcffib
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/libxcb python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-),python_targets_python3_10(-)?,-python_single_target_python3_10(-)] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] x11-libs/libxcb python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/x/xcffib/xcffib-0.11.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8b0cb8fc06b92294b90eddd98d47cbc1
+_md5_=b8312903c22c23c633418d64a545ab45
diff --git a/metadata/md5-cache/dev-python/xdg-5.0.2 b/metadata/md5-cache/dev-python/xdg-5.0.2
index 5ad9f0091578..c57091314e3f 100644
--- a/metadata/md5-cache/dev-python/xdg-5.0.2
+++ b/metadata/md5-cache/dev-python/xdg-5.0.2
@@ -1,15 +1,15 @@
-BDEPEND=test? ( !dev-python/pyxdg >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( !dev-python/pyxdg >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pyproject2setuppy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implementation of the XDG Base Directory Specification in Python
 EAPI=7
 HOMEPAGE=https://github.com/srstevenson/xdg/ https://pypi.org/project/xdg/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=!dev-python/pyxdg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=!dev-python/pyxdg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/srstevenson/xdg/archive/5.0.2.tar.gz -> xdg-5.0.2.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fd1774dbb2e5b518056195be6a6dd5c8
+_md5_=034e94cb4e7638fa26daa2acbcc3d858
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.15.4 b/metadata/md5-cache/dev-python/xdoctest-0.15.4
index 99ca4da44a8c..1a995e6e070d 100644
--- a/metadata/md5-cache/dev-python/xdoctest-0.15.4
+++ b/metadata/md5-cache/dev-python/xdoctest-0.15.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( >=dev-python/nbformat-5.1.2-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/nbformat-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/nbformat-5.1.2-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A rewrite of Python's builtin doctest module but without all the weirdness
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Erotemic/xdoctest/archive/0.15.4.tar.gz -> xdoctest-0.15.4.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91d8ee4b9ed3b4cc8475b54c3b3d4fb2
+_md5_=f13d3dfbd58674f275bb77fad88d06e4
diff --git a/metadata/md5-cache/dev-python/xxhash-2.0.0 b/metadata/md5-cache/dev-python/xxhash-2.0.0
deleted file mode 100644
index 1f15202f491c..000000000000
--- a/metadata/md5-cache/dev-python/xxhash-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/xxhash-0.8.0 test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python binding for the xxHash library
-EAPI=7
-HOMEPAGE=https://github.com/ifduyue/python-xxhash https://pypi.org/project/xxhash/
-IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-libs/xxhash-0.8.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xxhash/xxhash-2.0.0.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d8ae4e0f345a3da4251da8c642fe3392
diff --git a/metadata/md5-cache/dev-python/xxhash-2.0.2 b/metadata/md5-cache/dev-python/xxhash-2.0.2
index db14ecf36df1..c5306c0a2708 100644
--- a/metadata/md5-cache/dev-python/xxhash-2.0.2
+++ b/metadata/md5-cache/dev-python/xxhash-2.0.2
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-libs/xxhash-0.8.0 test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=>=dev-libs/xxhash-0.8.0 test? ( >=dev-libs/xxhash-0.8.0 dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python binding for the xxHash library
 EAPI=7
 HOMEPAGE=https://github.com/ifduyue/python-xxhash https://pypi.org/project/xxhash/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-libs/xxhash-0.8.0 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-libs/xxhash-0.8.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_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/x/xxhash/xxhash-2.0.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=121f8bd8bd93a4007b23f7e6a3f5699d
+_md5_=f90c92d5a79b551ec0a5ef220960356c
diff --git a/metadata/md5-cache/dev-python/yapf-0.31.0 b/metadata/md5-cache/dev-python/yapf-0.31.0
index 5f716323f31c..a3b77a69c750 100644
--- a/metadata/md5-cache/dev-python/yapf-0.31.0
+++ b/metadata/md5-cache/dev-python/yapf-0.31.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A formatter for Python files
 EAPI=7
 HOMEPAGE=https://github.com/google/yapf
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/google/yapf/archive/v0.31.0.tar.gz -> yapf-0.31.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f752cc609cda33db4f425e912f632a6d
+_md5_=41e2b1b58d2107790bff7ca8f7a634ba
diff --git a/metadata/md5-cache/dev-python/yapsy-1.12.2 b/metadata/md5-cache/dev-python/yapsy-1.12.2
index 06be042f7433..7126972c737a 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.12.2
+++ b/metadata/md5-cache/dev-python/yapsy-1.12.2
@@ -1,14 +1,14 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A fat-free DIY Python plugin management toolkit
 EAPI=7
 HOMEPAGE=http://yapsy.sourceforge.net/
-IUSE=doc python_targets_python3_8 python_targets_python3_9
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.12.2/Yapsy-1.12.2.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8958eb141edb30d48270cca9cb5e5957
+_md5_=ee0629e5a6cd1d5e1230915b49368414
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-2.0 b/metadata/md5-cache/dev-python/zc-lockfile-2.0
index 0420dbefc56a..141b500d9773 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-2.0
+++ b/metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -1,16 +1,15 @@
-BDEPEND=test? ( >=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Basic inter-process locks
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zc.lockfile/
-IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=ZPL
-RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/z/zc.lockfile/zc.lockfile-2.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d94f8a7d04d3dd98c27f82ab196549a2
+_md5_=0ad1661c0e4f018d0b74028127893b03
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.30.0 b/metadata/md5-cache/dev-python/zeroconf-0.30.0
index ec58dd81bcf9..76ac28559fcf 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.30.0
+++ b/metadata/md5-cache/dev-python/zeroconf-0.30.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi c
 EAPI=7
 HOMEPAGE=https://github.com/jstasiak/python-zeroconf/ https://pypi.org/project/zeroconf/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/jstasiak/python-zeroconf/archive/0.30.0.tar.gz -> python-zeroconf-0.30.0.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=941aa701552d70805d776f809c434ee2
+_md5_=ca339eef5507975862af4dce95949eed
diff --git a/metadata/md5-cache/dev-python/zope-interface-5.4.0 b/metadata/md5-cache/dev-python/zope-interface-5.4.0
index f9a052263582..49c97dd340e9 100644
--- a/metadata/md5-cache/dev-python/zope-interface-5.4.0
+++ b/metadata/md5-cache/dev-python/zope-interface-5.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=Interfaces for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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=ZPL
 RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-5.4.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ce26a36fcd79c47c0313f31653dbad4a
+_md5_=06ecb3c1d6d21b2d93cc6dad8e805aaa
diff --git a/metadata/md5-cache/dev-python/zxcvbn-4.4.28 b/metadata/md5-cache/dev-python/zxcvbn-4.4.28
index d8d33e0fa9c7..02e252f03f4d 100644
--- a/metadata/md5-cache/dev-python/zxcvbn-4.4.28
+++ b/metadata/md5-cache/dev-python/zxcvbn-4.4.28
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A realistic password strength estimator
 EAPI=7
 HOMEPAGE=https://github.com/dwolfhub/zxcvbn-python
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/dwolfhub/zxcvbn-python/archive/v4.4.28.tar.gz -> zxcvbn-4.4.28.gh.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=642975ed0c4b0d4d72168c30318f2542
+_md5_=3ae0c9221326d848d9e845becf8d5d98
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 0b8db1762417..d61afb38030d 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/actioncable-5.2.4.5 b/metadata/md5-cache/dev-ruby/actioncable-5.2.4.5
deleted file mode 100644
index 576a4fc002b0..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=test !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3a38d4a17ac6639207a7a1e28f1199f0
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.3.5 b/metadata/md5-cache/dev-ruby/actioncable-6.0.3.5
deleted file mode 100644
index 7a40d31a125c..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.2.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.2.1
deleted file mode 100644
index bd34626d6fd2..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.3 b/metadata/md5-cache/dev-ruby/actioncable-6.1.3
deleted file mode 100644
index 7359d61eadcc..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.3.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.3.1
deleted file mode 100644
index 6449535b5b65..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby25(-)] dev-ruby/nio4r:2[ruby_targets_ruby25(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=366044cd7d7112cb66a350871f55cd56
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.5 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.5
deleted file mode 100644
index 0545df5bea49..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e6c4e6d86c849deae4acc00c0d92a77d
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.2.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.2.1
deleted file mode 100644
index 2bed320b95b3..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ba4b1eba74998bc2bb1773729850d5e
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3
deleted file mode 100644
index 78042fabf0a0..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ba4b1eba74998bc2bb1773729850d5e
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.1
deleted file mode 100644
index faca0beba2a7..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6ba4b1eba74998bc2bb1773729850d5e
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.2.4.5 b/metadata/md5-cache/dev-ruby/actionmailer-5.2.4.5
deleted file mode 100644
index b15a14980de2..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=399b4f5da4b23ff7eeccf5c429673460
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.5 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.5
deleted file mode 100644
index 79c50ae670aa..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2e81ccfba18dbbd309ff57dbd7e3f49f
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.2.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.2.1
deleted file mode 100644
index 5ab942727694..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=889d8ba343f3566117819af04e7dd9fb
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.3 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.3
deleted file mode 100644
index 0f13e7f24c50..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=889d8ba343f3566117819af04e7dd9fb
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.1
deleted file mode 100644
index d747b6acd83e..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=889d8ba343f3566117819af04e7dd9fb
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.4.5 b/metadata/md5-cache/dev-ruby/actionpack-5.2.4.5
deleted file mode 100644
index a736e4184259..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fad222bb2a08927ac33b0b1454456556
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.2.6 b/metadata/md5-cache/dev-ruby/actionpack-5.2.6
index 4705400e0bbc..0840eb5c2a52 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionpack-5.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.6[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.6[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.6[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.6[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=78f1f716b0d78dbaf14d492b326b5c9a
+_md5_=6fd7a99e23136e386f6662b5178c3896
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.5 b/metadata/md5-cache/dev-ruby/actionpack-6.0.3.5
deleted file mode 100644
index ab2e1c1fb098..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3edca22b3dd310c8cfe676e1eb32a536
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.2.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.2.1
deleted file mode 100644
index f1a61d97255d..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=29141290376f46e4b42acf75b735cc65
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.3 b/metadata/md5-cache/dev-ruby/actionpack-6.1.3
deleted file mode 100644
index 3e62657ff1c1..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=29141290376f46e4b42acf75b735cc65
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.3.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.3.1
deleted file mode 100644
index ce5d1b911081..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] dev-ruby/bundler[ruby_targets_ruby25(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25(-)] www-servers/puma[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/rack:2.2[ruby_targets_ruby25(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=29141290376f46e4b42acf75b735cc65
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.5 b/metadata/md5-cache/dev-ruby/actiontext-6.0.3.5
deleted file mode 100644
index 0464280146ce..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=61fa3b81ead36ec56b2fcf9a062b0028
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.2.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.2.1
deleted file mode 100644
index 00b47cbac593..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=970f1ed8db3544781a4759815c24778e
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.3 b/metadata/md5-cache/dev-ruby/actiontext-6.1.3
deleted file mode 100644
index 9224d40efb04..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=970f1ed8db3544781a4759815c24778e
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.3.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.3.1
deleted file mode 100644
index 5bc2a1611fe0..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=970f1ed8db3544781a4759815c24778e
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.4.5 b/metadata/md5-cache/dev-ruby/actionview-5.2.4.5
deleted file mode 100644
index 8a3f5c85f45f..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=69976b95e3ba7aefe774fd6b3dccbb83
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.2.6 b/metadata/md5-cache/dev-ruby/actionview-5.2.6
index cbdbd5290270..934c5fd16fa6 100644
--- a/metadata/md5-cache/dev-ruby/actionview-5.2.6
+++ b/metadata/md5-cache/dev-ruby/actionview-5.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.6[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.6[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5d0771ccb9d28faf16265ea86b781f09
+_md5_=e06d848f5df9096d9556ff23ff8c565e
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.3.5 b/metadata/md5-cache/dev-ruby/actionview-6.0.3.5
deleted file mode 100644
index 2c61528d54d4..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=33f069560526a9908c9dab0704c19a29
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.2.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.2.1
deleted file mode 100644
index b68ee5c9a3a5..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a74ebbadb75736f4e21baf71c005415
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.3 b/metadata/md5-cache/dev-ruby/actionview-6.1.3
deleted file mode 100644
index 10c56f8f083f..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a74ebbadb75736f4e21baf71c005415
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.3.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.3.1
deleted file mode 100644
index d38273e54e95..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby25(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2a74ebbadb75736f4e21baf71c005415
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.2.4.5 b/metadata/md5-cache/dev-ruby/activejob-5.2.4.5
deleted file mode 100644
index a31477348b16..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=37c931bf157bdb32454a72ade906435e
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.3.5 b/metadata/md5-cache/dev-ruby/activejob-6.0.3.5
deleted file mode 100644
index 67a3af6decb0..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.2.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.2.1
deleted file mode 100644
index 31d52ece0598..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.3 b/metadata/md5-cache/dev-ruby/activejob-6.1.3
deleted file mode 100644
index e6fd3467efa3..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.3.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.3.1
deleted file mode 100644
index 103edd5e42ec..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8591a7debfa5a85ce6704cef9d254c92
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.4.5 b/metadata/md5-cache/dev-ruby/activemodel-5.2.4.5
deleted file mode 100644
index 0d67ac4d4591..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7fd7a6c0b438b5caa421b15923ccf6f0
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.2.6 b/metadata/md5-cache/dev-ruby/activemodel-5.2.6
index da2947ea273c..c9d6efa32acc 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activemodel-5.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.6:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.6:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=18a137baed8323dea6d29b3600074520
+_md5_=6af5cf9939ef936cdb19bc53e13bdee4
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.5 b/metadata/md5-cache/dev-ruby/activemodel-6.0.3.5
deleted file mode 100644
index d3febaf2b123..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1
deleted file mode 100644
index 3bb2cf0ef1e7..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.3 b/metadata/md5-cache/dev-ruby/activemodel-6.1.3
deleted file mode 100644
index efd19670e831..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.1.3[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.3[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.3[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.3.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.3.1
deleted file mode 100644
index 036fca7bfae8..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ae6e7c5d5f40636f6b390c59002cffbe
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.2.4.5 b/metadata/md5-cache/dev-ruby/activerecord-5.2.4.5
deleted file mode 100644
index 6310e4d44268..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/arel:9.0[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/arel:9.0[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/arel:9.0[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/arel:9.0[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-0.18.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a6d52063d8f3a3fd936d3bd56d407c64
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.5 b/metadata/md5-cache/dev-ruby/activerecord-6.0.3.5
deleted file mode 100644
index 9ee374cf7e20..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d772ddbab899dad4898ca3bbfdab3695
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.2.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.2.1
deleted file mode 100644
index 0e6d6bc0b686..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c13be25062b150ea5d1b7e995b2a61f4
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.3 b/metadata/md5-cache/dev-ruby/activerecord-6.1.3
deleted file mode 100644
index ec6af2c3bc1a..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ddb330faea3a92eadb8fb17d9d7eb1e
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.3.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.3.1
deleted file mode 100644
index d73889758453..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/minitest:5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby25(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby25(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ddb330faea3a92eadb8fb17d9d7eb1e
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.4.5 b/metadata/md5-cache/dev-ruby/activestorage-5.2.4.5
deleted file mode 100644
index 8e4749323d7e..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf ) test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-5.2.4.5:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-5.2.4.5:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mini_magick[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-5.2.4.5:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-5.2.4.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-5.2.4.5:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=052e5e368077749b7da0828e9bae17ce
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.5 b/metadata/md5-cache/dev-ruby/activestorage-6.0.3.5
deleted file mode 100644
index 9f9c63674aee..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mini_magick[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.3.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a83e4759ba751f13ae8b7ae6472b8364
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.2.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.2.1
deleted file mode 100644
index 2281f07b77b3..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1:*[ruby_targets_ruby27(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mini_magick[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.2.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1:*[ruby_targets_ruby27(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4ce4540a33833a464a7a79c1561824a7
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.3 b/metadata/md5-cache/dev-ruby/activestorage-6.1.3
deleted file mode 100644
index e96b7a4aeae6..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3:*[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] >=dev-ruby/mimemagic-0.3.2[ruby_targets_ruby25(-)] =dev-ruby/mimemagic-0.3*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] >=dev-ruby/mimemagic-0.3.2[ruby_targets_ruby26(-)] =dev-ruby/mimemagic-0.3*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby27(-)] >=dev-ruby/mimemagic-0.3.2[ruby_targets_ruby27(-)] =dev-ruby/mimemagic-0.3*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mini_magick[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3:*[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby25(-)] >=dev-ruby/mimemagic-0.3.2[ruby_targets_ruby25(-)] =dev-ruby/mimemagic-0.3*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby26(-)] >=dev-ruby/mimemagic-0.3.2[ruby_targets_ruby26(-)] =dev-ruby/mimemagic-0.3*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/marcel-0.3.1:0[ruby_targets_ruby27(-)] >=dev-ruby/mimemagic-0.3.2[ruby_targets_ruby27(-)] =dev-ruby/mimemagic-0.3*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=44411971cf48a70be9218ffc46d4e6e3
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.3.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.3.1
deleted file mode 100644
index e5d6c2eae942..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby25(-)] dev-ruby/marcel:1.0[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-1.0.2[ruby_targets_ruby25(-)] =dev-ruby/mini_mime-1.0*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.2[ruby_targets_ruby26(-)] =dev-ruby/mini_mime-1.0*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/mini_mime-1.0*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby25(-)] dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/mini_magick[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1:*[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby25(-)] dev-ruby/marcel:1.0[ruby_targets_ruby25(-)] >=dev-ruby/mini_mime-1.0.2[ruby_targets_ruby25(-)] =dev-ruby/mini_mime-1.0*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.0.2[ruby_targets_ruby26(-)] =dev-ruby/mini_mime-1.0*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/mini_mime-1.0*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16f5ed62e5c9f4f803ef898fad02b5f6
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.4.5 b/metadata/md5-cache/dev-ruby/activesupport-5.2.4.5
deleted file mode 100644
index f6d8d30b69cd..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fab92aa6f1221b236c5d7dd73edcbcf6
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.6 b/metadata/md5-cache/dev-ruby/activesupport-5.2.6
index 1105c5002298..6463d98b14f7 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.6
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=115d70a82635eabea078dc0549b69cce
+_md5_=785f0a261d075742cf8bc85ca9ff9365
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.5 b/metadata/md5-cache/dev-ruby/activesupport-6.0.3.5
deleted file mode 100644
index 745391287062..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] dev-ruby/i18n:1[ruby_targets_ruby25(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=473072ea61a39e3c160998f4b9f1c980
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.2.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.2.1
deleted file mode 100644
index 2709017f6b8d..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] dev-ruby/tzinfo:2[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] dev-ruby/tzinfo:2[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=060a002271459fe3e7fd78c4152a0df7
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.3 b/metadata/md5-cache/dev-ruby/activesupport-6.1.3
deleted file mode 100644
index 4b596fd18a82..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] dev-ruby/tzinfo:2[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] dev-ruby/tzinfo:2[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=060a002271459fe3e7fd78c4152a0df7
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.3.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.3.1
deleted file mode 100644
index a001a33846c6..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] dev-ruby/tzinfo:2[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby25(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby25(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby25(-)] dev-ruby/tzinfo:2[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=060a002271459fe3e7fd78c4152a0df7
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.2.19 b/metadata/md5-cache/dev-ruby/bundler-2.2.19
new file mode 100644
index 000000000000..8de147498ebf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-2.2.19
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=An easy way to vendor gem dependencies
+EAPI=7
+HOMEPAGE=https://github.com/carlhuda/bundler
+IUSE=+doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/bundler-2.2.19.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=20da7c0bf440cd7987dda03753c57a93
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1 b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
index 361b396ee330..7c973ac385e1 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=An easy way to detect and use command-line dependencies
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaauie/cliver/archive/3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b.tar.gz -> cliver-0.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bf0c988898b7f43c02a91b464ce19b57
+_md5_=b4a5876eef3d1e8f142e7741263dd672
diff --git a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1 b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
index 7304e3e5ad26..fd6c2e891785 100644
--- a/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
+++ b/metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Deep Freeze Ruby Objects
 EAPI=7
 HOMEPAGE=https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ice_nine-0.11.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5620e2de65d8dcfb4788c8063b9e69e8
+_md5_=42dc1561531ced3579021f7f7083637e
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.9.0 b/metadata/md5-cache/dev-ruby/loofah-2.10.0
similarity index 97%
rename from metadata/md5-cache/dev-ruby/loofah-2.9.0
rename to metadata/md5-cache/dev-ruby/loofah-2.10.0
index cf40446b99dc..451843f1d600 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.9.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.10.0
@@ -11,6 +11,6 @@ RDEPEND=ruby_targets_ruby25? ( =dev-ruby/crass-1.0*[ruby_targets_ruby25(-)] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/flavorjones/loofah/archive/v2.9.0.tar.gz -> loofah-2.9.0.tar.gz
+SRC_URI=https://github.com/flavorjones/loofah/archive/v2.10.0.tar.gz -> loofah-2.10.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=45795aa09b6663a85130930e929b6c34
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.8.0 b/metadata/md5-cache/dev-ruby/loofah-2.8.0
index dd7a073d0f0b..2d5efa4b6137 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.8.0
+++ b/metadata/md5-cache/dev-ruby/loofah-2.8.0
@@ -5,7 +5,7 @@ DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fra
 EAPI=7
 HOMEPAGE=https://github.com/flavorjones/loofah
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/crass-1.0*[ruby_targets_ruby25(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby25(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/crass-1.0*[ruby_targets_ruby26(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flavorjones/loofah/archive/v2.8.0.tar.gz -> loofah-2.8.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c754e76f6c99e41c217f4b2927348c2e
+_md5_=56e2397db1cd8263f8c732296c35d8f1
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.11.7 b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
new file mode 100644
index 000000000000..d0cb49552e65
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.11.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby25(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby25(-)] dev-ruby/rdoc[ruby_targets_ruby25(-)] test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby26(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby27(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby30(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libxml2-2.9.12 >=dev-libs/libxslt-1.1.34 sys-libs/zlib virtual/libiconv ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
+EAPI=7
+HOMEPAGE=https://www.nokogiri.org/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/libxml2-2.9.12:= >=dev-libs/libxslt-1.1.34 sys-libs/zlib virtual/libiconv ruby_targets_ruby25? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.11.7.tar.gz -> nokogiri-1.11.7-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d9d41536a3a45123cc5a25e8c47843e9
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.4.5 b/metadata/md5-cache/dev-ruby/rails-5.2.4.5
deleted file mode 100644
index da199e2a316d..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25(-)] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25(-)] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25(-)] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby26(-)] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby26(-)] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby26(-)] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=6
-HOMEPAGE=https://rubyonrails.org
-IUSE=+asset-pipeline test ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25(-)] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25(-)] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25(-)] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-5.2.4.5[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby26(-)] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby26(-)] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby26(-)] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5.2
-SRC_URI=https://rubygems.org/gems/rails-5.2.4.5.gem
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c24772777f46e4b38c376017aeb73f42
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.3.5 b/metadata/md5-cache/dev-ruby/rails-6.0.3.5
deleted file mode 100644
index 2093a6644eed..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.3.5[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://rubygems.org/gems/rails-6.0.3.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1dc3f41425d1ad2fdb476b074879402e
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.2.1 b/metadata/md5-cache/dev-ruby/rails-6.1.2.1
deleted file mode 100644
index 4a4560f9a00c..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.2.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://rubygems.org/gems/rails-6.1.2.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.3 b/metadata/md5-cache/dev-ruby/rails-6.1.3
deleted file mode 100644
index 402b54483f00..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://rubygems.org/gems/rails-6.1.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.3.1 b/metadata/md5-cache/dev-ruby/rails-6.1.3.1
deleted file mode 100644
index 1a890ccc1e1a..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailbox-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionmailer-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actiontext-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby25(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby25(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.3.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://rubygems.org/gems/rails-6.1.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=95937fe4dc37cea372215d03a326b8e7
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.4.5 b/metadata/md5-cache/dev-ruby/railties-5.2.4.5
deleted file mode 100644
index 586795556b01..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-5.2.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-5.2.4.5[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.4.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.4.5[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=test !test? ( test )
-SLOT=5.2
-SRC_URI=https://github.com/rails/rails/archive/v5.2.4.5.tar.gz -> rails-5.2.4.5.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7851db637ae5977e8259674f3ee6237d
diff --git a/metadata/md5-cache/dev-ruby/railties-5.2.6 b/metadata/md5-cache/dev-ruby/railties-5.2.6
index 099fbd653626..205777da06b6 100644
--- a/metadata/md5-cache/dev-ruby/railties-5.2.6
+++ b/metadata/md5-cache/dev-ruby/railties-5.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-5.2.6[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-5.2.6[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-5.2.6[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-5.2.6[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.6.tar.gz -> rails-5.2.6.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c4db60b90b22aa2c45fa2a4e303255de
+_md5_=2482b6309bc7f3c04a43708fc6c54d74
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.3.5 b/metadata/md5-cache/dev-ruby/railties-6.0.3.5
deleted file mode 100644
index a3598da149de..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.0.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.3.5[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.3.5[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.3.5[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.3.5.tar.gz -> rails-6.0.3.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91126d3bcc589a11a8409f0b396b937e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.2.1 b/metadata/md5-cache/dev-ruby/railties-6.1.2.1
deleted file mode 100644
index 6d9d5c62c056..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] || ( dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby25(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] || ( dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby26(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] || ( dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/thor-0.18.1:0[ruby_targets_ruby27(-)] ) >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91126d3bcc589a11a8409f0b396b937e
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.2.1-r1 b/metadata/md5-cache/dev-ruby/railties-6.1.2.1-r1
deleted file mode 100644
index 1db37b4a02f2..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.1.2.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.2.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.2.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.2.1.tar.gz -> rails-6.1.2.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=929e1f132ea436074c3a2b3c67af4a98
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.3 b/metadata/md5-cache/dev-ruby/railties-6.1.3
deleted file mode 100644
index 00cb48f01d98..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.1.3[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.1.3[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.3[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.tar.gz -> rails-6.1.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af265ce4645447d3ac964bb749ec0b04
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.3.1 b/metadata/md5-cache/dev-ruby/railties-6.1.3.1
deleted file mode 100644
index 4bdcaa2b54de..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/mocha:0.14[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby25(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] dev-ruby/method_source[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.3.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.3.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.3.1.tar.gz -> rails-6.1.3.1.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=af265ce4645447d3ac964bb749ec0b04
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.7.1 b/metadata/md5-cache/dev-ruby/regexp_parser-1.7.1
deleted file mode 100644
index e0cd426567d6..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=7
-HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.7.1.tar.gz -> regexp_parser-1.7.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=735ab342184ec5b1240d3d6886ecfa15
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.0.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
deleted file mode 100644
index 36b17c835f65..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=7
-HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.0.0.tar.gz -> regexp_parser-2.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d474df7c9103734468d78e2d5eebeaac
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.0.3 b/metadata/md5-cache/dev-ruby/regexp_parser-2.0.3
deleted file mode 100644
index 766601ebe669..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=7
-HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.0.3.tar.gz -> regexp_parser-2.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=849dfee93ce9c83b88de536ad3b12524
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.0
deleted file mode 100644
index 0d5df21eb624..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=7
-HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.0.tar.gz -> regexp_parser-2.1.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=849dfee93ce9c83b88de536ad3b12524
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
index 63b7c2f84afe..1bd3e5023ab7 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressio
 EAPI=7
 HOMEPAGE=https://github.com/ammar/regexp_parser
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.1.1.tar.gz -> regexp_parser-2.1.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ccb2b025e70c538429c07c7483b1ca28
+_md5_=23c8890b03292c8047d087ee28783809
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.18.0 b/metadata/md5-cache/dev-ruby/ruby-prof-0.18.0
deleted file mode 100644
index f9515c096a93..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=A module for profiling Ruby code
-EAPI=6
-HOMEPAGE=https://github.com/ruby-prof/ruby-prof
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/0.18.0.tar.gz -> ruby-prof-0.18.0.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=298198e37e602eeadcd478321ae886c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
similarity index 95%
rename from metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
rename to metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
index 4ea9bfc2ae53..636bbe51e5fb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
@@ -11,6 +11,6 @@ RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.1.tar.gz -> ruby-prof-1.4.1.tgz
+SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.3.tar.gz -> ruby-prof-1.4.3.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b4f92c18ad2205838c18be95d6fab4c6
+_md5_=b3a42d7c8bc284ce457c8d2291de42bd
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
new file mode 100644
index 000000000000..12a37486c782
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby25(-)] ) 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_ruby25? ( test? ( dev-ruby/racc[ruby_targets_ruby25(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby25(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby25(-)] ) ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A ruby parser written in pure ruby
+EAPI=7
+HOMEPAGE=https://github.com/seattlerb/ruby_parser
+IUSE=test ruby_targets_ruby25 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_ruby25? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby25(-)] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/ruby_parser-3.16.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=14a4887a2c2427d92613befad7ffcf01
diff --git a/metadata/md5-cache/dev-ruby/sassc-2.4.0 b/metadata/md5-cache/dev-ruby/sassc-2.4.0
new file mode 100644
index 000000000000..096e89cae78d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sassc-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test_construct[ruby_targets_ruby25(-)] dev-ruby/minitest-around[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test_construct[ruby_targets_ruby26(-)] dev-ruby/minitest-around[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test_construct[ruby_targets_ruby27(-)] dev-ruby/minitest-around[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Use libsass with Ruby
+EAPI=7
+HOMEPAGE=https://github.com/sass/sassc-ruby
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=>=dev-libs/libsass-3.6.1 ruby_targets_ruby25? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.9.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/sassc-2.4.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0b2b5e6c1e7e0435db9da1890af555bb
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.4.4 b/metadata/md5-cache/dev-ruby/test-unit-3.4.4
new file mode 100644
index 000000000000..1442accfccfd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.4.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/power_assert[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/power_assert[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=An xUnit family unit testing framework for Ruby
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/test-unit
+IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby GPL-2 ) PSF-2
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/power_assert[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/power_assert[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/power_assert[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/power_assert[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/test-unit-3.4.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=523e3bb95cb4d0075ce139ea178e4ece
diff --git a/metadata/md5-cache/dev-ruby/tins-1.29.1 b/metadata/md5-cache/dev-ruby/tins-1.29.1
new file mode 100644
index 000000000000..abbe5c0227f7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tins-1.29.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/sync[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/sync[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/sync[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=All the stuff that isn't good enough for a real library
+EAPI=7
+HOMEPAGE=https://github.com/flori/tins
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/sync[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/sync[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/sync[ruby_targets_ruby30(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/tins-1.29.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a9931ec99d526c1394771e2c89c344f7
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 01013d9e2eb4..df8f5e021c2e 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/bibtexu-3.71_p20210325 b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20210325
index f57f13ac38cc..b765fe628072 100644
--- a/metadata/md5-cache/dev-tex/bibtexu-3.71_p20210325
+++ b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20210325
@@ -5,9 +5,9 @@ DESCRIPTION=8-bit Implementation of BibTeX 0.99 with a Very Large Capacity
 EAPI=7
 HOMEPAGE=http://tug.org/texlive/
 IUSE=doc source
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.1:= >=dev-libs/icu-4.4:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-20210325-source.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtex8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexu-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtex8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexu.doc-2021.tar.xz )
-_md5_=7453d9a071162b5774ed424831693ecc
+_md5_=fe31aaa14b354c3b409c6140c2de258b
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210428 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
similarity index 82%
rename from metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210428
rename to metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
index deda23d0a423..04ce4aeb29b4 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210428
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
@@ -5,10 +5,10 @@ DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=7
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
 IUSE=doc java elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.8:* ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
-SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210428.tar.xz doc? ( https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210428.doc.tar.xz )
+SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.tar.xz doc? ( https://dev.gentoo.org/~ulm/distfiles/tex4ht-texlive-20210603.doc.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	latex-package	e5f296c98696dd02059bc6a5a03282e2	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5aa454b314711d483d45faf99614e8a9
+_md5_=e2d879fb3cb8aa9d302186d276d5750e
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index b9d1fa84e02d..3151782ebeb4 100644
Binary files a/metadata/md5-cache/dev-texlive/Manifest.gz and b/metadata/md5-cache/dev-texlive/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2021 b/metadata/md5-cache/dev-texlive/texlive-basic-2021
index ff9df5953153..79857d0bb9ef 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Essential programs and files
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc +luajittex
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OFL public-domain TeX TeX-other-free
 RDEPEND=!<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2020[luajittex?] >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorprofiles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorprofiles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enctex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enctex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex-pkg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex-pkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-def-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-def-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyph-utf8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyph-utf8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifplatform-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifplatform-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iftex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iftex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth-lib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth-lib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knuth-local-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knuth-local-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-alt-getopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-alt-getopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahbtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahbtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfware-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ini-files-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ini-files-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-common-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-common-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-docindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-docindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-en-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-en-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-msg-translations-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-msg-translations-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlshell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlshell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-data-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-data-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-basic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-basic-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorprofiles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorprofiles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enctex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enctex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etex-pkg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etex-pkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-def.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-def.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyph-utf8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyph-utf8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifplatform.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifplatform.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iftex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iftex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-alt-getopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-alt-getopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahbtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahbtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfware.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ini-files.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ini-files.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-common.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-common.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-docindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-docindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-en.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-en.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlshell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlshell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-data.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-data.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyph-utf8.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyph-utf8.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifplatform.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifplatform.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=518c80bd54f5fcde7627be4c3b242726
+_md5_=34811a40c052dab12476bd06252671f9
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
index f6b867ed302e..d9b56a44a1a4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive BibTeX additional styles
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2 GPL-2
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=dev-texlive/texlive-latex-2019 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aaai-named-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aaai-named-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aichej-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aichej-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ajl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ajl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annotate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annotate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authordate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authordate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beebe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beebe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-besjournals-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-besjournals-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bestpapers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bestpapers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibhtml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibhtml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-abnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-abnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ajc2020unofficial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ajc2020unofficial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-anonymous-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-anonymous-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa6-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa6-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-arthistory-bonn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-arthistory-bonn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinother-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinother-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bwl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bwl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-caspervector-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-caspervector-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chicago-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chicago-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-claves-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-claves-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-dw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-dw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-enc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-enc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-fiwi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-fiwi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gb7714-2015-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gb7714-2015-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-german-legal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-german-legal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-historian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-historian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ieee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ieee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ijsra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ijsra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-iso690-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-iso690-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-jura2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-jura2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-juradiss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-juradiss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-license-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-license-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-lni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-lni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-luh-ipw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-luh-ipw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-manuscripts-philology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-manuscripts-philology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-mla-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-mla-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-morenames-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-morenames-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-multiple-dm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-multiple-dm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-musuos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-musuos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nature-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nature-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nottsclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nottsclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-opcit-booktitle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-opcit-booktitle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-phys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-phys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-publist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-publist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-realauthor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-realauthor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-sbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-sbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-science-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-science-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-shortfields-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-shortfields-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-socialscienceshuberlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-socialscienceshuberlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-software-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-software-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-source-division-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-source-division-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-subseries-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-subseries-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-swiss-legal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-swiss-legal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-trad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-trad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-true-citepages-omit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-true-citepages-omit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-unified-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-unified-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-vancouver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-vancouver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex2bibitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex2bibitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biolett-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biolett-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookdb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookdb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakcites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakcites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chbibref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chbibref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicagoa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicagoa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-annote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-annote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeall-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeall-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-compactbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-compactbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossrefware-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossrefware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-din1505-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-din1505-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecobiblatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecobiblatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econ-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econ-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-economic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-economic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-francais-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-francais-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-historische-zeitschrift-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-historische-zeitschrift-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ietfbibs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ietfbibs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijqc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijqc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinebib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinebib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iopart-num-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iopart-num-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-is-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-is-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jbact-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jbact-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jneurosci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jneurosci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksfh_nat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksfh_nat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logreq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logreq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-munich-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-munich-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notex-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notex-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oscola-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oscola-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perception-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perception-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pnas2009-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pnas2009-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showtags-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showtags-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sort-by-letters-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sort-by-letters-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-formatting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-formatting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-ger-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-ger-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-lin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-lin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-windycity-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-windycity-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zootaxa-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zootaxa-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-bibtexextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-bibtexextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authordate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authordate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-besjournals.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-besjournals.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bestpapers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bestpapers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibhtml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibhtml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-abnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-abnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ajc2020unofficial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ajc2020unofficial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-anonymous.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-anonymous.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-apa6.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-apa6.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-arthistory-bonn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-arthistory-bonn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bookinother.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bookinother.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bwl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bwl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-caspervector.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-caspervector.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-chicago.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-chicago.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-claves.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-claves.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-dw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-dw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-enc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-enc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-fiwi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-fiwi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gb7714-2015.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gb7714-2015.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-german-legal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-german-legal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-gost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-gost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-historian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-historian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ieee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ieee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-iso690.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-iso690.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-jura2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-jura2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-juradiss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-juradiss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-license.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-license.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-lni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-lni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-luh-ipw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-luh-ipw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-manuscripts-philology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-manuscripts-philology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-mla.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-mla.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-morenames.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-morenames.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-multiple-dm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-multiple-dm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-musuos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-musuos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nature.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nature.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nottsclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nottsclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-opcit-booktitle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-opcit-booktitle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-phys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-phys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-publist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-publist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-realauthor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-realauthor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-sbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-sbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-science.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-science.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-shortfields.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-shortfields.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-socialscienceshuberlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-socialscienceshuberlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-software.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-software.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-source-division.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-source-division.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-subseries.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-subseries.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-swiss-legal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-swiss-legal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-trad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-trad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-true-citepages-omit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-true-citepages-omit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-unified.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-unified.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex2bibitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex2bibitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biolett-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biolett-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookdb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookdb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakcites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakcites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chbibref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chbibref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chicago-annote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chicago-annote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeall.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeall.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-citeref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-citeref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossrefware.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossrefware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-din1505.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-din1505.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecobiblatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecobiblatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econ-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econ-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-economic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-economic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-francais-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-francais-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-historische-zeitschrift.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-historische-zeitschrift.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ietfbibs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ietfbibs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijqc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijqc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinebib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinebib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iopart-num.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iopart-num.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-is-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-is-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jneurosci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jneurosci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logreq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logreq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-munich.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-munich.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oscola.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oscola.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perception.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perception.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showtags.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showtags.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sort-by-letters.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sort-by-letters.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-formatting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-formatting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-ger.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-ger.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uni-wtal-lin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uni-wtal-lin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-windycity.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-windycity.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zootaxa-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zootaxa-bst.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsrefs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsrefs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apacite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apacite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaeologie.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaeologie.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib2gls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib2gls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibarts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibarts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibexport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibexport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-archaeology.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-archaeology.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-bath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-bath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-nejm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-nejm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-oxref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-oxref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-philosophy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-philosophy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-software.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-software.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtexperllibs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtexperllibs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibtopicprefix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibtopicprefix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibunits.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibunits.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chembst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chembst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chscite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chscite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-custom-bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-custom-bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dk-bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dk-bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doipubmed.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doipubmed.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gbt7714.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gbt7714.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geschichtsfrkl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geschichtsfrkl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harvard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harvard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurabib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurabib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltb2bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltb2bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabibentry.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabibentry.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-margbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-margbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibibliography.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibibliography.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nmbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nmbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes2bib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes2bib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urlbst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urlbst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-usebib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-usebib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcite.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=c11d99871c09097674e0b109159448b0
+_md5_=b68523192936a5e5c9a4090bafce8ad9
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2021 b/metadata/md5-cache/dev-texlive/texlive-context-2021
index 856481d873fc..eec2fa270fad 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive ConTeXt and packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-npp-for-context-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-npp-for-context-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-account-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-account-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-algorithmic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-algorithmic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-animation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-animation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-annotation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-annotation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-bnf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-bnf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-chromato-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-chromato-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmscbf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmscbf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmttbf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmttbf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-construction-plan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-construction-plan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cyrillicnumbers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cyrillicnumbers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-degrade-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-degrade-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fancybreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fancybreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-filter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-filter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fullpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fullpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gantt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gantt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gnuplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gnuplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-handlecsv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-handlecsv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-inifile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-inifile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-layout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-layout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-letter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-letter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-lettrine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-lettrine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-mathsets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-mathsets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-rst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-rst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-ruby-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-ruby-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simplefonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simplefonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simpleslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simpleslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-title-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-title-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-transliterator-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-transliterator-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typearea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typearea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typescripts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typescripts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-vim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-vim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-context-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-context-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-npp-for-context.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-npp-for-context.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-account.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-account.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-algorithmic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-algorithmic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-animation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-animation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-annotation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-annotation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-bnf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-bnf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-chromato.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-chromato.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmscbf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmscbf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cmttbf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cmttbf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-construction-plan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-construction-plan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-cyrillicnumbers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-cyrillicnumbers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-degrade.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-degrade.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fancybreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fancybreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-filter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-filter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-fullpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-fullpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gantt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gantt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-gnuplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-gnuplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-handlecsv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-handlecsv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-inifile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-inifile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-layout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-layout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-letter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-letter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-mathsets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-mathsets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-rst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-rst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-ruby.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-ruby.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simplefonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simplefonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-simpleslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-simpleslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-title.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-title.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-transliterator.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-transliterator.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typearea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typearea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-typescripts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-typescripts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-vim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-vim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-context-visualcounter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-context-visualcounter.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=6dda9dcd6b0d505a4fc926d7ec4fd551
+_md5_=461709d77708026c44b70b37039257d3
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
index 049cfae2e9d5..0458a9d5e9a8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Additional fonts
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.3 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Asana-Math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Asana-Math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-academicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-academicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accanthis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accanthis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adforn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adforn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aesupp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aesupp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alegreya-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alegreya-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alfaslabone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alfaslabone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algolrevived-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algolrevived-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almendra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almendra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almfixed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almfixed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antiqua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antiqua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archivo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archivo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arimo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arimo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arvo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arvo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aspectratio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aspectratio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-astro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-astro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atkinson-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atkinson-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-augie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-augie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurical-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurical-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervaldx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervaldx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervillef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervillef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bera-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bera-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-berenisadf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-berenisadf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beuron-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beuron-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boisik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boisik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boondox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boondox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braille-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braille-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brushscr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brushscr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cabin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cabin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caladea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caladea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cantarell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cantarell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlito-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlito-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carolmin-ps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carolmin-ps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadia-code-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadia-code-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-initials-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-initials-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charissil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charissil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cherokee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cherokee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cinzel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cinzel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clara-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clara-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clearsans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clearsans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-lgc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-lgc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-mf-extra-bold-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-mf-extra-bold-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-unicode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-unicode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmathbb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmathbb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmexb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmexb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsrb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsrb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmtiup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmtiup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmupint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmupint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cochineal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cochineal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coelacanth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coelacanth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comfortaa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comfortaa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comicneue-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comicneue-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cormorantgaramond-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cormorantgaramond-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-countriesofeurope-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-countriesofeurope-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-scaled-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-scaled-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courierten-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courierten-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimson-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimson-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimsonpro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimsonpro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuprum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuprum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyklop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyklop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dancers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dancers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dantelogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dantelogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dictsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dictsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-domitian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-domitian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doublestroke-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doublestroke-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doulossil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doulossil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dutchcal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dutchcal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-maths-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-maths-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eczar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eczar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ektype-tanka-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ektype-tanka-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elvish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elvish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigrafica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigrafica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esstix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esstix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etbb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etbb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euxm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euxm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fira-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fira-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foekfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foekfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonetika-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonetika-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome5-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome5-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontmfizz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontmfizz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-churchslavonic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-churchslavonic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fourier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fourier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouriernc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouriernc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frcursive-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frcursive-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frederika2016-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frederika2016-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frimurer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frimurer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-libre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-libre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsartemisia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsartemisia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbodoni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbodoni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfscomplutum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfscomplutum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidotclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidotclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenicmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenicmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfssolomos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfssolomos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillcm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillcm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillius-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillius-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gofonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gofonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greenpoint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greenpoint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grotesq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grotesq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gudea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gudea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hacm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hacm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hands-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hands-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-heuristica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-heuristica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfbright-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfbright-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindmadurai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindmadurai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibarra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibarra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imfellenglish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imfellenglish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inconsolata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inconsolata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-initials-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-initials-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inriafonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inriafonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwona-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwona-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jablantile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jablantile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jamtimes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jamtimes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-josefin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-josefin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-junicode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-junicode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kixfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kixfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lato-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lato-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lfb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lfb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinegc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinegc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinust1math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinust1math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebaskerville-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebaskerville-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebodoni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebodoni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librecaslon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librecaslon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librefranklin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librefranklin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguisticspro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguisticspro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lobster2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lobster2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ly1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ly1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marcellus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marcellus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdesign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdesign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdputu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdputu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-merriweather-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-merriweather-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mintspirit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mintspirit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-missaali-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-missaali-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlmodern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlmodern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montserrat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montserrat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mweights-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mweights-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcomputermodern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcomputermodern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxsf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxsf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxtt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxtt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimbus15-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimbus15-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-emoji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-emoji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notomath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notomath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nunito-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nunito-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-obnov-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-obnov-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocherokee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocherokee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ogham-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ogham-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-old-arrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-old-arrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldlatin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldlatin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstandard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstandard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opensans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opensans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orkhun-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orkhun-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oswald-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oswald-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paratype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paratype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonetic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonetic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pigpen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pigpen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-playfair-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-playfair-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plimsoll-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plimsoll-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poiretone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poiretone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poltawski-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poltawski-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prodint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prodint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punknova-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punknova-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtxalfa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtxalfa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qualitype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qualitype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quattrocento-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quattrocento-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-raleway-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-raleway-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recycle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recycle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roboto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roboto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathaccent-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathaccent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scholax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scholax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulschriften-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulschriften-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semaphor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semaphor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shobhika-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shobhika-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skull-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skull-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcecodepro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcecodepro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcesanspro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcesanspro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourceserifpro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourceserifpro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectral-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectral-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-starfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-starfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-step-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-step-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stepgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stepgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stickstoo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stickstoo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-superiors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-superiors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tapir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tapir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tempora-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tempora-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanodidot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanodidot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanomodern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanomodern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanooldstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanooldstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tinos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tinos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twemoji-colr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twemoji-colr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txuprcal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txuprcal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umtypewriter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umtypewriter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universalis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universalis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uppunctlm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uppunctlm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urwchancal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urwchancal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsuipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsuipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcharter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcharter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-t1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-t1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yinit-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yinit-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zlmtt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zlmtt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontsextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontsextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Asana-Math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Asana-Math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-academicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-academicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accanthis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accanthis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adforn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adforn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aesupp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aesupp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alegreya.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alegreya.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alfaslabone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alfaslabone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algolrevived.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algolrevived.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almendra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almendra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-almfixed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-almfixed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antiqua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antiqua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archivo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archivo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arimo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arimo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arvo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arvo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aspectratio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aspectratio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-astro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-astro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atkinson.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atkinson.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-augie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-augie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurical.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurical.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervaldx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervaldx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervillef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervillef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bera.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bera.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-berenisadf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-berenisadf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beuron.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beuron.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boisik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boisik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boondox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boondox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braille.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braille.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brushscr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brushscr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cabin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cabin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caladea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caladea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calligra-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calligra-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cantarell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cantarell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlito.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlito.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carolmin-ps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carolmin-ps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadia-code.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadia-code.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-initials.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-initials.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charissil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charissil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cherokee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cherokee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cinzel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cinzel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clara.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clara.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clearsans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clearsans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-lgc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-lgc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-unicode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-unicode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmathbb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmathbb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmexb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmexb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsrb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsrb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmtiup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmtiup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmupint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmupint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cochineal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cochineal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coelacanth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coelacanth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comfortaa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comfortaa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comicneue.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comicneue.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cormorantgaramond.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cormorantgaramond.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-countriesofeurope.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-countriesofeurope.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-scaled.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-scaled.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courierten.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courierten.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimson.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimson.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crimsonpro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crimsonpro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuprum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuprum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyklop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyklop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dantelogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dantelogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dejavu-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dejavu-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dictsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dictsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-domitian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-domitian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doublestroke.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doublestroke.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doulossil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doulossil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duerer-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duerer-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dutchcal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dutchcal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebgaramond-maths.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebgaramond-maths.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eczar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eczar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ektype-tanka.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ektype-tanka.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elvish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elvish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigrafica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigrafica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erewhon-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erewhon-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esstix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esstix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etbb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etbb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fira.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fira.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firamath-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firamath-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foekfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foekfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonetika.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonetika.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontawesome5.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontawesome5.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontmfizz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontmfizz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fourier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fourier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouriernc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouriernc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frcursive.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frcursive.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frederika2016.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frederika2016.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frimurer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frimurer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-libre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-libre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garamond-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garamond-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsartemisia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsartemisia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbodoni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbodoni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfscomplutum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfscomplutum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsdidotclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsdidotclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsneohellenicmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsneohellenicmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfssolomos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfssolomos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillcm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillcm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gillius.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gillius.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gofonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gofonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greenpoint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greenpoint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grotesq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grotesq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gudea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gudea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hacm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hacm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-heuristica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-heuristica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfbright.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfbright.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindmadurai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindmadurai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibarra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibarra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imfellenglish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imfellenglish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inconsolata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inconsolata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-initials.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-initials.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inriafonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inriafonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwona.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwona.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jablantile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jablantile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jamtimes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jamtimes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-josefin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-josefin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-junicode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-junicode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kixfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kixfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lato.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lato.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lfb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lfb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinegc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinegc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinus-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinus-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libertinust1math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libertinust1math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebaskerville.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebaskerville.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librebodoni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librebodoni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librecaslon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librecaslon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librefranklin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librefranklin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguisticspro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguisticspro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lobster2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lobster2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ly1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ly1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marcellus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marcellus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathabx-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathabx-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdesign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdesign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdputu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdputu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-merriweather.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-merriweather.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mintspirit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mintspirit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-missaali.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-missaali.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlmodern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlmodern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montserrat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montserrat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mweights.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mweights.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcomputermodern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcomputermodern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxsf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxsf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newtxtt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newtxtt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimbus15.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimbus15.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noto-emoji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noto-emoji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notomath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notomath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nunito.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nunito.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-obnov.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-obnov.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocherokee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocherokee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ogham.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ogham.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-old-arrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-old-arrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldlatin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldlatin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstandard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstandard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opensans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opensans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orkhun.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orkhun.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oswald.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oswald.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paratype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paratype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonetic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonetic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pigpen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pigpen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-playfair.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-playfair.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plex-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plex-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plimsoll.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plimsoll.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poiretone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poiretone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poltawski.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poltawski.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prodint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prodint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punk-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punk-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-punknova.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-punknova.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtxalfa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtxalfa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qualitype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qualitype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quattrocento.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quattrocento.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-raleway.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-raleway.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recycle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recycle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roboto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roboto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathaccent.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathaccent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmathfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmathfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scholax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scholax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulschriften.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulschriften.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semaphor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semaphor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shobhika.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shobhika.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcecodepro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcecodepro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourcesanspro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourcesanspro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sourceserifpro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sourceserifpro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectral.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectral.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-starfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-starfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-step.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-step.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stepgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stepgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stickstoo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stickstoo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-superiors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-superiors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tapir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tapir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tempora.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tempora.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanodidot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanodidot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanomodern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanomodern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theanooldstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theanooldstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tinos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tinos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twemoji-colr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twemoji-colr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txuprcal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txuprcal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universalis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universalis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uppunctlm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uppunctlm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urwchancal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urwchancal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsuipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsuipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcharter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcharter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts-t1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts-t1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yinit-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yinit-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zlmtt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zlmtt.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aesupp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aesupp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-allrunes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-allrunes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymouspro.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymouspro.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-archaic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-archaic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asapsym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asapsym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-font.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-font.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auncial-new.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auncial-new.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-b1encoding.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-b1encoding.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barcodes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barcodes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baskervald.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baskervald.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbding.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbding.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbm-macros.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbm-macros.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbold.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbold.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-belleek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-belleek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bguq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bguq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blacklettert1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blacklettert1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookhands.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookhands.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccicons.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccicons.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cfr-lm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cfr-lm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chivo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chivo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmbright.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmbright.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmll.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmll.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cookingsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cookingsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dingbat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dingbat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dozenal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dozenal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsserif.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsserif.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eco.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eco.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eiad-ltx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eiad-ltx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-electrum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-electrum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsdice.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsdice.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esrelation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esrelation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esvect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esvect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulervm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulervm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fdsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fdsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetamont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetamont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feyn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feyn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frimurer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frimurer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentium-tug.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentium-tug.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnu-freefont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnu-freefont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gothic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gothic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hfoldsty.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hfoldsty.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kpfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kpfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libris.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libris.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linearA.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linearA.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lxfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lxfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miama.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miama.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nkarta.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nkarta.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-b-outline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-b-outline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oinuit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oinuit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pacioli.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pacioli.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phaistos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phaistos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plimsoll.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plimsoll.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romande.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romande.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rosario.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rosario.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauterfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauterfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skull.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skull.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-staves.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-staves.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stix2-type1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stix2-type1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svrsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svrsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tengwarscript.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tengwarscript.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tfrupee.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tfrupee.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tpslifonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tpslifonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trajan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trajan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfontsb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfontsb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-universa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-universa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venturisadf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venturisadf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yfonts.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=0b836f2f5e04432272adec18c35e1a24
+_md5_=2e80e696de50c1acf3c182b6c8a4742a
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021
index 6d9061aa90a4..2dc664e01d30 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Recommended fonts
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avantgar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avantgar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-super-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-super-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmextra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro-ce-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro-ce-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eurosym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eurosym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fpl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fpl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-helvetic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-helvetic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marvosym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marvosym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpazo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpazo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt-font-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt-font-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo-font-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo-font-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncntrsbk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncntrsbk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-palatino-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-palatino-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-symbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-symbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-times-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-times-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utopia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utopia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasysym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasysym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zapfchan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zapfchan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zapfding-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zapfding-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontsrecommended-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontsrecommended-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-charter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-charter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cm-super.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cm-super.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro-ce.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro-ce.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eurosym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eurosym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fpl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fpl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lm-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lm-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marvosym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marvosym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpazo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpazo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mflogo-font.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mflogo-font.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rsfs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rsfs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utopia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utopia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasy-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasy-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasysym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasysym.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euro.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euro.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fpl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fpl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marvosym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marvosym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpazo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpazo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-gyre-math.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-gyre-math.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wasysym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wasysym.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=9e94ae6ecc0cb475e2ca4c7af6354d02
+_md5_=e09c5fea4537c5b6bd85f2905ad7f661
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2021 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2021
index 929eb2aab21a..1a84bfac34fa 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Graphics and font utilities
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic BSD GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afm2pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afm2pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-albatross-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-albatross-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dosepsbin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dosepsbin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontware-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcdftypetools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcdftypetools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatype1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatype1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2pk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2pk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2eps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2eps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvipsconfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvipsconfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontinst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontinst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mf2pt1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mf2pt1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t1utils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t1utils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-fontutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-fontutils-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afm2pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afm2pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-albatross.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-albatross.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dosepsbin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dosepsbin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontware.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcdftypetools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcdftypetools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2pk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2pk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ps2eps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ps2eps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontinst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontinst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mf2pt1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mf2pt1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t1utils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t1utils.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-albatross.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-albatross.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dosepsbin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dosepsbin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatype1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatype1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontinst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontinst.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=e3b0838e4719d3f4a9a1d223f3faf0b4
+_md5_=11e49e6c55f3be6479f8d1b3d0d8a224
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2021 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2021
index 0457c85707ea..3aabeff9815b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Additional formats
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2021 >=dev-texlive/texlive-plaingeneric-2021 dev-texlive/texlive-xetex >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eplain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eplain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jadetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jadetex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lollipop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lollipop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-passivetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-passivetex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psizzl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psizzl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texsis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texsis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmltexconfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmltexconfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aleph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aleph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antomega-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antomega-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lambda-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lambda-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mxedruli-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mxedruli-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omega-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omega-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omegaware-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omegaware-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-otibet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-otibet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-formatsextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-formatsextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eplain.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eplain.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jadetex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jadetex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lollipop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lollipop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psizzl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psizzl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texsis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texsis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aleph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aleph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antomega.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antomega.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mxedruli.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mxedruli.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omega.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omega.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-omegaware.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-omegaware.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-otibet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-otibet.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eplain.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eplain.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jadetex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jadetex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psizzl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psizzl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antomega.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antomega.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-otibet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-otibet.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=719ce34befa2b341e32b0211179de222
+_md5_=432b879a265e504b6f8951500535526e
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2021 b/metadata/md5-cache/dev-texlive/texlive-games-2021
index d375cfd3b7e4..d6f79558ddc5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Games typesetting
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bartel-chess-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bartel-chess-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egameps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egameps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanoi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanoi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hexgame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hexgame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hmtrump-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hmtrump-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jigsaw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jigsaw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labyrinth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labyrinth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicpuzzle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicpuzzle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musikui-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musikui-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimsticks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimsticks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othello-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othello-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othelloboard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othelloboard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-crosswords-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-crosswords-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psgo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psgo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realtranspose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realtranspose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reverxii-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reverxii-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sgame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sgame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skaknew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skaknew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-games-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-games-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bartel-chess-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bartel-chess-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egameps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egameps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hexgame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hexgame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hmtrump.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hmtrump.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jigsaw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jigsaw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labyrinth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labyrinth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicpuzzle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicpuzzle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musikui.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musikui.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimsticks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimsticks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othello.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othello.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-othelloboard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-othelloboard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-crosswords.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-crosswords.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psgo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psgo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realtranspose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realtranspose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reverxii.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reverxii.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sgame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sgame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skaknew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skaknew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chess-problem-diagrams.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chess-problem-diagrams.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessboard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessboard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chessfss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chessfss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossword.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossword.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crosswrd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crosswrd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gamebook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gamebook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-go.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-go.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-havannah.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-havannah.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-horoscop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-horoscop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nimsticks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nimsticks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onedown.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onedown.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realtranspose.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realtranspose.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rubik.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rubik.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schwalbe-chess.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schwalbe-chess.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudoku.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudoku.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sudokubundle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sudokubundle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xskak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xskak.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=fa14dea11c6171c026ca54b777b2f965
+_md5_=f819b760049d95f49e6103ec4f09cb19
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2021 b/metadata/md5-cache/dev-texlive/texlive-humanities-2021
index 0290dd3aa65c..a50f367ff5be 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Humanities packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adtrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adtrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-parse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-parse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-covington-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-covington-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diadia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diadia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecltree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecltree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ednotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ednotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gb4e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gb4e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juramisc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juramisc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexikon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexikon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ling-macros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ling-macros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nnext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nnext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qobitree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qobitree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtklage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtklage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-pkg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-pkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theatre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theatre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tree-dvips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tree-dvips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xyling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xyling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-humanities-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-humanities-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adtrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adtrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-parse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-parse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-covington.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-covington.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diadia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diadia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecltree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecltree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ednotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ednotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gb4e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gb4e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juramisc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juramisc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexikon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexikon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lexref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lexref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ling-macros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ling-macros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linguex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linguex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nnext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nnext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonrule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonrule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qobitree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qobitree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtklage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtklage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay-pkg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay-pkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theatre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theatre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tree-dvips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tree-dvips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xyling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xyling.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-lds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-lds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-mouth.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-mouth.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dramatist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dramatist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvgloss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvgloss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edfnotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edfnotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledform.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledform.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eledmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eledmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jura.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jura.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-juraabbrev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-juraabbrev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jurarsp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jurarsp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ledmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ledmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-liturg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-liturg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metrix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metrix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nnext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nnext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parallel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parallel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parrun.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parrun.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plari.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plari.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-play.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-play.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poemscol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poemscol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetry.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetry.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poetrytex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poetrytex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reledmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reledmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rrgtrees.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rrgtrees.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-screenplay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-screenplay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textglos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textglos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thalie.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thalie.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verse.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verse.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=0491e2d00e5317969304ae84a618b8b9
+_md5_=26762445fe127f8a540e8cf10e28b950
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2021 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2021
index fbe5a648aa02..883e888fdbc1 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Arabic
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alkalami-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alkalami-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alpha-persian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alpha-persian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiri-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiri-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-add-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-add-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidihl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidihl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvarabic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvarabic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-arabic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-arabic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-farsi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-farsi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imsproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imsproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurdishlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurdishlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-persian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-persian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabidi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabidi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-box-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-box-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-persian-bib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-persian-bib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simurgh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simurgh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texnegar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texnegar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langarabic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langarabic-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alkalami.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alkalami.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alpha-persian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alpha-persian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiri.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiri.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabi-add.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabi-add.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidihl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidihl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvarabic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvarabic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imsproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imsproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kurdishlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kurdishlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-persian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-persian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luabidi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luabidi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-box.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-box.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-persian-bib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-persian-bib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simurgh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simurgh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texnegar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texnegar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabluatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabluatex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texnegar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texnegar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xepersian-hm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xepersian-hm.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=fc01b0821a906f05528e0830321818c5
+_md5_=e5b0901a663d6c3824601a4b552c9630
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2021 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2021
index 0fef47b9abce..b1a5a21f263b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Chinese
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-ttf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-ttf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-by-example-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-by-example-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-faq-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-faq-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-manual-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-manual-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-faq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-faq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fandol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fandol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-chinese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-chinese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-install-latex-guide-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-install-latex-guide-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-notes-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-chinese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-chinese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanicolle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanicolle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-han-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-han-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qyxf-book-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qyxf-book-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-zh-cn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-zh-cn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texproposal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texproposal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upzhkinsoku-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upzhkinsoku-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlineskip-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlineskip-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-uptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-uptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhspacing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhspacing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langchinese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langchinese-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arphic-ttf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arphic-ttf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-by-example-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-by-example-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-faq-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-faq-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asymptote-manual-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asymptote-manual-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex-faq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex-faq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fandol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fandol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-install-latex-guide-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-install-latex-guide-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-notes-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-chinese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-chinese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanicolle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanicolle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-han.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-han.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qyxf-book.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qyxf-book.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-zh-cn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texproposal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texproposal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upzhkinsoku.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upzhkinsoku.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlineskip.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlineskip.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics-uptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics-uptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhspacing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhspacing.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fduthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fduthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-njurepo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-njurepo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpinyin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpinyin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhlipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhlipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhmetrics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhmetrics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zhnumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zhnumber.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=b4145c3be4ffd099ce2a19957a8381d7
+_md5_=250998d669365e23c4ef5dc185b50056
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2021 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2021
index fa98968a1d54..805ea994933f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Chinese/Japanese/Korean (base)
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-basic-2019 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adobemapping-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adobemapping-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garuda-c90-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garuda-c90-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixjfm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixjfm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jfmutil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jfmutil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-norasi-c90-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-norasi-c90-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtatescale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtatescale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langcjk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langcjk-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixjfm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixjfm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jfmutil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jfmutil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxtatescale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxtatescale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafont.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c90.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c90.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-gs-integrate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-gs-integrate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjkpunct.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjkpunct.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garuda-c90.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garuda-c90.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-norasi-c90.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-norasi-c90.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcjk2uni.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcjk2uni.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=8ae37d969468db768a2f3fbc5c906640
+_md5_=a858131cc5432f67e9cd681562fed5b4
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
index dfaf2556d280..11d8931891ee 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Cyrillic
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-churchslavonic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-churchslavonic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmcyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmcyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-bin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-bin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrplain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrplain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskdx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskdx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-belarusian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-belarusian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-churchslavonic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-churchslavonic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-mongolian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-mongolian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ukrainian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ukrainian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhcyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhcyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-mongol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-mongol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-ukr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-ukr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpman-ru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpman-ru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numnameru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numnameru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-translation-bg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-translation-bg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruhyphen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruhyphen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-russ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-russ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-apostrophe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-apostrophe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-date-lat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-date-lat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-def-cyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-def-cyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-lig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-lig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-sr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-sr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ukrhyph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ukrhyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langcyrillic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langcyrillic-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-churchslavonic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmcyr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmcyr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic-bin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic-bin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskdx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskdx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-mongol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-mongol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-russian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-russian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-ukr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-ukr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-montex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-montex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpman-ru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpman-ru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numnameru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numnameru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-translation-bg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-translation-bg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-russ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-russ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-apostrophe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-apostrophe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-date-lat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-date-lat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-def-cyr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-def-cyr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-serbian-lig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-serbian-lig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-sr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-sr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ukrhyph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ukrhyph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-belarusian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-belarusian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-russian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-russian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-serbianc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-serbianc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyrillic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyrillic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-disser.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-disser.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eskd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eskd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gost.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gost.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcyw.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcyw.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhcyr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhcyr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mongolian-babel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mongolian-babel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruhyphen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruhyphen.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyrmongolian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyrmongolian.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=47c63e7f6209c8c1f851e5b7ac9637b4
+_md5_=f6a8bf57f415e12ab50a2a50fb6ce6fe
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
index 9f375c84303c..4b45c752c8a8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Czech/Slovak
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2014[xetex] >=dev-texlive/texlive-luatex-2016 >=dev-texlive/texlive-langenglish-2019 >=dev-texlive/texlive-langeuropean-2019 >=dev-texlive/texlive-langfrench-2019 >=dev-texlive/texlive-langgerman-2019 >=dev-texlive/texlive-langpolish-2019 >=dev-texlive/texlive-langspanish-2019 >=dev-texlive/texlive-langitalian-2019 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnbwp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnbwp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csbulletin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csbulletin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csplain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csplain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-cz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-cz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langczechslovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langczechslovak-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnbwp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnbwp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csbulletin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csbulletin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-czech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-czech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-cz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-cz.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-czech.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-czech.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cslatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cslatex.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=588218c993e8ff660169aec3a65d6674
+_md5_=d10f374c13f3092c6138bc9c034226dd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2021 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2021
index 20b5e0416c88..d5bcfed9d535 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive US and UK English
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 FDL-1.1 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-MemoirChapStyles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-MemoirChapStyles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Type1fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Type1fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiweb2c-guide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiweb2c-guide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amslatex-primer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amslatex-primer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-around-the-bend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-around-the-bend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-chart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-chart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-cheatsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-cheatsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-components-of-TeX-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-components-of-TeX-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comprehensive-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comprehensive-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dickimaw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dickimaw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docsurvey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docsurvey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxtut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxtut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-first-latex-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-first-latex-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-quickstart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-quickstart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guide-to-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guide-to-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-happy4th-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-happy4th-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intro-scientific-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intro-scientific-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-brochure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-brochure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-course-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-course-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-doc-ptr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-doc-ptr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-companion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-companion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-refsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-refsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-veryshortguide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-veryshortguide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-web-companion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-web-companion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcourse-rug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcourse-rug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macros2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macros2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-into-latex-4-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-into-latex-4-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maths-symbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maths-symbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memdesign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memdesign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-beginners-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-beginners-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-examples-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-examples-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen2-tutorial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patgen2-tutorial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictexsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictexsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-short-math-guide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-short-math-guide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplified-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplified-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startlatex2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startlatex2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-inkscape-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-inkscape-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamethebeast-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamethebeast-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-font-errors-cheatsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-font-errors-cheatsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-nutshell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-nutshell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-overview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-overview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-refs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-refs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texbytopic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texbytopic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texonly-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texonly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlmgrbasics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlmgrbasics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undergradmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undergradmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualfaq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualfaq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webguide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webguide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langenglish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langenglish-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-MemoirChapStyles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-MemoirChapStyles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Type1fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Type1fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amiweb2c-guide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amiweb2c-guide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amslatex-primer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amslatex-primer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-around-the-bend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-around-the-bend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascii-chart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascii-chart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biblatex-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biblatex-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-components-of-TeX.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-components-of-TeX.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comprehensive.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comprehensive.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dickimaw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dickimaw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docsurvey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docsurvey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxtut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxtut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-first-latex-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-first-latex-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-quickstart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-quickstart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guide-to-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guide-to-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-happy4th.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-happy4th.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intro-scientific.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intro-scientific.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-brochure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-brochure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-course.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-course.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-doc-ptr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-doc-ptr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-companion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-companion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-refsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-refsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-veryshortguide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-veryshortguide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-web-companion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-web-companion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcourse-rug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcourse-rug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macros2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macros2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-math-into-latex-4.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-math-into-latex-4.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maths-symbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maths-symbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memdesign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memdesign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metafont-beginners.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metafont-beginners.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-examples.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-examples.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patgen2-tutorial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patgen2-tutorial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictexsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictexsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plain-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plain-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-short-math-guide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-short-math-guide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplified-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplified-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-startlatex2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-startlatex2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-inkscape.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-inkscape.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamethebeast.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamethebeast.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-font-errors-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-font-errors-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-nutshell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-nutshell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-overview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-overview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-refs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-refs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texbytopic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texbytopic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texonly.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texonly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlmgrbasics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlmgrbasics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undergradmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undergradmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualfaq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualfaq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webguide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webguide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexref.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexfileinfo-pkgs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexfileinfo-pkgs.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=5599bc72264d572b6d79c46bb2bf65cc
+_md5_=df9d8fa6b887dd13c8cda5a2affd9640
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
index 5f9883268c91..14b53bdf0e4a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Other European languages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-armtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-armtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hungarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hungarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-croatian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-croatian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-friulan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-friulan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-hungarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-hungarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-icelandic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-icelandic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-kurmanji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-kurmanji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-latin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-latin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-latvian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-latvian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-lithuanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-lithuanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-macedonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-macedonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-norwegian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-norwegian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-occitan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-occitan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-piedmontese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-piedmontese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-romanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-romanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-romansh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-romansh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-slovenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-slovenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-swedish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-swedish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-uppersorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-uppersorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-welsh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-welsh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lithuanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lithuanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rojud-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rojud-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swebib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swebib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langeuropean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langeuropean-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-armtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-armtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-hungarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lithuanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lithuanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-slovenian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-turkish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-turkish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rojud.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rojud.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swebib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swebib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-albanian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-albanian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-bosnian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-bosnian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-breton.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-breton.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-croatian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-croatian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-danish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-danish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-dutch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-dutch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-estonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-estonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-finnish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-finnish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-friulan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-friulan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-icelandic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-icelandic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-irish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-irish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-kurmanji.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-kurmanji.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-latvian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-latvian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-macedonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-macedonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-norsk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-norsk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-occitan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-occitan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-piedmontese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-piedmontese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romanian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romanian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-romansh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-romansh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-samin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-samin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-scottish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-scottish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-slovenian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-slovenian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-swedish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-swedish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-turkish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-turkish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-welsh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-welsh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-occitan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-occitan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrlatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrlatex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hulipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hulipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nevelok.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nevelok.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turkmen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turkmen.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=0219372a954e03e7290dec53213e5245
+_md5_=77313bcfec7cb9c98ecc3083bce0db7d
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2021 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2021
index 7265a1795f48..e7b4d5e1ff0c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive French
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 CC-BY-4.0
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aeguill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aeguill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annee-scolaire-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annee-scolaire-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprendre-a-programmer-en-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprendre-a-programmer-en-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprends-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprends-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droit-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droit-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-e-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-e-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epslatex-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epslatex-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expose-expl3-dunkerque-2019-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expose-expl3-dunkerque-2019-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frpseudocode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frpseudocode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-basque-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-basque-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mafr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mafr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matapli-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matapli-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-profcollege-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-profcollege-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-array-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-array-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-dcolumn-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-dcolumn-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-natbib-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-natbib-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-tabbing-fr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-tabbing-fr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variations-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variations-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualtikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualtikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langfrench-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langfrench-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aeguill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aeguill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annee-scolaire.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annee-scolaire.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprendre-a-programmer-en-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprendre-a-programmer-en-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apprends-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apprends-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bib-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bib-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-droit-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-droit-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-e-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-e-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epslatex-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epslatex-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expose-expl3-dunkerque-2019.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expose-expl3-dunkerque-2019.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frpseudocode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frpseudocode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impatient-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impatient-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mafr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mafr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matapli.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matapli.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-profcollege.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-profcollege.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-array-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-array-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-dcolumn-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-dcolumn-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-natbib-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-natbib-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-tabbing-fr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-tabbing-fr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variations.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variations.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualtikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualtikz.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-annee-scolaire.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-annee-scolaire.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-basque.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-basque.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-book.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-book.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basque-date.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basque-date.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formation-latex-ul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formation-latex-ul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frenchmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frenchmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-basque.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-basque.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-impnattypo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-impnattypo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabvar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabvar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdsfrmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdsfrmath.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=1d11685425a6ec8c35b8a3e134f8076f
+_md5_=e2332eb2f600f57094a50b375dbc2ec6
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2021 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2021
index 0cb71e5493ed..23d761d4ae3d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive German
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free
 RDEPEND=!~dev-texlive/texlive-xetex-2020 >=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-exptl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-exptl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-bibliography-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-bibliography-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etdipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etdipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germkorr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germkorr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-examples-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-examples-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2picfaq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2picfaq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-r_und_s-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-r_und_s-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulmathematik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulmathematik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-fenn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-fenn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-sommer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-sommer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-arsclassica-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-arsclassica-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-biblatex-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-biblatex-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-chemsym-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-chemsym-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-ecv-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-ecv-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-enumitem-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-enumitem-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-europecv-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-europecv-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-filecontents-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-filecontents-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-moreverb-de-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-moreverb-de-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhrzeit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhrzeit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-voss-mathcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-voss-mathcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langgerman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langgerman-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apalike-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apalike-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibleref-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibleref-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dehyph-exptl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dehyph-exptl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-bibliography.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-bibliography.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etdipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etdipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-germkorr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-germkorr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-examples.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-examples.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2picfaq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2picfaq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-r_und_s.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-r_und_s.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schulmathematik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schulmathematik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-fenn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-fenn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templates-sommer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templates-sommer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipa-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipa-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-arsclassica-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-arsclassica-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-biblatex-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-biblatex-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-chemsym-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-chemsym-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-ecv-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-ecv-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-enumitem-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-enumitem-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-europecv-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-europecv-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-filecontents-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-filecontents-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translation-moreverb-de.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translation-moreverb-de.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhrzeit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhrzeit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-voss-mathcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-voss-mathcol.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dhua.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dhua.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifinddo-info.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifinddo-info.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hausarbeit-jura.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hausarbeit-jura.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-de.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-de.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-udesoftec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-udesoftec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umlaute.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umlaute.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=0a76141f2751f75326011fa2f46df7b8
+_md5_=535559081834fac9562eba2d4f2c2cf9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2021 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2021
index 907e5f6bd3dd..c4f52a668f6f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Greek
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-betababel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-betababel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbaskerville-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbaskerville-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsporson-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsporson-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-inputenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-inputenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektonoi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektonoi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-greek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-greek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ancientgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ancientgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibygrk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibygrk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerkis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerkis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-levy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-levy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkgrkindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkgrkindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yannisgr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yannisgr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langgreek-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-betababel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-betababel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsbaskerville.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsbaskerville.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfsporson.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfsporson.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-inputenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-inputenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greektonoi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greektonoi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-greek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-greek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibygrk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibygrk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerkis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerkis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-levy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-levy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkgrkindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkgrkindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yannisgr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yannisgr.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-greek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-greek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begingreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begingreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbfonts-fd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbfonts-fd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greek-fontenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greek-fontenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-greekdates.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-greekdates.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ibycus-babel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ibycus-babel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-teubner.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-teubner.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xgreek.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=e6364a0187515899d4b76aa4713db378
+_md5_=05beb5c8fc79f64045bb207f6d352b61
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2021 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2021
index c3c334506564..57fd074976d3 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Italian
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antanilipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antanilipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsthdoc-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsthdoc-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-it-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-it-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langitalian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langitalian-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antanilipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antanilipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsthdoc-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsthdoc-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4wp-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4wp-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-it.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-it.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-antanilipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-antanilipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-italian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-italian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codicefiscaleitaliano.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codicefiscaleitaliano.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixltxhyph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixltxhyph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frontespizio.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frontespizio.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-itnumpar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-itnumpar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layaureo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layaureo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifica.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifica.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=e9c79ebb66b80c747cf8d37b030c0867
+_md5_=56ecb3fee7d14aa90ac3c9d19b843c93
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
index dd915ada9ebf..a7b6e7d56d71 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Japanese
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 GPL-1 GPL-2 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2021 >=dev-texlive/texlive-latexextra-2021 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxbase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxbase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcjkjatype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcjkjatype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxghost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxghost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaholiday-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaholiday-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjalipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjalipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaprnind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaprnind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjatoucs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjatoucs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxorigcapt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxorigcapt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxwareki-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxwareki-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-convbkmk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-convbkmk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotesj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotesj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifxptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifxptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-deluxe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-deluxe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-japanese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-japanese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbibtex-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbibtex-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-tools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-tools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platexcheat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platexcheat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plautopatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plautopatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-manual-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-manual-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex2pdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex2pdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxbase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxbase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxchfon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxchfon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxcjkcat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxcjkcat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjahyper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjahyper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjodel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjodel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxufont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxufont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ja-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ja-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wadalab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wadalab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafbfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafbfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjatype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjatype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langjapanese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langjapanese-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxbase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxbase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcjkjatype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcjkjatype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxghost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxghost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaholiday.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaholiday.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjalipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjalipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjaprnind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjaprnind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjatoucs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjatoucs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxorigcapt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxorigcapt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxwareki.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxwareki.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-convbkmk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-convbkmk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotesj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotesj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gentombow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gentombow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-haranoaji-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-haranoaji-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifxptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifxptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ipaex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ipaex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq-deluxe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq-deluxe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-japanese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-japanese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbibtex-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbibtex-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex-tools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex-tools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platexcheat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platexcheat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plautopatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plautopatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-manual.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-manual.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex2pdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex2pdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxbase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxbase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxchfon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxchfon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxcjkcat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxcjkcat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjahyper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjahyper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxjodel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxjodel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxufont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxufont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-ja.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-ja.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uptex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wadalab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wadalab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjafbfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjafbfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zxjatype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zxjatype.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascmac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascmac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-japanese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-japanese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxjscls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxjscls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-japanese-otf-uptex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-japanese-otf-uptex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlreq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlreq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jsclasses.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jsclasses.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexja.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexja.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mendex-doc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mendex-doc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morisawa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morisawa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-platex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-platex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptex-fontmaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptex-fontmaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxrubrica.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxrubrica.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uplatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uplatex.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=69e97382d1dfaccc5c8239d578fb110b
+_md5_=e74a23d6c606c2c44bf734676eab0a2d
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2021 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2021
index f7565cbd88a9..830ed7f11e8e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Korean
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baekmuk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baekmuk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-ko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-ko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-oblivoir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-oblivoir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-plain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-plain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-korean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-korean-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanumtype1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanumtype1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmhanguljamo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmhanguljamo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-core-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-core-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langkorean-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langkorean-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-baekmuk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-baekmuk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjk-ko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjk-ko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-oblivoir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-oblivoir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-plain.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-plain.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kotex-utils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kotex-utils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-korean.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-korean.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nanumtype1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nanumtype1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmhanguljamo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmhanguljamo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-core.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-core.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unfonts-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unfonts-extra.doc-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=9e8b402f5a10ff8e880024a69434b0e4
+_md5_=86a007b152c0b3645c7811af47033fa3
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2021 b/metadata/md5-cache/dev-texlive/texlive-langother-2021
index aaab96c2153f..d3540c62884e 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Other languages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aalok-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aalok-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akshar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akshar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-vn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-vn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aramaic-serto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aramaic-serto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-georgian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-georgian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chhaya-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chhaya-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjhebrew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjhebrew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebong-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebong-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-t1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-t1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindawi-latex-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindawi-latex-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-afrikaans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-afrikaans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-armenian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-armenian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-coptic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-coptic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-esperanto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-esperanto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ethiopic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ethiopic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-georgian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-georgian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-indic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-indic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-indonesian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-indonesian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-interlingua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-interlingua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-sanskrit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-sanskrit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-thai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-thai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkmen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkmen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-mr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-mr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbangla-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbangla-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latino-sine-flexione-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latino-sine-flexione-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-thai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-thai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-vietnamese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-vietnamese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marathi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marathi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-vn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-vn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padauk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padauk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-bn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-bn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-ur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-ur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-t1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-t1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaienum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaienum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-alphabets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-alphabets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-velthuis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-velthuis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-devanagari-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-devanagari-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langother-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langother-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aalok.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aalok.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akshar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akshar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsldoc-vn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsldoc-vn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aramaic-serto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aramaic-serto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-georgian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-georgian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chhaya.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chhaya.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cjhebrew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cjhebrew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebong.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebong.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop-t1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop-t1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hindawi-latex-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hindawi-latex-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-mr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-mr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbangla.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbangla.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latino-sine-flexione.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latino-sine-flexione.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-thai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-thai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-vietnamese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marathi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marathi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-vn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-vn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padauk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padauk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-bn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-bn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quran-ur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quran-ur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit-t1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit-t1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaienum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaienum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-alphabets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-alphabets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-velthuis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-velthuis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-devanagari.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-devanagari.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aalok.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aalok.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akshar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akshar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-azerbaijani.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-azerbaijani.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-esperanto.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-esperanto.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-hebrew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-hebrew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-indonesian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-indonesian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-interlingua.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-interlingua.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-malay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-malay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-sorbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-sorbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-thai.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-thai.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-vietnamese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-vietnamese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bengali.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bengali.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-burmese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-burmese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chhaya.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chhaya.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ethiop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ethiop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonts-tlwg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonts-tlwg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-armenian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-armenian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-ethiopic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-ethiopic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-turkmen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-turkmen.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marathi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marathi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanskrit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanskrit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thaispec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thaispec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vntex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vntex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wnri-latex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wnri-latex.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=690b1d47d69f5afe533abec88eeabea9
+_md5_=84b894b7ff4f7c6e6e8e633f5d4d89d8
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2021 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2021
index d6c56f0d2662..154161b2521f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Polish
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bredzenie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bredzenie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cc-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cc-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustlib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustlib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustprog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustprog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-przechlewski-book-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-przechlewski-book-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qpxqtx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qpxqtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-virtual-academy-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-virtual-academy-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-pl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-pl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8mex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8mex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langpolish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langpolish-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bredzenie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bredzenie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cc-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cc-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustlib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustlib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gustprog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gustprog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-przechlewski-book.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-przechlewski-book.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qpxqtx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qpxqtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-virtual-academy-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-virtual-academy-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-pl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-pl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8mex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8mex.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-polish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-polish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwcls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwcls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polski.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polski.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=48863a34cb5a8fd2b07638bd4d14b7c7
+_md5_=794a5027684e47d1afbf0a284564e396
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
index 7007094ec3ca..ad5d8691b59f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Portuguese
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-tut-pt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-tut-pt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cursolatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cursolatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feupphdteses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feupphdteses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-portuguese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-portuguese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-via-exemplos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-via-exemplos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-ptbr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-ptbr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-portuguese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-portuguese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-tut-pt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-tut-pt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langportuguese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langportuguese-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-tut-pt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-tut-pt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cursolatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cursolatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feupphdteses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feupphdteses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-via-exemplos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-via-exemplos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-ptbr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-ptbr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-portuguese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-portuguese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-tut-pt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-tut-pt.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-portuges.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-portuges.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberpt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberpt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ordinalpt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ordinalpt.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=66cc1fe580044e38ac8bd510145819b6
+_md5_=01401c124fcba56e639f45d39930e94d
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2021 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2021
index 7ed566375a85..1589d4fb0732 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Spanish
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-es-tex-faq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-es-tex-faq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-catalan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-catalan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-galician-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-galician-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-esmx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-esmx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-es-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-es-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-langspanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-langspanish-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-es-tex-faq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-es-tex-faq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l2tabu-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l2tabu-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex2e-help-texinfo-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex2e-help-texinfo-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcheat-esmx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcheat-esmx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lshort-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lshort-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlive-es.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlive-es.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-catalan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-catalan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-galician.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-galician.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-spanish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-galician.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-galician.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphen-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphen-spanish.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=138b73f751853f3af1aa8df486435f30
+_md5_=32ddf4505ce7df355b4c179422377f95
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2021 b/metadata/md5-cache/dev-texlive/texlive-latex-2021
index 08756f0b1eda..2e85ca3431f4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive LaTeX fundamental packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LPPL-1.3 LPPL-1.3c public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2021 !~dev-texlive/texlive-latexrecommended-2020 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ae-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ae-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atbegshi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atbegshi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atveryend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atveryend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auxhook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auxhook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babelbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babelbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigintcalc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigintcalc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlisle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlisle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-pkg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-pkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etexcmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etexcmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firstaid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firstaid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fix2col-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fix2col-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geometry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geometry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gettitlestring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gettitlestring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-cfg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-cfg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hopatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hopatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hycolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hycolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intcalc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intcalc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvdefinekeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvdefinekeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvoptions-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvoptions-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvsetkeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvsetkeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3backend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3backend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3kernel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3kernel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3packages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3packages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexconfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexconfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letltxmacro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letltxmacro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxcmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxcmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxmisc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxmisc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfnfss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfnfss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptopdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptopdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natbib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natbib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oberdiek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oberdiek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagesel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagesel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfescape-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfescape-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pslatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pslatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psnfss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psnfss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pspicture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pspicture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rerunfilecheck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rerunfilecheck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uniquecounter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uniquecounter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-url-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-url-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latex-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ae.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ae.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atbegshi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atbegshi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atveryend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atveryend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auxhook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auxhook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babelbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babelbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigintcalc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigintcalc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlisle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlisle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-pkg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-pkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etexcmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etexcmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firstaid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firstaid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fix2col.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fix2col.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geometry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geometry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gettitlestring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gettitlestring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-cfg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-cfg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hopatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hopatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hycolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hycolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intcalc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intcalc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvdefinekeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvdefinekeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvoptions.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvoptions.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvsetkeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvsetkeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3backend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3backend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3kernel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3kernel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3packages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3packages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letltxmacro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letltxmacro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxcmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxcmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfnfss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfnfss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptopdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptopdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natbib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natbib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oberdiek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oberdiek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagesel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagesel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfescape.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfescape.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psnfss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psnfss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pspicture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pspicture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rerunfilecheck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rerunfilecheck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uniquecounter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uniquecounter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-url.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-url.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ae.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ae.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atbegshi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atbegshi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atveryend.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atveryend.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auxhook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auxhook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-babel-english.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-babel-english.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigintcalc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigintcalc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitset.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitset.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carlisle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carlisle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortbl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortbl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epstopdf-pkg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epstopdf-pkg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etexcmds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etexcmds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhdr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhdr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-firstaid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-firstaid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fix2col.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fix2col.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-geometry.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-geometry.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gettitlestring.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gettitlestring.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hopatch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hopatch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hycolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hycolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intcalc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intcalc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvdefinekeys.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvdefinekeys.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvoptions.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvoptions.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvsetkeys.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvsetkeys.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3backend.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3backend.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3kernel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3kernel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3packages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3packages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letltxmacro.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letltxmacro.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxcmds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxcmds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfnfss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfnfss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natbib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natbib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oberdiek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oberdiek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagesel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagesel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfescape.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfescape.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pslatex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pslatex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psnfss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psnfss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pspicture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pspicture.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rerunfilecheck.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rerunfilecheck.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uniquecounter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uniquecounter.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=b9407a35d8210b8ce8c6eeea8831fa9e
+_md5_=d9649c851ccc8131fabfb5872ad7cc41
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2021 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2021
index 61d0cdacc1af..3c8ec701fed8 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive LaTeX additional packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 Artistic BSD GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2021 >=dev-texlive/texlive-pictures-2021 dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-association-matrix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-association-matrix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerappendixnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerappendixnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-pure-minimalistic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-pure-minimalistic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemejltree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemejltree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenord-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenord-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beaulivre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beaulivre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookshelf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookshelf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bubblesort-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bubblesort-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centerlastline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centerlastline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-color-edits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-color-edits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conditext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conditext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diabetes-logbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diabetes-logbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easybook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easybook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfloats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfloats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edichokey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edichokey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-hy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-hy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-keys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-keys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eq-pin2corr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eq-pin2corr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-example-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-example-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exesheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exesheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-froufrou-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-froufrou-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-cyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-cyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-nynorsk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-nynorsk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridpapers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridpapers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-highlightlatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-highlightlatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitreport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitreport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdestopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdestopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-firstaid-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-firstaid-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lebhart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lebhart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectureslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectureslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-physical-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-physical-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media4svg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media4svg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menucard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menucard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metanorma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metanorma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mindflow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mindflow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minimalist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minimalist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nestquot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nestquot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nextpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nextpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orcidlink-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orcidlink-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orientation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orientation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbalance-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbalance-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prelim2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prelim2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readablecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readablecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-runcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-runcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savesym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savesym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schooldocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schooldocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlayer-fancyhdr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlayer-fancyhdr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semesterplanner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semesterplanner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplivre-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplivre-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeldoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeldoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skills-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skills-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suppose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suppose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swfigure-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swfigure-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texlogos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texlogos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlefoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlefoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totalcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totalcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitipa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitipa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitconv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitconv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8add-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8add-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vcell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vcell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifiche-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifiche-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-willowtreebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-willowtreebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latexextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latexextra-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-2up.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-2up.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a0poster.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a0poster.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a4wide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a4wide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-a5comb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-a5comb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abraces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abraces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-advdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-advdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akktex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akktex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-akletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-akletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anyfontsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anyfontsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendixnumberbeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendixnumberbeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabicfront.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabicfront.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arrayjobx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arrayjobx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assignment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assignment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-assoccnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-assoccnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-association-matrix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-association-matrix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authoraftertitle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authoraftertitle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorarchive.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorarchive.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-authorindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-authorindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autofancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autofancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bankstatement.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bankstatement.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bashful.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bashful.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bchart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bchart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer2thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer2thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-rl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-rl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerappendixnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerappendixnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beameraudience.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beameraudience.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerauxtheme.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerauxtheme.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerdarkthemes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerdarkthemes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-detlevcm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-detlevcm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-epyt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-epyt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-focus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-focus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-light.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-light.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-npbt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-npbt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-phnompenh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-phnompenh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-pure-minimalistic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-pure-minimalistic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-upenn-bc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenirma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenirma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerthemenord.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerthemenord.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beaulivre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beaulivre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bibletext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bibletext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigints.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigints.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biochemistry-colors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biochemistry-colors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blkarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blkarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-block.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-block.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bold-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bold-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookshelf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookshelf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bracketkey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bracketkey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braket.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braket.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bubblesort.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bubblesort.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxcalc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxcalc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdpx-beamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdpx-beamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxdvidriver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxdvidriver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxenclose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxenclose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxnewfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxnewfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpapersize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpapersize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxpdfver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxpdfver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxtexlogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxtexlogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calctab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calctab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calrsfs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calrsfs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calxxxx-yyyy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calxxxx-yyyy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cancel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cancel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-carbohydrates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-carbohydrates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cases.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cases.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-casyl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-casyl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catoptions.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catoptions.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cbcoptic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cbcoptic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-censor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-censor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centeredline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centeredline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centerlastline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centerlastline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelayout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changelog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changelog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkend.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkend.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chkfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chkfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chngcntr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chngcntr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circledsteps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circledsteps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clipboard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clipboard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdstring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdstring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmsd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmsd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cnltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cnltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntformats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntformats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cntperchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cntperchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codedoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codedoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-color-edits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-color-edits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coloring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coloring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colortab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colortab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colourchange.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colourchange.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combelow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combelow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-comment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-comment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concepts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concepts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concprog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concprog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conditext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conditext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyrightbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyrightbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coseoul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coseoul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-courseoutline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-courseoutline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coursepaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coursepaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreftools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreftools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csquotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csquotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-css-colors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-css-colors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvsimple.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvsimple.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cv4tw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cv4tw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dataref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dataref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dblfloatfix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dblfloatfix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diabetes-logbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diabetes-logbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagnose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagnose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dichokey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dichokey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-directory.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-directory.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dlfltxb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dlfltxb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotlessi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotlessi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxgallery.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxgallery.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dvdcoll.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dvdcoll.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynblocks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynblocks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ean13isbn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ean13isbn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easy-todo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easy-todo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easybook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easybook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfloats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfloats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyformat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyformat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easylist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easylist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edichokey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edichokey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ehhline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ehhline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-einfart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-einfart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elegantpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elegantpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elements.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elements.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elpres.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elpres.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embrac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embrac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emulateapj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emulateapj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-hy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-hy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enotez.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enotez.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envbig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envbig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph-keys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph-keys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eq-pin2corr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eq-pin2corr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esami.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esami.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint-type1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint-type1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eulerpx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eulerpx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europasscv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europasscv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-europecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-europecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-randomizechoices.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-randomizechoices.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examplep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examplep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exceltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exceltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-excludeonly.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-excludeonly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisebank.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisebank.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercisepoints.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercisepoints.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exesheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exesheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsheets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsheets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyhandout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyhandout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ffslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ffslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filemod.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filemod.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixfoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixfoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fjodor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fjodor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flacards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flacards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashmovie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashmovie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flipbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flipbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fn2end.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fn2end.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncychap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncychap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fncylab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fncylab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpara.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpara.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnpct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnpct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsetup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsetup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotebackref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotebackref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formlett.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formlett.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fragments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fragments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-framed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-framed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frege.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frege.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-froufrou.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-froufrou.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftcap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftcap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullwidth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullwidth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fwlw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fwlw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gauss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gauss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getfiledate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getfiledate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitinfo2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitinfo2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitlog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitlog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-globalvals.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-globalvals.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gloss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gloss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-nynorsk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-nynorsk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmiflink.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmiflink.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmutils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmutils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmverb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmverb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grfpaste.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grfpaste.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid-system.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid-system.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridpapers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridpapers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hackthefootline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hackthefootline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-handout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-handout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hang.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hang.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harnon-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harnon-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harpoon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harpoon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-he-she.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-he-she.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-highlightlatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-highlightlatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitreport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitreport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobsub.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobsub.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvqrurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvqrurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdestopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdestopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypdvips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypdvips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hypernat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hypernat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-identkey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-identkey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxcmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxcmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmslide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmslide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifthenx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifthenx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-image-gallery.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-image-gallery.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-import.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-import.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-incgraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-incgraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inline-images.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inline-images.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interactiveworkbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interactiveworkbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice-class.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice-class.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isonums.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isonums.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isopt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isopt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iwhdp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iwhdp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jlabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jlabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jslectureplanner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jslectureplanner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jumplines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jumplines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyreader.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyreader.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keystroke.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keystroke.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyval2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyval2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-moderncvclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-moderncvclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-sfs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-sfs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels4easylist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels4easylist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-bin-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-bin-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-firstaid-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-firstaid-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-uni8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-uni8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lazylist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lazylist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lebhart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lebhart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectures.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectures.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lectureslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lectureslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lewis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lewis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lisp-on-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lisp-on-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lkproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lkproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logical-markup-utils.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logical-markup-utils.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-loops.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-loops.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lsc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lsc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstfiracode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstfiracode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lt3graph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lt3graph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltablex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltablex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltabptch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltabptch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxdockit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxdockit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxguidex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxguidex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxkeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxkeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-check-hyphen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-check-hyphen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-physical.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-physical.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magaz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magaz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecookbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecookbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makerobust.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makerobust.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebarcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebarcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecirc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecirc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeglos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeglos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manyind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manyind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathalpha.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathalpha.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfam256.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfam256.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maybemath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maybemath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mceinleger.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mceinleger.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mciteplus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mciteplus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media4svg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media4svg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-medstarbeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-medstarbeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memexsupp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memexsupp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mensa-tex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mensa-tex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menucard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menucard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metanorma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metanorma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mindflow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mindflow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minimalist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minimalist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minitoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minitoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minorrevision.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minorrevision.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mla-paper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mla-paper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderncv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderncv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modernposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modernposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreenum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreenum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-movie15.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-movie15.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mslapa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mslapa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multenum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multenum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncclatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncclatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newenviron.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newenviron.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nfssext-cfr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nfssext-cfr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nlctdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nlctdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noconflict.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noconflict.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noindentafter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noindentafter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nolbreaks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nolbreaks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nopageno.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nopageno.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notestex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notestex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notoccite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notoccite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numberedblock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numberedblock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numname.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numname.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numspell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numspell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocg-p.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocg-p.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocr-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocr-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optidef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optidef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optional.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optional.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-options.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-options.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orcidlink.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orcidlink.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orientation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orientation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outliner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outliner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overlays.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overlays.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagerange.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagerange.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parades.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parades.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parsa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parsa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cours.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cours.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pas-tableur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pas-tableur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbalance.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbalance.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcolmk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcolmk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcomment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcomment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmarginpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmarginpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpagediff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpagediff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfreview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfreview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfscreen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfscreen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfslide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfslide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfsync.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfsync.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfwin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfwin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pecha.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pecha.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petiteannonce.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petiteannonce.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phonenumbers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phonenumbers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkgloader.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkgloader.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantslabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantslabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postcards.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postcards.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poster-mac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poster-mac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-practicalreports.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-practicalreports.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prelim2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prelim2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-printlen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-printlen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-program.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-program.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progress.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progress.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-progressbar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-progressbar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-properties.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-properties.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prosper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prosper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pygmentex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pygmentex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-python.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-python.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quicktype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quicktype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quiz2socrative.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quiz2socrative.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readablecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readablecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-readarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-readarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rectopma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rectopma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refcheck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refcheck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refenums.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refenums.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relsize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relsize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repeatindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repeatindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-returntogrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-returntogrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rlepsf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rlepsf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanneg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanneg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rterface.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rterface.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulerbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulerbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-runcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-runcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rvwrite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rvwrite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sanitize-umlaut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sanitize-umlaut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalerel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalerel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scanpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scanpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schooldocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schooldocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlayer-fancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlayer-fancyhdr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlttr2copy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlttr2copy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdrt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdrt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secdot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secdot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectionbreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectionbreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selectp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selectp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic-markup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic-markup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semesterplanner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semesterplanner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepfootnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepfootnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadethm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadethm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shadowtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shadowtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapepar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapepar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shipunov.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shipunov.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showdim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showdim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showhyphens.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showhyphens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleinvoice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleinvoice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplivre.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplivre.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeldoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeldoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeycommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeycommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skeyval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skeyval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skills.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skills.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smalltableof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smalltableof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snotez.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snotez.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulpos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulpos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spark-otf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spark-otf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sparklines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sparklines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spotcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spotcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spreadtab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spreadtab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srbook-mem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srbook-mem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sslides.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sslides.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stackengine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stackengine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storecmd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storecmd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stubs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stubs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-studenthandouts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-studenthandouts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigmat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigmat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substitutefont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substitutefont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suppose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suppose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svgcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svgcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swfigure.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swfigure.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableaux.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableaux.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabstackengine.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabstackengine.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-ltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-ltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularcalc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularcalc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagging.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagging.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpair.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpair.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tamefloats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tamefloats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tasks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tasks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcolorbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcolorbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tdclock.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tdclock.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-theoremref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-theoremref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thinsp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thinsp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeparttablex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeparttablex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumby.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumby.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticket.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticket.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlecaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlecaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titleref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titleref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titlesec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titlesec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokcycle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokcycle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tokenizer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tokenizer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topiclongtable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topiclongtable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totalcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totalcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translations.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translations.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-truncate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-truncate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnthepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnthepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoinone.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoinone.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typoaid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typoaid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uassign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uassign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uebungsblatt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uebungsblatt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underoverlap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underoverlap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitipa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitipa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitconv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitconv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upmethodology.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upmethodology.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utf8add.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utf8add.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwmslide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwmslide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-variablelm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-variablelm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varsfromjobname.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varsfromjobname.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varwidth.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varwidth.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vcell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vcell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vdmlisting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vdmlisting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbasef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbasef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbatimcopy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbatimcopy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verbments.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verbments.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifiche.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifiche.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-version.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-version.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versions.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versions.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vertbars.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vertbars.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vhistory.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vhistory.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vpe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vpe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vruler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vruler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vtable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vtable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallcalendar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallcalendar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wallpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wallpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warning.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warning.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-webquiz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-webquiz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-williams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-williams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-willowtreebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-willowtreebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-withargs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-withargs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordcount.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordcount.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-worksheet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-worksheet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wrapfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wrapfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wtref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wtref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xassoccnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xassoccnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcntperchap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcntperchap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcomment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcomment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfakebold.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfakebold.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xhfill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xhfill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xifthen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xifthen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkcdcolors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkcdcolors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltabular.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltabular.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xnewcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xnewcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xoptarg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xoptarg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xprintlen.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xprintlen.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xstring.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xstring.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xurl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xurl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xwatermark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xwatermark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xytree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xytree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ycbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ycbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yplan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yplan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zed-csp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zed-csp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ziffer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ziffer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwgetfdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwgetfdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zwpagelayout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zwpagelayout.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ESIEEcv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ESIEEcv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-GS1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-GS1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-HA-prosper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-HA-prosper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-Tabbing.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-Tabbing.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstract.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstract.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accessibility.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accessibility.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accsupp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accsupp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-achemso.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-achemso.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acronym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acronym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acroterm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acroterm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialangle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialangle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-actuarialsymbol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-actuarialsymbol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addlines.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addlines.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjmulticol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjmulticol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adjustbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adjustbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adrconv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adrconv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alertmessage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alertmessage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alnumsec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alnumsec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alphalph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alphalph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-altfont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-altfont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amsaddr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amsaddr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-animate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-animate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-answers.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-answers.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-appendix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-appendix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apptools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apptools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arcs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arcs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraycols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraycols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arraysort.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arraysort.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arydshln.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arydshln.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asciilist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asciilist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askinclude.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askinclude.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-atenddvi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-atenddvi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autonum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autonum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autopdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autopdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-avremu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-avremu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axessibility.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axessibility.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-background.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-background.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-basicarith.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-basicarith.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerappendixnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerappendixnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamercolorthemeowl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamercolorthemeowl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamersubframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamersubframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-cuerna.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-cuerna.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-metropolis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-metropolis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamertheme-saintpetersburg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bearwear.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bearwear.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beton.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beton.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bewerbung.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bewerbung.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bez123.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bez123.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bhcexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bhcexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bigfoot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bigfoot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bizcard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bizcard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blindtext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blindtext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blowup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blowup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bnumexpr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bnumexpr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boites.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boites.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookcover.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookcover.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booklet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booklet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bookshelf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bookshelf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boolexpr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boolexpr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bophook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bophook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxedminipage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxedminipage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boxhandler.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boxhandler.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breakurl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breakurl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bubblesort.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bubblesort.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bullcntr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bullcntr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calcage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calcage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculator.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculator.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cals.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cals.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-canoniclayout.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-canoniclayout.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-capt-of.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-capt-of.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-captcont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-captcont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catchfilebetweentags.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catchfilebetweentags.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catechis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catechis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccaption.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccaption.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cclicenses.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cclicenses.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cd-cover.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cd-cover.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cdpbundl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cdpbundl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cellprops.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cellprops.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-centerlastline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-centerlastline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changebar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changebar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changepage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changepage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-changes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-changes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chappg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chappg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chapterfolder.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chapterfolder.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cheatsheet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cheatsheet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chextras.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chextras.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-childdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-childdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chletter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chletter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circ.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circ.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classpack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classpack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clefval.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clefval.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleveref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleveref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrdblpg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrdblpg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrstrip.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrstrip.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmdtrack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmdtrack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codepage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codepage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codesection.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codesection.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collcell.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collcell.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collectbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collectbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colophon.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colophon.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-color-edits.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-color-edits.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colordoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colordoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorwav.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorwav.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorweb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorweb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combine.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combine.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commado.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commado.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commedit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commedit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-competences.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-competences.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-constants.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-constants.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-continue.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-continue.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contour.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contour.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-contracard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-contracard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conv-xkv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conv-xkv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooking-units.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooking-units.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cool.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cool.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coollist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coollist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolstr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolstr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coolthms.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coolthms.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cooltooltips.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cooltooltips.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coordsys.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coordsys.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-copyedit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-copyedit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-counttexruns.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-counttexruns.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-coverpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-coverpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cprotect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cprotect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crossreference.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crossreference.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-csvmerge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-csvmerge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cuisine.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cuisine.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currency.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currency.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-currvita.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-currvita.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cutwin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cutwin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cyber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cyber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cybercic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cybercic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashrule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashrule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dashundergaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dashundergaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datax.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datax.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datatool.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datatool.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dateiliste.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dateiliste.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datenumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datenumber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bahasai.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bahasai.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-basque.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-basque.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-breton.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-breton.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-bulgarian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-catalan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-catalan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-croatian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-croatian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-czech.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-czech.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-danish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-danish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-dutch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-dutch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-en-fulltext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-en-fulltext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-english.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-english.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-esperanto.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-esperanto.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-estonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-estonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-finnish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-finnish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-galician.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-galician.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-greek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-greek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-hebrew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-hebrew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-icelandic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-icelandic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-irish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-irish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-italian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-italian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-it-fulltext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-it-fulltext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-latin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-latin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-lsorbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-lsorbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-magyar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-magyar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-norsk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-norsk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-polish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-polish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-portuges.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-portuges.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-romanian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-romanian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-russian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-russian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-samin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-samin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-scottish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-scottish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-serbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-serbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-slovene.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-slovene.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-spanish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-swedish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-swedish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-turkish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-turkish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-ukrainian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-usorbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-usorbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-datetime2-welsh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-datetime2-welsh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decimal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decimal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decorule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decorule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimtxt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimtxt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-denisbdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-denisbdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dialogl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dialogl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinbrief.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinbrief.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtytalk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtytalk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dnaseq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dnaseq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doclicense.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doclicense.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmfp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmfp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docmute.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docmute.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doctools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doctools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-documentation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-documentation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotarrow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotarrow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dotseqn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dotseqn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-download.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-download.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dprogress.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dprogress.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftcopy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftcopy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-draftwatermark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-draftwatermark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dtxdescribe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dtxdescribe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duckuments.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duckuments.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ducksay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ducksay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynamicnumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynamicnumber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easybook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easybook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyfloats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyfloats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-easyreview.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-easyreview.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebezier.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebezier.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecclesiastic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecclesiastic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econlipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econlipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ed.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ed.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-edmargin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-edmargin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eemeir.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eemeir.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-efbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-efbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-egplot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-egplot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipsis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipsis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elocalloc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elocalloc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elzcards.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elzcards.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emarks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emarks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedall.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedall.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-embedfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-embedfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emptypage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emptypage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endheads.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endheads.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endnotes-hy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endnotes-hy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engpron.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engpron.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engrec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engrec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enumitem-zref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enumitem-zref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-environ.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-environ.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-envlab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-envlab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigraph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigraph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epiolmec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epiolmec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eq-pin2corr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eq-pin2corr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnalign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnalign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqparbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqparbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-errata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-errata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erw-l3.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erw-l3.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esdiff.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esdiff.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etaremune.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etaremune.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etextools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etextools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eukdate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eukdate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyhook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyhook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everypage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everypage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exam-n.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exam-n.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-examdesign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-examdesign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercise.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercise.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exercises.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exercises.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exesheet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exesheet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exp-testopt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exp-testopt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expdlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expdlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-export.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-export.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exsol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exsol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extract.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extract.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facsimile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facsimile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-factura.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-factura.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancylabel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancylabel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancynum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancynum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancypar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancypar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytabs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytabs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancytooltips.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancytooltips.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcolumn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcolumn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fetchcls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fetchcls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fewerfloatpages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fewerfloatpages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fgruler.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fgruler.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fibeamer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fibeamer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fifo-stack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fifo-stack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontents.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontents.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filecontentsdef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filecontentsdef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filedate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filedate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fileinfo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fileinfo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fink.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fink.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-finstrut.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-finstrut.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixcmex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixcmex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixme.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixme.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixmetodonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixmetodonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flabels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flabels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flagderiv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flagderiv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flashcards.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flashcards.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flippdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flippdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatflt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatflt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-floatrow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-floatrow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowfram.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowfram.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fmtcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fmtcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnbreak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnbreak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnumprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnumprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foilhtml.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foilhtml.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontaxes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontaxes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontsize.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontsize.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fonttable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fonttable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footmisx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footmisx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnoterange.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnoterange.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnpag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnpag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forarray.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forarray.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-foreign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-foreign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forloop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forloop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forms16be.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forms16be.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-formular.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-formular.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-frankenstein.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-frankenstein.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-froufrou.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-froufrou.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftnxtra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftnxtra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullblck.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullblck.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fullminipage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fullminipage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-calligra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-calligra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fundus-sueterlin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fundus-sueterlin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fvextra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fvextra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-g-brief.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-g-brief.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatherenum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatherenum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gcite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gcite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gender.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gender.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genmpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genmpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getitems.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getitems.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ginpenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ginpenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gitfile-info.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gitfile-info.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-danish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-danish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-dutch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-dutch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-english.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-english.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-estonian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-estonian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-extra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-extra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-finnish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-finnish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-french.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-french.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-german.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-german.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-irish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-irish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-italian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-italian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-magyar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-magyar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-nynorsk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-nynorsk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-polish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-polish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-portuges.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-portuges.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-serbian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-serbian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-slovene.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-slovene.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glossaries-spanish.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glossaries-spanish.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmdoc-enhance.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmdoc-enhance.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grabbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grabbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicx-psmin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicx-psmin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphpaper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphpaper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grayhints.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grayhints.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridpapers.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridpapers.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gridset.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gridset.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitlogo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitlogo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-halloweenmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-halloweenmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hanging.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hanging.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hardwrap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hardwrap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hhtensor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hhtensor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-histogr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-histogr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitreport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitreport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hpsdiss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hpsdiss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hrefhide.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hrefhide.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperbar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperbar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyperxmp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyperxmp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyphenat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyphenat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-idxlayout.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-idxlayout.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iffont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iffont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifmtarg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifmtarg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifnextok.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifnextok.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ifoddpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ifoddpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iitem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iitem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imakeidx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imakeidx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-indextools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-indextools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inlinedef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inlinedef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputenx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputenx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inputtrc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inputtrc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interfaces.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interfaces.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-intopdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-intopdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inversepath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inversepath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-invoice2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-invoice2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iso10303.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iso10303.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isodoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isodoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isorot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isorot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isotope.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isotope.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-issuulinks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-issuulinks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jvlisting.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jvlisting.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kalendarium.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kalendarium.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kantlipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kantlipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kerntest.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kerntest.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keycommand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keycommand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-keyvaltable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-keyvaltable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knowledge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knowledge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-komacv-rg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-komacv-rg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ktv-texdata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ktv-texdata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3build.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3build.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labbook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labbook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-labelschanged.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-labelschanged.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpackage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpackage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lastpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lastpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-amsmath-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-amsmath-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-base-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-base-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-firstaid-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-firstaid-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-graphics-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-graphics-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-tools-dev.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-tools-dev.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexcolors.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexcolors.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexdemo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexdemo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexgit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexgit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-layouts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-layouts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lccaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lccaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lcg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lcg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leading.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leading.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leaflet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leaflet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leftidx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leftidx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leipzig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leipzig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lengthconvert.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lengthconvert.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lettrine.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lettrine.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lhelp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lhelp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-libgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-libgreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-linegoal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-linegoal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lipsum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lipsum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listingsutf8.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listingsutf8.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listlbls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listlbls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listliketab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listliketab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lmake.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lmake.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-locality.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-locality.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logpap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logpap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longfigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longfigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longnamefilelist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longnamefilelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstaddons.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstaddons.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ltxnew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ltxnew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatodonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatodonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-macroswap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-macroswap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-magicnum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-magicnum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailing.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailing.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mailmerge.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mailmerge.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makebox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makebox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecell.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecell.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makecmds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makecmds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makedtx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makedtx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mandi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mandi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manfnt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manfnt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-manuscript.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-manuscript.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginfix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginfix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-marginnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-marginnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-markdown.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-markdown.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathastext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathastext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcaption.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcaption.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcite.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcite.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdframed.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdframed.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-media9.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-media9.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-meetingmins.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-meetingmins.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memory.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memory.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menucard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menucard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-menukeys.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-menukeys.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metastr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metastr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-method.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-method.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metre.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metre.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfirstuc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfirstuc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mftinc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mftinc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mi-solns.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mi-solns.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mindflow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mindflow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minibox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minibox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minidocument.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minidocument.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minifp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minifp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minipage-marginpar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minipage-marginpar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minted.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minted.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-minutes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-minutes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mleftright.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mleftright.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moderntimeline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moderntimeline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modroman.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modroman.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-monofill.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-monofill.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moodle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moodle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morefloats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morefloats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morehype.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morehype.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moresize.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moresize.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-moreverb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-moreverb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-morewrites.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-morewrites.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparhack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparhack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpostinl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpostinl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mtgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mtgreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiaudience.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiaudience.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multibbl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multibbl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multicolrule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multicolrule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multidef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multidef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multienv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multienv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiexpand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiexpand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multilang.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multilang.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multirow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multirow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mversion.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mversion.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mwe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mwe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mycv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mycv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mylatexformat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mylatexformat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nameauth.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nameauth.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namespc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namespc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ncctools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ncctools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-needspace.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-needspace.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newlfm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newlfm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newspaper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newspaper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newunicodechar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newunicodechar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newvbtm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newvbtm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newverbs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newverbs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicefilelist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicefilelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-niceframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-niceframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicetext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicetext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nidanfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nidanfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-noitcrul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-noitcrul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomencl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomencl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nomentbl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nomentbl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nonumonpart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nonumonpart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-normalcolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-normalcolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-notespages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-notespages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nowidow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nowidow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntheorem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntheorem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ocgx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ocgx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octavo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octavo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oldstyle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oldstyle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onlyamsmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onlyamsmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opcit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opcit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-orcidlink.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-orcidlink.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outlining.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outlining.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-overpic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-overpic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-padcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-padcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagecont.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagecont.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pagenote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pagenote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pageslts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pageslts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papercdcase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papercdcase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papermas.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papermas.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-papertex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-papertex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paracol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paracol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paralist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paralist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-paresse.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-paresse.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parselines.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parselines.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-patchcmd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-patchcmd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pauldoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pauldoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pawpict.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pawpict.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbalance.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbalance.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pbsheet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pbsheet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf14.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf14.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfcprot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfcprot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfoverlay.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfoverlay.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpc-movie.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpc-movie.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfprivacy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfprivacy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perltex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perltex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-permute.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-permute.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phffullpagefigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phffullpagefigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfparen.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfparen.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfqit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfqit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfquotetext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfquotetext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfsvnwatermark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfsvnwatermark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-phfthm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-phfthm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-photo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-photo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picture.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plweb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plweb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmboxdraw.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmboxdraw.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynom.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynom.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polynomial.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polynomial.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polytable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polytable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ppr-prv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ppr-prv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prelim2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prelim2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pressrelease.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pressrelease.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prettyref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prettyref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-preview.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-preview.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-probsoln.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-probsoln.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proofread.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proofread.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-protocol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-protocol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfragx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfragx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxgreeks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxgreeks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qstest.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qstest.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotchap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotchap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quoting.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quoting.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quotmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quotmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ran_toks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ran_toks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rccol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rccol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-multi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-multi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcsinfo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcsinfo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realboxes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realboxes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-recipecard.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-recipecard.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reflectgraphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reflectgraphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refman.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refman.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-refstyle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-refstyle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regexpatch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regexpatch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-register.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-register.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-regstats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-regstats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-relenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-relenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repltext.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repltext.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rgltxdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rgltxdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rjlparshap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rjlparshap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-robustcommand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-robustcommand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romanbarpagenumber.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romanbarpagenumber.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-romannum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-romannum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rotfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rotfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rtkinenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rtkinenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rulercompass.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rulercompass.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sauerj.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sauerj.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savefnmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savefnmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-savetrees.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-savetrees.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scale.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scale.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scalebar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scalebar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schedule.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schedule.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schooldocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schooldocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scontents.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scontents.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrlayer-fancyhdr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrlayer-fancyhdr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sdaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sdaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-secnum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-secnum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sectsty.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sectsty.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seealso.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seealso.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selinput.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selinput.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semantic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semantic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semesterplanner.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semesterplanner.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semioneside.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semioneside.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-semproc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-semproc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seqsplit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seqsplit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesstime.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesstime.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sf298.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sf298.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sffms.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sffms.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shorttoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shorttoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-show2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-show2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showcharinbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showcharinbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showexpl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showexpl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-showlabels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-showlabels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidecap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidecap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sidenotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sidenotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-silence.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-silence.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplecv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplecv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sitem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sitem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skrapport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skrapport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slantsc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slantsc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-snapshot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-snapshot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soulutf8.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soulutf8.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spacingtricks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spacingtricks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splitindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splitindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spverbatim.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spverbatim.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srcltx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srcltx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sseq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sseq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-standalone.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-standalone.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdclsdv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdclsdv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stealcaps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stealcaps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stdpage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stdpage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-storebox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-storebox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stringstrings.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stringstrings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sttools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sttools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subdepth.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subdepth.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subeqnarray.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subeqnarray.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfiles.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfiles.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-supertabular.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-supertabular.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-multi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-multi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svn-prov.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svn-prov.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-svninfo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-svninfo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swfigure.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swfigure.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntrace.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntrace.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synttree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synttree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabfigures.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabfigures.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablefootnote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablefootnote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tableof.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tableof.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablestyles.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablestyles.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablists.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablists.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablvar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablvar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularborder.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularborder.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabularew.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabularew.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabulary.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabulary.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tagpdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tagpdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-talk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-talk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tcldoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tcldoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ted.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ted.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-templatetools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-templatetools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termcal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termcal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testhyphens.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testhyphens.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-testidx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-testidx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-label.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-label.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-locale.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-locale.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texmate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texmate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texments.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texments.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texpower.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texpower.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texshade.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texshade.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texvc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texvc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textfit.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textfit.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textmerg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textmerg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textualicomma.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textualicomma.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmtools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmtools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threadcol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threadcol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-titling.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-titling.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocbibind.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocbibind.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocdata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocdata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocloft.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocloft.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tocvsec2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tocvsec2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-todonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-todonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toolbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toolbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totalcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totalcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totcount.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totcount.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-totpages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-totpages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-transparent.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-transparent.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trfsigns.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trfsigns.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trimspaces.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trimspaces.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trivfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trivfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trsym.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trsym.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tucv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tucv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-twoup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-twoup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-txgreeks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-txgreeks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-type1cm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-type1cm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typed-checklist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typed-checklist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typeface.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typeface.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typogrid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typogrid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umoline.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umoline.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underlin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underlin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-undolabl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-undolabl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitipa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitipa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-units.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-units.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unravel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unravel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upquote.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upquote.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uri.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uri.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ushort.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ushort.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-verifiche.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-verifiche.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-versonotes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-versonotes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vgrid.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vgrid.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vmargin.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vmargin.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-volumes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-volumes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vwcol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vwcol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-warpcol.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-warpcol.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-was.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-was.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widetable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widetable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-widows-and-orphans.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-widows-and-orphans.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wordlike.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wordlike.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xargs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xargs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xbmks.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xbmks.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-material.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-material.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-solarized.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-solarized.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcookybooky.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcookybooky.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcpdftips.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcpdftips.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xellipsis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xellipsis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xfor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xfor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmpincl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmpincl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpatch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpatch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpeek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpeek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpunctuate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpunctuate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xsavebox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xsavebox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xtab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xtab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yafoot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yafoot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yaletter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yaletter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yagusylo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yagusylo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ydoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ydoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zebra-goodies.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zebra-goodies.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zref.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=73aec86bbc19fdea01f09a1ace552774
+_md5_=a2d4fa7025978481c207fcd5bd0292e1
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021
index 4035cfb5a2cd..16b02be6cd92 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive LaTeX recommended packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anysize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anysize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breqn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breqn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caption-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caption-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eso-pic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eso-pic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everysel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everysel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyshi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyshi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extsizes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extsizes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancybox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancybox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyref-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyref-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyvrb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyvrb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filehook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filehook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-float-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-float-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontspec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontspec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotehyper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotehyper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grffile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grffile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hologo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hologo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-index-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-index-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-infwarerr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-infwarerr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jknapltx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jknapltx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-koma-script-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-koma-script-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3experimental-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3experimental-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lineno-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lineno-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lwarp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lwarp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdwtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdwtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memoir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memoir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ms-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ms-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntgclass-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntgclass-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parskip-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parskip-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflscape-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdflscape-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmanagement-testphase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmanagement-testphase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftexcmds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftexcmds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polyglossia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polyglossia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ragged2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ragged2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-section-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-section-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seminar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seminar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textcase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textcase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbpdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbpdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translator-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translator-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typehtml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typehtml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharcat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharcat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underscore-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underscore-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkeyval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkeyval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltxtra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltxtra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xunicode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xunicode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-latexrecommended-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-latexrecommended-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anysize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anysize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breqn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breqn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caption.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caption.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eso-pic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eso-pic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euler.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euler.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etoolbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etoolbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everysel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everysel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyshi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyshi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extsizes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extsizes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancybox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancybox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyref.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyref.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyvrb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyvrb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filehook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filehook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-float.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-float.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontspec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontspec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotehyper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotehyper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grffile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grffile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hologo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hologo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-index.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-index.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-infwarerr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-infwarerr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jknapltx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jknapltx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3experimental.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3experimental.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lineno.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lineno.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lwarp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lwarp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdwtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdwtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memoir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memoir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ms.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ms.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntgclass.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntgclass.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parskip.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parskip.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflscape.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdflscape.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmanagement-testphase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmanagement-testphase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftexcmds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftexcmds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polyglossia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polyglossia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ragged2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ragged2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sansmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sansmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-section.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-section.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seminar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seminar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sepnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sepnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textcase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textcase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thumbpdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thumbpdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-translator.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-translator.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typehtml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typehtml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharcat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharcat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-underscore.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-underscore.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkeyval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkeyval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltxtra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltxtra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xunicode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xunicode.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-attachfile2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-attachfile2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-booktabs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-booktabs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-breqn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-breqn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-caption.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-caption.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-crop.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-crop.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctable.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctable.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eso-pic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eso-pic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euler.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euler.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everysel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everysel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-everyshi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-everyshi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fancyref.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fancyref.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-filehook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-filehook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-float.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-float.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontspec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontspec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-footnotehyper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-footnotehyper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grffile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grffile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hologo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hologo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-index.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-index.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-infwarerr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-infwarerr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexbug.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexbug.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-l3experimental.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-l3experimental.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lineno.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lineno.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listings.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lwarp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lwarp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathtools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathtools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mdwtools.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mdwtools.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memoir.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memoir.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metalogo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metalogo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-microtype.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-microtype.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ms.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ms.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newfloat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newfloat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ntgclass.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ntgclass.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-parskip.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-parskip.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdflscape.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdflscape.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfmanagement-testphase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfmanagement-testphase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfpages.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfpages.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftexcmds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftexcmds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polyglossia.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polyglossia.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psfrag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psfrag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ragged2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ragged2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rcs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rcs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subfig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subfig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textcase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textcase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typehtml.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typehtml.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharcat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharcat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-math.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-math.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xcolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xcolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xkeyval.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xkeyval.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xltxtra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xltxtra.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=0d6196e897e9753ff69dbc55f9f2fd35
+_md5_=be5de772e7cb6849a9245d0d6b470384
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2021 b/metadata/md5-cache/dev-texlive/texlive-luatex-2021
index b227322ae9cb..03d771c97b48 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive LuaTeX packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD FDL-1.1 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=!~dev-texlive/texlive-latexextra-2020 >=dev-texlive/texlive-basic-2021 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chinese-jfm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chinese-jfm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekdosis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekdosis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emojicite-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emojicite-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-innerscript-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-innerscript-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-typo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-typo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uni-algos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uni-algos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luakeys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luakeys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaprogtable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaprogtable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stricttex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stricttex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uninormalize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uninormalize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-luatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-luatex-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-addliga.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-addliga.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-lua.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barracuda.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barracuda.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bezierplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bezierplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-checkcites.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-checkcites.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chinese-jfm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chinese-jfm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combofont.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combofont.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cstypo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cstypo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekdosis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekdosis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emoji.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emoji.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emojicite.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emojicite.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-enigma.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-enigma.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-innerscript.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-innerscript.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interpreter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interpreter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kanaparser.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kanaparser.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-typo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-typo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uca.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uca.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-uni-algos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-uni-algos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-visual-debug.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-visual-debug.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luahyphenrules.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luahyphenrules.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaimageembed.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaimageembed.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaintro.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaintro.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luakeys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luakeys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luapackageloader.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luapackageloader.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaprogtable.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaprogtable.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luarandom.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luarandom.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luavlna.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luavlna.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaxml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaxml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-odsfile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-odsfile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-optex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-optex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdfarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdfarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plantuml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plantuml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-selnolig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-selnolig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spelling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spelling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stricttex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stricttex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-typewriter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-typewriter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uninormalize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uninormalize.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chickenize.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chickenize.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cloze.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cloze.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ctablestack.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ctablestack.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekdosis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekdosis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-innerscript.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-innerscript.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-typo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-typo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lua-ul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lua-ul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luacolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luacolor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaindex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaindex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luainputenc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luainputenc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-doc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-doc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-math.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-math.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualatex-truncate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualatex-truncate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lualibs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lualibs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamplib.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamplib.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luaotfload.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luaotfload.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatex85.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatex85.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatexbase.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatexbase.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luatextra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luatextra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newpax.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newpax.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nodetree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nodetree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeat.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=bb2f88498de51ee18293c0a13b6c11ae
+_md5_=05f1a66040d94dfe44c8f04b93ebdb75
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2021 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2021
index dc137da07d88..a896c49edba0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Mathematics, natural sciences, computer science packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 CC-BY-4.0
 RDEPEND=>=dev-texlive/texlive-fontsrecommended-2021 >=dev-texlive/texlive-latex-2021 dev-texlive/texlive-pstricks >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-12many-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-12many-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accents-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accents-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algobox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algobox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithm2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithm2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithmicx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithmicx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithms-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithms-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algpseudocodex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algpseudocodex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algxpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algxpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aligned-overset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aligned-overset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscdx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscdx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amstex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amstex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apxproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apxproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autobreak-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autobreak-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axodraw2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axodraw2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-backnaur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-backnaur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begriff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begriff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binomexp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binomexp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biocon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biocon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitpattern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitpattern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bohr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bohr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boldtensors-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boldtensors-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bosisio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bosisio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpchem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpchem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bropd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bropd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-extra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-extra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bytefield-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bytefield-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascade-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascade-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-causets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-causets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccfonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccfonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccool-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccool-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemarrow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemarrow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcompounds-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcompounds-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcono-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcono-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemexec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemexec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemformula-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemformula-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemmacros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemmacros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemplants-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemplants-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemschemex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemschemex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemsec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemsec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemstyle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemstyle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode3e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode3e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codeanatomy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codeanatomy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commutative-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commutative-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-complexity-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-complexity-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-computational-complexity-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-computational-complexity-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concrete-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concrete-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conteq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conteq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-correctmathalign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-correctmathalign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryptocode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryptocode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decision-table-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decision-table-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delim-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delim-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimseasy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimseasy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-derivative-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-derivative-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diffcoeff-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diffcoeff-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-digiconfigs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-digiconfigs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dijkstra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dijkstra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawmatrix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawmatrix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawstack-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawstack-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dyntree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dyntree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econometrics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econometrics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engtlc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engtlc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqexpl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqexpl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnarray-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnarray-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnnumwarn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnnumwarn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euclideangeometry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euclideangeometry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extarrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extarrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extpfeil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extpfeil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-faktor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-faktor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fascicules-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fascicules-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnspe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnspe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouridx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouridx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-functan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-functan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-galois-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-galois-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gastex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gastex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gene-logic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gene-logic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghsystem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghsystem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glosmathtools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glosmathtools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gotoh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gotoh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grundgesetze-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grundgesetze-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-helmholtz-ellis-ji-notation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-helmholtz-ellis-ji-notation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepnames-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepnames-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepparticles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepparticles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-includernw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-includernw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ionumbers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ionumbers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isomath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isomath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jkmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jkmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jupynotex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jupynotex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-map-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-map-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaughmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaughmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterswitharrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterswitharrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lie-hasse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lie-hasse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longdivision-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longdivision-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpform-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpform-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lplfitch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lplfitch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstbayes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstbayes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcommand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcommand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcomp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcomp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfixs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfixs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathlig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathlig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpartir-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpartir-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpunctspace-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpunctspace-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matrix-skeleton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matrix-skeleton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matlab-prettifier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matlab-prettifier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mattens-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mattens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-membranecomputing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-membranecomputing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memorygraphs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memorygraphs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mgltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mgltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhchem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhchem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhequ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhequ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miller-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miller-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mismath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mismath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiobjective-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiobjective-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natded-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natded-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicematrix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicematrix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nuc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nuc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nucleardata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nucleardata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numerica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numerica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-objectz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-objectz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oplotsymbl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oplotsymbl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ot-tableau-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ot-tableau-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oubraces-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oubraces-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perfectcut-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perfectcut-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physconst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physconst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physunits-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physunits-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinoutikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinoutikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pm-isomath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pm-isomath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polexpr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polexpr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prftree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prftree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-principia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-principia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proba-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proba-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proof-at-the-end-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proof-at-the-end-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prooftrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prooftrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudocode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudocode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythonhighlight-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pythonhighlight-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsharp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsharp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rank-2-roots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rank-2-roots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rec-thy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rec-thy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rest-api-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rest-api-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revquantum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revquantum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ribbonproofs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ribbonproofs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmathbr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmathbr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sankey-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sankey-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sasnrdisplay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sasnrdisplay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sciposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sciposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sclang-prettifier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sclang-prettifier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratchx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratchx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesamanuel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesamanuel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shuffle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shuffle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplebnf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplebnf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpler-wick-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpler-wick-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplewick-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplewick-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-siunitx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-siunitx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spalign-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spalign-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stanli-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stanli-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-steinmetz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-steinmetz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stmaryrd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stmaryrd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-structmech-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-structmech-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-struktex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-struktex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substances-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substances-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subsupscripts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subsupscripts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-susy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-susy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syllogism-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syllogism-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sympytexpackage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sympytexpackage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t-angles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t-angles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensind-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensind-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ewd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ewd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textgreek-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textgreek-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textopo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textopo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnstile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnstile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulqda-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulqda-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitsdef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitsdef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-witharrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-witharrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xymtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xymtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yhmath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yhmath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-youngtab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-youngtab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yquant-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yquant-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ytableau-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ytableau-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-mathscience-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-mathscience-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-12many.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-12many.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-accents.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-accents.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algobox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algobox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithm2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithm2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithmicx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithmicx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithms.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithms.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algpseudocodex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algpseudocodex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algxpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algxpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aligned-overset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aligned-overset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscdx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscdx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amstex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amstex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apxproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apxproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autobreak.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autobreak.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axodraw2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axodraw2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-backnaur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-backnaur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-begriff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-begriff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binomexp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binomexp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-biocon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-biocon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitpattern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitpattern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bohr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bohr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-boldtensors.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-boldtensors.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bosisio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bosisio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpchem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpchem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bropd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bropd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-extra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-extra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bytefield.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bytefield.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascade.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascade.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-causets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-causets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccfonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccfonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccool.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccool.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemarrow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemarrow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcompounds.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcompounds.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcono.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcono.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemexec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemexec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemformula.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemformula.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemmacros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemmacros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemplants.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemplants.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemschemex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemschemex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemsec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemsec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemstyle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemstyle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-clrscode3e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-clrscode3e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codeanatomy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codeanatomy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-commutative-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-commutative-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-complexity.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-complexity.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-computational-complexity.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-computational-complexity.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concrete.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concrete.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conteq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conteq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-correctmathalign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-correctmathalign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryptocode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryptocode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decision-table.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decision-table.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delim.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delim.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimseasy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimseasy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-derivative.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-derivative.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diffcoeff.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diffcoeff.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-digiconfigs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-digiconfigs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dijkstra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dijkstra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawmatrix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawmatrix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawstack.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawstack.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dyntree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dyntree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-econometrics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-econometrics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-engtlc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-engtlc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqexpl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqexpl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnarray.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnarray.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnnumwarn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnnumwarn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euclideangeometry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euclideangeometry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extarrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extarrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extpfeil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extpfeil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-faktor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-faktor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fascicules.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fascicules.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fnspe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fnspe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouridx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouridx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-functan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-functan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-galois.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-galois.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gastex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gastex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gene-logic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gene-logic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ghsystem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ghsystem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-glosmathtools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-glosmathtools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gotoh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gotoh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grundgesetze.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grundgesetze.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-helmholtz-ellis-ji-notation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-helmholtz-ellis-ji-notation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepnames.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepnames.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepparticles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepparticles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hepunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hepunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-includernw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-includernw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ionumbers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ionumbers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-isomath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-isomath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jkmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jkmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jupynotex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jupynotex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-map.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-map.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaughmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaughmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterswitharrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterswitharrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lie-hasse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lie-hasse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-longdivision.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-longdivision.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpform.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpform.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lplfitch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lplfitch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstbayes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstbayes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcommand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcommand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcomp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcomp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfixs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfixs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpartir.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpartir.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpunctspace.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpunctspace.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matrix-skeleton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matrix-skeleton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matlab-prettifier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matlab-prettifier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mattens.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mattens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-membranecomputing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-membranecomputing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-memorygraphs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-memorygraphs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mgltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mgltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhchem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhchem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mhequ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mhequ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miller.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miller.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mismath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mismath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiobjective.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiobjective.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-natded.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-natded.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicematrix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicematrix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nuc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nuc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nucleardata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nucleardata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numerica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numerica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-objectz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-objectz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oplotsymbl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oplotsymbl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ot-tableau.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ot-tableau.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oubraces.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oubraces.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-perfectcut.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-perfectcut.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physconst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physconst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physunits.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physunits.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinoutikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinoutikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pm-isomath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pm-isomath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-polexpr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-polexpr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prftree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prftree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-principia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-principia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proba.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proba.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proof-at-the-end.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proof-at-the-end.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prooftrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prooftrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pseudocode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pseudocode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pythonhighlight.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pythonhighlight.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsharp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsharp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rank-2-roots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rank-2-roots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rec-thy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rec-thy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rest-api.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rest-api.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revquantum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revquantum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ribbonproofs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ribbonproofs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmathbr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmathbr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sankey.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sankey.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sasnrdisplay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sasnrdisplay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sciposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sciposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sclang-prettifier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sclang-prettifier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratchx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratchx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesamanuel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesamanuel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sfg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sfg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shuffle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shuffle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplebnf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplebnf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpler-wick.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpler-wick.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplewick.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplewick.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-siunitx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-siunitx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spalign.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spalign.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stanli.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stanli.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statex2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statex2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-steinmetz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-steinmetz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stmaryrd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stmaryrd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-structmech.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-structmech.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-struktex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-struktex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-substances.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-substances.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subsupscripts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subsupscripts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-subtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-subtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-susy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-susy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syllogism.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syllogism.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sympytexpackage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sympytexpackage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-synproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-synproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-t-angles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-t-angles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tablor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tablor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensind.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensind.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ewd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ewd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textgreek.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textgreek.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textopo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textopo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnstile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnstile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulqda.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulqda.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitsdef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitsdef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-witharrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-witharrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xymtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xymtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yhmath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yhmath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-youngtab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-youngtab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yquant.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yquant.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ytableau.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ytableau.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-12many.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-12many.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIstyle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIstyle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-SIunits.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-SIunits.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-alg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-alg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algobox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algobox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algorithms.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algorithms.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-algxpar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-algxpar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aligned-overset.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aligned-overset.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-amscdx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-amscdx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apxproof.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apxproof.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autobreak.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autobreak.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-axodraw2.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-axodraw2.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-backnaur.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-backnaur.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binomexp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binomexp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitpattern.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitpattern.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bosisio.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bosisio.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpchem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpchem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bropd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bropd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bussproofs-extra.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bussproofs-extra.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bytefield.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bytefield.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-calculation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-calculation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascade.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascade.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccfonts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccfonts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ccool.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ccool.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemarrow.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemarrow.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemcompounds.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemcompounds.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemschemex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemschemex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemsec.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemsec.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemstyle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemstyle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-codeanatomy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-codeanatomy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-computational-complexity.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-computational-complexity.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-concmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-concmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-conteq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-conteq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cryptocode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cryptocode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-decision-table.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-decision-table.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delim.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delim.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-delimset.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-delimset.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drawmatrix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drawmatrix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dyntree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dyntree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebproof.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebproof.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eqnarray.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eqnarray.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euclideangeometry.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euclideangeometry.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-extpfeil.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-extpfeil.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-faktor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-faktor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fascicules.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fascicules.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fouridx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fouridx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-functan.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-functan.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-galois.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-galois.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gotoh.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gotoh.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grundgesetze.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grundgesetze.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-helmholtz-ellis-ji-notation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-helmholtz-ellis-ji-notation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ionumbers.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ionumbers.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaugh-map.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaugh-map.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-karnaughmap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-karnaughmap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kvmap.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kvmap.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterswitharrows.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterswitharrows.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-logicproof.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-logicproof.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lplfitch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lplfitch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lstbayes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lstbayes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcommand.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcommand.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathcomp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathcomp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathfixs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathfixs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathpartir.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathpartir.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matlab-prettifier.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matlab-prettifier.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mattens.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mattens.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mgltex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mgltex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miller.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miller.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mismath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mismath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multiobjective.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multiobjective.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nicematrix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nicematrix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nucleardata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nucleardata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-objectz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-objectz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physconst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physconst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-physunits.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-physunits.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pm-isomath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pm-isomath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proba.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proba.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proof-at-the-end.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proof-at-the-end.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qsharp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qsharp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rest-api.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rest-api.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revquantum.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revquantum.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rmathbr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rmathbr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sankey.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sankey.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sclang-prettifier.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sclang-prettifier.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sesamanuel.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sesamanuel.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shuffle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shuffle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplewick.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplewick.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-siunitx.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-siunitx.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-skmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-skmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spalign.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spalign.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statistik.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statistik.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-statmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-statmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-steinmetz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-steinmetz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stmaryrd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stmaryrd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-struktex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-struktex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sympytexpackage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sympytexpackage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tensor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tensor.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textgreek.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textgreek.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textopo.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textopo.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thmbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thmbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turnstile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turnstile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulqda.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulqda.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitsdef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitsdef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-witharrows.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-witharrows.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xymtex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xymtex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yhmath.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yhmath.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-youngtab.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-youngtab.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ytableau.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ytableau.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=76e9f98784a5f87949dd0f6bc36145ef
+_md5_=b233eae2a0a965b9aeabf57435bf1268
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2021 b/metadata/md5-cache/dev-texlive/texlive-metapost-2021
index a952ee0a31b9..ef7e79d11e6c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive MetaPost and Metafont packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-automata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-automata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbcard-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbcard-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blockdraw_mp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blockdraw_mp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpolynomial-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpolynomial-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmarrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmarrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviincl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dviincl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsincl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsincl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exteps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exteps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-featpost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-featpost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fiziko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fiziko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garrigues-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garrigues-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hatching-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hatching-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcf2graph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcf2graph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metago-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metago-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaobj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaobj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-colorbrewer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-colorbrewer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metauml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metauml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mp3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mp3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparrows-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparrows-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpattern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpattern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piechartmp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piechartmp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repere-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repere-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slideshow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slideshow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suanpan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suanpan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpath-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpath-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeddice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeddice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-metapost-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-metapost-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-automata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-automata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bbcard.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bbcard.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blockdraw_mp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blockdraw_mp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bpolynomial.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bpolynomial.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmarrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmarrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dviincl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dviincl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsincl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsincl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-exteps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-exteps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-featpost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-featpost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fiziko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fiziko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-garrigues.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-garrigues.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hatching.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hatching.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latexmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latexmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcf2graph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcf2graph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metago.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metago.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaobj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaobj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metaplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metaplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metapost-colorbrewer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metapost-colorbrewer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metauml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metauml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mp3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mp3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mparrows.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mparrows.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpattern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpattern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mptrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mptrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piechartmp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piechartmp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-repere.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-repere.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-slideshow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-slideshow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suanpan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suanpan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-textpath.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-textpath.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-threeddice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-threeddice.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expressg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expressg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-feynmp-auto.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-feynmp-auto.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gmp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gmp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mfpic4ode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mfpic4ode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpcolornames.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpcolornames.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mpgraphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mpgraphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-roundrect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-roundrect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shapes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shapes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-splines.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-splines.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=8c5952cc4a47922cae80d7623657f314
+_md5_=d8787303f1a6c9d8e0afdbee099b5c57
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2021 b/metadata/md5-cache/dev-texlive/texlive-music-2021
index eb9c4ad7e980..b5f43961fcc9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Music packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=FDL-1.1 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autosp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autosp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bagpipe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bagpipe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbars-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbars-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ddphonism-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ddphonism-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbas-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbas-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gchords-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gchords-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrcrd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrcrd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitarchordschemes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitarchordschemes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitartabs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitartabs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harmony-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harmony-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leadsheets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leadsheets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4musicians-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4musicians-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lyluatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lyluatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-m-tx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-m-tx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musical-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musical-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musicography-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musicography-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixguit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixguit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-fonts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-fonts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octave-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octave-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piano-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piano-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmxchords-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmxchords-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-music-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-music-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autosp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autosp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bagpipe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bagpipe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbars.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbars.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chordbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chordbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ddphonism.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ddphonism.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figbas.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figbas.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gchords.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gchords.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrcrd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrcrd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitarchordschemes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitarchordschemes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitartabs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitartabs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harmony.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harmony.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-leadsheets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-leadsheets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex4musicians.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex4musicians.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lyluatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lyluatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-m-tx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-m-tx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musical.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musical.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musicography.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musicography.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixguit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixguit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex-fonts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-octave.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-octave.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-piano.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-piano.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmxchords.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmxchords.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-guitar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-guitar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lilyglyphs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lilyglyphs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musixtex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musixtex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songbook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songbook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-songs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-songs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpiano.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpiano.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=80ed968befc66fff7d7a4a738c7a5dd4
+_md5_=7e912eafe665ce4d53d11f4c007abc9d
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2021 b/metadata/md5-cache/dev-texlive/texlive-pictures-2021
index e26ad18f5075..d3a081d361ce 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Graphics, pictures, diagrams
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD-2 GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-tex/pgf-3.0.1 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dot2texi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dot2texi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpcircling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpcircling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mercatormap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mercatormap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nl-interval-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nl-interval-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-pie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-pie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-puyotikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-puyotikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntaxdi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntaxdi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-among-us-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-among-us-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-lake-fig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-lake-fig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-planets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-planets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpackets-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpackets-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikztosvg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikztosvg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tile-graphic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tile-graphic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-berge-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-berge-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-fct-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-fct-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-graph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-graph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tsemlines-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tsemlines-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tzplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tzplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utfsym-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utfsym-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-pictures-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-pictures-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adigraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adigraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-askmaps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-askmaps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoarea.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoarea.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bardiag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bardiag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bloques.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bloques.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bodegraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bodegraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bxeepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bxeepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cachepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cachepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-callouts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-callouts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chemfig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chemfig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuit-macros.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuit-macros.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-circuitikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-circuitikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dcpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dcpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-diagmac2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-diagmac2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ditaa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ditaa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-doc-pictex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-doc-pictex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dot2texi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dot2texi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dpcircling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dpcircling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dratex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dratex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-drs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-drs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-duotenzor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-duotenzor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dynkin-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dynkin-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eepic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eepic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-endofproofwd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-endofproofwd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epspdfconversion.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epspdfconversion.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fast-diagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fast-diagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fig4latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fig4latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-genealogytree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-genealogytree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getmap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getmap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grafcet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grafcet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphicxpsd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphicxpsd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-harveyballs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-harveyballs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-here.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-here.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hvfloat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hvfloat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-istgame.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-istgame.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kblocks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kblocks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knitting.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knitting.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-knittingpattern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-knittingpattern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ladder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ladder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lapdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lapdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luamesh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luamesh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-maker.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-maker.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathspic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathspic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mercatormap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mercatormap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-milsymb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-milsymb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-miniplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-miniplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-neuralnetwork.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-neuralnetwork.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nl-interval.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nl-interval.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-numericplots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-numericplots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pb-diagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pb-diagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-petri-nets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-petri-nets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-pie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-pie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-soroban.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-soroban.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-spectra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-spectra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlcd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlcd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-umlsd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-umlsd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfkeyx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfkeyx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmorepages.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmorepages.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfornament.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfornament.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-picinpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-picinpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pictex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pictex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pinlabel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pinlabel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pmgraph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pmgraph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prerex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prerex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-puyotikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-puyotikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpgfmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpgfmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qcircuit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qcircuit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-reotex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-reotex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sa-tikz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sa-tikz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemabloc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemabloc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scratch3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scratch3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scsnowman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scsnowman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-setdeck.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-setdeck.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simpleoptics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simpleoptics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spectralsequences.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spectralsequences.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swimgraf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swimgraf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-syntaxdi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-syntaxdi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-table-fct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-table-fct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdraw.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdraw.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ticollege.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ticollege.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-3dplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-3dplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-among-us.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-among-us.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bayesnet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bayesnet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-bbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-bbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-cd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-cd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dependency.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dependency.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-dimline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-dimline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynhand.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynhand.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-feynman.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-feynman.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-inet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-inet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-kalender.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-kalender.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-karnaugh.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-karnaugh.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-ladder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-ladder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-lake-fig.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-lake-fig.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-layers.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-layers.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-nef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-nef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-network.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-network.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-opm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-opm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-optics.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-optics.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-palattice.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-palattice.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-planets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-planets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-qtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-qtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-relay.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-relay.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-sfc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-sfc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-trackschematic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-trackschematic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzcodeblocks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzcodeblocks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzducks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzducks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzlings.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzlings.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmarmots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmarmots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzorbital.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzorbital.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpackets.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpackets.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpeople.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpeople.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikztosvg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikztosvg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tile-graphic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tile-graphic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timing-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timing-diagrams.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tipfr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tipfr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-base.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-base.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-berge.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-berge.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-doc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-doc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-euclide.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-euclide.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-fct.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-fct.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-graph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-graph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-orm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-orm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tkz-tab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tkz-tab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tufte-latex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tufte-latex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tzplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tzplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utfsym.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utfsym.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-visualpstricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-visualpstricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xypic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xypic.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aobs-tikz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aobs-tikz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asyfig.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asyfig.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asypictureb.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asypictureb.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamerswitch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamerswitch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-binarytree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-binarytree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blochsphere.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blochsphere.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-blox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-blox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bondgraphs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bondgraphs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-braids.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-braids.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-celtic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-celtic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-combinedgraphics.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-combinedgraphics.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curve2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curve2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-curves.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-curves.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dottex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dottex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecgdraw.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecgdraw.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ellipse.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ellipse.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-esk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-esk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-euflag.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-euflag.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fitbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fitbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-flowchart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-flowchart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-forest.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-forest.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gincltex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gincltex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gnuplottex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gnuplottex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradientframe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradientframe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graph35.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graph35.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphviz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphviz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtrlib-largetrees.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtrlib-largetrees.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hf-tikz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hf-tikz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobby.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobby.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-latex-make.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-latex-make.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lroundrect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lroundrect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-luasseq.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-luasseq.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeshape.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeshape.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-penrose.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-penrose.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-blur.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-blur.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgf-cmykshadings.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgf-cmykshadings.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfgantt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfgantt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfmolbio.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfmolbio.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfopts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfopts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pgfplots.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pgfplots.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pict2e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pict2e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pixelart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pixelart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-postage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-postage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-productbox.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-productbox.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptolemaicastronomy.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptolemaicastronomy.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pxpic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pxpic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrcode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrcode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randbild.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randbild.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomwalk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomwalk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realhats.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realhats.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rviewport.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rviewport.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-signchart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-signchart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-smartdiagram.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-smartdiagram.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spath3.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spath3.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-imagelabels.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-imagelabels.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-page.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-page.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-timing.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-timing.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikz-truchet.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikz-truchet.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzinclude.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzinclude.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzmark.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzmark.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpagenodes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpagenodes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzpfeile.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzpfeile.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzposter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzposter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzscale.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzscale.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tikzsymbols.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tikzsymbols.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tile-graphic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tile-graphic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tqft.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tqft.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-venndiagram.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-venndiagram.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xpicture.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xpicture.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=3c5c64d5377687451076552ef7cfc6ba
+_md5_=9a03058e63fcda807af7609e1ad3b0a5
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021
index 96cc0512aa73..d02704af646c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Plain (La)TeX packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-basic-2019 !dev-texlive/texlive-genericextra !dev-texlive/texlive-genericrecommended !dev-texlive/texlive-plainextra >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abbr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abbr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstyles-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstyles-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apnum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apnum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoaligne-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoaligne-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitelist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitelist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-borceux-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-borceux-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c-pascal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c-pascal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catcodes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catcodes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronosys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronosys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-colorsep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-colorsep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-compare-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-compare-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cweb-old-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cweb-old-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docbytex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docbytex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dowith-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dowith-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-eijkhout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-eijkhout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-encxvlna-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-encxvlna-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epigram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epigram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf-dvipdfmx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf-dvipdfmx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-cs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-cs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-def-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-def-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-opt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-opt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fenixpar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fenixpar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figflow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figflow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixpdfmag-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixpdfmag-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fltpoint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fltpoint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fntproof-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fntproof-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontname-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontname-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getoptk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getoptk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfnotation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfnotation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gobble-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gobble-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-pln-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-pln-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyplain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyplain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-insbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-insbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-js-misc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-js-misc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kastrup-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kastrup-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lambda-lists-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lambda-lists-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lecturer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lecturer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-letterspacing-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-letterspacing-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librarian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librarian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofitems-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofitems-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdots-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdots-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midnight-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midnight-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpattern-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpattern-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modulus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modulus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multido-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multido-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namedef-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namedef-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navigator-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navigator-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newsletr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newsletr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nth-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nth-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ofs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ofs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-olsak-misc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-olsak-misc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-outerhbox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-outerhbox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-path-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-path-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf-trans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf-trans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pitex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pitex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-placeins-plain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-placeins-plain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainpkg-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainpkg-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plipsum-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plipsum-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plnfss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plnfss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plstmary-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plstmary-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poormanlog-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poormanlog-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-present-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-present-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pwebmac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pwebmac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-random-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-random-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomlist-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomlist-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumemac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumemac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ruler-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ruler-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemata-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemata-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shade-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shade-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplekv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplekv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-swrule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-swrule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-systeme-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-systeme-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabto-generic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabto-generic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termmenu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termmenu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ht-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex4ht-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texapi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texapi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timetable-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timetable-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tracklang-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tracklang-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-treetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-treetex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trigonometry-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trigonometry-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upca-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upca-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varisize-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varisize-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii-lat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii-lat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xlop-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xlop-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yax-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yax-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zztex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zztex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-plaingeneric-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-plaingeneric-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abbr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abbr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abstyles.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abstyles.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apnum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apnum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-autoaligne.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-autoaligne.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-barr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-barr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitelist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitelist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-borceux.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-borceux.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-c-pascal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-c-pascal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catcodes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catcodes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chronosys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chronosys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dinat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dinat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-docbytex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-docbytex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dowith.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dowith.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-encxvlna.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-encxvlna.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-epsf-dvipdfmx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-epsf-dvipdfmx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-cs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-cs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-def.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-def.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-opt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-opt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fenixpar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fenixpar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-figflow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-figflow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fltpoint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fltpoint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fntproof.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fntproof.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontname.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontname.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-getoptk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-getoptk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gfnotation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gfnotation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gobble.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gobble.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-graphics-pln.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-graphics-pln.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hyplain.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hyplain.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-insbox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-insbox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-js-misc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-js-misc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kastrup.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kastrup.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lambda-lists.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lambda-lists.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lecturer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lecturer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-librarian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-librarian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-listofitems.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-listofitems.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdots.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdots.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-metatex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-metatex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-midnight.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-midnight.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mkpattern.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mkpattern.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modulus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modulus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multido.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multido.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namedef.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namedef.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navigator.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navigator.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-newsletr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-newsletr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ofs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ofs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-olsak-misc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-olsak-misc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-path.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-path.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdf-trans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdf-trans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pitex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pitex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainpkg.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainpkg.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plipsum.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plipsum.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plnfss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plnfss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plstmary.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plstmary.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-poormanlog.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-poormanlog.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-present.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-present.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pwebmac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pwebmac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-random.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-random.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomlist.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomlist.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumemac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumemac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemata.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemata.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shade.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shade.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simplekv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simplekv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-systeme.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-systeme.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termmenu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termmenu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex-ps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex-ps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tex4ht.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tex4ht.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texapi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texapi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tracklang.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tracklang.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-treetex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-treetex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-trigonometry.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-trigonometry.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-upca.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-upca.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-varisize.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-varisize.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xii-lat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xii-lat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xlop.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xlop.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yax.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yax.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zztex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zztex.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bitelist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bitelist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-catcodes.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-catcodes.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dirtree.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dirtree.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dowith.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dowith.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-cs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-cs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-def.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-def.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-expkv-opt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-expkv-opt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fltpoint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fltpoint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gobble.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gobble.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gtl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gtl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kastrup.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kastrup.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langcode.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langcode.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-localloc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-localloc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mathdots.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mathdots.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modulus.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modulus.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-multido.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-multido.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-namedef.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-namedef.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-plainpkg.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-plainpkg.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-randomlist.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-randomlist.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schemata.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schemata.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soul.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soul.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-termmenu.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-termmenu.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texdate.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texdate.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tracklang.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tracklang.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=86c233a16a945c101c62ee5389bbf4f6
+_md5_=04757144c6d32a51cd183cb94202a9eb
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2021 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2021
index e410e1afebb0..6653cbbb7e9d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive PSTricks
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-1 GPL-2 LGPL-2 LGPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-plaingeneric-2021 dev-tex/pgf >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bclogo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bclogo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsptricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsptricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pedigree-perl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pedigree-perl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psbao-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psbao-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-2dplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-2dplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3dplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3dplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-abspos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-abspos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-arrow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-arrow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-am-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-am-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-antiprism-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-antiprism-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-asr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-asr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-barcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-barcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bezier-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bezier-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-blur-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-blur-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bspline-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bspline-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calculate-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calculate-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calendar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calendar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-circ-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-circ-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-coil-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-coil-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-contourplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-contourplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dbicons-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dbicons-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-diffraction-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-diffraction-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-electricfield-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-electricfield-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-exa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-exa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-feyn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-feyn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fit-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fit-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fr3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fr3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fractal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fractal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fun-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fun-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-func-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-func-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gantt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gantt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geometrictools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geometrictools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ghsb-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ghsb-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gr3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gr3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-grad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-grad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-graphicx-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-graphicx-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-infixplot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-infixplot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-intersect-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-intersect-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-jtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-jtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-knot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-knot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-labo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-labo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-layout-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-layout-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lens-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lens-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-light3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-light3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lsystem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lsystem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-magneticfield-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-magneticfield-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-marble-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-marble-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-math-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-math-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-mirror-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-mirror-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-moire-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-moire-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-node-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-node-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ob3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ob3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optexp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optexp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-osci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-osci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ovl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ovl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pad-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pad-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdgr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdgr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-perspective-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-perspective-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-platon-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-platon-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-plot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-plot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poker-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poker-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poly-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poly-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pulley-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pulley-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-qtree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-qtree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rputover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rputover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rubans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rubans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-shell-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-shell-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-sigsys-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-sigsys-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-slpe-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-slpe-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solarsystem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solarsystem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solides3d-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solides3d-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-soroban-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-soroban-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spectra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spectra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spinner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spinner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-stru-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-stru-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-support-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-support-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-text-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-text-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-thick-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-thick-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tools-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tools-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tree-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tree-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-turtle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-turtle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tvz-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tvz-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-uml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-uml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vectorian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vectorian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vehicle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vehicle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-venn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-venn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vowel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vowel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst2pdf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst2pdf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks-add-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks-add-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks_calcnotes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks_calcnotes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uml-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uml-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vaucanson-g-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vaucanson-g-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vocaltract-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vocaltract-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-pstricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-pstricks-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bclogo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bclogo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dsptricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dsptricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pdftricks2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pdftricks2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pedigree-perl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pedigree-perl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-psbao.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-psbao.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-2dplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-2dplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3dplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3dplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-abspos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-abspos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-arrow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-arrow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-am.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-am.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-antiprism.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-antiprism.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-asr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-asr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-barcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-barcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bezier.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bezier.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-blur.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-blur.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bspline.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bspline.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calculate.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calculate.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-calendar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-calendar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-circ.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-circ.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-coil.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-coil.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-contourplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-contourplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-cox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-cox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dbicons.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dbicons.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-diffraction.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-diffraction.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-electricfield.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-electricfield.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eucl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eucl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-exa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-exa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-feyn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-feyn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fit.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fit.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fr3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fr3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fractal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fractal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fun.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fun.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-func.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-func.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gantt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gantt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-geometrictools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-geometrictools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ghsb.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ghsb.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gr3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gr3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-grad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-grad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-graphicx.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-graphicx.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-infixplot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-infixplot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-intersect.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-intersect.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-jtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-jtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-knot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-knot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-labo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-labo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-layout.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-layout.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lens.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lens.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-light3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-light3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lsystem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lsystem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-magneticfield.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-magneticfield.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-marble.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-marble.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-math.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-math.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-mirror.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-mirror.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-moire.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-moire.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-node.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-node.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ob3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ob3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optexp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optexp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-osci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-osci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ovl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ovl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pad.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pad.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdgr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdgr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-perspective.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-perspective.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-platon.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-platon.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-plot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-plot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poker.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poker.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-poly.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-poly.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pulley.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pulley.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-qtree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-qtree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rputover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rputover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rubans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rubans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-shell.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-shell.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-sigsys.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-sigsys.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-slpe.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-slpe.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solarsystem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solarsystem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-solides3d.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-solides3d.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-soroban.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-soroban.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spectra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spectra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-spinner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-spinner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-stru.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-stru.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-support.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-support.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-text.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-text.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-thick.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-thick.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tools.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tools.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tree.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tree.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-turtle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-turtle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tvz.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tvz.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-uml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-uml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vectorian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vectorian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vehicle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vehicle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-venn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-venn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-vowel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-vowel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst2pdf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst2pdf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks-add.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks-add.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pstricks_calcnotes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pstricks_calcnotes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uml.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uml.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vaucanson-g.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vaucanson-g.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vocaltract.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vocaltract.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-auto-pst-pdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-auto-pst-pdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-makeplot.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-makeplot.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-3d.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-3d.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-abspos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-abspos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-am.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-am.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-bar.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-bar.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-blur.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-blur.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-dbicons.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-dbicons.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-diffraction.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-diffraction.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-electricfield.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-electricfield.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-eps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-eps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fill.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fill.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fr3d.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fr3d.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-fun.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-fun.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-gr3d.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-gr3d.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-intersect.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-intersect.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-lens.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-lens.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-light3d.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-light3d.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-ob3d.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-ob3d.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-optexp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-optexp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pad.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pad.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdgr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdgr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-pdf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-pdf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-platon.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-platon.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-rubans.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-rubans.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-shell.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-shell.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-slpe.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-slpe.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-soroban.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-soroban.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-thick.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-thick.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-tvz.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-tvz.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pst-uml.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pst-uml.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uml.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uml.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=b228d50dc808233edfba2736dac51201
+_md5_=ba9388f312e999f489c1e193de1446bc
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2021 b/metadata/md5-cache/dev-texlive/texlive-publishers-2021
index e6b6a115283b..693f4a34e638 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive Publisher styles, theses, etc.
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-latex-2021 >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEtran-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEtran-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aastex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aastex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abnt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abnt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abntex2-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abntex2-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aguplus-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aguplus-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ametsoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ametsoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymous-acm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymous-acm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anufinalexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anufinalexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arsclassica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arsclassica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asaetr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asaetr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascelike-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascelike-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmeconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmeconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmejour-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmejour-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aucklandthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aucklandthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-FUBerlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-FUBerlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-verona-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-verona-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-br-lex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-br-lex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-problemset-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-problemset-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadilla-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadilla-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chem-journal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chem-journal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chifoot-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chifoot-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chs-physics-report-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chs-physics-report-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cje-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cje-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classicthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classicthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleanthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleanthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecothesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecothesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-els-cas-templates-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-els-cas-templates-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elteikthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elteikthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etsvthor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etsvthor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-belge-simple-sans-tva-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-belge-simple-sans-tva-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcavtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcavtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftc-notebook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftc-notebook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gaceta-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gaceta-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gammas-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gammas-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatech-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatech-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradstudentresume-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradstudentresume-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-h2020proposal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-h2020proposal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hagenberg-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hagenberg-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-har2nat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-har2nat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobete-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobete-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ieeepes-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ieeepes-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijsra-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijsra-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inkpaper-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inkpaper-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iodhbwm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iodhbwm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iscram-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iscram-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jacow-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jacow-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jnuexam-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jnuexam-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jpsj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jpsj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksp-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksp-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ku-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ku-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lion-msc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lion-msc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-llncsconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-llncsconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mluexercise-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mluexercise-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnras-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnras-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modeles-factures-belges-assocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modeles-factures-belges-assocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msu-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msu-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nature-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nature-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ndsu-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ndsu-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-novel-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-novel-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nih-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nih-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nihbiosketch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nihbiosketch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onrannual-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onrannual-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opteng-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opteng-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oup-authoring-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oup-authoring-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkuthss-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkuthss-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-fuberlin-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-fuberlin-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-tuliplab-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-tuliplab-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-procIAGssymp-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-procIAGssymp-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prtec-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prtec-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptptex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptptex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrbill-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrbill-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantumarticle-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantumarticle-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-1-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-1-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryersonsgsthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryersonsgsthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sapthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sapthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schule-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schule-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shortmathj-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shortmathj-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shtthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shtthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soton-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soton-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphdthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphdthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spie-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spie-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srdp-mathematik-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srdp-mathematik-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sugconf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sugconf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabriz-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabriz-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technion-thesis-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technion-thesis-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texilikechaps-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texilikechaps-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-texilikecover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-texilikecover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-gwu-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-gwu-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-qom-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-qom-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuaslogos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuaslogos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc-article-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc-article-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tuda-ci-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tuda-ci-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-plain-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-plain-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tui-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tui-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uafthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uafthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucalgmthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucalgmthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucbthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucbthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uestcthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uestcthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umbclegislation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umbclegislation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umich-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umich-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unam-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unam-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamth-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamth-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unifith-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unifith-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitn-bimrep-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitn-bimrep-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-univie-ling-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-univie-ling-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unizgklasa-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unizgklasa-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unswcover-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unswcover-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urcls-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urcls-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesistitlepage-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesistitlepage-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspatent-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspatent-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utexasthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utexasthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vancouver-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vancouver-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmuthesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmuthesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yazd-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yazd-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-publishers-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-publishers-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEtran.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEtran.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aastex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aastex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abnt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abnt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-abntex2.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-abntex2.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aguplus.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aguplus.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ametsoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ametsoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anonymous-acm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anonymous-acm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-anufinalexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-anufinalexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arsclassica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arsclassica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asaetr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asaetr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ascelike.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ascelike.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmeconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmeconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-asmejour.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-asmejour.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aucklandthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aucklandthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-FUBerlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-FUBerlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beamer-verona.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beamer-verona.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-br-lex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-br-lex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-problemset.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-problemset.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cascadilla.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cascadilla.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chifoot.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chifoot.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-chs-physics-report.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-chs-physics-report.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cje.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cje.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-classicthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-classicthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cleanthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cleanthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cmpj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cmpj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ecothesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ecothesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-els-cas-templates.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-els-cas-templates.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elteikthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elteikthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-etsvthor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-etsvthor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-facture-belge-simple-sans-tva.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-facture-belge-simple-sans-tva.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcavtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcavtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ftc-notebook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ftc-notebook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gaceta.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gaceta.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gammas.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gammas.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gatech-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gatech-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gradstudentresume.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gradstudentresume.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-h2020proposal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-h2020proposal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hagenberg-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hagenberg-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-har2nat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-har2nat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hobete.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hobete.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ieeepes.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ieeepes.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijsra.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-inkpaper.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-inkpaper.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iodhbwm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iodhbwm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-iscram.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-iscram.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jacow.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jacow.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jnuexam.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jnuexam.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jpsj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jpsj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ksp-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ksp-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ku-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ku-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lion-msc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lion-msc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-llncsconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-llncsconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mluexercise.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mluexercise.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mnras.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mnras.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-modeles-factures-belges-assocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-modeles-factures-belges-assocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-msu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-msu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nature.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nature.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ndsu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ndsu-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-novel.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-novel.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nih.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nih.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nihbiosketch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nihbiosketch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-onrannual.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-onrannual.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-opteng.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-opteng.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-oup-authoring-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-oup-authoring-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pkuthss.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pkuthss.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-fuberlin.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-fuberlin.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-powerdot-tuliplab.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-powerdot-tuliplab.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-procIAGssymp.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-procIAGssymp.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-prtec.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-prtec.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptptex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptptex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrbill.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrbill.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-quantumarticle.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-quantumarticle.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-1.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-1.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryersonsgsthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryersonsgsthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sapthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sapthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-schule.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-schule.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shortmathj.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shortmathj.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-shtthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-shtthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-soton.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-soton.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sphdthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sphdthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-spie.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-spie.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-srdp-mathematik.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-srdp-mathematik.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sugconf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sugconf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tabriz-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tabriz-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-technion-thesis-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-technion-thesis-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-gwu.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-gwu.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-qom.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-qom.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuaslogos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuaslogos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tlc-article.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tlc-article.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tuda-ci.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tuda-ci.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat-plain.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat-plain.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-turabian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-turabian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tui.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tui.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uafthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uafthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucalgmthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucalgmthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucbthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucbthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uestcthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uestcthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umbclegislation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umbclegislation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-umich-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-umich-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unam-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unam-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamth-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamth-template.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unamthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unamthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unifith.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unifith.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unitn-bimrep.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unitn-bimrep.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-univie-ling.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-univie-ling.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unizgklasa.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unizgklasa.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unswcover.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unswcover.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-urcls.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-urcls.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uowthesistitlepage.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uowthesistitlepage.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uspatent.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uspatent.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-utexasthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-utexasthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uwthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uwthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-vancouver.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmuthesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmuthesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yazd-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yazd-thesis.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-IEEEconf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-IEEEconf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-acmconf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-acmconf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-active-conf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-active-conf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-adfathesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-adfathesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-afparticle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-afparticle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aiaa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aiaa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-aomart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-aomart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa6e.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa6e.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-apa7.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-apa7.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-articleingud.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-articleingud.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorcsthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorcsthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bangorexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bangorexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bath-bst.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bath-bst.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-beilstein.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-beilstein.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bgteubner.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bgteubner.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-dissertation.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-dissertation.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-brandeis-thesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-brandeis-thesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cesenaexam.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cesenaexam.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-confproc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-confproc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cquthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cquthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-dccpaper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-dccpaper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ebsthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ebsthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ejpecp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ejpecp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ekaia.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ekaia.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elbioimp.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elbioimp.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-elsarticle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-elsarticle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-emisa.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-emisa.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-erdc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-erdc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-estcpmm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-estcpmm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fbithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fbithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fcltxdoc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fcltxdoc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fei.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fei.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-grant.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-grant.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gsemthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gsemthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-gzt.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-gzt.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hecthese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hecthese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hep-paper.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hep-paper.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hithesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hithesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hitszbeamer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hitszbeamer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hu-berlin-bundle.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hu-berlin-bundle.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-hustthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-hustthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-icsv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-icsv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ijmart.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ijmart.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-imtekda.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-imtekda.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-jmlr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-jmlr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kdgdocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kdgdocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-kluwer.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-kluwer.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-langsci-avm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-langsci-avm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-limecv.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-limecv.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lni.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lni.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-lps.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-lps.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-matc3mem.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-matc3mem.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mcmthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mcmthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mentis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mentis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mlacls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mlacls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mluexercise.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mluexercise.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mucproc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mucproc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mugsthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mugsthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-muling.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-muling.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-musuos.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-musuos.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-mynsfc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-mynsfc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-navydocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-navydocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nddiss.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nddiss.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nwejm.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nwejm.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nostarch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nostarch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-nrc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-nrc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philosophersimprint.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philosophersimprint.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pittetd.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pittetd.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-pracjourn.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-pracjourn.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-proposal.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-proposal.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-qrbill.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-qrbill.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resphilosophica.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resphilosophica.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-resumecls.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-resumecls.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-revtex4-1.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-revtex4-1.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-rutitlepage.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-rutitlepage.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ryethesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ryethesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sageep.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sageep.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scrjrnl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scrjrnl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-scientific-thesis-cover.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-scientific-thesis-cover.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sduthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sduthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-seuthesix.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-seuthesix.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-sr-vorl.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-sr-vorl.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-stellenbosch.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-stellenbosch.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-suftesi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-suftesi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-ekf.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-ekf.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thesis-titlepage-fhac.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thesis-titlepage-fhac.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thucoursework.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thucoursework.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-thuthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-thuthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-timbreicmc.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-timbreicmc.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-topletter.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-topletter.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-toptesi.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-toptesi.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tudscr.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tudscr.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tugboat.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tugboat.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uaclasses.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uaclasses.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uantwerpendocs.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uantwerpendocs.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucdavisthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucdavisthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucsmonograph.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucsmonograph.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uhhassignment.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uhhassignment.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucredborder.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucredborder.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uiucthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uiucthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ulthese.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ulthese.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-uothesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-uothesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ut-thesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ut-thesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xduthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xduthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xmuthesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xmuthesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-wsemclassic.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-wsemclassic.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-yathesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-yathesis.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-york-thesis.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-york-thesis.source-2021.tar.xz )
 _eclasses_=texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=30c5bf22a3bc9062eee7bbe33ba4947e
+_md5_=96759f07f369d06c1a5ca3a8dc4814d7
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2021 b/metadata/md5-cache/dev-texlive/texlive-xetex-2021
index 5d83629c6a91..5df4bb778200 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2021
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2021
@@ -5,10 +5,10 @@ DESCRIPTION=TeXLive XeTeX and packages
 EAPI=7
 HOMEPAGE=http://www.tug.org/texlive/
 IUSE=X source doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-1 GPL-2 GPL-3 LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2021 >=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience dev-texlive/texlive-luatex >=app-text/texlive-core-2021
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabxetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabxetex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-awesomebox-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-awesomebox-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-atbegshi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-atbegshi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidicontour-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidicontour-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipagegrid-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipagegrid-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidishadowtext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidishadowtext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipresentation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipresentation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-businesscard-qrcode-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-businesscard-qrcode-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cqubeamer-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cqubeamer-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixlatvian-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixlatvian-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change-xetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change-xetex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontbook-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontbook-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontwrap-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontwrap-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interchar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interchar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-position-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-position-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philokalia-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philokalia-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptext-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptext-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realscripts-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realscripts-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-resume-cv-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-resume-cv-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-thesis-dissertation-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-thesis-dissertation-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tetragonos-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tetragonos-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharclasses-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharclasses-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-bidi-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-bidi-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unisugar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unisugar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xebaposter-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xebaposter-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xechangebar-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xechangebar-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecjk-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecjk-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyr-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyr-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xeindex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xeindex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xelatex-dev-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xelatex-dev-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xesearch-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xesearch-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xespotcolor-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xespotcolor-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-itrans-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-itrans-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-pstricks-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-pstricks-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-tibetan-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-tibetan-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexconfig-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexconfig-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexfontinfo-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexfontinfo-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexko-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexko-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xevlna-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xevlna-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zbmath-review-template-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zbmath-review-template-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-collection-xetex-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-collection-xetex-2021.tar.xz doc? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabxetex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabxetex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-awesomebox.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-awesomebox.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidi-atbegshi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidi-atbegshi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidicontour.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidicontour.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipagegrid.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipagegrid.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidishadowtext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidishadowtext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-bidipresentation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-bidipresentation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-businesscard-qrcode.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-businesscard-qrcode.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-cqubeamer.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-cqubeamer.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixlatvian.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixlatvian.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-font-change-xetex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-font-change-xetex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontbook.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontbook.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontwrap.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontwrap.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-interchar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-interchar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-na-position.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-na-position.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philokalia.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philokalia.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ptext.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ptext.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realscripts.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realscripts.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-resume-cv.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-resume-cv.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-simple-thesis-dissertation.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-simple-thesis-dissertation.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-tetragonos.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-tetragonos.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-ucharclasses.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-ucharclasses.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unicode-bidi.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unicode-bidi.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-unisugar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-unisugar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xebaposter.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xebaposter.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xechangebar.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xechangebar.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecjk.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecjk.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecyr.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecyr.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xeindex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xeindex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xesearch.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xesearch.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xespotcolor.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xespotcolor.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-itrans.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-itrans.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-pstricks.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-pstricks.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetex-tibetan.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetex-tibetan.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexfontinfo.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexfontinfo.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xetexko.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xetexko.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xevlna.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xevlna.doc-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-zbmath-review-template.doc-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-zbmath-review-template.doc-2021.tar.xz ) source? ( https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-arabxetex.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-arabxetex.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fixlatvian.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fixlatvian.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-fontbook.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-fontbook.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-philokalia.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-philokalia.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-realscripts.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-realscripts.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xecjk.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xecjk.source-2021.tar.xz https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-xespotcolor.source-2021.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive/tl-xespotcolor.source-2021.tar.xz )
 _eclasses_=font	0667878c2b594871023dd1833d05996f	texlive-common	0ed8c0ce6e8c9bb49ab84344ac802665	texlive-module	d7464383ac32acb3a1ebae40ebb19ca6
-_md5_=118b8faa1ce86abe51fbd0223e139165
+_md5_=78ca3cadf79d499f2bac1d592d613705
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 85f30a6c9090..79d84b4b1aac 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bcc-0.17.0-r100 b/metadata/md5-cache/dev-util/bcc-0.17.0-r100
index e6c8fc9587af..8e9c69955b66 100644
--- a/metadata/md5-cache/dev-util/bcc-0.17.0-r100
+++ b/metadata/md5-cache/dev-util/bcc-0.17.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.17.0.tar.gz -> bcc-0.17.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe94c3728c76b062edbf972e52ca0a36
diff --git a/metadata/md5-cache/dev-util/bcc-0.18.0-r1 b/metadata/md5-cache/dev-util/bcc-0.18.0-r1
index f35a1fd6b534..6f5018f5d430 100644
--- a/metadata/md5-cache/dev-util/bcc-0.18.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.18.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.18.0.tar.gz -> bcc-0.18.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ae6959479f704e674bc958b91a71ba0
diff --git a/metadata/md5-cache/dev-util/bcc-0.19.0 b/metadata/md5-cache/dev-util/bcc-0.19.0
index 11c6af2bf039..578ff2b4a17c 100644
--- a/metadata/md5-cache/dev-util/bcc-0.19.0
+++ b/metadata/md5-cache/dev-util/bcc-0.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.19.0.tar.gz -> bcc-0.19.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01c67810434116f6bed35def9331c0e6
diff --git a/metadata/md5-cache/dev-util/bcc-0.20.0-r1 b/metadata/md5-cache/dev-util/bcc-0.20.0-r1
index 829d5ad8b029..efedffa698ad 100644
--- a/metadata/md5-cache/dev-util/bcc-0.20.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.20.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) lua? ( ^^
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.20.0.tar.gz -> bcc-0.20.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec8a1354063214a97300edc2a1ca48b5
diff --git a/metadata/md5-cache/dev-util/bear-3.0.12 b/metadata/md5-cache/dev-util/bear-3.0.12
new file mode 100644
index 000000000000..7ecb2d374b87
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bear-3.0.12
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-cpp/nlohmann_json-3.7:= >=dev-db/sqlite-3.14:= >=dev-libs/libfmt-6.2 >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:= test? ( >=dev-cpp/gtest-1.10 )
+DESCRIPTION=Build EAR generates a compilation database for clang tooling
+EAPI=7
+HOMEPAGE=https://github.com/rizsotto/Bear
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-cpp/nlohmann_json-3.7:= >=dev-db/sqlite-3.14:= >=dev-libs/libfmt-6.2 >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rizsotto/Bear/archive/3.0.12.tar.gz -> bear-3.0.12.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0e88e93810c06d62bd38152fc11e78e
diff --git a/metadata/md5-cache/dev-util/byacc-20210328 b/metadata/md5-cache/dev-util/byacc-20210328
deleted file mode 100644
index 222b714c060f..000000000000
--- a/metadata/md5-cache/dev-util/byacc-20210328
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=the best variant of the Yacc parser generator
-EAPI=7
-HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20210328.tgz
-_md5_=24cdce9b1328d2a9eb2bcc1aae9468c3
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.18 b/metadata/md5-cache/dev-util/catalyst-3.0.18
new file mode 100644
index 000000000000..0ba415ba6715
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
+LICENSE=GPL-2+
+PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
+RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pydecomp-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( app-cdr/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.18.tar.bz2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e261f02b649967c7d4989b00414d48aa
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.3 b/metadata/md5-cache/dev-util/cookiecutter-1.7.3
new file mode 100644
index 000000000000..d0fe4180c17b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( >=dev-python/binaryornot-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jinja-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/poyo-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja2-time-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-slugify-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command-line utility to create projects from cookiecutters (project templates)
+EAPI=7
+HOMEPAGE=https://github.com/cookiecutter/cookiecutter
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/binaryornot-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/jinja-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/poyo-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja2-time-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-slugify-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cookiecutter/cookiecutter/archive/1.7.3.tar.gz -> cookiecutter-1.7.3.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b36d3f15ef73eac7474044311e0643a1
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20210509 b/metadata/md5-cache/dev-util/dialog-1.3.20210509
deleted file mode 100644
index a2ccf32c8979..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20210509
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext )
-DESCRIPTION=Tool to display dialog boxes from a shell
-EAPI=7
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
-SLOT=0/15
-SRC_URI=https://invisible-mirror.net/archives/dialog/dialog-1.3-20210509.tgz
-_md5_=7d719b3580b2d3266e4bceced4b2975f
diff --git a/metadata/md5-cache/dev-util/diffoscope-175 b/metadata/md5-cache/dev-util/diffoscope-177
similarity index 98%
rename from metadata/md5-cache/dev-util/diffoscope-175
rename to metadata/md5-cache/dev-util/diffoscope-177
index 62dd4dec9fce..6d596b2ecafd 100644
--- a/metadata/md5-cache/dev-util/diffoscope-175
+++ b/metadata/md5-cache/dev-util/diffoscope-177
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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 ) gzip? ( app-arch/gzip ) 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 ) 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_single_target_python3_8(-),-python_single_target_python3_9(-)] ) 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 ) xz? ( app-arch/xz-utils ) zip? ( app-arch/unzip ) 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] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-175.tar.gz
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-177.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d01d0df333eb80c08ef06b6c4a711c29
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.11 b/metadata/md5-cache/dev-util/dogtail-0.9.11
index 0a9fd6d353c6..e5084b02ba94 100644
--- a/metadata/md5-cache/dev-util/dogtail-0.9.11
+++ b/metadata/md5-cache/dev-util/dogtail-0.9.11
@@ -5,11 +5,11 @@ DESCRIPTION=GUI test tool and automation framework using accessibility framework
 EAPI=7
 HOMEPAGE=https://gitlab.com/dogtail/dogtail/commits/master
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gobject-introspection dev-python/pyatspi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/libwnck:3[introspection] x11-base/xorg-server[xvfb] x11-apps/xinit python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.11.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=564f06cdbb292a33d082fc16ac839959
+_md5_=b39d17d80cd01e25469ac620da399897
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.3.5 b/metadata/md5-cache/dev-util/flawfinder-2.0.17
similarity index 56%
rename from metadata/md5-cache/dev-python/nodeenv-1.3.5
rename to metadata/md5-cache/dev-util/flawfinder-2.0.17
index 6211f1a32fe8..7ff3e48311ef 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.3.5
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.17
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Node.js virtual environment builder
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Examines C/C++ source code for security flaws
 EAPI=7
-HOMEPAGE=https://github.com/ekalinin/nodeenv
+HOMEPAGE=https://www.dwheeler.com/flawfinder/
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.3.5.tar.gz -> nodeenv-1.3.5.tar.gz
+SRC_URI=mirror://sourceforge/flawfinder/flawfinder-2.0.17.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0a90bf4a171903201f8f1d68ffa1e9ad
+_md5_=4ab14ec4be61f2ef2b69a26ded735718
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101 b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
index f583100ccc5a..830872e3a71a 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.37-r101
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.37[-gtk2(-)] x11-libs/gtk+:3 ctags? (
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.37.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4c4ca24c9df264fccae2617ff7015858
diff --git a/metadata/md5-cache/dev-util/hermes-2.8_p20180315 b/metadata/md5-cache/dev-util/hermes-2.8_p20180315
index b699122bc389..b46f5265c9bc 100644
--- a/metadata/md5-cache/dev-util/hermes-2.8_p20180315
+++ b/metadata/md5-cache/dev-util/hermes-2.8_p20180315
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TACC/Hermes/archive/b99622087233178368cff6cf38ec72fa01dfd8a6.tar.gz -> hermes-2.8_p20180315.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=17719ec9a7db3f263bc6da3b2196ba30
diff --git a/metadata/md5-cache/dev-util/hermes-9999 b/metadata/md5-cache/dev-util/hermes-9999
index 8f55eabce0fb..c1911a45f6be 100644
--- a/metadata/md5-cache/dev-util/hermes-9999
+++ b/metadata/md5-cache/dev-util/hermes-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4ffd619bb6f6d97f9f0cf70b5cca05d9
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.7 b/metadata/md5-cache/dev-util/howdoi-2.0.7
deleted file mode 100644
index 62e48cbd5d8f..000000000000
--- a/metadata/md5-cache/dev-util/howdoi-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A code search tool
-EAPI=7
-HOMEPAGE=https://pypi.org/project/howdoi/
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/cachelib[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/keep[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.7.tar.gz
-_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4982213f74ff98542e6783ead6950715
diff --git a/metadata/md5-cache/dev-util/jarwizard-2.50 b/metadata/md5-cache/dev-util/jarwizard-2.50
deleted file mode 100644
index 7fd85be6ef69..000000000000
--- a/metadata/md5-cache/dev-util/jarwizard-2.50
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Takes the hassle out of creating executable JAR files for your Java programs
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/jarwizard/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jarwizard/jarwizard_250_src.zip
-_eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=99113959daa7778854af8c27a9697667
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.1
index f9876ee22c3e..7febc000d8ac 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=sys-apps/pkgcore-0.12.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4fbd64bc1d859a6f5dee096ba84c478b
+_md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 1baeb2d114be..4c09e8949379 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) test? ( ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ~sys-apps/pkgcore-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4fbd64bc1d859a6f5dee096ba84c478b
+_md5_=419a1119b0e3342c96aa35f86f87934a
diff --git a/metadata/md5-cache/dev-util/poke-1.3 b/metadata/md5-cache/dev-util/poke-1.3
new file mode 100644
index 000000000000..262193eebbc6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/poke-1.3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex sys-devel/bison sys-apps/help2man virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/boehm-gc:= sys-devel/gettext sys-libs/readline:= machine-interface? ( dev-libs/json-c:= ) test? ( dev-util/dejagnu )
+DESCRIPTION=extensible editor for structured binary data
+EAPI=7
+HOMEPAGE=http://www.jemarch.net/poke
+IUSE=machine-interface nls static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/boehm-gc:= sys-devel/gettext sys-libs/readline:= machine-interface? ( dev-libs/json-c:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/poke/poke-1.3.tar.gz
+_md5_=ebe5b4bde8ef9d28219efe89d70c1ce5
diff --git a/metadata/md5-cache/dev-util/radare2-5.3.0 b/metadata/md5-cache/dev-util/radare2-5.3.0
new file mode 100644
index 000000000000..53dd5d19a883
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-5.3.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= ) dev-util/gperf
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=7
+HOMEPAGE=http://www.radare.org
+IUSE=ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libzip dev-libs/xxhash sys-apps/file sys-libs/zlib dev-libs/capstone:0= ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=https://github.com/radareorg/radare2/archive/5.3.0.tar.gz -> radare2-5.3.0.tar.gz
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a512a11440acfb05ef3a12fec76a7a39
diff --git a/metadata/md5-cache/dev-util/rizin-0.2.1 b/metadata/md5-cache/dev-util/rizin-0.2.1
index c15e40facbd8..8922252459cd 100644
--- a/metadata/md5-cache/dev-util/rizin-0.2.1
+++ b/metadata/md5-cache/dev-util/rizin-0.2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rizinorg/rizin/releases/download/v0.2.1/rizin-src-v0.2.1.tar.xz test? ( https://github.com/rizinorg/rizin-testbins/archive/a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz -> rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz )
 _eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=55a98e30831a8623293efa550d4b61be
+_md5_=4ef1cf51f62b946520a8d170b2ec581a
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10_p12 b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
similarity index 97%
rename from metadata/md5-cache/dev-util/schroot-1.6.10_p12
rename to metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
index 77b7956e380c..12f40a20bb97 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10_p12
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-12.debian.tar.xz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=150772d8044406f4369c04e06cd90923
+_md5_=7831e98a07c39ce3092351d8d90d788e
diff --git a/metadata/md5-cache/dev-util/sysdig-0.27.1-r100 b/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
index db4074d3d8e0..9a79b775fb7a 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
+++ b/metadata/md5-cache/dev-util/sysdig-0.27.1-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.1.tar.gz -> sysdig-0.27.1.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=003897d6d1f6fc4b99e1748acc6fd1cd
diff --git a/metadata/md5-cache/dev-util/sysprof-3.40.1 b/metadata/md5-cache/dev-util/sysprof-3.40.1
new file mode 100644
index 000000000000..49c349945c58
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysprof-3.40.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/itstool >=sys-devel/gettext-0.19.8 >=sys-kernel/linux-headers-2.6.32 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.67.4:2 gtk? ( >=x11-libs/gtk+-3.22.0:3 >=dev-libs/libdazzle-3.30.0 ) dev-libs/json-glib >=sys-auth/polkit-0.114 unwind? ( sys-libs/libunwind:= ) >=dev-util/sysprof-common-3.40.1 >=dev-util/sysprof-capture-3.40.1:4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=System-wide Linux Profiler
+EAPI=7
+HOMEPAGE=http://sysprof.com/
+IUSE=gtk +unwind
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.67.4:2 gtk? ( >=x11-libs/gtk+-3.22.0:3 >=dev-libs/libdazzle-3.30.0 ) dev-libs/json-glib >=sys-auth/polkit-0.114 unwind? ( sys-libs/libunwind:= ) >=dev-util/sysprof-common-3.40.1 >=dev-util/sysprof-capture-3.40.1:4
+SLOT=0/4
+SRC_URI=mirror://gnome/sources/sysprof/3.40/sysprof-3.40.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47aff6a64d7a5b0581c3edf70cecf9aa
diff --git a/metadata/md5-cache/dev-util/sysprof-capture-3.40.1 b/metadata/md5-cache/dev-util/sysprof-capture-3.40.1
new file mode 100644
index 000000000000..64d306ece80c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysprof-capture-3.40.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-kernel/linux-headers-2.6.32 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=!=dev-util/sysprof-3.34.1-r0
+DESCRIPTION=Static library for sysprof capture data generation
+EAPI=7
+HOMEPAGE=http://sysprof.com/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+
+RDEPEND=!=dev-util/sysprof-3.34.1-r0
+SLOT=4
+SRC_URI=mirror://gnome/sources/sysprof/3.40/sysprof-3.40.1.tar.xz
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=fd55cfa58f4cf2bd9298d4d659bd5e23
diff --git a/metadata/md5-cache/dev-util/sysprof-common-3.40.1 b/metadata/md5-cache/dev-util/sysprof-common-3.40.1
new file mode 100644
index 000000000000..eba153105cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysprof-common-3.40.1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=install
+DESCRIPTION=Static library for sysprof capture data generation
+EAPI=7
+HOMEPAGE=http://sysprof.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+
+RDEPEND=!=dev-util/sysprof-3.34.1-r0 !=dev-util/sysprof-capture-3.36.0-r0
+SLOT=0
+SRC_URI=mirror://gnome/sources/sysprof/3.40/sysprof-3.40.1.tar.xz
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3
+_md5_=32707c38fd9183ff25a5020b03c3191f
diff --git a/metadata/md5-cache/dev-util/uftrace-0.10 b/metadata/md5-cache/dev-util/uftrace-0.10
index 521d9a872452..ffd7d2089bd8 100644
--- a/metadata/md5-cache/dev-util/uftrace-0.10
+++ b/metadata/md5-cache/dev-util/uftrace-0.10
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/namhyung/uftrace/archive/v0.10.tar.gz -> uftrace-0.10.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=69a7259bae43476a52f90027e0638aa1
diff --git a/metadata/md5-cache/dev-util/valgrind-3.17.0 b/metadata/md5-cache/dev-util/valgrind-3.17.0
index a0606370def9..01627530c035 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.17.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.17.0
@@ -5,10 +5,10 @@ DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=7
 HOMEPAGE=http://www.valgrind.org
 IUSE=mpi
-KEYWORDS=-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f243ca6a1a1a75271759b30252e1962f
+_md5_=e4394f309efd27368cfbc2b7c6284ce0
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.179 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.179
index 8593181e43d8..d0535041f36c 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.179
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.2.179
@@ -5,11 +5,11 @@ DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
 IUSE=cube wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=media-libs/vulkan-loader-1.2.179:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[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=!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.2.179.tar.gz -> vulkan-tools-1.2.179.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f4d8826250ce2463f4e55a94cab6dde
+_md5_=37942c97fc0f457f2ada7e1963d08914
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 813622a53af6..124f12f00d73 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.32.0_rc3 b/metadata/md5-cache/dev-vcs/git-2.32.0
similarity index 87%
rename from metadata/md5-cache/dev-vcs/git-2.32.0_rc3
rename to metadata/md5-cache/dev-vcs/git-2.32.0
index 5226a8bcd8ef..2bec0e6fec74 100644
--- a/metadata/md5-cache/dev-vcs/git-2.32.0_rc3
+++ b/metadata/md5-cache/dev-vcs/git-2.32.0
@@ -5,11 +5,12 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=7
 HOMEPAGE=https://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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=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/testing/git-2.32.0.rc3.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.32.0.rc3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.32.0.rc3.tar.xz )
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.32.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.32.0.tar.xz )
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	elisp-common	6bfea130fc0f2cbd4cbc23dc12992349	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4814955660a0279b6530cab95c265899
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.10.1 b/metadata/md5-cache/dev-vcs/hg-git-0.10.1
new file mode 100644
index 000000000000..46184a93bd35
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.10.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=push to and pull from a Git repository using Mercurial
+EAPI=7
+HOMEPAGE=https://hg-git.github.io https://pypi.org/project/hg-git/
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.10.1/hg-git-0.10.1.tar.bz2
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=470da6fdee5153e497962b09a357cae9
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.9.0 b/metadata/md5-cache/dev-vcs/hg-git-0.9.0
index 46c04c5631c4..3f4e45cb91b3 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.9.0
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.9.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/dulwich-0.19.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+DEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=push to and pull from a Git repository using Mercurial
 EAPI=7
 HOMEPAGE=https://hg-git.github.io https://pypi.org/project/hg-git/
-IUSE=python_targets_python3_8
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/dulwich-0.19.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-vcs/mercurial-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://foss.heptapod.net/mercurial/hg-git/-/archive/0.9.0/hg-git-0.9.0.tar.bz2
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f18f113e0d187ab76aab4fe642858922
+_md5_=3b3a2d2e3587db74de4fed31df21a1ed
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0 b/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
index 63f302e5ac4f..a2256e4e85e6 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/httmock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/httmock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python command line interface to gitlab API
 EAPI=7
 HOMEPAGE=https://github.com/python-gitlab/python-gitlab/
-IUSE=test test python_targets_python3_8
+IUSE=test test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/requests-2.25.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=>=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-2.6.0.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=18cbcef4d919db47a9bbd84d7a03ed2d
+_md5_=baab4762c30bba5005379826a6548e18
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.3 b/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
similarity index 94%
rename from metadata/md5-cache/dev-vcs/tig-2.5.3
rename to metadata/md5-cache/dev-vcs/tig-2.5.3-r1
index 79f6fc8537fc..a1ed29aa5637 100644
--- a/metadata/md5-cache/dev-vcs/tig-2.5.3
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=34bbbbb54fb4768346d501f69b34b733
+_md5_=20fcc2a1d35822ac1f86f02cea4592ec
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.2 b/metadata/md5-cache/dev-vcs/tig-2.5.4
similarity index 83%
rename from metadata/md5-cache/dev-vcs/tig-2.5.2
rename to metadata/md5-cache/dev-vcs/tig-2.5.4
index 5e563b363663..ad229df877bb 100644
--- a/metadata/md5-cache/dev-vcs/tig-2.5.2
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.4
@@ -10,6 +10,6 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] sys-libs/readline:0= dev-vcs/git
 REQUIRED_USE=test? ( unicode )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.2/tig-2.5.2.tar.gz
+SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.4/tig-2.5.4.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=34bbbbb54fb4768346d501f69b34b733
+_md5_=20fcc2a1d35822ac1f86f02cea4592ec
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 9b45288575cc..0220fb957b01 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/minetest-5.4.1-r1 b/metadata/md5-cache/games-action/minetest-5.4.1-r1
index 823fbd1c8728..8758ac67eef1 100644
--- a/metadata/md5-cache/games-action/minetest-5.4.1-r1
+++ b/metadata/md5-cache/games-action/minetest-5.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) || ( clien
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/archive/5.4.1.tar.gz -> minetest-5.4.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4fbbd16b9efb06dfd9cdbc1baaf996ba
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 7dc5633ef004..8d7895621686 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/epiar-0.5.1 b/metadata/md5-cache/games-arcade/epiar-0.5.1
index 25b8114de1e2..46c4a722dcd2 100644
--- a/metadata/md5-cache/games-arcade/epiar-0.5.1
+++ b/metadata/md5-cache/games-arcade/epiar-0.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-games/physfs dev-libs/libxml2 media-libs/ftgl media-libs/libsdl[vide
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://github.com/cthielen/Epiar/archive/0.5.1.tar.gz -> epiar-0.5.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6fd208cefb874a1f6e93af25da8a9927
diff --git a/metadata/md5-cache/games-arcade/jvgs-0.5-r100 b/metadata/md5-cache/games-arcade/jvgs-0.5-r100
index 35f89780bb68..7f8ec60c08c1 100644
--- a/metadata/md5-cache/games-arcade/jvgs-0.5-r100
+++ b/metadata/md5-cache/games-arcade/jvgs-0.5-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-libs/tinyxml[stl] med
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jvgs/jvgs-0.5-src.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08015bb028a0de7b6882582ceeb581fb
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index aecb4a119943..1161f35d90f6 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.8-r1 b/metadata/md5-cache/games-board/gnuchess-6.2.8-r1
index 191371c3bf31..943b38661171 100644
--- a/metadata/md5-cache/games-board/gnuchess-6.2.8-r1
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.8-r1
@@ -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 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-6.2.8.tar.gz
-_md5_=4235de71e5519e388e57a33517a745b4
+_md5_=dc186fab1515d40f5ac8f65092a23d62
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 5b2d6abf20c6..ca2e48dd5269 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/fceux-2.3.0 b/metadata/md5-cache/games-emulation/fceux-2.3.0
index d5235e8ba88a..a85ea4256e49 100644
--- a/metadata/md5-cache/games-emulation/fceux-2.3.0
+++ b/metadata/md5-cache/games-emulation/fceux-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-qt/qtcore:5 dev-qt/qt
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fceultra/fceux-2.3.0.src.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abd237054b63f458d54273cd21bfba1d
diff --git a/metadata/md5-cache/games-emulation/openmsx-17.0 b/metadata/md5-cache/games-emulation/openmsx-17.0
new file mode 100644
index 000000000000..0c6a670d2f37
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/openmsx-17.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-lang/tcl:0= media-libs/alsa-lib media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick=,sound,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-ttf >=media-libs/glew-1.3.2:0= sys-libs/zlib virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MSX emulator that aims for perfection
+EAPI=7
+HOMEPAGE=https://openmsx.org/
+IUSE=+joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= media-libs/alsa-lib media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick=,sound,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-ttf >=media-libs/glew-1.3.2:0= sys-libs/zlib virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/openMSX/openMSX/releases/download/RELEASE_17_0/openmsx-17.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f8267e074ef42ee23c4131354722ac91
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index de605dcd4680..25fd6e6a942c 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/love-0.7.2-r100 b/metadata/md5-cache/games-engines/love-0.7.2-r100
index 7205a9161091..57adb9115105 100644
--- a/metadata/md5-cache/games-engines/love-0.7.2-r100
+++ b/metadata/md5-cache/games-engines/love-0.7.2-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phy
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0.7
 SRC_URI=https://github.com/love2d/love/releases/download/0.7.2/love-0.7.2-linux-src.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=10f7ba063f6d3b4563e25286ad25e59d
diff --git a/metadata/md5-cache/games-engines/love-0.8.0-r100 b/metadata/md5-cache/games-engines/love-0.8.0-r100
index 58805b8d765c..0d3544a97b29 100644
--- a/metadata/md5-cache/games-engines/love-0.8.0-r100
+++ b/metadata/md5-cache/games-engines/love-0.8.0-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) dev-games/phy
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0.8
 SRC_URI=https://github.com/love2d/love/releases/download/0.8.0/love-0.8.0-linux-src.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1aaf212d856523453a02655bf518a30e
diff --git a/metadata/md5-cache/games-engines/love-11.3-r100 b/metadata/md5-cache/games-engines/love-11.3-r100
index 65777ad03465..0026167259a7 100644
--- a/metadata/md5-cache/games-engines/love-11.3-r100
+++ b/metadata/md5-cache/games-engines/love-11.3-r100
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-src.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=771fbb30f04cf5c19ff95f0f7e98e9c5
diff --git a/metadata/md5-cache/games-engines/love-9999 b/metadata/md5-cache/games-engines/love-9999
index 836875aa7193..3c00906f83da 100644
--- a/metadata/md5-cache/games-engines/love-9999
+++ b/metadata/md5-cache/games-engines/love-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=771fbb30f04cf5c19ff95f0f7e98e9c5
diff --git a/metadata/md5-cache/games-engines/openmw-0.46.0 b/metadata/md5-cache/games-engines/openmw-0.46.0-r1
similarity index 73%
rename from metadata/md5-cache/games-engines/openmw-0.46.0
rename to metadata/md5-cache/games-engines/openmw-0.46.0-r1
index a5ccafa027b9..50d6cd4cb14e 100644
--- a/metadata/md5-cache/games-engines/openmw-0.46.0
+++ b/metadata/md5-cache/games-engines/openmw-0.46.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja dev-util/cmake
 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:=[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=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:=[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 )
+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	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf68ce07a7450c621fdada1498fd3543
+_md5_=555bca71eb20aee21a98a996eb8680ab
diff --git a/metadata/md5-cache/games-engines/solarus-1.3.1-r100 b/metadata/md5-cache/games-engines/solarus-1.3.1-r100
index 89688effc396..4238b70dc1e3 100644
--- a/metadata/md5-cache/games-engines/solarus-1.3.1-r100
+++ b/metadata/md5-cache/games-engines/solarus-1.3.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=http://www.zelda-solarus.com/downloads/solarus/solarus-1.3.1-src.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a93bad80ae19ddfca894dd90ffa7971a
diff --git a/metadata/md5-cache/games-engines/stratagus-2.4.3-r100 b/metadata/md5-cache/games-engines/stratagus-2.4.3-r100
index fbbc19e9bc1e..85700f2c49bf 100644
--- a/metadata/md5-cache/games-engines/stratagus-2.4.3-r100
+++ b/metadata/md5-cache/games-engines/stratagus-2.4.3-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0
 SRC_URI=https://github.com/Wargus/stratagus/archive/v2.4.3.tar.gz -> stratagus-2.4.3.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ccff266d2e63f26474bd71bbbeab7c8
diff --git a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100 b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
index 14ed8c66158d..15ccb4ea662d 100644
--- a/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
+++ b/metadata/md5-cache/games-engines/stratagus-3.0.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/t
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
 SLOT=0/3
 SRC_URI=https://github.com/Wargus/stratagus/archive/v3.0.0.tar.gz -> stratagus-3.0.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f51ceff10498cea23fec34d717dd4aa1
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 5c32d71e9eb3..cd90de5a8894 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1 b/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
deleted file mode 100644
index 5aae6bce9d4b..000000000000
--- a/metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl alsa? ( media-libs/alsa-lib ) dga? ( x11-libs/libXxf86dga ) flac? ( media-libs/flac ) ncurses? ( sys-libs/ncurses:0 ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl[video] ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wildmidi? ( media-sound/wildmidi ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) cdinstall? ( games-fps/quake1-data ) >=sys-devel/bison-2.6 sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=New 3d engine based off of id Softwares's Quake and QuakeWorld game engine
-EAPI=6
-HOMEPAGE=http://www.quakeforge.net/
-IUSE=alsa cdinstall debug dga fbcon flac ipv6 ncurses oss png sdl vorbis wildmidi X xdg xv zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl alsa? ( media-libs/alsa-lib ) dga? ( x11-libs/libXxf86dga ) flac? ( media-libs/flac ) ncurses? ( sys-libs/ncurses:0 ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl[video] ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wildmidi? ( media-sound/wildmidi ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib )
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=mirror://sourceforge/quake/quakeforge-0.7.2.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35f89f6a2354ef821bd47dd420b25332
diff --git a/metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210601 b/metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210601
new file mode 100644
index 000000000000..164ab8ed4c57
--- /dev/null
+++ b/metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210601
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen[dot] media-gfx/transfig ) 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
+DEPEND=client? ( media-libs/libsamplerate net-misc/curl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack ) sdl? ( media-libs/libsdl[sound] ) vorbis? ( media-libs/libvorbis ) wildmidi? ( media-sound/wildmidi ) ) ncurses? ( sys-libs/ncurses:= ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= ) client? ( virtual/opengl x11-base/xorg-proto )
+DESCRIPTION=3D engine based on id Software's Quake and QuakeWorld game engines
+EAPI=7
+HOMEPAGE=http://www.quakeforge.net/
+IUSE=alsa +client custom-cflags debug doc flac ipv6 jack ncurses oss png sdl vorbis wildmidi zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=client? ( media-libs/libsamplerate net-misc/curl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) jack? ( virtual/jack ) sdl? ( media-libs/libsdl[sound] ) vorbis? ( media-libs/libvorbis ) wildmidi? ( media-sound/wildmidi ) ) ncurses? ( sys-libs/ncurses:= ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
+SLOT=0
+SRC_URI=https://github.com/quakeforge/quakeforge/archive/53b553e89234306dc0111b107308fb42998e522b.tar.gz -> quakeforge-0.7.2_p20210601.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2c8cc30627c3b6697092bf5c19881cc6
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index e7d50c1f6402..22cead802b16 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/wtf-20210130 b/metadata/md5-cache/games-misc/wtf-20210416
similarity index 84%
rename from metadata/md5-cache/games-misc/wtf-20210130
rename to metadata/md5-cache/games-misc/wtf-20210416
index 2e5d02349307..52babd15f940 100644
--- a/metadata/md5-cache/games-misc/wtf-20210130
+++ b/metadata/md5-cache/games-misc/wtf-20210416
@@ -6,6 +6,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~x86 ~amd64-li
 LICENSE=BSD
 RDEPEND=!<=games-misc/bsd-games-3
 SLOT=0
-SRC_URI=https://sourceforge.net/projects/bsdwtf/files/wtf-20210130.tar.gz
+SRC_URI=https://sourceforge.net/projects/bsdwtf/files/wtf-20210416.tar.gz
 _eclasses_=prefix	de7d8e2b10085ed5ff09ad70e4753e5c
 _md5_=dcce77af3962af6fd5ede67c39b955bd
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 682c4c6cdff1..940caf7db2b1 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/fish-fillets-1.0.1-r100 b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
index 776106adac2d..7f70a86d593c 100644
--- a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
+++ b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-libs/fribidi >=media-
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9aad56bc0af10342c7b5123545527255
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.38.2 b/metadata/md5-cache/games-puzzle/hitori-3.38.2
new file mode 100644
index 000000000000..4d29a39ffda3
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/hitori-3.38.2
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/cairo-1.4 dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Logic puzzle game for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/cairo-1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/hitori/3.38/hitori-3.38.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ed805d9a409bd33a300d9af53c8d5c1
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a b/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
index 0682feb4a731..c08ea57c1e06 100644
--- a/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
+++ b/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3?
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/meandmyshadow/0.5a/meandmyshadow-0.5a-src.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ab1dc385d9b8c11bda80737eec2d665
diff --git a/metadata/md5-cache/games-puzzle/nudoku-2.1.0 b/metadata/md5-cache/games-puzzle/nudoku-2.1.0
index eac3a50f635d..732cbe679d2e 100644
--- a/metadata/md5-cache/games-puzzle/nudoku-2.1.0
+++ b/metadata/md5-cache/games-puzzle/nudoku-2.1.0
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure prepare
 DEPEND=cairo? ( x11-libs/cairo ) >=sys-devel/gettext-0.20 sys-libs/ncurses:= virtual/libintl
 DESCRIPTION=ncurses based sudoku game
 EAPI=7
-HOMEPAGE=https://jubalh.github.io/nudoku
+HOMEPAGE=https://jubalh.github.io/nudoku/
 IUSE=cairo
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=cairo? ( x11-libs/cairo ) >=sys-devel/gettext-0.20 sys-libs/ncurses:= virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/jubalh/nudoku/archive/2.1.0.tar.gz -> nudoku-2.1.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4311d237b2ec79ad2b8fe049a6957ca
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=9099181fb998316d7fdc1152107e1b84
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r2 b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r2
deleted file mode 100644
index 624925173f27..000000000000
--- a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) doc? ( media-libs/netpbm )
-DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygame-1.5.5[python_targets_python3_8(-)] <dev-python/pygame-2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygame-1.5.5[python_targets_python3_9(-)] <dev-python/pygame-2[python_targets_python3_9(-)] )
-DESCRIPTION=An enriched clone of the game 'Logical' by Rainbow Arts
-EAPI=7
-HOMEPAGE=http://pathological.sourceforge.net/
-IUSE=doc python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/pygame-1.5.5[python_targets_python3_8(-)] <dev-python/pygame-2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygame-1.5.5[python_targets_python3_9(-)] <dev-python/pygame-2[python_targets_python3_9(-)] )
-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	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f37654a3e00a5de230e2137a628781d1
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
new file mode 100644
index 000000000000..6eea063a3802
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) doc? ( media-libs/netpbm[png] )
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=Enriched clone of the game 'Logical' by Rainbow Arts
+EAPI=7
+HOMEPAGE=https://pathological.sourceforge.net/
+IUSE=doc python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/sdl2-image[jpeg,png] python_single_target_python3_8? ( dev-python/pygame[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygame[python_targets_python3_9(-)] )
+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	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c13dc9cf135f5849b5e499fcd06938dd
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8-r1 b/metadata/md5-cache/games-puzzle/pauker-1.8-r2
similarity index 77%
rename from metadata/md5-cache/games-puzzle/pauker-1.8-r1
rename to metadata/md5-cache/games-puzzle/pauker-1.8-r2
index 71c5711fb72e..33034e9870be 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8-r1
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=A java based flashcard program
 EAPI=6
 HOMEPAGE=http://pauker.sourceforge.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0403618efb9058285364cfa647a7afe3
+_md5_=242fa61e2fb0968f7b75948ce85f9aff
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 1a7cf1848af4..6c390917f6cb 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100 b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
index a9b853d630a0..e28c7a4c9510 100644
--- a/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
+++ b/metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) media-libs/libpn
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.71.0.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=475889cd037ab56dc1b87eff506499e7
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
index c98ef59453d4..b06543015e77 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 RESTRICT=test
 SLOT=0.25
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.25.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.25.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af23c70f417721cf2b952ad2c5d7cfb2
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
index ef59ca7dc245..b04655fcd777 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 RESTRICT=test
 SLOT=0.26
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.0/stone_soup-0.26.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a31515cd43418550d7c25f16cb516ef
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1
index 94d584f9f838..506185089990 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 RESTRICT=test
 SLOT=0.26
 SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.1/stone_soup-0.26.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a31515cd43418550d7c25f16cb516ef
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 1ba9b0c2fa1a..3bcf4b75ce4f 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/freedroid-1.0.2-r1 b/metadata/md5-cache/games-rpg/freedroid-1.0.2-r1
deleted file mode 100644
index 8b18d2ebff6e..000000000000
--- a/metadata/md5-cache/games-rpg/freedroid-1.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] media-libs/libvorbis media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] sys-libs/zlib
-DESCRIPTION=Freedroid - a Paradroid clone
-EAPI=6
-HOMEPAGE=http://freedroid.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] media-libs/libvorbis media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/freedroid/freedroid-1.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f174b0ac79e60dbb79ac38369045afa2
diff --git a/metadata/md5-cache/games-rpg/freedroid-1.2.1 b/metadata/md5-cache/games-rpg/freedroid-1.2.1
new file mode 100644
index 000000000000..dc255fffd11d
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/freedroid-1.2.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] media-libs/libpng media-libs/libvorbis sys-libs/zlib virtual/jpeg
+DESCRIPTION=The original Freedroid, a clone of the C64 classic Paradroid
+EAPI=7
+HOMEPAGE=https://github.com/ReinhardPrix/FreedroidClassic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis]
+SLOT=0
+SRC_URI=https://github.com/ReinhardPrix/FreedroidClassic/archive/refs/tags/release-1.2.1.tar.gz -> freedroid-1.2.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=5fd1fe2f75028b64497c6113a957641d
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1 b/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1
index 66d25310cf1b..9a0b87afdaec 100644
--- a/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) media-libs/libpng:= media
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-1.0/freedroidRPG-1.0rc2.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb9a29f2eec37b61f05d36a6ef1daac2
diff --git a/metadata/md5-cache/games-rpg/kqlives-0.99-r100 b/metadata/md5-cache/games-rpg/kqlives-0.99-r100
index 2b0322a895c0..54c846ce033a 100644
--- a/metadata/md5-cache/games-rpg/kqlives-0.99-r100
+++ b/metadata/md5-cache/games-rpg/kqlives-0.99-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=gnome-base/libglade-2.4
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/kqlives/kq-0.99.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=91a32e6e7a9cfcc3e0f353551d06f66d
diff --git a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100 b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
index b62a8ead46ae..4b63d7208573 100644
--- a/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
+++ b/metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=247f0976c6e275fbb0d7abebb6c578fb
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 451a55e0db44..e68da04e57cf 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.64-r100 b/metadata/md5-cache/games-simulation/corsix-th-0.64-r100
index ce10c0c24b1c..e5ec824df22b 100644
--- a/metadata/md5-cache/games-simulation/corsix-th-0.64-r100
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.64-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.64.tar.gz -> corsix-th-0.64.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d77ac0a852445b6a101840dd05c2ac73
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 64631a2107af..9dd9693ce639 100644
Binary files a/metadata/md5-cache/games-sports/Manifest.gz and b/metadata/md5-cache/games-sports/Manifest.gz differ
diff --git a/metadata/md5-cache/games-sports/xmoto-0.6.1-r100 b/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
index 9e3762d18dd6..f955c812161c 100644
--- a/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
+++ b/metadata/md5-cache/games-sports/xmoto-0.6.1-r100
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] lua_sing
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/xmoto/xmoto/archive/0.6.1.tar.gz -> xmoto-0.6.1.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c84301632f1444507c18ec39b09bca94
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 63918065d8ba..f0c573bed4b5 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.6.4 b/metadata/md5-cache/games-strategy/freeciv-2.6.4
index 5c538cc7ac49..4a4e4d2799dd 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.6.4
+++ b/metadata/md5-cache/games-strategy/freeciv-2.6.4
@@ -1,14 +1,15 @@
 BDEPEND=virtual/pkgconfig !dedicated? ( nls? ( sys-devel/gettext ) )
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:0= ) system-lua? ( >=dev-lang/lua-5.3:= ) !dedicated? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) !dedicated? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Multiplayer strategy game (Civilization Clone)
 EAPI=7
 HOMEPAGE=http://www.freeciv.org/
-IUSE=aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
+IUSE=aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua +lua_single_target_lua5-3
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:0= ) system-lua? ( >=dev-lang/lua-5.3:= )
+RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
+REQUIRED_USE=system-lua? ( ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.4.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abfba2e235a6ff2dd327a713d45b3c83
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c2b3ff4c98aee155c2aae76fc800f85
diff --git a/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100 b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
index 3520a7c2c569..3fe9548e86f5 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
+++ b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) >=dev-games/physfs-3.0.1
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-1.0.0.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84118d96f550bbadf10eb886a4fa0f9c
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100 b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
index abea0ac25033..559f6dd02b19 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
+++ b/metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8d22a40be3e34a79d328834a2ce5b6b
diff --git a/metadata/md5-cache/games-strategy/megaglest-3.13.0 b/metadata/md5-cache/games-strategy/megaglest-3.13.0
index 8e69e12db13d..5e1e2f6dade5 100644
--- a/metadata/md5-cache/games-strategy/megaglest-3.13.0
+++ b/metadata/md5-cache/games-strategy/megaglest-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.13.0/megaglest-source-3.13.0.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7bbb9d7e22fd126b03d8066e2282d00
diff --git a/metadata/md5-cache/games-strategy/naev-0.8.2 b/metadata/md5-cache/games-strategy/naev-0.8.2
index dd025a5d70f3..7eed73bb37ca 100644
--- a/metadata/md5-cache/games-strategy/naev-0.8.2
+++ b/metadata/md5-cache/games-strategy/naev-0.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naev/naev/releases/download/v0.8.2/naev-0.8.2-source.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8237d2f2406966facdc1c8588495de64
diff --git a/metadata/md5-cache/games-strategy/openra-20190314-r100 b/metadata/md5-cache/games-strategy/openra-20190314-r100
index f4146b6de9d8..87a4f50e1d8f 100644
--- a/metadata/md5-cache/games-strategy/openra-20190314-r100
+++ b/metadata/md5-cache/games-strategy/openra-20190314-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/archive/release-20190314.tar.gz -> openra-20190314.tar.gz https://github.com/OpenRA/Eluant/releases/download/20160124/Eluant.dll -> Eluant-20160124.dll https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll.config -> OpenAL-CS-20151227.dll.config https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config -> SDL2-CS-20161223.dll.config https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS-20161223.dll https://www.nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip https://www.nuget.org/api/v2/package/MaxMind.Db/2.0.0 -> MaxMind.Db-2.0.0.zip https://www.nuget.org/api/v2/package/Open.Nat/2.1.0 -> Open.Nat-2.1.0.zip https://www.nuget.org/api/v2/package/rix0rrr.BeaconLib/1.0.1 -> rix0rrr.BeaconLib-1.0.1.zip https://www.nuget.org/api/v2/package/SharpFont/4.0.1 -> SharpFont-4.0.1.zip https://www.nuget.org/api/v2/package/SharpZipLib/0.86.0 -> SharpZipLib-0.86.0.zip
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80521911ea2046c5261f769add0e7bf7
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100 b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
index 0e7bdcd666ae..e7ab4dc0e919 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Return-To-The-Roots/s25client/archive/f0b97b120140c96bbeacae9c22633f899931db69.tar.gz -> s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6015f2cc31f9c400a55572116cdfeeef
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 53283a857823..8785f54e4782 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/slade-3.2.0_beta2 b/metadata/md5-cache/games-util/slade-3.2.0_beta2
index 182da002d709..535189f734f2 100644
--- a/metadata/md5-cache/games-util/slade-3.2.0_beta2
+++ b/metadata/md5-cache/games-util/slade-3.2.0_beta2
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/sirjuddington/SLADE/archive/3.2.0_b2.tar.gz -> slade-3.2.0_beta2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=009624972a020d4d96d1b07dd2c3ffdc
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 1d55ba41a34e..46f88189e227 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1 b/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
index 745977ddff13..f0ca7c3240de 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_8 python_single_target_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.65.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-40.0:0/8[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:0/0.3 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] 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_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gtk
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/40/gnome-shell-40.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-40.1-r1-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1fb005bc2f6acb541497b08f5d29fb4
+_md5_=53d7f20952fa55e128a1faa98d955189
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.50.7 b/metadata/md5-cache/gnome-base/librsvg-2.50.7
new file mode 100644
index 000000000000..b986de0d2152
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/librsvg-2.50.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/cairo-1.16.0[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) >=virtual/rust-1.40[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-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
+IUSE=+introspection +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=x11-libs/cairo-1.16.0[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://gnome/sources/librsvg/2.50/librsvg-2.50.7.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	preserve-libs	ef207dc62baddfddfd39a164d9797648	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa2a589a2d3145a0d8665220eae23177
diff --git a/metadata/md5-cache/gnome-base/nautilus-40.2 b/metadata/md5-cache/gnome-base/nautilus-40.2
new file mode 100644
index 000000000000..4d614db1e320
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/nautilus-40.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.51.2 >=dev-util/meson-0.57.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.3.0 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.1.90:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Default file manager for the GNOME desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+ LGPL-2.1+
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
+RDEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.10.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.3.0 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.1.90:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) >=app-misc/tracker-miners-3.0:3=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/40/nautilus-40.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=635a4a07827540070eef90952fc9c11a
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 144243c22ad2..62900c7153b9 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.40.2 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.40.2
new file mode 100644
index 000000000000..c8294e164ac3
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.40.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:=[vala?] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:=[vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) net-libs/libsoup:2.4[vala] dev-libs/libical[vala] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution groupware backend
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:=[vala?] ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:=[vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test !test? ( test )
+SLOT=0/62-26-20
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.40/evolution-data-server-3.40.2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82e6662c53c1a7acac941dd7b0c33094
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.40.2 b/metadata/md5-cache/gnome-extra/evolution-ews-3.40.2
new file mode 100644
index 000000000000..4b0df61fb767
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.40.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.40.2:0= >=mail-client/evolution-3.40.2:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3 test? ( net-libs/uhttpmock ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.40.2:0= >=mail-client/evolution-3.40.2:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.40/evolution-ews-3.40.2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=982aafe127e6c6d77f06c3466113c31a
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-40.2 b/metadata/md5-cache/gnome-extra/gnome-boxes-40.2
new file mode 100644
index 000000000000..5cb2515e17f9
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-40.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] ) net-libs/gtk-vnc[vala] sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:2.4[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib rdp? ( x11-libs/gtk+:3[introspection] ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+IUSE=rdp kernel_linux
+KEYWORDS=~amd64
+LICENSE=LGPL-2+ CC-BY-2.0
+RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] x11-libs/gtksourceview:4 >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/40/gnome-boxes-40.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=94946c4cb44245b718da853d60bc774a
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-40.1 b/metadata/md5-cache/gnome-extra/gnome-calendar-40.1
index 8695c8649379..f4569c185477 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-40.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-40.1
@@ -5,11 +5,11 @@ DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
 IUSE=test
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-3.27.2:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/40/gnome-calendar-40.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a75423df866d5bd1b84a8b8d8e74a387
+_md5_=79fab53e3c28e0e4f355e8b406b1f8c5
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-40.2 b/metadata/md5-cache/gnome-extra/gnome-calendar-40.2
new file mode 100644
index 000000000000..84af362a976f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-40.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-40.0:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=dev-libs/libdazzle-3.33.1 >=gui-libs/libhandy-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=x11-libs/gtk+-3.22.0:3 >=net-libs/gnome-online-accounts-3.2.0:= >=dev-libs/libgweather-40.0:= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/40/gnome-calendar-40.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=776f942304a25d317c4f30188cc48e8c
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-40.0 b/metadata/md5-cache/gnome-extra/gnome-characters-40.0
index 235a2654e8bf..43ef7f484e66 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-40.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-40.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspecti
 DESCRIPTION=Unicode character map viewer and library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=x11-libs/gtk+-3.20:3[introspection] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] >=gui-libs/libhandy-1.1:1=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/40/gnome-characters-40.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17f41b3a2f498095a072e1fab5a50134
+_md5_=3b022cc1f2b6ca5e4cfe581c46428167
diff --git a/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2 b/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
index e7f67b6ac1ba..a5f72e81e5d0 100644
--- a/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
+++ b/metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst preinst prerm
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=GNOME integration for Spotify
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/mrpdaemon/gnome-integration-spotify
-IUSE=python_targets_python3_8
+IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] media-gfx/imagemagick x11-misc/wmctrl x11-misc/xautomation x11-misc/xdotool x11-apps/xwininfo
-REQUIRED_USE=|| ( python_targets_python3_8 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/imagemagick x11-misc/wmctrl x11-misc/xautomation x11-misc/xdotool x11-apps/xwininfo
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mrpdaemon/gnome-integration-spotify/archive/20140907.tar.gz -> gnome-integration-spotify-20140907.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79c4b2026704367e09de0075a9de5c1d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=52ec0168be56d5bf8680a2422dab8853
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-33 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-33
new file mode 100644
index 000000000000..6a2e0c1fdf75
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-33
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Changes your wallpaper daily to the bing.com background image
+EAPI=7
+HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.28
+SLOT=0
+SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v33.tar.gz -> gnome-shell-extension-bing-wallpaper-33.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8cc83d42f4bc1ca49bb818f6e0949b5a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
new file mode 100644
index 000000000000..a0b991dd0dda
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/typescript
+DEFINED_PHASES=install postinst
+DESCRIPTION=Keyboard-driven layer for GNOME Shell with tiling support
+EAPI=7
+HOMEPAGE=https://github.com/pop-os/shell
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-3
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1
+SLOT=0
+SRC_URI=https://github.com/pop-os/shell/archive/f7cbe060e8d293bfe3b0b759032a85773b542645.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa47218855234cb114913a0ee4c3e866
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.34.2 b/metadata/md5-cache/gnome-extra/gnome-software-3.34.2
deleted file mode 100644
index 5436c56cc9de..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-software-3.34.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome install & update software
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Software
-IUSE=+firmware gnome gtk-doc packagekit spell udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/3.34/gnome-software-3.34.2.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94b672ce21ee220fcac3a3ff372ed932
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.36.1 b/metadata/md5-cache/gnome-extra/gnome-software-3.36.1
deleted file mode 100644
index 56b31925eab1..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-software-3.36.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome install & update software
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Software
-IUSE=+firmware gnome gtk-doc packagekit spell udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/3.36/gnome-software-3.36.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e18ac4e1cd2daa7104bf36d3c94c0646
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-40.1 b/metadata/md5-cache/gnome-extra/gnome-software-40.1
deleted file mode 100644
index 324e5d113517..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-software-40.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libhandy-1.0.2:1= sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) flatpak? ( >=sys-apps/flatpak-1.0.4 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome install & update software
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Software
-IUSE=flatpak +firmware gnome gtk-doc packagekit spell sysprof udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libhandy-1.0.2:1= sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) flatpak? ( >=sys-apps/flatpak-1.0.4 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/40/gnome-software-40.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83f3a003042746cd4705986c21f21bc3
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-40.0 b/metadata/md5-cache/gnome-extra/gnome-software-40.2
similarity index 99%
rename from metadata/md5-cache/gnome-extra/gnome-software-40.0
rename to metadata/md5-cache/gnome-extra/gnome-software-40.2
index b6809166f6de..45ecac1c1a65 100644
--- a/metadata/md5-cache/gnome-extra/gnome-software-40.0
+++ b/metadata/md5-cache/gnome-extra/gnome-software-40.2
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22.4:3 >=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libhandy-1.0.2:1= sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) flatpak? ( >=sys-apps/flatpak-1.0.4 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-software/40/gnome-software-40.0.tar.xz
+SRC_URI=mirror://gnome/sources/gnome-software/40/gnome-software-40.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83f3a003042746cd4705986c21f21bc3
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-40.0 b/metadata/md5-cache/gnome-extra/gnome-weather-40.0
index 11c4d336440b..6010ec328f34 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-40.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-40.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=x11-libs
 DESCRIPTION=A weather application for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=x11-libs/gtk+-3.20:3 >=dev-libs/gjs-1.50 >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.28:= >=gui-libs/libhandy-1.1.90:1= gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/40/gnome-weather-40.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=284c33b875c3f36704e78b2e3b7ce3c6
+_md5_=e60e83503ef5b92138a76b0302d0787f
diff --git a/metadata/md5-cache/gnome-extra/sushi-3.38.1 b/metadata/md5-cache/gnome-extra/sushi-3.38.1
new file mode 100644
index 000000000000..daa4e541c080
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/sushi-3.38.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] >=dev-libs/gjs-1.40 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/sushi
+IUSE=office wayland +X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] >=dev-libs/gjs-1.40 >=gnome-base/nautilus-3.1.90 office? ( app-office/libreoffice )
+REQUIRED_USE=|| ( wayland X )
+SLOT=0
+SRC_URI=mirror://gnome/sources/sushi/3.38/sushi-3.38.1.tar.xz
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae5478c0f0fdf01c164cc10f47dcc6e4
diff --git a/metadata/md5-cache/gnome-extra/yelp-40.2 b/metadata/md5-cache/gnome-extra/yelp-40.2
new file mode 100644
index 000000000000..a4c30be68de5
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-40.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.13 dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help browser for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.27.1 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp/40/yelp-40.2.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab9833247aab6d9669c5077f9a77c0fc
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-40.2 b/metadata/md5-cache/gnome-extra/yelp-xsl-40.2
new file mode 100644
index 000000000000..60a6c1bce0de
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-40.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=XSL stylesheets for yelp
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/GNOME/yelp-xsl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
+RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-xsl/40/yelp-xsl-40.2.tar.xz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec633e26de70d52798dcc076d390a97c
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index c00f95d60b6a..e7c59abc43e0 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/mako-1.5 b/metadata/md5-cache/gui-apps/mako-1.5
index b17638a082fe..bfd6dca269c2 100644
--- a/metadata/md5-cache/gui-apps/mako-1.5
+++ b/metadata/md5-cache/gui-apps/mako-1.5
@@ -5,10 +5,10 @@ DESCRIPTION=A lightweight notification daemon for Wayland. Works on Sway.
 EAPI=7
 HOMEPAGE=https://github.com/emersion/mako
 IUSE=+icons
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf ) dev-libs/wayland-protocols
 SLOT=0
 SRC_URI=https://github.com/emersion/mako/archive/v1.5.tar.gz -> mako-1.5.tar.gz
 _eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=753de189582eecaa9f2005336dcb683b
+_md5_=80386947699dd9d7ddb148ccf8bb0be7
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 24bdfb5ac7b7..768481cdc41c 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/xdg-desktop-portal-wlr-0.4.0 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
new file mode 100644
index 000000000000..bda0126dec30
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=>=media-video/pipewire-0.3.2:= >=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.50.0 dev-libs/inih:0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 )
+DESCRIPTION=xdg-desktop-portal backend for wlroots
+EAPI=7
+HOMEPAGE=https://github.com/emersion/xdg-desktop-portal-wlr
+IUSE=elogind systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 ) sys-apps/xdg-desktop-portal
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0/9999
+SRC_URI=https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.4.0/xdg-desktop-portal-wlr-0.4.0.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=252c1079d19bffca172c0e80a9750722
diff --git a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
index fc1a4d15898f..0acda712092e 100644
--- a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
+++ b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=media-video/pipewire-0.3.2:= >=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.50.0 dev-libs/iniparser:0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=media-video/pipewire-0.3.2:= >=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.50.0 dev-libs/inih:0 virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-protocols-1.14:= elogind? ( >=sys-auth/elogind-237 ) systemd? ( >=sys-apps/systemd-237 )
 DESCRIPTION=xdg-desktop-portal backend for wlroots
@@ -11,4 +11,4 @@ RDEPEND=>=media-video/pipewire-0.3.2:= dev-libs/wayland >=dev-libs/wayland-proto
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/9999
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=675c8f4ce7b7e00654ba72b9e59bd747
+_md5_=252c1079d19bffca172c0e80a9750722
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index b44186965801..371049fe61c9 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/cantor-20.12.3 b/metadata/md5-cache/kde-apps/cantor-20.12.3
index a73e627e218b..d499102496b8 100644
--- a/metadata/md5-cache/kde-apps/cantor-20.12.3
+++ b/metadata/md5-cache/kde-apps/cantor-20.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/cantor-20.12.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25bdd2c6c2746ba0f28c9bb070701f95
diff --git a/metadata/md5-cache/kde-apps/cantor-21.04.1 b/metadata/md5-cache/kde-apps/cantor-21.04.1
index 402bc5c18b56..481fca8045c9 100644
--- a/metadata/md5-cache/kde-apps/cantor-21.04.1
+++ b/metadata/md5-cache/kde-apps/cantor-21.04.1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.1/src/cantor-21.04.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e8f674fff8b419a61090177e5146b77
diff --git a/metadata/md5-cache/kde-apps/kate-20.12.3-r1 b/metadata/md5-cache/kde-apps/kate-20.12.3-r1
index ffde344b0835..05a3c13a9063 100644
--- a/metadata/md5-cache/kde-apps/kate-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kate-20.12.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-document editor with network transparency, Plasma integration
 EAPI=7
 HOMEPAGE=https://kate-editor.org/ https://apps.kde.org/en/kate
 IUSE=activities +filebrowser lspclient +projects plasma +snippets sql telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcodecs-5.75.0:5 >=kde-frameworks/kcompletion-5.75.0:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kcrash-5.75.0:5 >=kde-frameworks/kdbusaddons-5.75.0:5 >=kde-frameworks/kguiaddons-5.75.0:5 >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kiconthemes-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/kitemviews-5.75.0:5 >=kde-frameworks/kjobwidgets-5.75.0:5 >=kde-frameworks/kparts-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/ktexteditor-5.75.0:5 >=kde-frameworks/ktextwidgets-5.75.0:5 >=kde-frameworks/kwidgetsaddons-5.75.0:5 >=kde-frameworks/kwindowsystem-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 activities? ( >=kde-frameworks/kactivities-5.75.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.75.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.75.0:5 ) plasma? ( >=kde-frameworks/plasma-5.75.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.75.0:5 >=kde-frameworks/threadweaver-5.75.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.75.0:5 ) sql? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kwallet-5.75.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kate-20.12.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70c4f334380e73a1ef4d1df7dcb6fc37
+_md5_=767596d6ae878a47a05e339d842a1284
diff --git a/metadata/md5-cache/kde-apps/kio-extras-20.12.3-r1 b/metadata/md5-cache/kde-apps/kio-extras-20.12.3-r1
index 39b7a0507966..1786c6aada92 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/kio-extras-20.12.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
 EAPI=7
 HOMEPAGE=https://invent.kde.org/network/kio-extras
 IUSE=activities +man mtp nfs openexr phonon samba +sftp taglib X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.75.0:5 >=kde-frameworks/kbookmarks-5.75.0:5 >=kde-frameworks/kcodecs-5.75.0:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kdbusaddons-5.75.0:5 >=kde-frameworks/kdnssd-5.75.0:5 >=kde-frameworks/kguiaddons-5.75.0:5 >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kiconthemes-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/kparts-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 >=kde-frameworks/solid-5.75.0:5 >=kde-frameworks/syntax-highlighting-5.75.0:5 activities? ( >=dev-qt/qtsql-5.15.2:5 >=kde-frameworks/kactivities-5.75.0:5 >=kde-frameworks/kactivities-stats-5.75.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) nfs? ( net-libs/libtirpc:= ) openexr? ( media-libs/openexr:= ) phonon? ( >=media-libs/phonon-4.11.0 ) samba? ( net-fs/samba[client] net-libs/kdsoap:= net-libs/kdsoap-ws-discovery-client ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) X? ( x11-libs/libX11 x11-libs/libXcursor ) >=kde-frameworks/kded-5.75.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/kio-extras-20.12.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bde0949baf26a2830d16b485d4dddc53
+_md5_=df6adf6601b7209da7389419a7e9701c
diff --git a/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1 b/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1
new file mode 100644
index 000000000000..e27e41f3414f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-20.12.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.75.0:5 ) >=kde-frameworks/extra-cmake-modules-5.75.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.75.0:5 >=kde-frameworks/kbookmarks-5.75.0:5 >=kde-frameworks/kcmutils-5.75.0:5 >=kde-frameworks/kcodecs-5.75.0:5 >=kde-frameworks/kcompletion-5.75.0:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kcrash-5.75.0:5 >=kde-frameworks/kdbusaddons-5.75.0:5 >=kde-frameworks/kdesu-5.75.0:5 >=kde-frameworks/kguiaddons-5.75.0:5 >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kiconthemes-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/kitemviews-5.75.0:5 >=kde-frameworks/kjobwidgets-5.75.0:5 >=kde-frameworks/kparts-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/kwallet-5.75.0:5 >=kde-frameworks/kwidgetsaddons-5.75.0:5 >=kde-frameworks/kwindowsystem-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) activities? ( >=kde-frameworks/kactivities-5.75.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://apps.kde.org/konqueror/
+IUSE=activities speech X test debug +handbook test
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5[widgets] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.75.0:5 >=kde-frameworks/kbookmarks-5.75.0:5 >=kde-frameworks/kcmutils-5.75.0:5 >=kde-frameworks/kcodecs-5.75.0:5 >=kde-frameworks/kcompletion-5.75.0:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kcrash-5.75.0:5 >=kde-frameworks/kdbusaddons-5.75.0:5 >=kde-frameworks/kdesu-5.75.0:5 >=kde-frameworks/kguiaddons-5.75.0:5 >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kiconthemes-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/kitemviews-5.75.0:5 >=kde-frameworks/kjobwidgets-5.75.0:5 >=kde-frameworks/kparts-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/kwallet-5.75.0:5 >=kde-frameworks/kwidgetsaddons-5.75.0:5 >=kde-frameworks/kwindowsystem-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.12.3/src/konqueror-20.12.3.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b49e6aa5a9486473958f5746166e6c4d
diff --git a/metadata/md5-cache/kde-apps/konqueror-21.04.1-r1 b/metadata/md5-cache/kde-apps/konqueror-21.04.1-r1
index 037e219088f2..fb7a0b0cfb45 100644
--- a/metadata/md5-cache/kde-apps/konqueror-21.04.1-r1
+++ b/metadata/md5-cache/kde-apps/konqueror-21.04.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.04.1/src/konqueror-21.04.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87a66e07f44ce0b5cecf964e82895d31
+_md5_=7baa49e6302914139f15549fc60d1fa0
diff --git a/metadata/md5-cache/kde-apps/spectacle-20.12.3-r1 b/metadata/md5-cache/kde-apps/spectacle-20.12.3-r1
index 5dfc0785445e..3fb17018ce36 100644
--- a/metadata/md5-cache/kde-apps/spectacle-20.12.3-r1
+++ b/metadata/md5-cache/kde-apps/spectacle-20.12.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Screenshot capture utility
 EAPI=7
 HOMEPAGE=https://apps.kde.org/en/spectacle
 IUSE=+annotate kipi share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.75.0:5 >=kde-frameworks/kconfigwidgets-5.75.0:5 >=kde-frameworks/kcoreaddons-5.75.0:5 >=kde-frameworks/kdbusaddons-5.75.0:5 >=kde-frameworks/kglobalaccel-5.75.0:5 >=kde-frameworks/ki18n-5.75.0:5 >=kde-frameworks/kio-5.75.0:5 >=kde-frameworks/knewstuff-5.75.0:5 >=kde-frameworks/knotifications-5.75.0:5 >=kde-frameworks/kservice-5.75.0:5 >=kde-frameworks/kwayland-5.75.0:5 >=kde-frameworks/kwidgetsaddons-5.75.0:5 >=kde-frameworks/kwindowsystem-5.75.0:5 >=kde-frameworks/kxmlgui-5.75.0:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image annotate? ( >=media-libs/kimageannotator-0.4.1 ) kipi? ( >=kde-apps/libkipi-20.12.3:5= ) share? ( >=kde-frameworks/purpose-5.75.0:5 ) kipi? ( >=kde-apps/kipi-plugins-20.12.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.12.3/src/spectacle-20.12.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be784b07f88a7efcbb1ba77154d93c36
+_md5_=fe82d6287ec4136ea632c1c7f8b74c86
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 4039ca5176fe..3594726107e1 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.82.0 b/metadata/md5-cache/kde-frameworks/attica-5.82.0
index 6b06d2accd36..c790e66899ad 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing access to Open Collaboration Services
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/attica-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8516649e62a853b3f28272e11f24d5a6
+_md5_=a6772d1d6177ebcd79e8e60e04dc0797
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.82.0 b/metadata/md5-cache/kde-frameworks/baloo-5.82.0
index 37138b33d565..227b1d2f8c5b 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for searching and managing metadata
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/kfilemetadata-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kidletime-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/solid-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/baloo-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c07d3b8894d94bb9b5cb78c220720199
+_md5_=826eee1a3eae1191ef664a56a9d04084
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.82.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.82.0
index 7f7d93251dff..94e15f0afd9a 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt wrapper for Bluez 5 DBus API
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/bluez-qt-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=776828e8a6916a3e0708f2fe0171d51d
+_md5_=b166713ff4e095ae9cadd7898d91ca53
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.82.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.82.0
index 127216005527..c52ae7a5ab66 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Breeze SVG icon theme
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/breeze-icons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b57d89a4518d632e710d451d640c1c56
+_md5_=4e3a0e050b268b8d6bb6f02f6b5e3533
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.82.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.82.0
index 84877a85c08e..2cd19796d3de 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Breeze SVG icon theme binary resource
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/breeze-icons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac688b1a088a19f0de7faf32a3ca636d
+_md5_=d2212aad1cf58ac5f89ca2b9ee3dda8f
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.82.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.82.0
index 1f657d5f7a90..22657a91d340 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.82.0
@@ -4,11 +4,11 @@ DESCRIPTION=Extra modules and scripts for CMake
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/extra-cmake-modules-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f19027e60e918623d6fefd2a026f1e2
+_md5_=80e0b068286664af86edb883a240c784
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.82.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.82.0
index 3992fdec1080..82b8f006b91f 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/knewstuff-5.82*:5 =kde-frameworks/knotifications-5.82*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/frameworkintegration-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44abdda9da5740ffccf171d957b5fb19
+_md5_=06da7df0982a8e25085bd6bd6e70de8c
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.82.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.82.0
index d48a0c0d52ba..d447c50ed59f 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for working with KDE activities
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kactivities-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bffe162fec757ca9dc958d42bcdac6a7
+_md5_=200f17ea5cd903abb6b34b8ad7f032f3
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.82.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.82.0
index 5622389546d8..1712261521ff 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for getting the usage statistics collected by the activiti
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 =kde-frameworks/kactivities-5.82*:5 =kde-frameworks/kconfig-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kactivities-stats-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5aea89a80b6fa7cea3c7062c9526ee26
+_md5_=3cfea57e430fd56ced84ac4ee1b62d36
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.82.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.82.0
index 778950b816d6..ac564c4369b5 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.82.0
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for building KDE API documentation in a standard format an
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=app-doc/doxygen python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jinja[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) media-gfx/graphviz[python,python_single_target_python3_8(-)?,python_single_target_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 )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kapidox-5.82.0.tar.xz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	kde.org	6e4d9db9698dba71a2c9085b861e29b5	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d2215bdc37dfeffb09f65de4e7f271b5
+_md5_=c5600f1f4bedc76692f278d6ec854c65
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.82.0 b/metadata/md5-cache/kde-frameworks/karchive-5.82.0
index 15108dbdbba3..c900e99d4c05 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for reading, creation, and manipulation of various archive
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+zstd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib zstd? ( app-arch/zstd:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/karchive-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ac0855534764278bb8e322f1cfd5714
+_md5_=a212a2902f4fa2451f7dbeba2aeef7d2
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.82.0 b/metadata/md5-cache/kde-frameworks/kauth-5.82.0
index 466b518cd447..bbf2efee5ad6 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.82.0
@@ -5,7 +5,7 @@ DESCRIPTION=Framework to let applications perform actions as a privileged user
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.82*:5 policykit? ( >=sys-auth/polkit-qt-0.113.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kauth-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=241e87d50aaf188757d1dfd8520c7213
+_md5_=2b6f44122099c9ac35f8ea389afc44ca
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.82.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.82.0
index 0f2cb04f919a..703aca67f4fa 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for managing bookmarks stored in XBEL format
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kbookmarks-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5da4f8caf8bb3aac0d7d836587de81c3
+_md5_=d80a123d13d00e7209734ffd04623659
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.82.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.82.0
index c97bb8bccd40..6fd931955bac 100644
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for interfacing with calendars
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+ test? ( LGPL-3+ )
 RDEPEND=>=dev-libs/libical-3.0.5:= >=dev-qt/qtgui-5.15.2:5 !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcalendarcore-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67cb406eb21e6b1561295e2a0e936466
+_md5_=8da049b373a343afe9a19c7097649053
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.82.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.82.0
index c85feea2ab62..58e1063f127d 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to work with KDE System Settings modules
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kdeclarative-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcmutils-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9772842f582a8291c6c074d4ad88d19
+_md5_=446b2e56a9ba4b06c4b2b644145a40a5
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.82.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.82.0
index c0fd2e8bd66c..306a7d1e768a 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for manipulating strings using various encodings
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcodecs-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f116733276df6ae11be55604633f372
+_md5_=13575612b71502fac0a770851291a977
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.82.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.82.0
index 13c516981d1d..ef772248d568 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for common completion tasks such as filename or URL comple
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcompletion-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3513182ddf43be9a46ebb59fe9ec9af9
+_md5_=a9b4d5da837a505a4a6b10ca6b93885e
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.82.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.82.0
index fc951b26cb9c..4dd6a52b91d7 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for reading and writing configuration
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=dbus nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 dbus? ( >=dev-qt/qtdbus-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kconfig-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c44964139f2be3e817521ee3893b2a1
+_md5_=e87b4114579d40bd840cbb22d09bdf06
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.82.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.82.0
index c0baa4fde935..da61be32c495 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing an assortment of configuration-related widgets
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.82*:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kconfigwidgets-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a3c1fb521fe5972ee4b7eb04feb7b92
+_md5_=a603bafe22b67cd94ade63c94dcd2f15
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.82.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.82.0
index d99d546ab5a8..28012746d74a 100644
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Address book API based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcontacts-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4216c1dc35bdcd152028f49c6d6bc4fd
+_md5_=7eb223211c7413efa5a8090f5cc9d9f8
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.82.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.82.0
index 2d2009360387..a7af39037a12 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for solving common problems such as caching, randomisation
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.15.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcoreaddons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a618a2507a03494ec24f0408428d90d
+_md5_=fc78aba16ede1e02bb56551418353ca1
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.82.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.82.0
index 96544a66f36a..1ea275271700 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for intercepting and handling application crashes
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kcrash-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32554cc1d32ac43cac337f0b743bfa41
+_md5_=012dd3dd83aa321891ba5445932fba45
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.82.0 b/metadata/md5-cache/kde-frameworks/kdav-5.82.0
index 4de5c5a0bcf0..d56a6abc240b 100644
--- a/metadata/md5-cache/kde-frameworks/kdav-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=DAV protocol implemention with KJobs
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82:5 >=kde-frameworks/ki18n-5.82:5 >=kde-frameworks/kio-5.82:5 !kde-apps/kdav:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kdav-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d0bdf86374c78a76fbede4ada6fab6b
+_md5_=60b1af4f4bf4c5cbc1e6c888fd9c0383
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.82.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.82.0
index 10a0c6af1f2b..665e74e20a14 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for registering services and applications per freedesktop
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kdbusaddons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1991ce1586e66d30fcb115d13680cd5
+_md5_=398a0b3ac09d32f1bc49d468d747b629
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.82.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.82.0
index 7a97e196b637..78431f658af7 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework providing integration of QML and KDE work spaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kglobalaccel-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/knotifications-5.82*:5 =kde-frameworks/kpackage-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kdeclarative-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=549aabd7b38c0a799790dd1e2fb1d4ea
+_md5_=c71b153378368a6f8b99c612d291a3af
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.82.0 b/metadata/md5-cache/kde-frameworks/kded-5.82.0
index e98e3e2135eb..c59da8fb46b0 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Central daemon of KDE workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/kinit-5.82*:5 =kde-frameworks/kservice-5.82*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kded-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a8962f7bb454b35f78897a9f8700a26
+_md5_=427c7e284f77daf4e58bd008f902fd98
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.82.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.82.0
index 5a6f8f1c648d..a9bb16dc1e68 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qttest-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kauth-5.82*:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 >=kde-frameworks/kded-5.82:5 =kde-frameworks/kdoctools-5.82*:5 =kde-frameworks/kemoticons-5.82*:5 =kde-frameworks/kglobalaccel-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kjobwidgets-5.82*:5 =kde-frameworks/knotifications-5.82*:5 =kde-frameworks/kparts-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/ktextwidgets-5.82*:5 =kde-frameworks/kunitconversion-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 =kde-frameworks/solid-5.82*:5 virtual/libintl X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kinit-5.82*:5 =kde-frameworks/kitemmodels-5.82*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/portingAids/kdelibs4support-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3eb73f452e53a9595465963fb7af4fa8
+_md5_=cc9949b66b0b83ddbc1b2ee2be65b7da
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.82.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.82.0
index a438cc0ce5e6..04190253d90a 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to handle super user actions
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND==kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kpty-5.82*:5 =kde-frameworks/kservice-5.82*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kdesu-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0e2eb5357928579b3229e3e297b1ea0
+_md5_=ee232746a90fdb9e527fdaadc17bace5
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.82.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.82.0
index 7397201145d5..04192b7ecfcf 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for network service discovery using Zeroconf
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 zeroconf? ( >=dev-qt/qtdbus-5.15.2:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kdnssd-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e556ce795f2a4f785b1b437606efe1f2
+_md5_=9c89104f069d254b34f49ec90625c681
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.82.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.82.0
index c7356219a85f..c5b65c4881ec 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Tools to generate documentation in various formats from DocBook file
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt =kde-frameworks/karchive-5.82*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kdoctools-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b7a10c64fc3946d4d7890ae594d7fd9
+_md5_=c97c90ff39d9fbbc794e2e51210d33f3
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.82.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.82.0
index 942a42c2919d..514fd06732e6 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for converting text emoticons to graphical representations
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kservice-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kemoticons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc62f9bb2db06b38b028274bd94aa581
+_md5_=a68e48deadda97ae27f347f0d9e6bf49
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
index 3781bdbbc324..e85b11fba0d2 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for extracting file metadata
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=epub exif ffmpeg kernel_linux office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) office? ( =kde-frameworks/karchive-5.82*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kfilemetadata-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50103c67573822b2e23a92adc409f12a
+_md5_=65be9e6468207a4d94c055f129fc75b0
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.82.0-r1 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.82.0-r1
index 0aec6cfb8e5f..78ef2c9055e8 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.82.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.82.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to handle global shortcuts
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5[X] x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kglobalaccel-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2b156979d9c5a5fb7f7cc0080457332
+_md5_=0fb2ee26a74f186fe36b0e438393c51d
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.82.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.82.0
index 82050333afe8..13d0e7d37bb6 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing assorted high-level user interface components
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=wayland test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5[wayland?] >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 wayland? ( dev-libs/wayland >=dev-qt/qtwayland-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kguiaddons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdefd21c0159d94cc4448fd825e1f387
+_md5_=94e9af852a861bdaad48091e070113b4
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.82.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.82.0
index bf955435b537..e43f83833e8f 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library to determine holidays and other special events for a geograp
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kholidays-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80760306e20981b4fcad658c1800f3cc
+_md5_=0c869018570c95e48ac0137c53f9cb7b
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.82.0 b/metadata/md5-cache/kde-frameworks/khtml-5.82.0
index 3f37ac0f5f37..71cfb78766bf 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=KHTML web rendering engine
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kglobalaccel-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kjobwidgets-5.82*:5 =kde-frameworks/kjs-5.82*:5 =kde-frameworks/knotifications-5.82*:5 =kde-frameworks/kparts-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/ktextwidgets-5.82*:5 =kde-frameworks/kwallet-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 =kde-frameworks/sonnet-5.82*:5 media-libs/giflib:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib virtual/jpeg:0 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/portingAids/khtml-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39b58049c89b9c1e0e6831bad4487539
+_md5_=a817a090748c1eb4fa9e69491ea8e58d
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.82.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.82.0
index 21c50f22643a..00ba243a4905 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.82.0
@@ -5,7 +5,7 @@ DESCRIPTION=Framework based on Gettext for internationalizing user interface tex
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=dev-qt/qtdeclarative-5.15.2:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/ki18n-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dddddfd97fb4884fb1409b4fc51953f
+_md5_=4eddca8714b0f2323340855fc157448a
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.82.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.82.0
index a4d6c5091c41..1912650c4a8e 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for icon theming and configuration
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kiconthemes-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24a1619710ad97dc64d0dfc8a86ce606
+_md5_=4ea076c829590ef52d8167befe83b81e
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.82.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.82.0
index 60de12916d03..4acd0d190266 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for detection and notification of device idle time
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.15.2:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kidletime-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f39f7ad48f71cc91adb85bac0d557a5
+_md5_=76ec13cb1f4bee30ce6751a4f85ca68a
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.82.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.82.0
index a675673a29c5..b3adae6d8b43 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing additional format plugins for Qt's image I/O sys
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=avif eps heif openexr test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 =kde-frameworks/karchive-5.82*:5 avif? ( >=media-libs/libavif-0.8.2 ) eps? ( >=dev-qt/qtprintsupport-5.15.2:5 ) heif? ( >=media-libs/libheif-1.10.0:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kimageformats-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dac815c470e3b9ee0330ad1a88f1e75
+_md5_=8b4abb1ccde343a55d5d1da8450237b0
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.82.0 b/metadata/md5-cache/kde-frameworks/kinit-5.82.0
index 7e742100f1d2..9693f1e6e21b 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kinit-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a5c9e13d5890ab99385d3536e9ccbee
+_md5_=60b7ee091f709c8db601bfd9eb9b3ee4
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.82.0-r2 b/metadata/md5-cache/kde-frameworks/kio-5.82.0-r2
index a109f332f590..272459b0ed31 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.82.0-r2
+++ b/metadata/md5-cache/kde-frameworks/kio-5.82.0-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Framework providing transparent file and data management
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.82:5
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kauth-5.82*:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kbookmarks-5.82*:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kjobwidgets-5.82*:5 =kde-frameworks/knotifications-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/ktextwidgets-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 =kde-frameworks/solid-5.82*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.82*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.82*:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kio-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c748b42b116bc4525d12a8186ed04b89
+_md5_=44bd197f8460d921edf2b7da004d9434
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.82.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.82.0
index be3f523a254f..3158135edc5b 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Lightweight user interface framework for mobile and convergent appli
 EAPI=7
 HOMEPAGE=https://techbase.kde.org/Kirigami
 IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kirigami2-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dc3721e3d570c26ae271a7b15ac5c39
+_md5_=9f55299bc304a1a0fc3d2f06cde61ebf
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.82.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.82.0
index 055451365219..bc35a64a935e 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing data models to help with tasks such as sorting a
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kitemmodels-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b81fdf395fb8ef8c9bbabee7b2892604
+_md5_=f4068faa3a56bc50ad1f65d356b40648
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.82.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.82.0
index 94268aed7ba2..2478a76563a1 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing additional widgets for item models
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kitemviews-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b700afc793d208f4634b327f3a6e0e95
+_md5_=a5c5ab0626c383cbcea756b2c29c1ba5
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.82.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.82.0
index e9b6a3347f14..e7ecc8cb7629 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing assorted widgets for showing the progress of job
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kjobwidgets-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c62372e2f3982e3c70936141e2ccabdb
+_md5_=f627e97df64555a3c68b4e5ee8c4cb45
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.82.0 b/metadata/md5-cache/kde-frameworks/kjs-5.82.0
index 10541b5c1c15..a47163d46f48 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=ECMAScipt compatible parser and engine
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/portingAids/kjs-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=042f9f07f1bbacc8de846bfb8ab0f9d0
+_md5_=9415bbd45480e8052df225a13858c6c7
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.82.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.82.0
index cde3c841cf49..4b346af21e0d 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for downloading and sharing additional application data
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/attica-5.82*:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kpackage-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/ktextwidgets-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 >=kde-frameworks/kirigami-5.82:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/knewstuff-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1338fee755c60b4d3440d6fbf301cfb5
+_md5_=1ee07e8f2500d7bdc1f721d8ccf40476
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.82.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.82.0
index 6fbc78c1c241..60d3ead410d8 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for notifying the user of an event
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/knotifications-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8364561cf7ca9fea7ffb4074fc8d3a02
+_md5_=53fff29e748aa4b85687e8149c2c8028
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.82.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.82.0
index 6ef60e6da1da..4b33ffc50eb9 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Framework for configuring desktop notifications
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kio-5.82*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/knotifyconfig-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28d536fa7eada0b9b2cf65f19323f5b9
+_md5_=94603ec3cf47c261571367bebed3dcda
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.82.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.82.0
index 793ce17e6763..b328790dc664 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework to install and load packages of non binary content
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kpackage-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8b80b445ff9683f9aafe29925d26bd6
+_md5_=0ef59e1955645e21d46055ea06b503d1
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.82.0 b/metadata/md5-cache/kde-frameworks/kparts-5.82.0
index bf056e8dcb76..d622ae0e1197 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing elaborate user-interface components
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kjobwidgets-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kparts-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=001c184f6288e2a74330eaf5f13c25a0
+_md5_=1dd96709c2ed826a39e0b9e541e8d567
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.82.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.82.0
index 236ce31fa000..47791ada4170 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=KDE contact person abstraction library
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/kpeople
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kpeople-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af99ba7b77ac14e29f817b6614103352
+_md5_=cf03952f3e1c50e6ab73673cf7eb40d4
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.82.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.82.0
index d93b85e468e2..2575c39b6b23 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing easy data-plotting functions
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kplotting-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb2b9aa05659165788533e02301918d0
+_md5_=ca60392d69309f52a521050fd3b4fd83
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.82.0 b/metadata/md5-cache/kde-frameworks/kpty-5.82.0
index 1522923c5003..bcfc1348a291 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for pseudo terminal devices and running child processes
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kpty-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b93394e11566963da161f916d4f382d
+_md5_=88caf45890d3928e6b7c85522131a8f0
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.82.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.82.0
index 9f53c52b2fa6..888079f4a507 100644
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=QtQuick plugin providing high-performance charts
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/kquickcharts
 IUSE=test debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 examples? ( >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kdeclarative-5.82*:5 =kde-frameworks/kirigami-5.82*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kquickcharts-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2655231b9d56aae120c4e88f86277b81
+_md5_=f936b3a44f02649b35260ab72338adf3
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.82.0 b/metadata/md5-cache/kde-frameworks/kross-5.82.0
index 89f517f8fb69..ee20f92670de 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for embedding scripting into applications
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kparts-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/portingAids/kross-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b063fc1156e2c0ddc194810ce2af02c9
+_md5_=cf9eba3b4fd30e6eddb4ca45c93e12aa
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.82.0 b/metadata/md5-cache/kde-frameworks/krunner-5.82.0
index f5a8cb6a8d08..42a46fd0654f 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for providing different actions given a string query
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=activities test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/plasma-5.82*:5 =kde-frameworks/solid-5.82*:5 =kde-frameworks/threadweaver-5.82*:5 activities? ( =kde-frameworks/kactivities-5.82*:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/krunner-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2133532067e1b3110ce291331483f900
+_md5_=858fbe7f62684a304a1fd414261bc525
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.82.0 b/metadata/md5-cache/kde-frameworks/kservice-5.82.0
index e893338dd561..9f66c2ebeac6 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced plugin and service introspection
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2 LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kcrash-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kservice-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac16f21350bc3b4441e8b4b16da61998
+_md5_=1432f4eccad977d712452202ec772900
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.82.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.82.0
index 01962f4e518d..a6d3148b7296 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing a full text editor component
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=+editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kauth-5.82*:5 =kde-frameworks/kcodecs-5.82*:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kjobwidgets-5.82*:5 =kde-frameworks/kparts-5.82*:5 =kde-frameworks/ktextwidgets-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 =kde-frameworks/sonnet-5.82*:5 =kde-frameworks/syntax-highlighting-5.82*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/ktexteditor-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f46ea40d4c7f637a6d018382e2ad949
+_md5_=41f61e6e5536da6274528494cf11f33c
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.82.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.82.0
index 75fb3c6a0dc5..f003bcdf597b 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing an assortment of widgets for displaying and edit
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcompletion-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/sonnet-5.82*:5 speech? ( >=dev-qt/qtspeech-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/ktextwidgets-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5fb6e01ffa2693643fc93f795aea2e4
+_md5_=818bf62fc75cff1e9f16084a665ddce8
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.82.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.82.0
index 6dcd2a5782ba..d58a8116eda2 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for converting units
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.15.2:5 =kde-frameworks/ki18n-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kunitconversion-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb5af1d24568cdd9b3be2ea53a6cd946
+_md5_=c6d583f4116e3dcbaa115f2eb39205d6
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.82.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.82.0
index 4b7e67e8d2ee..d46b137b2e14 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing desktop-wide storage for passwords
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kdbusaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/knotifications-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kwallet-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5135b9479bc90fbd0b61f9148cefd297
+_md5_=2a1c15300d719df9c003bf71512cf00b
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.82.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.82.0
index 3381032851fa..9ba2f922deef 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/kwayland
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 media-libs/mesa[egl] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kwayland-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1d7aa4df9e822efb08563d824389cc0
+_md5_=420f36cff942e759a1b66254ac204206
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.82.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.82.0
index b4758c982d71..1f13b1fe0fe7 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=An assortment of high-level widgets for common tasks
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kwidgetsaddons-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd0699d8c693e2a3091f1e084c31b182
+_md5_=64b251faf28e84bb340679dce6cab3a9
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.82.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.82.0
index 1e63078a8296..409e7c2e1cab 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework providing access to properties and features of the window
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kwindowsystem-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83cb43739ea98bf4e1f3f86626e3416a
+_md5_=2ee8ee1e92ab5ffcdeaeaa94354345cc
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.82.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.82.0
index 6f69904c475c..f22b736e59e2 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.15.2:5= >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5[ssl] >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kglobalaccel-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kitemviews-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/kxmlgui-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0345312ad90ff553a3aad16f728be72f
+_md5_=c88345d6afbe3572c70572fc8b0c442c
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.82.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.82.0
index 043dc3285814..3072677e769c 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=ModemManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/modemmanager-qt-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=837a5b997b01de7326714f12109fc566
+_md5_=252fa51ee8677b403f5a618d735e9e0d
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.82.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.82.0
index 47abad124655..215f30efdace 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/networkmanager-qt-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d280d82f03532c384f4ace21a0366ed
+_md5_=94bbf78494e78b329b360137a138005a
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.82.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.82.0
index d5525056a3d3..3d5b9e932661 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.82.0
@@ -5,10 +5,10 @@ DESCRIPTION=Oxygen SVG icon theme
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/oxygen-icons5-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53b95611290300d5075fb53373dadf83
+_md5_=9bae39cd26b4b83886e7e25cd16b41d3
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.82.0 b/metadata/md5-cache/kde-frameworks/plasma-5.82.0
index b8bc8ef2ee05..744b6dac3475 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma framework
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=gles2-only wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kactivities-5.82*:5 =kde-frameworks/karchive-5.82*:5 =kde-frameworks/kconfig-5.82*:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/kdeclarative-5.82*:5 =kde-frameworks/kglobalaccel-5.82*:5 =kde-frameworks/kguiaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kirigami-5.82*:5 =kde-frameworks/knotifications-5.82*:5 =kde-frameworks/kpackage-5.82*:5 =kde-frameworks/kservice-5.82*:5 =kde-frameworks/kwidgetsaddons-5.82*:5 =kde-frameworks/kwindowsystem-5.82*:5 =kde-frameworks/kxmlgui-5.82*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.82*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/plasma-framework-5.82.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-5.82.0-plasma-transparency.patch.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d487a3a8d3f864139b7f77539ad5ecb
+_md5_=9ad809f70ba77d825a97578fd6cbfe55
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.82.0 b/metadata/md5-cache/kde-frameworks/prison-5.82.0
index e301efcf2899..2317b462199d 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=QRCode and data matrix barcode library
 EAPI=7
 HOMEPAGE=https://invent.kde.org/frameworks/prison
 IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.15.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/prison-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=356c18ee170584c45d4c25ff5cc89cad
+_md5_=fd08553a19ee2cdc6326e2e4ef57f7bb
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.82.0 b/metadata/md5-cache/kde-frameworks/purpose-5.82.0
index ed359b4998a7..f2dea37d59dc 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for providing abstractions to get the developer's purposes f
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=bluetooth +kaccounts debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kcoreaddons-5.82*:5 =kde-frameworks/ki18n-5.82*:5 =kde-frameworks/kio-5.82*:5 =kde-frameworks/kirigami-5.82*:5 =kde-frameworks/knotifications-5.82*:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kdeclarative-5.82:5 bluetooth? ( =kde-frameworks/bluez-qt-5.82*:5 ) kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/purpose-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=138d650ef6ec5bcd715041d3eb40743b
+_md5_=dcc1ff5dee300dcaf3a1f015876509c8
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.82.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.82.0
index 0a27601b6454..ba2db600bb48 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5= >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 =kde-frameworks/kconfigwidgets-5.82*:5 =kde-frameworks/kiconthemes-5.82*:5 =kde-frameworks/kirigami-5.82*:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/qqc2-desktop-style-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78b7626feb4e0ab77fc3b97fa9a63a63
+_md5_=f833737897f2518534f12a9f079ed1cf
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.82.0 b/metadata/md5-cache/kde-frameworks/solid-5.82.0
index 57395fb2a484..bf518d9951fd 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Provider for platform independent hardware discovery, abstraction an
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=ios nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 sys-fs/udisks:2 virtual/libudev:= ios? ( app-pda/libimobiledevice:= app-pda/libplist:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/solid-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3b145e7fd64ccc1296b7ae075a5908a
+_md5_=0d8cd83c4edd81d1a59acad6b4dad351
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.82.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.82.0
index 3a484c35cacf..d5306b30f5f9 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for providing spell-checking through abstraction of popula
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/sonnet-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=714553800a5e85689fbc1ad969deee7d
+_md5_=a9a25a437a636404aaa8eac68da40810
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.82.0 b/metadata/md5-cache/kde-frameworks/syndication-5.82.0
index 33fbecb9e775..48c4d0b76c8b 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Library for parsing RSS and Atom feeds
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtxml-5.15.2:5 =kde-frameworks/kcodecs-5.82*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/syndication-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74df6605f660b67e16d2f17efbef0be7
+_md5_=8bf79fd8557e9f64db241e0417d931b8
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.82.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.82.0
index 106b207ef8ff..a30d6791b873 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for syntax highlighting
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtxmlpatterns-5.15.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/syntax-highlighting-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f6a8f0b62eba3e86c1d9d647d04d2d0
+_md5_=796d18e097314a18839f0569cbeca5c2
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.82.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.82.0
index 885612e767bd..12183018efbc 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.82.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.82.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for managing threads using job and queue-based interfaces
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.82
 SRC_URI=mirror://kde/stable/frameworks/5.82/threadweaver-5.82.0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da61434d5ddd6ecccb7446e633bfdd71
+_md5_=8b133a10c425c7773466152ad55e13a2
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index fe4b6e083283..ede72590f3f7 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1 b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
index 78fb0ee170cd..ec99061927b1 100644
--- a/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
+++ b/metadata/md5-cache/kde-misc/kio-fuse-5.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=FUSE interface for KIO
 EAPI=7
 HOMEPAGE=https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/
 IUSE=debug test kernel_linux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 sys-fs/fuse:3 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-fuse/5.0.1/kio-fuse-5.0.1.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6abb9c9a836ce9cff1875044c4b80b3f
+_md5_=357e6f49db7753cb0e8d49fb59c74d4e
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.9.12 b/metadata/md5-cache/kde-misc/latte-dock-0.9.12
index 46631bff577e..696720924ced 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.9.12
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.9.12
@@ -5,10 +5,10 @@ DESCRIPTION=Elegant dock, based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://apps.kde.org/latte-dock/
 IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[X] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.9.12.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f52d4d950076220e3cc6b930849a6c1
+_md5_=114516fb3f4d9d6f01e48f3cbbb7cf08
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index a2f301dac232..14b6e0f6ac5b 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.21.5-r1 b/metadata/md5-cache/kde-plasma/bluedevil-5.21.5-r1
index 598bbf04677d..2cd2dde1ca89 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.21.5-r1
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.21.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Bluetooth stack for KDE Plasma
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/bluedevil
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/bluedevil-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ea98fa9eaaa1cdd3e79cf337c9f40da
+_md5_=9198803681c0223f81bc8a235ddc13bf
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.21.5-r1 b/metadata/md5-cache/kde-plasma/breeze-5.21.5-r1
index afbefe386192..ab6b05f6db21 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.21.5-r1
+++ b/metadata/md5-cache/kde-plasma/breeze-5.21.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/breeze
 IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-frameworks/breeze-icons-5.82.0:5 >=kde-plasma/kde-cli-tools-5.21.5:5
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kdecoration-5.21.5:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/breeze-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdb0f5f6dce9e97add5fcdd41b8f4012
+_md5_=422326b3fdc87a614e724442f500b2a9
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.21.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.21.5
index 7b5f4b4853a7..ab3109e87af3 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.21.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.21.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install nofetch prepare unpack
 DESCRIPTION=Breeze theme for GRUB
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/breeze-grub-5.21.5.tar.xz
 _eclasses_=kde.org	6e4d9db9698dba71a2c9085b861e29b5
-_md5_=0e3a4688990878e76dae032eb33e94ef
+_md5_=6c015644a332b5595cd05f253af5fe03
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.5
index 8fe77f6bf799..784a8e2f5097 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/breeze-gtk-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f966d21a3c311be9a020bd1792ef9365
+_md5_=d7c8577ec0c129390fdc941345055439
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.5
index dd8c7b705d93..69c97ba2ab07 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.5
@@ -4,10 +4,10 @@ DEPEND=sys-boot/plymouth
 DESCRIPTION=Breeze theme for Plymouth
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/breeze-plymouth-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c80fc745d870e20f647de218ea13eb7
+_md5_=f6af4638df6a52d1a7ddfad15908efc3
diff --git a/metadata/md5-cache/kde-plasma/discover-5.21.5 b/metadata/md5-cache/kde-plasma/discover-5.21.5
index fb8f0f79932f..29b4a0b6116d 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.21.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma resources management GUI
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/Discover
 IUSE=+firmware flatpak telemetry test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.12.8:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/discover-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0952e559b2ee832af2c25e24916ee298
+_md5_=d8bd72dba019b45bd4760c3aed4d8cb0
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.21.5-r1 b/metadata/md5-cache/kde-plasma/drkonqi-5.21.5-r1
index 56173429894c..42fd5d3a47e1 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.21.5-r1
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.21.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/syntax-highlighting-5.82.0:5 X? ( >=dev-qt/qtx11extras-5.15.2:5 ) || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/drkonqi-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a14b063dc482979717a8949942dabf76
+_md5_=3e57e17d0bcec7fc2180d2a73bffc326
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.5
index 65d27907ebe0..462d192c180b 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=System service to manage user's activities, track the usage patterns
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kactivitymanagerd-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86fc57e8f9e46658b740916106104da6
+_md5_=d9896e346deb41c852f4203eb85eebed
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.5
index 73e240ad1ef9..da41c7297563 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.5
@@ -5,7 +5,7 @@ DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
 IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/libkworkspace-5.21.5:5 kdesu? ( >=kde-frameworks/kdesu-5.82.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=kdesu? ( X )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kde-cli-tools-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=019b4d9d1ed28434a4e8234b2fb5f08b
+_md5_=594cde4fd6be66e8b28f7f7a8bc2a466
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.5
index 91d88b821777..73f192821d4b 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
 IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-plasma/kdecoration-5.21.5:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.21.5:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kde-gtk-config-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a985172981d2ad438847109cfecc5436
+_md5_=0b4d5c63787bb3e65a65f352a4933f0c
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.21.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.21.5
index 083c810667e7..09b804a74663 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plugin based library to create window decorations
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/ki18n-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kdecoration-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff592ec0759a346073db78c2d1b30251
+_md5_=8933b32c5cd0f2e76e3f1f37cc0e6272
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
index a021cc5c57ed..bcc3c83cd855 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Extra Plasma applets and engines
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=comic share webengine test debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kholidays-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kunitconversion-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 comic? ( >=kde-frameworks/kross-5.82.0:5 ) share? ( >=kde-frameworks/purpose-5.82.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kdeplasma-addons-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42df799bf202a063f32643a3b3f69c43
+_md5_=e381e0a7192081cefc9b4e98411fe89c
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.21.5 b/metadata/md5-cache/kde-plasma/kgamma-5.21.5
index cb72879419a5..f32ec6b2801c 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Screen gamma values kcontrol module
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kgamma5-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f16cd807995c6b0fd6e785bafd689de4
+_md5_=b53c0d95780e7f28312dd0924fed5d97
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.21.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.21.5
index 5ecdf3779d20..0712314f05ca 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.21.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma workspace hotkey module
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5[X] >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.21.5:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.82.0:5 >=kde-plasma/kde-cli-tools-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/khotkeys-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d99796f08edb4230cb0f7c8089c7bc26
+_md5_=079be3dbe8a04ff929204dcded833f5c
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
index c8c033408958..fc917ce4a1e9 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Utility providing information about the computer hardware
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/KInfoCenter
 IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.21.5:5 >=kde-plasma/systemsettings-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kinfocenter-5.21.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ecc5cf6b853b3946b6be03d8c9a4f9e
+_md5_=ad3fabc3cf45469ad078acde996f50ff
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.21.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.21.5
index 2ef70cdf876c..e5278576832d 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma menu editor
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kmenuedit-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e85a83defdf044c2e45b3752540366eb
+_md5_=3f5bd81a414d6407f1510a93678cc0f7
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.21.5 b/metadata/md5-cache/kde-plasma/kscreen-5.21.5
index f68ba9917ac4..944a2d10750f 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma screen management
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/libkscreen-5.21.5:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kscreen-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69c509e92e5f76fad9cc3d03203cbf48
+_md5_=c26b1a4acea4e0b0068150cfec58fa56
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.5
index 319576aa9762..d3274f8c4da0 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.21.5
@@ -5,7 +5,7 @@ DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=+pam test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.21.5:5
 RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kscreenlocker-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23307ef49cee38d1e86421e2e29d236e
+_md5_=fc0c4d6c228a34d98afc97f6d95a0445
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.5
index 4bf1b6f22ce5..03e98a9b5b6f 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/ksshaskpass-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=709ccb6858fdd98cb4171afa02352a5b
+_md5_=5787dc15a650a6a7f7523c622dc5a4f0
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.21.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.21.5
index 4e56a29d0751..bb9ee4bd9d67 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.21.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=lm-sensors networkmanager test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kinit-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/libksysguard-5.21.5:5 net-libs/libpcap sys-libs/libcap virtual/libudev:= lm-sensors? ( sys-apps/lm-sensors:= ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/ksysguard-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b22cc15586822ff60a6d2504d382064b
+_md5_=645a49787198f41d1bcc0b6e40600a0c
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.5
index d256c5a841d0..87aeb8799a2f 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=PAM module to not enter KWallet password again after login
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.82.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kwallet-pam-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5d6bcab29f5a500ddbf112a2d694309
+_md5_=0995e280a0de3f27a1a836d266fef25a
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.5
index 0a648685756a..b5604bb735c1 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kwayland-integration-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b2cde316257a36e9d171085e83a1ba0
+_md5_=aeb19a574a78825618c1680941fb6699
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.21.5 b/metadata/md5-cache/kde-plasma/kwayland-server-5.21.5
index f62704c51de3..f3c635aed330 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Wayland Server Components built on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.82.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kwayland-server-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=934ff7f3145fb5c2a92da316ba793178
+_md5_=2b07e8ee58eb940bb9c2c7a6c3ac7083
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.21.5 b/metadata/md5-cache/kde-plasma/kwin-5.21.5
index 2629db212396..4f153ceab1c4 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.21.5
@@ -5,7 +5,7 @@ DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.21.5:5
 RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=] >=dev-qt/qtscript-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5= >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5= >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kdecoration-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/kwayland-server-5.21.5:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.82.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kwin-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4dd9e35a25a283dfb0b988ef71b1ae4
+_md5_=ce514df546becb639cfcc84bc6caedf5
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.21.5 b/metadata/md5-cache/kde-plasma/kwrited-5.21.5
index acd190ce47fc..d8e4f6455521 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.21.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma daemon listening for wall and write messages
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kpty-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/kwrited-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c1f21286baadfe89303b5357c350317
+_md5_=3325868fb226faf98699853f16a42c26
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.21.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.21.5
index e41dae794642..6c30c9cae46e 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.21.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma screen management library
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.21.5/libkscreen-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ae0794fdf541ee95146b3718063f81d
+_md5_=27c187c5db9a7b5cbf2be9e1dbf196df
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.21.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.21.5
index 42cc54e5c9b7..bcf2f07bf13c 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.21.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Task management and system monitoring library
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=webengine X test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/9
 SRC_URI=mirror://kde/stable/plasma/5.21.5/libksysguard-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b5a0d1d9ff08b6e5bf5e10c46e04a4f9
+_md5_=76f1d1de4c731a2117eb6ba86c092f1a
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.21.5-r1 b/metadata/md5-cache/kde-plasma/libkworkspace-5.21.5-r1
index cb496afeff2e..b8cc00287178 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.21.5-r1
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.21.5-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kscreenlocker-5.21.5:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-workspace-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c45534646502c8174026da9aaa3969c2
+_md5_=89315709d2f2e56c07fde246e6eff98c
diff --git a/metadata/md5-cache/kde-plasma/milou-5.21.5 b/metadata/md5-cache/kde-plasma/milou-5.21.5
index e50ea9d7b07c..74ccd53f81f9 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.21.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/milou
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/milou-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48a7db827e0de79abcf8116cc3af4f7e
+_md5_=90edf2f5e2906b9d60066025b33b8e7e
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.21.5 b/metadata/md5-cache/kde-plasma/oxygen-5.21.5
index 301b18c40783..c158aa75c440 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.21.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Oxygen visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/oxygen
 IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.21.5:5
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-plasma/kdecoration-5.21.5:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.82.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/oxygen-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56355ada59c68aa2d301c1c47c1be3c0
+_md5_=41ee2ce3ca3c9b4652c6904e4ec2924d
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.5
index 5a359f6e9c14..4260c7fbd97a 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensio
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kfilemetadata-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/purpose-5.82.0:5 >=kde-plasma/plasma-workspace-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-browser-integration-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9da67ab40a5e6ed07c483dd7ae9fa293
+_md5_=840e9484316a2cd32b8853d856b461ab
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5
index 007b6355643e..4085bf7e33b0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=emoji ibus +kaccounts +policykit scim +semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.82.0:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcodecs-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kparts-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-frameworks/sonnet-5.82.0:5 >=kde-plasma/kwin-5.21.5:5 >=kde-plasma/libksysguard-5.21.5:5 >=kde-plasma/libkworkspace-5.21.5:5 >=kde-plasma/plasma-workspace-5.21.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) policykit? ( >=kde-frameworks/kwallet-5.82.0:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/qqc2-desktop-style-5.82.0:5 >=kde-plasma/kde-cli-tools-5.21.5:5 >=kde-plasma/oxygen-5.21.5:5 sys-apps/util-linux x11-apps/setxkbmap kaccounts? ( net-libs/signon-oauth2 ) policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-desktop-5.21.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ce0bf9da3e4d31c755f5e17d91c2650
+_md5_=eeb3203ece15d2aca8a74691df3d899e
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-disks-5.21.5
index 7b8bed0ffc43..a5766f3f2ce5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-disks-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de1f1fc4818062aad6b7f7aedc125607
+_md5_=2aa2a0ed3da40ef8c26d76d93161d8a9
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.5
index c18609d680eb..7fe4d83b7f43 100644
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma frontend for Firewalld or UFW
 EAPI=7
 HOMEPAGE=https://invent.kde.org/network/plasma-firewall
 IUSE=debug python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) || ( net-firewall/firewalld net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-firewall-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=822a32857a0ffbe5da91a3783c66a5b5
+_md5_=d325a96ec3d5b2265761c597add9db91
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.21.5
index f52447b303f9..51bb275de293 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-integration-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc60a723799ddefca5767fa8c2c58230
+_md5_=ed8d8feb786f27a5584ffecf234f80c4
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.21.5
index cb6d5d22c14f..f175561cef00 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.21.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all Plasma 5 packages
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop/
 IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kactivitymanagerd-5.21.5:5 >=kde-plasma/kde-cli-tools-5.21.5:5 >=kde-plasma/kdecoration-5.21.5:5 >=kde-plasma/kdeplasma-addons-5.21.5:5 >=kde-plasma/kgamma-5.21.5:5 >=kde-plasma/khotkeys-5.21.5:5 >=kde-plasma/kinfocenter-5.21.5:5 >=kde-plasma/kmenuedit-5.21.5:5 >=kde-plasma/kscreen-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/ksshaskpass-5.21.5:5 >=kde-plasma/ksysguard-5.21.5:5 >=kde-plasma/kwayland-integration-5.21.5:5 >=kde-plasma/kwayland-server-5.21.5:5 >=kde-plasma/kwin-5.21.5:5 >=kde-plasma/kwrited-5.21.5:5 >=kde-plasma/libkscreen-5.21.5:5 >=kde-plasma/libksysguard-5.21.5:5 >=kde-plasma/milou-5.21.5:5 >=kde-plasma/oxygen-5.21.5:5 >=kde-plasma/plasma-desktop-5.21.5:5 >=kde-plasma/plasma-integration-5.21.5:5 >=kde-plasma/plasma-systemmonitor-5.21.5:5 >=kde-plasma/plasma-workspace-5.21.5:5 >=kde-plasma/polkit-kde-agent-5.21.5:5 >=kde-plasma/powerdevil-5.21.5:5 >=kde-plasma/systemsettings-5.21.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.21.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.21.5:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.21.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.21.5:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.21.5:5 ) discover? ( >=kde-plasma/discover-5.21.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.21.5:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.21.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.21.5:5 >=kde-plasma/kde-gtk-config-5.21.5:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.21.5:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.21.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.21.5:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.21.5:5 >=kde-plasma/plymouth-kcm-5.21.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.21.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.21.5:5 ) smart? ( >=kde-plasma/plasma-disks-5.21.5:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.21.5:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.21.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.21.5:5 ) accessibility? ( app-accessibility/orca )
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=5
-_md5_=2c7dbb685a374e83128895070173199f
+_md5_=ca6894d18f88a6a6a81ac25b864c2c78
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.21.5
index 7eba648e68aa..0fb67753c936 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5[teamd=] >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.82.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-plasma/kde-cli-tools-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-nm-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=78c92b966a680af74bba9e8c118c4413
+_md5_=8f8576211dbc095160e48eb7f7b93273
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.21.5
index 7f2e77f728a6..bf6f0b138bec 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-pa-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40aa7add1fe96ccfc7b1375b220f4262
+_md5_=3aceb730376b9947f8318d80fe6f41f6
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.5
index 50367fec034b..fb335b40094f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Useful applications for Plasma development
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-sdk-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b68e46288944de41acff69d6e2e9c06a
+_md5_=09ce5a238e120ce765d76ee73569d321
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.5
index e5d5788a4fff..1bde1cd89f38 100644
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=New version of KSysGuard built on top of the new KStats daemon and u
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plasma-systemmonitor
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-plasma/libksysguard-5.21.5:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] >=kde-frameworks/kquickcharts-5.82.0:5 >=kde-plasma/ksysguard-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-systemmonitor-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30b745310f6b7920e95bdd9b4c586388
+_md5_=205fa3710aad2e1120cd55c4ae3a5a1b
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.5
index 0c04c92b8f8e..a103e7c7e99f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma integration for controlling Thunderbolt devices
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3+ )
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-thunderbolt-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=208d15d3945d8e1524c73e8c5d3a76f6
+_md5_=a4d8cdab0e76658c6424a62d8eb2e2bc
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.21.5
index 60b66399448a..389365823932 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kcodecs-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-plasma/libksysguard-5.21.5:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-vault-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=356f92629c9531b633230a8a923f9691
+_md5_=7d39be384fd615fca4085d382faa0cc5
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.5
index 1e0e90361885..53d99ea7ffb6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.21.5
@@ -5,7 +5,7 @@ DESCRIPTION=KDE Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=appstream +calculator +calendar +fontconfig geolocation gps screencast +semantic-desktop systemd telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.21.5:5
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kbookmarks-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kded-5.82.0:5 >=kde-frameworks/kdelibs4support-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kjobwidgets-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kpeople-5.82.0:5 >=kde-frameworks/krunner-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/ktexteditor-5.82.0:5 >=kde-frameworks/ktextwidgets-5.82.0:5 >=kde-frameworks/kwallet-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 >=kde-frameworks/prison-5.82.0:5[qml] >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/breeze-5.21.5:5 >=kde-plasma/kscreenlocker-5.21.5:5 >=kde-plasma/kwin-5.21.5:5 >=kde-plasma/libkscreen-5.21.5:5 >=kde-plasma/libksysguard-5.21.5:5 >=kde-plasma/libkworkspace-5.21.5:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calculator? ( sci-libs/libqalculate:= ) calendar? ( >=kde-frameworks/kholidays-5.82.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.82.0:5 ) gps? ( sci-geosciences/gpsd ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.82.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kquickcharts-5.82.0:5 >=kde-plasma/ksysguard-5.21.5:5 >=kde-plasma/milou-5.21.5:5 >=kde-plasma/plasma-integration-5.21.5:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.19.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-workspace-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d847d380968532f2e76eca1797ec27a
+_md5_=990b0a03cddc4266bcc78e97a0e771f8
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.5
index e60bcb6a2406..d44de64bdb7b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.5
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install nofetch prepare test unpack
 DESCRIPTION=Wallpapers for the Plasma workspace
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-workspace-wallpapers-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=563ca45e0047e986ceb4116bf7f9be47
+_md5_=18ff35867aeb473e4891b7e968dddef9
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.5
index 1fff6fff8df0..895b685790ad 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma control module for Plymouth
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.21.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plymouth-kcm-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82edd24571329caf5ea28ff41ba6afda
+_md5_=82ca9d778cf3432350323ced3f0a1674
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.5
index 635152faeda4..6da201daf324 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=PolKit agent module for KDE Plasma
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/polkit-kde-agent-1-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c2bb90cd9dcfc513967b1ab7c717753
+_md5_=459b9e73091c1b759233fa0ddd495e18
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.21.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.21.5
index 7b58c1b54206..87b840142e31 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.21.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5[policykit] >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kglobalaccel-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kidletime-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwayland-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 >=kde-plasma/libkscreen-5.21.5:5 >=kde-plasma/libkworkspace-5.21.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.82.0:5 >=kde-frameworks/networkmanager-qt-5.82.0:5 ) >=kde-plasma/kde-cli-tools-5.21.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/powerdevil-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28aca2e38b57011f6f3b5e414710c057
+_md5_=d08933753116fb789aa69e5e275e763e
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.5
index 1dbbedb56560..5292dd67ae90 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=KDE Plasma control module for SDDM
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5[qml] >=kde-plasma/kde-cli-tools-5.21.5:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/sddm-kcm-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71963ce6a4caef9d32dae59e40ca6031
+_md5_=431c08abd29f570d10c8637391c62051
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.21.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.21.5
index a9142fe03750..e8cb0bdb63f7 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.21.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Control Center to configure KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.82.0:5 >=kde-frameworks/kactivities-stats-5.82.0:5 >=kde-frameworks/kauth-5.82.0:5 >=kde-frameworks/kcmutils-5.82.0:5 >=kde-frameworks/kcompletion-5.82.0:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/kguiaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kiconthemes-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kitemmodels-5.82.0:5 >=kde-frameworks/kitemviews-5.82.0:5 >=kde-frameworks/kpackage-5.82.0:5 >=kde-frameworks/kservice-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-plasma/libkworkspace-5.21.5:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/systemsettings-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d92450515e9799cb2cf3fc0ffad4db9
+_md5_=1d25922c5f82f3f80fcdcee05757db06
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.5
index 9f4c2d763880..b1af67a74ac6 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.5
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.5
@@ -5,10 +5,10 @@ DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE F
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwayland-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdeclarative-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kirigami-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/plasma-5.82.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/xdg-desktop-portal-kde-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d4dc88585dbbf1470b4d838c95da06c
+_md5_=6a8b84bc47388da90fed2163fdf9c11e
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.5
index 2a23fdcec304..b980980297a7 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.5
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.5
@@ -4,10 +4,10 @@ DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5
 DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
 EAPI=7
 HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.21.5/plasma-workspace-5.21.5.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04d56752490933b79bc7aec3350e1410
+_md5_=c24708632fc34f663a225bb595ce419a
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 4a419dd8e1ee..51f5189151e7 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/evolution-3.40.2 b/metadata/md5-cache/mail-client/evolution-3.40.2
new file mode 100644
index 000000000000..2a12d0c25715
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.40.2
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja dev-util/cmake >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.40.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
+RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.40.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.40/evolution-3.40.2.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72d621ae093954b159ee69e8b32d26dd
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.11.0 b/metadata/md5-cache/mail-client/thunderbird-78.11.0
new file mode 100644
index 000000000000..5634ef883d02
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-78.11.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi 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_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt 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_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla ) !<x11-plugins/enigmail-2.2
+REQUIRED_USE=wifi? ( dbus )
+SLOT=0/78
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/source/thunderbird-78.11.0.source.tar.xz -> thunderbird-78.11.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.11.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.11.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.11.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.11.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.11.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.11.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.11.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.11.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.11.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.11.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.11.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.11.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.11.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.11.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.11.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.11.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.11.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.11.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.11.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.11.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.11.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.11.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.11.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.11.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.11.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.11.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.11.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.11.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.11.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.11.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.11.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.11.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.11.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.11.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.11.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.11.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.11.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.11.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.11.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.11.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.11.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.11.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.11.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.11.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.11.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.11.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.11.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.11.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.11.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.11.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.11.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.11.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.11.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.11.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.11.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.11.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.11.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.11.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.11.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.11.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.11.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.11.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.11.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.11.0-zh-TW.xpi )
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5a870215c23a7758f4fa58e277923d1
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
new file mode 100644
index 000000000000..d181e94dd293
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thunderbird Mail Client
+EAPI=7
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+alsa +ffmpeg +pulseaudio selinux wayland 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_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt 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_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/78
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-US/thunderbird-78.11.0.tar.bz2 -> thunderbird-bin_x86_64-78.11.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-US/thunderbird-78.11.0.tar.bz2 -> thunderbird-bin_i686-78.11.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.11.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.11.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.11.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.11.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.11.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.11.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.11.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.11.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.11.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.11.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.11.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.11.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.11.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.11.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.11.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.11.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.11.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.11.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.11.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.11.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.11.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.11.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.11.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.11.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.11.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.11.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.11.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.11.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.11.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.11.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.11.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.11.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.11.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.11.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.11.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.11.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.11.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.11.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.11.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.11.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.11.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.11.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.11.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.11.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.11.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.11.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.11.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.11.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.11.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.11.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.11.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.11.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.11.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.11.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.11.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.11.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.11.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.11.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.11.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.11.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.11.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.11.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.11.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.11.0-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	d3fc79d3d50544347e324864f95206e2	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f99471bb6728676b111bc3ac979c4665
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c49fff705b81..4c2980fb4ac6 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/imapfilter-2.7.5 b/metadata/md5-cache/mail-filter/imapfilter-2.7.5
index 5a4c0731b2ba..5aa37e63dc4b 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.7.5
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.7.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0= dev-libs/libpcre lua_single_target_lua5-1? ( dev-lan
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.7.5.tar.gz -> imapfilter-2.7.5.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=66bd688cfe23774312530b68a56446aa
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
index 40162e6e6ac6..0d3fea1f022e 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
+++ b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
@@ -12,5 +12,5 @@ REQUIRED_USE=sasl? ( ldap ) stats? ( opendbx ) querycache? ( berkdb ) lua? ( ^^
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/opendkim/opendkim-2.10.3.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	db-use	063d3e7add942762a8203b52ec3066c2	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0f66766c37c8da5ad217ae47fe92f54d
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.6-r100 b/metadata/md5-cache/mail-filter/rspamd-2.6-r100
index c597e554307c..35834a82c652 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.6-r100
+++ b/metadata/md5-cache/mail-filter/rspamd-2.6-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.6.tar.gz -> rspamd-2.6.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cfcc0c7f5df4068fad066b5e3f5b93a
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.7-r100 b/metadata/md5-cache/mail-filter/rspamd-2.7-r100
index b57427262790..563731a83445 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.7-r100
+++ b/metadata/md5-cache/mail-filter/rspamd-2.7-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.7.tar.gz -> rspamd-2.7.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca2740b5f7e8e4c53a698128d8feebf2
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 38b0240504fb..d40181135140 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/LuaBitOp[lua_targets_lua5-2(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) dev-libs/openssl:0=[-bindist] pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) jit? ( lua_single_target_luajit )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=299c6d114b1df2d2b7757c9d33c9392b
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 0b172789f54a..0f60d92b9c55 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-1.6.9 b/metadata/md5-cache/mail-mta/protonmail-bridge-1.6.9
deleted file mode 100644
index 0be8c98e0a6b..000000000000
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-1.6.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DEPEND=app-crypt/libsecret
-DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
-EAPI=7
-HOMEPAGE=https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/
-IUSE=gui
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense
-RDEPEND=app-crypt/libsecret
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/br-1.6.9.tar.gz -> protonmail-bridge-1.6.9.tar.gz mirror://goproxy//github.com/0x!a!x/notificator/@v/v0.0.0-20191016112426-3962a5ea8da1.zip -> github.com%2F0x!a!x%2Fnotificator%2F@v%2Fv0.0.0-20191016112426-3962a5ea8da1.zip mirror://goproxy//github.com/0x!a!x/notificator/@v/v0.0.0-20191016112426-3962a5ea8da1.mod -> github.com%2F0x!a!x%2Fnotificator%2F@v%2Fv0.0.0-20191016112426-3962a5ea8da1.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!cloudy!kit/fastprinter/@v/v0.0.0-20200109182630-33d98a066a53.mod -> github.com%2F!cloudy!kit%2Ffastprinter%2F@v%2Fv0.0.0-20200109182630-33d98a066a53.mod mirror://goproxy//github.com/!cloudy!kit/jet/v3/@v/v3.0.0.mod -> github.com%2F!cloudy!kit%2Fjet%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!joker/hpp/@v/v1.0.0.mod -> github.com%2F!joker%2Fhpp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!proton!mail/bcrypt/@v/v0.0.0-20170924085257-7509ea014998.zip -> github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20170924085257-7509ea014998.zip mirror://goproxy//github.com/!proton!mail/bcrypt/@v/v0.0.0-20170924085257-7509ea014998.mod -> github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20170924085257-7509ea014998.mod mirror://goproxy//github.com/!proton!mail/crypto/@v/v0.0.0-20201112115411-41db4ea0dd1c.zip -> github.com%2F!proton!mail%2Fcrypto%2F@v%2Fv0.0.0-20201112115411-41db4ea0dd1c.zip mirror://goproxy//github.com/!proton!mail/crypto/@v/v0.0.0-20201112115411-41db4ea0dd1c.mod -> github.com%2F!proton!mail%2Fcrypto%2F@v%2Fv0.0.0-20201112115411-41db4ea0dd1c.mod mirror://goproxy//github.com/!proton!mail/docker-credential-helpers/@v/v1.1.0.zip -> github.com%2F!proton!mail%2Fdocker-credential-helpers%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!proton!mail/docker-credential-helpers/@v/v1.1.0.mod -> github.com%2F!proton!mail%2Fdocker-credential-helpers%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!proton!mail/go-autostart/@v/v0.0.0-20181114175602-c5272053443a.zip -> github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.zip mirror://goproxy//github.com/!proton!mail/go-autostart/@v/v0.0.0-20181114175602-c5272053443a.mod -> github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.mod mirror://goproxy//github.com/!proton!mail/go-crypto/@v/v0.0.0-20201208171014-cdb7591792e2.zip -> github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20201208171014-cdb7591792e2.zip mirror://goproxy//github.com/!proton!mail/go-crypto/@v/v0.0.0-20201208171014-cdb7591792e2.mod -> github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20201208171014-cdb7591792e2.mod mirror://goproxy//github.com/!proton!mail/go-imap/@v/v0.0.0-20201228133358-4db68cea0cac.zip -> github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.zip mirror://goproxy//github.com/!proton!mail/go-imap/@v/v0.0.0-20201228133358-4db68cea0cac.mod -> github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.mod mirror://goproxy//github.com/!proton!mail/go-imap-id/@v/v0.0.0-20190926060100-f94a56b9ecde.zip -> github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.zip mirror://goproxy//github.com/!proton!mail/go-imap-id/@v/v0.0.0-20190926060100-f94a56b9ecde.mod -> github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.mod mirror://goproxy//github.com/!proton!mail/go-mime/@v/v0.0.0-20190923161245-9b5a4261663a.zip -> github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.zip mirror://goproxy//github.com/!proton!mail/go-mime/@v/v0.0.0-20190923161245-9b5a4261663a.mod -> github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.mod mirror://goproxy//github.com/!proton!mail/go-rfc5322/@v/v0.5.0.zip -> github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!proton!mail/go-rfc5322/@v/v0.5.0.mod -> github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!proton!mail/go-vcard/@v/v0.0.0-20180326232728-33aaa0a0c8a5.zip -> github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.zip mirror://goproxy//github.com/!proton!mail/go-vcard/@v/v0.0.0-20180326232728-33aaa0a0c8a5.mod -> github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.mod mirror://goproxy//github.com/!proton!mail/gopenpgp/v2/@v/v2.1.3.zip -> github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.3.zip mirror://goproxy//github.com/!proton!mail/gopenpgp/v2/@v/v2.1.3.mod -> github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.3.mod mirror://goproxy//github.com/!puerkito!bio/goquery/@v/v1.5.1.zip -> github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/!puerkito!bio/goquery/@v/v1.5.1.mod -> github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/!shopify/goreferrer/@v/v0.0.0-20181106222321-ec9c9a553398.mod -> github.com%2F!shopify%2Fgoreferrer%2F@v%2Fv0.0.0-20181106222321-ec9c9a553398.mod mirror://goproxy//github.com/abiosoft/ishell/@v/v2.0.0+incompatible.zip -> github.com%2Fabiosoft%2Fishell%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/abiosoft/ishell/@v/v2.0.0+incompatible.mod -> github.com%2Fabiosoft%2Fishell%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/abiosoft/readline/@v/v0.0.0-20180607040430-155bce2042db.zip -> github.com%2Fabiosoft%2Freadline%2F@v%2Fv0.0.0-20180607040430-155bce2042db.zip mirror://goproxy//github.com/abiosoft/readline/@v/v0.0.0-20180607040430-155bce2042db.mod -> github.com%2Fabiosoft%2Freadline%2F@v%2Fv0.0.0-20180607040430-155bce2042db.mod mirror://goproxy//github.com/ajg/form/@v/v1.5.1.mod -> github.com%2Fajg%2Fform%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/allan-simon/go-singleinstance/@v/v0.0.0-20160830203053-79edcfdc2dfc.zip -> github.com%2Fallan-simon%2Fgo-singleinstance%2F@v%2Fv0.0.0-20160830203053-79edcfdc2dfc.zip mirror://goproxy//github.com/allan-simon/go-singleinstance/@v/v0.0.0-20160830203053-79edcfdc2dfc.mod -> github.com%2Fallan-simon%2Fgo-singleinstance%2F@v%2Fv0.0.0-20160830203053-79edcfdc2dfc.mod mirror://goproxy//github.com/andybalholm/cascadia/@v/v1.1.0.zip -> github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/andybalholm/cascadia/@v/v1.1.0.mod -> github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20201029161626-9a95f0cc3d7c.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20201029161626-9a95f0cc3d7c.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20201029161626-9a95f0cc3d7c.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20201029161626-9a95f0cc3d7c.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/aymerick/raymond/@v/v2.0.3-0.20180322193309-b565731e1464+incompatible.mod -> github.com%2Faymerick%2Fraymond%2F@v%2Fv2.0.3-0.20180322193309-b565731e1464+incompatible.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.zip -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.mod -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eknkc/amber/@v/v0.0.0-20171010120322-cdade1c07385.mod -> github.com%2Feknkc%2Famber%2F@v%2Fv0.0.0-20171010120322-cdade1c07385.mod mirror://goproxy//github.com/emersion/go-imap-appendlimit/@v/v0.0.0-20190308131241-25671c986a6a.zip -> github.com%2Femersion%2Fgo-imap-appendlimit%2F@v%2Fv0.0.0-20190308131241-25671c986a6a.zip mirror://goproxy//github.com/emersion/go-imap-appendlimit/@v/v0.0.0-20190308131241-25671c986a6a.mod -> github.com%2Femersion%2Fgo-imap-appendlimit%2F@v%2Fv0.0.0-20190308131241-25671c986a6a.mod mirror://goproxy//github.com/emersion/go-imap-idle/@v/v0.0.0-20200601154248-f05f54664cc4.zip -> github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664cc4.zip mirror://goproxy//github.com/emersion/go-imap-idle/@v/v0.0.0-20200601154248-f05f54664cc4.mod -> github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664cc4.mod mirror://goproxy//github.com/emersion/go-imap-move/@v/v0.0.0-20190710073258-6e5a51a5b342.zip -> github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.zip mirror://goproxy//github.com/emersion/go-imap-move/@v/v0.0.0-20190710073258-6e5a51a5b342.mod -> github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.mod mirror://goproxy//github.com/emersion/go-imap-quota/@v/v0.0.0-20210203125329-619074823f3c.zip -> github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.zip mirror://goproxy//github.com/emersion/go-imap-quota/@v/v0.0.0-20210203125329-619074823f3c.mod -> github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.mod mirror://goproxy//github.com/emersion/go-imap-unselect/@v/v0.0.0-20171113212723-b985794e5f26.zip -> github.com%2Femersion%2Fgo-imap-unselect%2F@v%2Fv0.0.0-20171113212723-b985794e5f26.zip mirror://goproxy//github.com/emersion/go-imap-unselect/@v/v0.0.0-20171113212723-b985794e5f26.mod -> github.com%2Femersion%2Fgo-imap-unselect%2F@v%2Fv0.0.0-20171113212723-b985794e5f26.mod mirror://goproxy//github.com/emersion/go-mbox/@v/v1.0.2.zip -> github.com%2Femersion%2Fgo-mbox%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/emersion/go-mbox/@v/v1.0.2.mod -> github.com%2Femersion%2Fgo-mbox%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/emersion/go-message/@v/v0.11.1.mod -> github.com%2Femersion%2Fgo-message%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/emersion/go-message/@v/v0.12.1-0.20201221184100-40c3f864532b.zip -> github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20201221184100-40c3f864532b.zip mirror://goproxy//github.com/emersion/go-message/@v/v0.12.1-0.20201221184100-40c3f864532b.mod -> github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20201221184100-40c3f864532b.mod mirror://goproxy//github.com/emersion/go-sasl/@v/v0.0.0-20191210011802-430746ea8b9b.mod -> github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20191210011802-430746ea8b9b.mod mirror://goproxy//github.com/emersion/go-sasl/@v/v0.0.0-20200509203442-7bfe0ed36a21.zip -> github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.zip mirror://goproxy//github.com/emersion/go-sasl/@v/v0.0.0-20200509203442-7bfe0ed36a21.mod -> github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.mod mirror://goproxy//github.com/emersion/go-smtp/@v/v0.14.0.zip -> github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/emersion/go-smtp/@v/v0.14.0.mod -> github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/emersion/go-textwrapper/@v/v0.0.0-20160606182133-d0e65e56babe.mod -> github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20160606182133-d0e65e56babe.mod mirror://goproxy//github.com/emersion/go-textwrapper/@v/v0.0.0-20200911093747-65d896831594.zip -> github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20200911093747-65d896831594.zip mirror://goproxy//github.com/emersion/go-textwrapper/@v/v0.0.0-20200911093747-65d896831594.mod -> github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20200911093747-65d896831594.mod mirror://goproxy//github.com/emersion/go-vcard/@v/v0.0.0-20190105225839-8856043f13c5.zip -> github.com%2Femersion%2Fgo-vcard%2F@v%2Fv0.0.0-20190105225839-8856043f13c5.zip mirror://goproxy//github.com/emersion/go-vcard/@v/v0.0.0-20190105225839-8856043f13c5.mod -> github.com%2Femersion%2Fgo-vcard%2F@v%2Fv0.0.0-20190105225839-8856043f13c5.mod mirror://goproxy//github.com/etcd-io/bbolt/@v/v1.3.3.mod -> github.com%2Fetcd-io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/fasthttp-contrib/websocket/@v/v0.0.0-20160511215533-1f3b11f56072.mod -> github.com%2Ffasthttp-contrib%2Fwebsocket%2F@v%2Fv0.0.0-20160511215533-1f3b11f56072.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gavv/httpexpect/@v/v2.0.0+incompatible.mod -> github.com%2Fgavv%2Fhttpexpect%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/getsentry/sentry-go/@v/v0.8.0.zip -> github.com%2Fgetsentry%2Fsentry-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/getsentry/sentry-go/@v/v0.8.0.mod -> github.com%2Fgetsentry%2Fsentry-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gin-contrib/sse/@v/v0.0.0-20190301062529-5545eab6dad3.mod -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.0.0-20190301062529-5545eab6dad3.mod mirror://goproxy//github.com/gin-gonic/gin/@v/v1.4.0.mod -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-resty/resty/v2/@v/v2.3.0.zip -> github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/go-resty/resty/v2/@v/v2.3.0.mod -> github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.0.0-20180130184737-2c6c146eadee.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.0.0-20180130184737-2c6c146eadee.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.0.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.2.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.7.1-0.20190724094224-574c33c3df38.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.7.1-0.20190724094224-574c33c3df38.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190411002643-bd77b112433e.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190411002643-bd77b112433e.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imkira/go-interpol/@v/v1.1.0.mod -> github.com%2Fimkira%2Fgo-interpol%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/iris-contrib/blackfriday/@v/v2.0.0+incompatible.mod -> github.com%2Firis-contrib%2Fblackfriday%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/iris-contrib/go.uuid/@v/v2.0.0+incompatible.mod -> github.com%2Firis-contrib%2Fgo.uuid%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/iris-contrib/jade/@v/v1.1.3.mod -> github.com%2Firis-contrib%2Fjade%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/iris-contrib/pongo2/@v/v0.0.1.mod -> github.com%2Firis-contrib%2Fpongo2%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/iris-contrib/schema/@v/v0.0.1.mod -> github.com%2Firis-contrib%2Fschema%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.zip -> github.com%2Fjaytaylor%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.zip mirror://goproxy//github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.mod -> github.com%2Fjaytaylor%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/k0kubun/colorstring/@v/v0.0.0-20150214042306-9440f1994b88.mod -> github.com%2Fk0kubun%2Fcolorstring%2F@v%2Fv0.0.0-20150214042306-9440f1994b88.mod mirror://goproxy//github.com/kataras/golog/@v/v0.0.10.mod -> github.com%2Fkataras%2Fgolog%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/kataras/iris/v12/@v/v12.1.8.mod -> github.com%2Fkataras%2Firis%2Fv12%2F@v%2Fv12.1.8.mod mirror://goproxy//github.com/kataras/neffos/@v/v0.0.14.mod -> github.com%2Fkataras%2Fneffos%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/kataras/pio/@v/v0.0.2.mod -> github.com%2Fkataras%2Fpio%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/kataras/sitemap/@v/v0.0.5.mod -> github.com%2Fkataras%2Fsitemap%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/keybase/go-keychain/@v/v0.0.0-20200502122510-cda31fe0c86d.zip -> github.com%2Fkeybase%2Fgo-keychain%2F@v%2Fv0.0.0-20200502122510-cda31fe0c86d.zip mirror://goproxy//github.com/keybase/go-keychain/@v/v0.0.0-20200502122510-cda31fe0c86d.mod -> github.com%2Fkeybase%2Fgo-keychain%2F@v%2Fv0.0.0-20200502122510-cda31fe0c86d.mod mirror://goproxy//github.com/keybase/go.dbus/@v/v0.0.0-20200324223359-a94be52c0b03.mod -> github.com%2Fkeybase%2Fgo.dbus%2F@v%2Fv0.0.0-20200324223359-a94be52c0b03.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.8.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.7.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.7.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/labstack/echo/v4/@v/v4.1.11.mod -> github.com%2Flabstack%2Fecho%2Fv4%2F@v%2Fv4.1.11.mod mirror://goproxy//github.com/labstack/gommon/@v/v0.3.0.mod -> github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v2.0.3+incompatible.zip -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/logrusorgru/aurora/@v/v2.0.3+incompatible.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/martinlindhe/base36/@v/v1.0.0.mod -> github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/martinlindhe/base36/@v/v1.1.0.zip -> github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/martinlindhe/base36/@v/v1.1.0.mod -> github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.4.2.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.4.2.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moul/http2curl/@v/v1.0.0.mod -> github.com%2Fmoul%2Fhttp2curl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nsf/jsondiff/@v/v0.0.0-20200515183724-f29ed568f4ce.zip -> github.com%2Fnsf%2Fjsondiff%2F@v%2Fv0.0.0-20200515183724-f29ed568f4ce.zip mirror://goproxy//github.com/nsf/jsondiff/@v/v0.0.0-20200515183724-f29ed568f4ce.mod -> github.com%2Fnsf%2Fjsondiff%2F@v%2Fv0.0.0-20200515183724-f29ed568f4ce.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pingcap/errors/@v/v0.11.4.zip -> github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.zip mirror://goproxy//github.com/pingcap/errors/@v/v0.11.4.mod -> github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v2.1.0+incompatible.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/skratchdot/open-golang/@v/v0.0.0-20200116055534-eef842397966.zip -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.zip mirror://goproxy//github.com/skratchdot/open-golang/@v/v0.0.0-20200116055534-eef842397966.mod -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ssor/bom/@v/v0.0.0-20170718123548-6386211fdfcf.zip -> github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.zip mirror://goproxy//github.com/ssor/bom/@v/v0.0.0-20170718123548-6386211fdfcf.mod -> github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/therecipe/qt/@v/v0.0.0-20200701200531-7f61353ee73e.zip -> github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.zip mirror://goproxy//github.com/therecipe/qt/@v/v0.0.0-20200701200531-7f61353ee73e.mod -> github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.mod mirror://goproxy//github.com/therecipe/qt/@v/v0.0.0-20200904063919-c0c124a5770d.zip -> github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/@v/v0.0.0-20191019224306-1097424d656c.zip -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F@v%2Fv0.0.0-20191019224306-1097424d656c.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.12.0/@v/v0.0.0-20200904063919-c0c124a5770d.zip -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.12.0/@v/v0.0.0-20200904063919-c0c124a5770d.mod -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.13.0/@v/v0.0.0-20200904063919-c0c124a5770d.zip -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.13.0/@v/v0.0.0-20200904063919-c0c124a5770d.mod -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.6.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vmihailenco/msgpack/v5/@v/v5.1.3.zip -> github.com%2Fvmihailenco%2Fmsgpack%2Fv5%2F@v%2Fv5.1.3.zip mirror://goproxy//github.com/vmihailenco/msgpack/v5/@v/v5.1.3.mod -> github.com%2Fvmihailenco%2Fmsgpack%2Fv5%2F@v%2Fv5.1.3.mod mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.2.zip -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.2.mod -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yalp/jsonpath/@v/v0.0.0-20180802001716-5cc68e5049a0.mod -> github.com%2Fyalp%2Fjsonpath%2F@v%2Fv0.0.0-20180802001716-5cc68e5049a0.mod mirror://goproxy//github.com/yudai/gojsondiff/@v/v1.0.0.mod -> github.com%2Fyudai%2Fgojsondiff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/yudai/golcs/@v/v0.0.0-20170316035057-ecda9a501e82.mod -> github.com%2Fyudai%2Fgolcs%2F@v%2Fv0.0.0-20170316035057-ecda9a501e82.mod mirror://goproxy//github.com/yudai/pp/@v/v2.0.1+incompatible.mod -> github.com%2Fyudai%2Fpp%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20200801112145-973feb4309de.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20200801112145-973feb4309de.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180218175443-cbe0f9307d01.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180218175443-cbe0f9307d01.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190327091125-710a502c58a2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190327091125-710a502c58a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190420063019-afa5a82059c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190420063019-afa5a82059c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200513185701-a91f0712d120.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/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 mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5-0.20201125200606-c27b9fd57aec.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5-0.20201125200606-c27b9fd57aec.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5-0.20201125200606-c27b9fd57aec.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5-0.20201125200606-c27b9fd57aec.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181221001348-537d06c36207.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181221001348-537d06c36207.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190327201419-c70d86f8b7cf.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190327201419-c70d86f8b7cf.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.mod -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.mod mirror://goproxy//gopkg.in/go-playground/validator.v8/@v/v8.18.2.mod -> gopkg.in%2Fgo-playground%2Fvalidator.v8%2F@v%2Fv8.18.2.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20191120175047-4206685974f2.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=go-module	bf028003684a8b018e4de9e3c272ed33	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=320801a1a283211e1cef7d088dc068bb
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-1.8.3 b/metadata/md5-cache/mail-mta/protonmail-bridge-1.8.3
new file mode 100644
index 000000000000..b6943674c243
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-1.8.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DEPEND=app-crypt/libsecret
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=7
+HOMEPAGE=https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/
+IUSE=gui
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense
+RDEPEND=app-crypt/libsecret
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v1.8.3.tar.gz -> protonmail-bridge-1.8.3.tar.gz mirror://goproxy//github.com/0x!a!x/notificator/@v/v0.0.0-20191016112426-3962a5ea8da1.zip -> github.com%2F0x!a!x%2Fnotificator%2F@v%2Fv0.0.0-20191016112426-3962a5ea8da1.zip mirror://goproxy//github.com/0x!a!x/notificator/@v/v0.0.0-20191016112426-3962a5ea8da1.mod -> github.com%2F0x!a!x%2Fnotificator%2F@v%2Fv0.0.0-20191016112426-3962a5ea8da1.mod mirror://goproxy//github.com/!andreas!briese/bbloom/@v/v0.0.0-20190306092124-e2d15f34fcf9.mod -> github.com%2F!andreas!briese%2Fbbloom%2F@v%2Fv0.0.0-20190306092124-e2d15f34fcf9.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/!cloudy!kit/fastprinter/@v/v0.0.0-20200109182630-33d98a066a53.mod -> github.com%2F!cloudy!kit%2Ffastprinter%2F@v%2Fv0.0.0-20200109182630-33d98a066a53.mod mirror://goproxy//github.com/!cloudy!kit/jet/v3/@v/v3.0.0.mod -> github.com%2F!cloudy!kit%2Fjet%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/!joker/hpp/@v/v1.0.0.mod -> github.com%2F!joker%2Fhpp%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.1.0.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/!proton!mail/bcrypt/@v/v0.0.0-20170924085257-7509ea014998.zip -> github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20170924085257-7509ea014998.zip mirror://goproxy//github.com/!proton!mail/bcrypt/@v/v0.0.0-20170924085257-7509ea014998.mod -> github.com%2F!proton!mail%2Fbcrypt%2F@v%2Fv0.0.0-20170924085257-7509ea014998.mod mirror://goproxy//github.com/!proton!mail/crypto/@v/v0.0.0-20201112115411-41db4ea0dd1c.zip -> github.com%2F!proton!mail%2Fcrypto%2F@v%2Fv0.0.0-20201112115411-41db4ea0dd1c.zip mirror://goproxy//github.com/!proton!mail/crypto/@v/v0.0.0-20201112115411-41db4ea0dd1c.mod -> github.com%2F!proton!mail%2Fcrypto%2F@v%2Fv0.0.0-20201112115411-41db4ea0dd1c.mod mirror://goproxy//github.com/!proton!mail/docker-credential-helpers/@v/v1.1.0.zip -> github.com%2F!proton!mail%2Fdocker-credential-helpers%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!proton!mail/docker-credential-helpers/@v/v1.1.0.mod -> github.com%2F!proton!mail%2Fdocker-credential-helpers%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!proton!mail/go-autostart/@v/v0.0.0-20181114175602-c5272053443a.zip -> github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.zip mirror://goproxy//github.com/!proton!mail/go-autostart/@v/v0.0.0-20181114175602-c5272053443a.mod -> github.com%2F!proton!mail%2Fgo-autostart%2F@v%2Fv0.0.0-20181114175602-c5272053443a.mod mirror://goproxy//github.com/!proton!mail/go-crypto/@v/v0.0.0-20201208171014-cdb7591792e2.zip -> github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20201208171014-cdb7591792e2.zip mirror://goproxy//github.com/!proton!mail/go-crypto/@v/v0.0.0-20201208171014-cdb7591792e2.mod -> github.com%2F!proton!mail%2Fgo-crypto%2F@v%2Fv0.0.0-20201208171014-cdb7591792e2.mod mirror://goproxy//github.com/!proton!mail/go-imap/@v/v0.0.0-20201228133358-4db68cea0cac.zip -> github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.zip mirror://goproxy//github.com/!proton!mail/go-imap/@v/v0.0.0-20201228133358-4db68cea0cac.mod -> github.com%2F!proton!mail%2Fgo-imap%2F@v%2Fv0.0.0-20201228133358-4db68cea0cac.mod mirror://goproxy//github.com/!proton!mail/go-imap-id/@v/v0.0.0-20190926060100-f94a56b9ecde.zip -> github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.zip mirror://goproxy//github.com/!proton!mail/go-imap-id/@v/v0.0.0-20190926060100-f94a56b9ecde.mod -> github.com%2F!proton!mail%2Fgo-imap-id%2F@v%2Fv0.0.0-20190926060100-f94a56b9ecde.mod mirror://goproxy//github.com/!proton!mail/go-mime/@v/v0.0.0-20190923161245-9b5a4261663a.zip -> github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.zip mirror://goproxy//github.com/!proton!mail/go-mime/@v/v0.0.0-20190923161245-9b5a4261663a.mod -> github.com%2F!proton!mail%2Fgo-mime%2F@v%2Fv0.0.0-20190923161245-9b5a4261663a.mod mirror://goproxy//github.com/!proton!mail/go-rfc5322/@v/v0.5.0.zip -> github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!proton!mail/go-rfc5322/@v/v0.5.0.mod -> github.com%2F!proton!mail%2Fgo-rfc5322%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!proton!mail/go-vcard/@v/v0.0.0-20180326232728-33aaa0a0c8a5.zip -> github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.zip mirror://goproxy//github.com/!proton!mail/go-vcard/@v/v0.0.0-20180326232728-33aaa0a0c8a5.mod -> github.com%2F!proton!mail%2Fgo-vcard%2F@v%2Fv0.0.0-20180326232728-33aaa0a0c8a5.mod mirror://goproxy//github.com/!proton!mail/gopenpgp/v2/@v/v2.1.3.zip -> github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.3.zip mirror://goproxy//github.com/!proton!mail/gopenpgp/v2/@v/v2.1.3.mod -> github.com%2F!proton!mail%2Fgopenpgp%2Fv2%2F@v%2Fv2.1.3.mod mirror://goproxy//github.com/!puerkito!bio/goquery/@v/v1.5.1.zip -> github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/!puerkito!bio/goquery/@v/v1.5.1.mod -> github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/!shopify/goreferrer/@v/v0.0.0-20181106222321-ec9c9a553398.mod -> github.com%2F!shopify%2Fgoreferrer%2F@v%2Fv0.0.0-20181106222321-ec9c9a553398.mod mirror://goproxy//github.com/abiosoft/ishell/@v/v2.0.0+incompatible.zip -> github.com%2Fabiosoft%2Fishell%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/abiosoft/ishell/@v/v2.0.0+incompatible.mod -> github.com%2Fabiosoft%2Fishell%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/abiosoft/readline/@v/v0.0.0-20180607040430-155bce2042db.zip -> github.com%2Fabiosoft%2Freadline%2F@v%2Fv0.0.0-20180607040430-155bce2042db.zip mirror://goproxy//github.com/abiosoft/readline/@v/v0.0.0-20180607040430-155bce2042db.mod -> github.com%2Fabiosoft%2Freadline%2F@v%2Fv0.0.0-20180607040430-155bce2042db.mod mirror://goproxy//github.com/ajg/form/@v/v1.5.1.mod -> github.com%2Fajg%2Fform%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/allan-simon/go-singleinstance/@v/v0.0.0-20160830203053-79edcfdc2dfc.zip -> github.com%2Fallan-simon%2Fgo-singleinstance%2F@v%2Fv0.0.0-20160830203053-79edcfdc2dfc.zip mirror://goproxy//github.com/allan-simon/go-singleinstance/@v/v0.0.0-20160830203053-79edcfdc2dfc.mod -> github.com%2Fallan-simon%2Fgo-singleinstance%2F@v%2Fv0.0.0-20160830203053-79edcfdc2dfc.mod mirror://goproxy//github.com/andybalholm/cascadia/@v/v1.1.0.zip -> github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/andybalholm/cascadia/@v/v1.1.0.mod -> github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20201029161626-9a95f0cc3d7c.zip -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20201029161626-9a95f0cc3d7c.zip mirror://goproxy//github.com/antlr/antlr4/@v/v0.0.0-20201029161626-9a95f0cc3d7c.mod -> github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20201029161626-9a95f0cc3d7c.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/aymerick/raymond/@v/v2.0.3-0.20180322193309-b565731e1464+incompatible.mod -> github.com%2Faymerick%2Fraymond%2F@v%2Fv2.0.3-0.20180322193309-b565731e1464+incompatible.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.zip -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.zip -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/codegangsta/inject/@v/v0.0.0-20150114235600-33e0aa1cb7c0.mod -> github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.zip -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/cucumber/godog/@v/v0.8.1.mod -> github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.zip -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.mod -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgraph-io/badger/@v/v1.6.0.mod -> github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-farm/@v/v0.0.0-20190423205320-6a90982ecee2.mod -> github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/eknkc/amber/@v/v0.0.0-20171010120322-cdade1c07385.mod -> github.com%2Feknkc%2Famber%2F@v%2Fv0.0.0-20171010120322-cdade1c07385.mod mirror://goproxy//github.com/emersion/go-imap-appendlimit/@v/v0.0.0-20190308131241-25671c986a6a.zip -> github.com%2Femersion%2Fgo-imap-appendlimit%2F@v%2Fv0.0.0-20190308131241-25671c986a6a.zip mirror://goproxy//github.com/emersion/go-imap-appendlimit/@v/v0.0.0-20190308131241-25671c986a6a.mod -> github.com%2Femersion%2Fgo-imap-appendlimit%2F@v%2Fv0.0.0-20190308131241-25671c986a6a.mod mirror://goproxy//github.com/emersion/go-imap-idle/@v/v0.0.0-20200601154248-f05f54664cc4.zip -> github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664cc4.zip mirror://goproxy//github.com/emersion/go-imap-idle/@v/v0.0.0-20200601154248-f05f54664cc4.mod -> github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664cc4.mod mirror://goproxy//github.com/emersion/go-imap-move/@v/v0.0.0-20190710073258-6e5a51a5b342.zip -> github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.zip mirror://goproxy//github.com/emersion/go-imap-move/@v/v0.0.0-20190710073258-6e5a51a5b342.mod -> github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.mod mirror://goproxy//github.com/emersion/go-imap-quota/@v/v0.0.0-20210203125329-619074823f3c.zip -> github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.zip mirror://goproxy//github.com/emersion/go-imap-quota/@v/v0.0.0-20210203125329-619074823f3c.mod -> github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.mod mirror://goproxy//github.com/emersion/go-imap-unselect/@v/v0.0.0-20171113212723-b985794e5f26.zip -> github.com%2Femersion%2Fgo-imap-unselect%2F@v%2Fv0.0.0-20171113212723-b985794e5f26.zip mirror://goproxy//github.com/emersion/go-imap-unselect/@v/v0.0.0-20171113212723-b985794e5f26.mod -> github.com%2Femersion%2Fgo-imap-unselect%2F@v%2Fv0.0.0-20171113212723-b985794e5f26.mod mirror://goproxy//github.com/emersion/go-mbox/@v/v1.0.2.zip -> github.com%2Femersion%2Fgo-mbox%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/emersion/go-mbox/@v/v1.0.2.mod -> github.com%2Femersion%2Fgo-mbox%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/emersion/go-message/@v/v0.11.1.mod -> github.com%2Femersion%2Fgo-message%2F@v%2Fv0.11.1.mod mirror://goproxy//github.com/emersion/go-message/@v/v0.12.1-0.20201221184100-40c3f864532b.zip -> github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20201221184100-40c3f864532b.zip mirror://goproxy//github.com/emersion/go-message/@v/v0.12.1-0.20201221184100-40c3f864532b.mod -> github.com%2Femersion%2Fgo-message%2F@v%2Fv0.12.1-0.20201221184100-40c3f864532b.mod mirror://goproxy//github.com/emersion/go-sasl/@v/v0.0.0-20191210011802-430746ea8b9b.mod -> github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20191210011802-430746ea8b9b.mod mirror://goproxy//github.com/emersion/go-sasl/@v/v0.0.0-20200509203442-7bfe0ed36a21.zip -> github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.zip mirror://goproxy//github.com/emersion/go-sasl/@v/v0.0.0-20200509203442-7bfe0ed36a21.mod -> github.com%2Femersion%2Fgo-sasl%2F@v%2Fv0.0.0-20200509203442-7bfe0ed36a21.mod mirror://goproxy//github.com/emersion/go-smtp/@v/v0.14.0.zip -> github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.14.0.zip mirror://goproxy//github.com/emersion/go-smtp/@v/v0.14.0.mod -> github.com%2Femersion%2Fgo-smtp%2F@v%2Fv0.14.0.mod mirror://goproxy//github.com/emersion/go-textwrapper/@v/v0.0.0-20160606182133-d0e65e56babe.mod -> github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20160606182133-d0e65e56babe.mod mirror://goproxy//github.com/emersion/go-textwrapper/@v/v0.0.0-20200911093747-65d896831594.zip -> github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20200911093747-65d896831594.zip mirror://goproxy//github.com/emersion/go-textwrapper/@v/v0.0.0-20200911093747-65d896831594.mod -> github.com%2Femersion%2Fgo-textwrapper%2F@v%2Fv0.0.0-20200911093747-65d896831594.mod mirror://goproxy//github.com/emersion/go-vcard/@v/v0.0.0-20190105225839-8856043f13c5.zip -> github.com%2Femersion%2Fgo-vcard%2F@v%2Fv0.0.0-20190105225839-8856043f13c5.zip mirror://goproxy//github.com/emersion/go-vcard/@v/v0.0.0-20190105225839-8856043f13c5.mod -> github.com%2Femersion%2Fgo-vcard%2F@v%2Fv0.0.0-20190105225839-8856043f13c5.mod mirror://goproxy//github.com/etcd-io/bbolt/@v/v1.3.3.mod -> github.com%2Fetcd-io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/fasthttp-contrib/websocket/@v/v0.0.0-20160511215533-1f3b11f56072.mod -> github.com%2Ffasthttp-contrib%2Fwebsocket%2F@v%2Fv0.0.0-20160511215533-1f3b11f56072.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn-archive/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn-archive%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/gavv/httpexpect/@v/v2.0.0+incompatible.mod -> github.com%2Fgavv%2Fhttpexpect%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/getsentry/sentry-go/@v/v0.8.0.zip -> github.com%2Fgetsentry%2Fsentry-go%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/getsentry/sentry-go/@v/v0.8.0.mod -> github.com%2Fgetsentry%2Fsentry-go%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/gin-contrib/sse/@v/v0.0.0-20190301062529-5545eab6dad3.mod -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.0.0-20190301062529-5545eab6dad3.mod mirror://goproxy//github.com/gin-gonic/gin/@v/v1.4.0.mod -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20180628173108-788fd7840127.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20180628173108-788fd7840127.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/go-martini/martini/@v/v0.0.0-20170121215854-22fa46961aab.mod -> github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod mirror://goproxy//github.com/go-resty/resty/v2/@v/v2.6.0.zip -> github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.6.0.zip mirror://goproxy//github.com/go-resty/resty/v2/@v/v2.6.0.mod -> github.com%2Fgo-resty%2Fresty%2Fv2%2F@v%2Fv2.6.0.mod mirror://goproxy//github.com/gobwas/httphead/@v/v0.0.0-20180130184737-2c6c146eadee.mod -> github.com%2Fgobwas%2Fhttphead%2F@v%2Fv0.0.0-20180130184737-2c6c146eadee.mod mirror://goproxy//github.com/gobwas/pool/@v/v0.2.0.mod -> github.com%2Fgobwas%2Fpool%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gobwas/ws/@v/v1.0.2.mod -> github.com%2Fgobwas%2Fws%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gomodule/redigo/@v/v1.7.1-0.20190724094224-574c33c3df38.mod -> github.com%2Fgomodule%2Fredigo%2F@v%2Fv1.7.1-0.20190724094224-574c33c3df38.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-querystring/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190411002643-bd77b112433e.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190411002643-bd77b112433e.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20190430165422-3e4dfb77656c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20190430165422-3e4dfb77656c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.1.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.2.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imkira/go-interpol/@v/v1.1.0.mod -> github.com%2Fimkira%2Fgo-interpol%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/iris-contrib/blackfriday/@v/v2.0.0+incompatible.mod -> github.com%2Firis-contrib%2Fblackfriday%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/iris-contrib/go.uuid/@v/v2.0.0+incompatible.mod -> github.com%2Firis-contrib%2Fgo.uuid%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/iris-contrib/jade/@v/v1.1.3.mod -> github.com%2Firis-contrib%2Fjade%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/iris-contrib/pongo2/@v/v0.0.1.mod -> github.com%2Firis-contrib%2Fpongo2%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/iris-contrib/schema/@v/v0.0.1.mod -> github.com%2Firis-contrib%2Fschema%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.zip -> github.com%2Fjaytaylor%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.zip mirror://goproxy//github.com/jaytaylor/html2text/@v/v0.0.0-20200412013138-3577fbdbcff7.mod -> github.com%2Fjaytaylor%2Fhtml2text%2F@v%2Fv0.0.0-20200412013138-3577fbdbcff7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/k0kubun/colorstring/@v/v0.0.0-20150214042306-9440f1994b88.mod -> github.com%2Fk0kubun%2Fcolorstring%2F@v%2Fv0.0.0-20150214042306-9440f1994b88.mod mirror://goproxy//github.com/kataras/golog/@v/v0.0.10.mod -> github.com%2Fkataras%2Fgolog%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/kataras/iris/v12/@v/v12.1.8.mod -> github.com%2Fkataras%2Firis%2Fv12%2F@v%2Fv12.1.8.mod mirror://goproxy//github.com/kataras/neffos/@v/v0.0.14.mod -> github.com%2Fkataras%2Fneffos%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/kataras/pio/@v/v0.0.2.mod -> github.com%2Fkataras%2Fpio%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/kataras/sitemap/@v/v0.0.5.mod -> github.com%2Fkataras%2Fsitemap%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/keybase/go-keychain/@v/v0.0.0-20200502122510-cda31fe0c86d.zip -> github.com%2Fkeybase%2Fgo-keychain%2F@v%2Fv0.0.0-20200502122510-cda31fe0c86d.zip mirror://goproxy//github.com/keybase/go-keychain/@v/v0.0.0-20200502122510-cda31fe0c86d.mod -> github.com%2Fkeybase%2Fgo-keychain%2F@v%2Fv0.0.0-20200502122510-cda31fe0c86d.mod mirror://goproxy//github.com/keybase/go.dbus/@v/v0.0.0-20200324223359-a94be52c0b03.mod -> github.com%2Fkeybase%2Fgo.dbus%2F@v%2Fv0.0.0-20200324223359-a94be52c0b03.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.8.2.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.9.7.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.7.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/labstack/echo/v4/@v/v4.1.11.mod -> github.com%2Flabstack%2Fecho%2Fv4%2F@v%2Fv4.1.11.mod mirror://goproxy//github.com/labstack/gommon/@v/v0.3.0.mod -> github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/logrusorgru/aurora/@v/v2.0.3+incompatible.zip -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv2.0.3+incompatible.zip mirror://goproxy//github.com/logrusorgru/aurora/@v/v2.0.3+incompatible.mod -> github.com%2Flogrusorgru%2Faurora%2F@v%2Fv2.0.3+incompatible.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/martinlindhe/base36/@v/v1.0.0.mod -> github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/martinlindhe/base36/@v/v1.1.0.zip -> github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/martinlindhe/base36/@v/v1.1.0.mod -> github.com%2Fmartinlindhe%2Fbase36%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.2.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/goveralls/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mediocregopher/radix/v3/@v/v3.4.2.mod -> github.com%2Fmediocregopher%2Fradix%2Fv3%2F@v%2Fv3.4.2.mod mirror://goproxy//github.com/microcosm-cc/bluemonday/@v/v1.0.2.mod -> github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.41.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moul/http2curl/@v/v1.0.0.mod -> github.com%2Fmoul%2Fhttp2curl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/nats-io/jwt/@v/v0.3.0.mod -> github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/nats-io/nats.go/@v/v1.9.1.mod -> github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/nats-io/nkeys/@v/v0.1.0.mod -> github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/nats-io/nuid/@v/v1.0.1.mod -> github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.zip -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nsf/jsondiff/@v/v0.0.0-20200515183724-f29ed568f4ce.zip -> github.com%2Fnsf%2Fjsondiff%2F@v%2Fv0.0.0-20200515183724-f29ed568f4ce.zip mirror://goproxy//github.com/nsf/jsondiff/@v/v0.0.0-20200515183724-f29ed568f4ce.mod -> github.com%2Fnsf%2Fjsondiff%2F@v%2Fv0.0.0-20200515183724-f29ed568f4ce.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pingcap/errors/@v/v0.11.4.zip -> github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.zip mirror://goproxy//github.com/pingcap/errors/@v/v0.11.4.mod -> github.com%2Fpingcap%2Ferrors%2F@v%2Fv0.11.4.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/schollz/closestmatch/@v/v2.1.0+incompatible.mod -> github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/skratchdot/open-golang/@v/v0.0.0-20200116055534-eef842397966.zip -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.zip mirror://goproxy//github.com/skratchdot/open-golang/@v/v0.0.0-20200116055534-eef842397966.mod -> github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/ssor/bom/@v/v0.0.0-20170718123548-6386211fdfcf.zip -> github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.zip mirror://goproxy//github.com/ssor/bom/@v/v0.0.0-20170718123548-6386211fdfcf.mod -> github.com%2Fssor%2Fbom%2F@v%2Fv0.0.0-20170718123548-6386211fdfcf.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/therecipe/qt/@v/v0.0.0-20200701200531-7f61353ee73e.zip -> github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.zip mirror://goproxy//github.com/therecipe/qt/@v/v0.0.0-20200701200531-7f61353ee73e.mod -> github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.mod mirror://goproxy//github.com/therecipe/qt/@v/v0.0.0-20200904063919-c0c124a5770d.zip -> github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.12.0/@v/v0.0.0-20200904063919-c0c124a5770d.zip -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.12.0/@v/v0.0.0-20200904063919-c0c124a5770d.mod -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.13.0/@v/v0.0.0-20200904063919-c0c124a5770d.zip -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip mirror://goproxy//github.com/therecipe/qt/internal/binding/files/docs/5.13.0/@v/v0.0.0-20200904063919-c0c124a5770d.mod -> github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.2.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/bytebufferpool/@v/v1.0.0.mod -> github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/valyala/fasthttp/@v/v1.6.0.mod -> github.com%2Fvalyala%2Ffasthttp%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/valyala/fasttemplate/@v/v1.0.1.mod -> github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/valyala/tcplisten/@v/v0.0.0-20161114210144-ceec8f93295a.mod -> github.com%2Fvalyala%2Ftcplisten%2F@v%2Fv0.0.0-20161114210144-ceec8f93295a.mod mirror://goproxy//github.com/vmihailenco/msgpack/v5/@v/v5.1.3.zip -> github.com%2Fvmihailenco%2Fmsgpack%2Fv5%2F@v%2Fv5.1.3.zip mirror://goproxy//github.com/vmihailenco/msgpack/v5/@v/v5.1.3.mod -> github.com%2Fvmihailenco%2Fmsgpack%2Fv5%2F@v%2Fv5.1.3.mod mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.2.zip -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/vmihailenco/tagparser/@v/v0.1.2.mod -> github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/xeipuuv/gojsonpointer/@v/v0.0.0-20180127040702-4e3ac2762d5f.mod -> github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod mirror://goproxy//github.com/xeipuuv/gojsonreference/@v/v0.0.0-20180127040603-bd5ef7bd5415.mod -> github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod mirror://goproxy//github.com/xeipuuv/gojsonschema/@v/v1.2.0.mod -> github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yalp/jsonpath/@v/v0.0.0-20180802001716-5cc68e5049a0.mod -> github.com%2Fyalp%2Fjsonpath%2F@v%2Fv0.0.0-20180802001716-5cc68e5049a0.mod mirror://goproxy//github.com/yudai/gojsondiff/@v/v1.0.0.mod -> github.com%2Fyudai%2Fgojsondiff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/yudai/golcs/@v/v0.0.0-20170316035057-ecda9a501e82.mod -> github.com%2Fyudai%2Fgolcs%2F@v%2Fv0.0.0-20170316035057-ecda9a501e82.mod mirror://goproxy//github.com/yudai/pp/@v/v2.0.1+incompatible.mod -> github.com%2Fyudai%2Fpp%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.5.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20200801112145-973feb4309de.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20200801112145-973feb4309de.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180218175443-cbe0f9307d01.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180218175443-cbe0f9307d01.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190327091125-710a502c58a2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190327091125-710a502c58a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190420063019-afa5a82059c6.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190420063019-afa5a82059c6.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190419153524-e8e3143a4f4a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190419153524-e8e3143a4f4a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190626221950-04f50cda93cb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210303074136-134d130e1a04.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5-0.20201125200606-c27b9fd57aec.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5-0.20201125200606-c27b9fd57aec.zip mirror://goproxy//golang.org/x/text/@v/v0.3.5-0.20201125200606-c27b9fd57aec.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5-0.20201125200606-c27b9fd57aec.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181221001348-537d06c36207.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181221001348-537d06c36207.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190327201419-c70d86f8b7cf.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190327201419-c70d86f8b7cf.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190420181800-aa740d480789.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190420181800-aa740d480789.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.mod -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.mod mirror://goproxy//gopkg.in/go-playground/validator.v8/@v/v8.18.2.mod -> gopkg.in%2Fgo-playground%2Fvalidator.v8%2F@v%2Fv8.18.2.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.1.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.1.mod mirror://goproxy//gopkg.in/mgo.v2/@v/v2.0.0-20180705113604-9856a29383ce.mod -> gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20191120175047-4206685974f2.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
+_eclasses_=go-module	bf028003684a8b018e4de9e3c272ed33	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=567ac631c8d11a2b496deacda739d2f3
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index cfdaa05f3030..d509ca2aff13 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/ahem-1.0 b/metadata/md5-cache/media-fonts/ahem-1.0
index c9d4fe308982..21e26f77c1cb 100644
--- a/metadata/md5-cache/media-fonts/ahem-1.0
+++ b/metadata/md5-cache/media-fonts/ahem-1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Font to help test writers develop predictable tests
 EAPI=7
 HOMEPAGE=https://github.com/Kozea/Ahem
 IUSE=X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Kozea/Ahem/archive/1.0.tar.gz -> ahem-1.0.tar.gz
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=c972de8dfd18fc7cbf47bcc1c3212c1b
+_md5_=666581aa0d7032d21d0ed90186014da0
diff --git a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1 b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
index d72d7d2d2b01..b8fdae9fa971 100644
--- a/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
+++ b/metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Arabeyes Arabic TrueType fonts
 EAPI=7
 HOMEPAGE=https://www.arabeyes.org/Khotot#2.0
 IUSE=X
-KEYWORDS=amd64 arm ~ia64 ppc ~s390 sparc x86
+KEYWORDS=amd64 arm ~ia64 ppc ~ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/ae_fonts_2.0.tar.bz2
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=8612ae3d4076fbb469832bfafa0253fb
+_md5_=3f48ed70a136bb293efd73dde0fde7f6
diff --git a/metadata/md5-cache/media-fonts/clearsans-1.00 b/metadata/md5-cache/media-fonts/clearsans-1.00
index b21cb243b7fd..b6b968927e61 100644
--- a/metadata/md5-cache/media-fonts/clearsans-1.00
+++ b/metadata/md5-cache/media-fonts/clearsans-1.00
@@ -4,10 +4,10 @@ DESCRIPTION=OpenType font optimized for readability on small screens
 EAPI=7
 HOMEPAGE=https://01.org/clear-sans
 IUSE=X
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/downloads/clear-sans/clearsans-1.00.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=6099aacc1185f28e2af1ea3a2330b314
+_md5_=37851badf7ed4c8c4ff12c7af9270d3e
diff --git a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0 b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
index 8ad36bc6682a..233be8c07476 100644
--- a/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
+++ b/metadata/md5-cache/media-fonts/croscorefonts-1.31.0
@@ -4,10 +4,10 @@ DESCRIPTION=Open licensed fonts metrically compatible with MS corefonts
 EAPI=7
 HOMEPAGE=https://www.google.com/webfonts/specimen/Arimo https://www.google.com/webfonts/specimen/Cousine https://www.google.com/webfonts/specimen/Tinos
 IUSE=X
-KEYWORDS=amd64 arm arm64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/croscorefonts-1.31.0.tar.bz2
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=7951dd7c358c157c9495d387710d8042
+_md5_=cbc3213e77d141ccc0033a5afa8730de
diff --git a/metadata/md5-cache/media-fonts/roboto-2.138 b/metadata/md5-cache/media-fonts/roboto-2.138
index 191f99c2b0c2..42b6e5e1643c 100644
--- a/metadata/md5-cache/media-fonts/roboto-2.138
+++ b/metadata/md5-cache/media-fonts/roboto-2.138
@@ -4,9 +4,9 @@ DESCRIPTION=Standard font for Android 4.0 (Ice Cream Sandwich) and later
 EAPI=7
 HOMEPAGE=https://github.com/google/roboto
 IUSE=X
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/google/roboto/releases/download/v2.138/roboto-unhinted.zip -> roboto-2.138.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=38321c9368d4800096e320a4f315eaa5
+_md5_=6d356bc29eec17e6e2e60e747fb8aa5e
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.49 b/metadata/md5-cache/media-fonts/terminus-font-4.49
index ca73cbd0cc03..77d2b4357384 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.49
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.49
@@ -4,11 +4,11 @@ DEPEND=app-arch/gzip || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/pyth
 DESCRIPTION=A clean fixed font for the console and X11
 EAPI=7
 HOMEPAGE=http://terminus-font.sourceforge.net/
-IUSE=a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
+IUSE=a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=OFL-1.1 GPL-2
 REQUIRED_USE=X? ( pcf )
 SLOT=0
 SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.49/terminus-font-4.49.tar.gz
 _eclasses_=font	0667878c2b594871023dd1833d05996f	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=522e38e9e0d7e1529d77581dbca02800
+_md5_=97b7595c0d33c0a6043d3948a8ef0346
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.49.1 b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
new file mode 100644
index 000000000000..ca8ed2ed7138
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
@@ -0,0 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=app-arch/gzip || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/awk pcf? ( x11-apps/bdftopcf )
+DESCRIPTION=A clean fixed font for the console and X11
+EAPI=7
+HOMEPAGE=http://terminus-font.sourceforge.net/
+IUSE=a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=OFL-1.1 GPL-2
+REQUIRED_USE=X? ( pcf )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/terminus-font/terminus-font-4.49/terminus-font-4.49.1.tar.gz
+_eclasses_=font	0667878c2b594871023dd1833d05996f	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0d07993903615dcdd2e55b609244ec75
diff --git a/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1 b/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
index ee970cd53b16..f4cb3198637a 100644
--- a/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
+++ b/metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Set of matching libre/open fonts funded by Canonical
 EAPI=7
 HOMEPAGE=https://design.ubuntu.com/font/
 IUSE=X
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=UbuntuFontLicense-1.0
 SLOT=0
 SRC_URI=https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip -> ubuntu-font-family-0.83.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=738703ca2ae2bba8c656f3d6d8d2f9d6
+_md5_=f02a1108b74d38f0feadaf40fd404992
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f20620870c91..b77d5904598b 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/darktable-3.4.1 b/metadata/md5-cache/media-gfx/darktable-3.4.1
index 05125bac19b7..838aa41bffe3 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.4.1
+++ b/metadata/md5-cache/media-gfx/darktable-3.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.4.1/darktable-3.4.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf -> darktable-usermanual-3.4.0.pdf )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9714ab787d091c00af479d602e1f4cf1
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index a7154484942c..b6604b3aed82 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e36bb2287d4b9cf1d6406b2c9c500e17
diff --git a/metadata/md5-cache/media-gfx/eog-40.2 b/metadata/md5-cache/media-gfx/eog-40.2
new file mode 100644
index 000000000000..acbf798ef620
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-40.2
@@ -0,0 +1,15 @@
+BDEPEND=gtk-doc? ( >=dev-util/gtk-doc-1.16 app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Eye of GNOME image viewer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
+IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.22.0:3[introspection,X] sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+REQUIRED_USE=exif? ( jpeg )
+SLOT=1
+SRC_URI=mirror://gnome/sources/eog/40/eog-40.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8cbe31ffd657e5712cf95f0b500ca8f2
diff --git a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1 b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
index 7c9cc2bec394..88e0e9406448 100644
--- a/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
+++ b/metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( v
 REQUIRED_USE=lua? ( swig )
 SLOT=0
 SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-1.0.2.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=483352b76d77767deae6747436ec7ecb
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.1 b/metadata/md5-cache/media-gfx/freecad-0.19.1
index 66d16a4e393f..169a42a261b0 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.1
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/0.19.1.tar.gz -> freecad-0.19.1.tar.gz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76fb528259adf5e88e69be604df49913
+_md5_=e6163d1c69806fc441b1a70231e2805a
diff --git a/metadata/md5-cache/media-gfx/freecad-0.19.2 b/metadata/md5-cache/media-gfx/freecad-0.19.2
index 938aac040cb8..daa66254f55e 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.19.2
+++ b/metadata/md5-cache/media-gfx/freecad-0.19.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.19.2.tar.gz -> freecad-0.19.2.tar.gz
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2df46816f72183dac3f7b0b0b7b68aa2
+_md5_=e2c7f3b1f342c7ec8a5cee8f0d9e668d
diff --git a/metadata/md5-cache/media-gfx/freecad-9999 b/metadata/md5-cache/media-gfx/freecad-9999
index 631372989f2b..ca55b1cdd744 100644
--- a/metadata/md5-cache/media-gfx/freecad-9999
+++ b/metadata/md5-cache/media-gfx/freecad-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 ) inspection? ( points ) path?
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f7f421541759fc738c7162e25bf4120
+_md5_=bad36baf71ddd5218aea173770148cdb
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1 b/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
index 8167abe45a55..2f68d6d15e1c 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( m
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.5.1.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cd3e166f37dbdf518f34af995aa5e05
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.6 b/metadata/md5-cache/media-gfx/geeqie-1.6
index 32284de910ec..2dec221b2d97 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.6
+++ b/metadata/md5-cache/media-gfx/geeqie-1.6
@@ -11,5 +11,5 @@ RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( m
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.6.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71123bf3f4006d181facdb4b522d39dd
diff --git a/metadata/md5-cache/media-gfx/geeqie-9999 b/metadata/md5-cache/media-gfx/geeqie-9999
index 77b6ccdd66dc..eb60aff150b5 100644
--- a/metadata/md5-cache/media-gfx/geeqie-9999
+++ b/metadata/md5-cache/media-gfx/geeqie-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) ) gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2a3708030b50869238973c918c763c9
diff --git a/metadata/md5-cache/media-gfx/gimp-2.99.6 b/metadata/md5-cache/media-gfx/gimp-2.99.6
index e1e70e6800eb..12edbdbc69e3 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.99.6
+++ b/metadata/md5-cache/media-gfx/gimp-2.99.6
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_sing
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://gimp/v2.99/gimp-2.99.6.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5586679c85faa1c6e798916fd7d2142b
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index ff377fbf3ec3..e80e6a2c2549 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/poppler-0.90.1[cairo] >=app-text/poppler-data-0.4.9 >=dev-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=643b6f8df53446ff1f20cb7b47bcaef6
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.5 b/metadata/md5-cache/media-gfx/gmic-2.9.5
deleted file mode 100644
index 24929eda05b9..000000000000
--- a/metadata/md5-cache/media-gfx/gmic-2.9.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
-DESCRIPTION=GREYC's Magic Image Converter
-EAPI=7
-HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
-IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=amd64 arm64 x86
-LICENSE=CeCILL-2 GPL-3
-RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
-REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
-SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_2.9.5.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86ddeb9ea8f0fad6ef2ef9e9484a625e
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.7 b/metadata/md5-cache/media-gfx/gmic-2.9.7
index 7c136ff7d7dc..e1ab6e65b60f 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.7
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.7
@@ -5,11 +5,11 @@ DESCRIPTION=GREYC's Magic Image Converter
 EAPI=7
 HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
 IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=CeCILL-2 GPL-3
 RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
 REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.7.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=589ad04cbee1b8a138d2515a6ebf3195
+_md5_=86ddeb9ea8f0fad6ef2ef9e9484a625e
diff --git a/metadata/md5-cache/media-gfx/hydrus-441 b/metadata/md5-cache/media-gfx/hydrus-441
deleted file mode 100644
index e71e03eacfab..000000000000
--- a/metadata/md5-cache/media-gfx/hydrus-441
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile install postinst prepare setup test
-DESCRIPTION=A booru-like media organizer for the desktop
-EAPI=7
-HOMEPAGE=http://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
-IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=WTFPL-2 CC-BY-2.5
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v441.tar.gz -> hydrus-441.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=229bde7f78563ebf17e5f04f6a13ac72
diff --git a/metadata/md5-cache/media-gfx/hydrus-441-r1 b/metadata/md5-cache/media-gfx/hydrus-441-r1
new file mode 100644
index 000000000000..dc49b808e85c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-441-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v441.tar.gz -> hydrus-441.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=588d361fb1b0fbbf1f38c6307cfa9207
diff --git a/metadata/md5-cache/media-gfx/hydrus-442 b/metadata/md5-cache/media-gfx/hydrus-442
new file mode 100644
index 000000000000..736fb41f5ece
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/hydrus-442
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) ) python_single_target_python3_8? ( test? ( dev-python/httmock[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] dev-python/unittest2[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/httmock[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] dev-python/unittest2[python_targets_python3_9(-)] ) )
+DEFINED_PHASES=compile install postinst prepare setup test
+DESCRIPTION=A booru-like media organizer for the desktop
+EAPI=7
+HOMEPAGE=https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus
+IUSE=+mpv +ffmpeg +lz4 socks +cloudscraper charts test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=WTFPL-2 CC-BY-2.5
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/html5lib[python_targets_python3_8(-)] dev-python/lxml[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] dev-python/service_identity[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_8(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_8(-)] dev-python/beautifulsoup:4[python_targets_python3_8(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_8(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_8(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_8(-)] dev-python/python-mpv[python_targets_python3_8(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_8(-)] dev-python/PySocks[python_targets_python3_8(-)] ) ) ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/html5lib[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyside2[widgets,gui,charts?,python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] media-libs/opencv[python,png,jpeg,python_targets_python3_9(-)] >=dev-python/QtPy-1.9.0-r4[pyside2,python_targets_python3_9(-)] dev-python/beautifulsoup:4[python_targets_python3_9(-)] cloudscraper? ( dev-python/cloudscraper[python_targets_python3_9(-)] ) ffmpeg? ( media-video/ffmpeg ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) mpv? ( media-video/mpv[libmpv,python_targets_python3_9(-)] dev-python/python-mpv[python_targets_python3_9(-)] ) socks? ( || ( dev-python/requests[socks5,python_targets_python3_9(-)] dev-python/PySocks[python_targets_python3_9(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hydrusnetwork/hydrus/archive/v442.tar.gz -> hydrus-442.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=588d361fb1b0fbbf1f38c6307cfa9207
diff --git a/metadata/md5-cache/media-gfx/tintii-2.10.0-r1 b/metadata/md5-cache/media-gfx/tintii-2.10.0-r1
index beea558aa44f..0e3eba55f73b 100644
--- a/metadata/md5-cache/media-gfx/tintii-2.10.0-r1
+++ b/metadata/md5-cache/media-gfx/tintii-2.10.0-r1
@@ -3,11 +3,11 @@ DEFINED_PHASES=prepare
 DEPEND=x11-libs/wxGTK:3.0-gtk3[X] dev-libs/boost
 DESCRIPTION=Photo editor for selective color, saturation, and hue shift adjustments
 EAPI=7
-HOMEPAGE=https://www.indii.org/software/tintii
+HOMEPAGE=https://www.indii.org/software/tintii/
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=x11-libs/wxGTK:3.0-gtk3[X]
 SLOT=0
 SRC_URI=https://www.indii.org/files/tint/releases/tintii-2.10.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
-_md5_=cc6a014fd0fe3d3e3b41e3aebdf68785
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_md5_=09ead99955b8d11e970f7f0cbdef4007
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23-r1 b/metadata/md5-cache/media-gfx/zbar-0.23-r1
deleted file mode 100644
index 9c2803b547b6..000000000000
--- a/metadata/md5-cache/media-gfx/zbar-0.23-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection ) ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l: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(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.8 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) ) test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Library and tools for reading barcodes from images or video
-EAPI=7
-HOMEPAGE=https://github.com/mchehab/zbar
-IUSE=dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 +python_single_target_python3_8 test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection ) ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l: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(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=introspection? ( gtk ) python? ( ^^ ( python_single_target_python3_8 ) ) test? ( ^^ ( python_single_target_python3_8 ) X? ( imagemagick ) ) xv? ( X )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.23.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3436d4b82a893b63632ff7d4eb2b42c1
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23.1 b/metadata/md5-cache/media-gfx/zbar-0.23.1
index 25fa38e1654c..e5055556f195 100644
--- a/metadata/md5-cache/media-gfx/zbar-0.23.1
+++ b/metadata/md5-cache/media-gfx/zbar-0.23.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mchehab/zbar/archive/0.23.1.tar.gz -> zbar-0.23.1.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=caccff4351a623d81d44ebfaa94357d1
+_md5_=f7b4d1dd55b1894195e10011322b78a4
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 536e6cea4ba0..7caadd6a2c74 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.2-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
index 9eee5d8e4930..f2e0c7cbced3 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
@@ -3,7 +3,7 @@ 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] ) )
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+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
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3751b9d2e58129a6175717db67a98e1f
+_md5_=7b64e8a3857372e349b372041b04d1b1
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1
index ec5116bad9e7..12033294b2b0 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1
@@ -3,7 +3,7 @@ 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] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+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
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.3.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0b83ae4fe4a3842327835efcbf81cc8a
+_md5_=f8caa19c4c4c93b1180b531ff7c54604
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.4 b/metadata/md5-cache/media-libs/alsa-lib-1.2.4
index 96a4debaa835..f5992021e77e 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.4
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.4
@@ -3,7 +3,7 @@ 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] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+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
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.4.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=2902c354c8aaa7e328f51c594b814600
+_md5_=96bbcacc5168fe1ee642fc653132cabe
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.5 b/metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
similarity index 85%
rename from metadata/md5-cache/media-libs/alsa-lib-1.2.5
rename to metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
index 1f94c898bb4b..7853539b8251 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.5
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
@@ -1,15 +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
+DEFINED_PHASES=compile configure install prepare pretend 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] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+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
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.5.tar.bz2
+SRC_URI=https://git.alsa-project.org/?p=alsa-lib.git;a=snapshot;h=abe805ed6c7f38e48002e575535afd1f673b9bcd;sf=tgz -> alsa-lib-1.2.5_p20210604.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c064a314697cc4688e0c40e3c311a56
+_md5_=90337aee2bd2305ea893f174f6936116
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.1.8 b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
index d70509a5e94b..4ee6c1163d8f 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.1.8
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/alsa-lib-1.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Advanced Linux Sound Architecture OSS compatibility layer
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-1.1.8.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=94ebf081fc4078e1d1be2199a4b0a818
+_md5_=7dc6629631a2e454cf00ea4f80716be3
diff --git a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.2 b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.2
index f49493894999..9adbd085ffc9 100644
--- a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.2
+++ b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA topology configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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-topology-conf-1.2.2.tar.bz2
-_md5_=4b5298620f99ed627e3e3b317e4d0dbb
+_md5_=23002e55b7dd5523d4afb95d9984d334
diff --git a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.3 b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.3
index 6d847bdc5c46..b49234c56dc5 100644
--- a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.3
+++ b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA topology configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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-topology-conf-1.2.3.tar.bz2
-_md5_=4b5298620f99ed627e3e3b317e4d0dbb
+_md5_=23002e55b7dd5523d4afb95d9984d334
diff --git a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4 b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
index 0028145e59b0..7b98c9cbc9fe 100644
--- a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
+++ b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA topology configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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-topology-conf-1.2.4.tar.bz2
-_md5_=9eab121a3d9eb450f0be41f92845e32f
+_md5_=ea87317d5bc3ee85ffeffbde88dc27c3
diff --git a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5 b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
index e92af1664f0c..db2a24cfe992 100644
--- a/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
+++ b/metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA topology configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-topology-conf-1.2.5.tar.bz2
-_md5_=1f9d0a2d2706b65efc235c13fbc0924f
+_md5_=53f460f1083d5af9919b679b592a75da
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.2 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.2
index 0c3a501ad0eb..5f9f6372eec9 100644
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.2
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA ucm configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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.2.tar.bz2
-_md5_=31406420f12efe50462db48f2d27128c
+_md5_=be67be844ff30fdbf20ae28d65adf4ad
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.3 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.3
index 6cbdf1798fa3..d967e97617ed 100644
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.3
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA ucm configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 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.3.tar.bz2
-_md5_=31406420f12efe50462db48f2d27128c
+_md5_=be67be844ff30fdbf20ae28d65adf4ad
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
index d6add58b11ba..6cdd94a57f5f 100644
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA ucm configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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.4.tar.bz2
-_md5_=a1ff7c8b4558f85c2c9ed817cbaf66fc
+_md5_=7f976e12cec9ea739f5e959d6de3c110
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
similarity index 78%
rename from metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5
rename to metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
index 82ab7a4d36e9..62292980db79 100644
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA ucm configuration files
 EAPI=7
-HOMEPAGE=https://www.alsa-project.org
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.5.tar.bz2
-_md5_=889d5f6827a0a8d6cdd026844ddb223d
+_md5_=6b6f0e27ff349e0aa319f594c37bdac8
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.5.6 b/metadata/md5-cache/media-libs/ilmbase-2.5.6
index c953e8dfcbf4..b8cf85c4efef 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.5.6
+++ b/metadata/md5-cache/media-libs/ilmbase-2.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=OpenEXR ILM Base libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=large-stack static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.6.tar.gz -> ilmbase-2.5.6.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ade7baa5f7be5543335f6c4be08b6f0c
+_md5_=e204fc6ea882ecd3f762883a075e8372
diff --git a/metadata/md5-cache/media-libs/libheif-1.12.0 b/metadata/md5-cache/media-libs/libheif-1.12.0
index ed4e53ee0b77..e9dbfdf5ed92 100644
--- a/metadata/md5-cache/media-libs/libheif-1.12.0
+++ b/metadata/md5-cache/media-libs/libheif-1.12.0
@@ -5,7 +5,7 @@ DESCRIPTION=ISO/IEC 23008-12:2017 HEIF file format decoder and encoder
 EAPI=7
 HOMEPAGE=https://github.com/strukturag/libheif
 IUSE=+aom gdk-pixbuf go libde265 rav1e test +threads x265 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/dav1d:=[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/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aom? ( >=media-libs/libaom-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) libde265? ( media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( go libde265 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c22c7ca7f93a69233d3ac0e88e3607b9
+_md5_=ca7d16176ca85957996c860c14b4f30f
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
new file mode 100644
index 000000000000..d6b113c1feca
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16.5 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
+EAPI=7
+HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
+IUSE=cpu_flags_arm_neon java static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD IJG ZLIB
+RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/0.2
+SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d71684e9487605c5a7b75317719bd1d4
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.5 b/metadata/md5-cache/media-libs/libogg-1.3.5
new file mode 100644
index 000000000000..3f101911493c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libogg-1.3.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=The Ogg media file format library
+EAPI=7
+HOMEPAGE=https://xiph.org/ogg/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/ogg/libogg-1.3.5.tar.xz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=453251dd1dd809834a01554dec3b6caa
diff --git a/metadata/md5-cache/media-libs/libquvi-0.9.4-r100 b/metadata/md5-cache/media-libs/libquvi-0.9.4-r100
index 78a39c8e57f8..ef1ea95fcee6 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.9.4-r100
+++ b/metadata/md5-cache/media-libs/libquvi-0.9.4-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) >=dev-libs/gl
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0/8
 SRC_URI=mirror://sourceforge/quvi/0.9/libquvi-0.9.4.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4a823afdd9495a8f38a7a16de7146978
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100 b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
index a210a2bd9662..5902622fc2f2 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/libquvi-scripts-0.9.20131130.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=eae57f3156ecb78801027af2eff3b111
diff --git a/metadata/md5-cache/media-libs/mlt-6.24.0-r1 b/metadata/md5-cache/media-libs/mlt-6.24.0-r1
index cf55ffc0aee7..9d9f08248635 100644
--- a/metadata/md5-cache/media-libs/mlt-6.24.0-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.24.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-
 REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.24.0/mlt-6.24.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f92977ad09fc2b16345bf8fb7305889b
diff --git a/metadata/md5-cache/media-libs/mlt-6.26.1-r1 b/metadata/md5-cache/media-libs/mlt-6.26.1-r1
index fa9f7779a6a3..744399586053 100644
--- a/metadata/md5-cache/media-libs/mlt-6.26.1-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.26.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=7
 HOMEPAGE=https://www.mltframework.org/
 IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python qt5 rtaudio rubberband sdl vdpau vidstab xine xml lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) opencv? ( >=media-libs/opencv-4.5.1:= ) opengl? ( media-video/movit ) 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] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
 REQUIRED_USE=lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.26.1/mlt-6.26.1.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e4df780823c2287a755fc580c83a5cd1
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bfb63fab92dcb51a39d9f5a661d0f5af
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.1 b/metadata/md5-cache/media-libs/opencolorio-1.1.1
index 9fdc58b8f71e..f6bbc7cf35d7 100644
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.1
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.1
@@ -1,7 +1,7 @@
 BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) 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] ) )
-DESCRIPTION=A color management framework for visual effects and animation
+DESCRIPTION=color management framework for visual effects and animation
 EAPI=7
 HOMEPAGE=https://opencolorio.org/
 IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_single_target_python3_8 python_single_target_python3_9
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenColorIO/archive/v1.1.1.tar.gz -> opencolorio-1.1.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23bc2cb8b451d551daff8c452da5fe1f
+_md5_=43839fbc74f9ebba34ec985d2316fb1f
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.6 b/metadata/md5-cache/media-libs/openexr-2.5.6
index d9cd33b32758..b16f693caab0 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.6
+++ b/metadata/md5-cache/media-libs/openexr-2.5.6
@@ -5,11 +5,11 @@ DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
 EAPI=7
 HOMEPAGE=https://www.openexr.com/
 IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=~media-libs/ilmbase-2.5.6:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.6.tar.gz -> openexr-2.5.6.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e9f31cf6ab5817f04050cf7951726fe
+_md5_=6ea791cc55d3d712b94ca3c141feb573
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2.0 b/metadata/md5-cache/media-libs/speexdsp-1.2.0
index 4696e7ed9bf0..e2c0411fdfd4 100644
--- a/metadata/md5-cache/media-libs/speexdsp-1.2.0
+++ b/metadata/md5-cache/media-libs/speexdsp-1.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=Audio compression format designed for speech -- DSP
 EAPI=7
 HOMEPAGE=https://www.speex.org/
 IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!<media-libs/speex-1.2.0
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f1061542e4202c510a24db6dd437f39
+_md5_=0c8aa538107f30d53ef472d9ad68e816
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3 b/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
deleted file mode 100644
index b8f0c205097d..000000000000
--- a/metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<media-libs/speex-1.2.0
-DESCRIPTION=Audio compression format designed for speech -- DSP
-EAPI=7
-HOMEPAGE=https://www.speex.org/
-IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=!<media-libs/speex-1.2.0
-SLOT=0
-SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2rc3.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a304765d79d61b672cf2eea1b6410511
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.179 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.179
index b8130ea761ae..0fd2aa14ee41 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.179
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.2.179
@@ -5,9 +5,9 @@ DESCRIPTION=Vulkan Validation Layers
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.179.tar.gz -> vulkan-layers-1.2.179.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f8df56444750e682639a58a7207982a
+_md5_=b6ab91a3dbd1839d2c12f6410fa9c18e
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.179 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.179
index 3c5c38e159ee..a8c92fc76a7e 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.179
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.2.179
@@ -5,10 +5,10 @@ DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
 EAPI=7
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64
 LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[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/KhronosGroup/Vulkan-Loader/archive/v1.2.179.tar.gz -> vulkan-loader-1.2.179.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8291ae052dab04772a671055ffaddc8c
+_md5_=f72a0edcaf4345ff3e5cee181313f4d8
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 1bf5a8dc49c4..d32ed0e24737 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.2 b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
index 284b54fa948b..d1eb4f4824ef 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=media-libs/alsa-lib-1.2.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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=7
-HOMEPAGE=http://www.alsa-project.org/
+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 sparc x86 ~amd64-linux
 LICENSE=GPL-2 LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.2.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/plugins/alsa-plugins-1.2.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88019135a1fe08ca66a28d7e40dd75a4
+_md5_=ef447ec85b8487e112c3efc8560039d6
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.5 b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.5
new file mode 100644
index 000000000000..d5af8ed05ee8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.5
@@ -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.5:=[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=7
+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 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/alsa-lib-1.2.5:=[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.5.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=814bd7d2ca195387158d6ffd590a638d
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.13 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.13
index 96c53744092e..432d9daf35ae 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.13
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.13
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 ) )
 RESTRICT=!test? ( test )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.13.tar.xz
-_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	df5c6c53843e1be0aad724138e78bbc3	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25fce7ffe2c5a162020c252f1c2f4076
diff --git a/metadata/md5-cache/media-plugins/x42-avldrums-0.4.2 b/metadata/md5-cache/media-plugins/x42-avldrums-0.4.2
new file mode 100644
index 000000000000..0b3b97abe615
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/x42-avldrums-0.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/glib media-libs/glu media-libs/lv2 x11-libs/cairo[X] media-libs/libglvnd[X] x11-libs/libX11 x11-libs/pango
+DESCRIPTION=AVLinux Drumkits
+EAPI=7
+HOMEPAGE=http://x42-plugins.com/x42/x42-avldrums https://github.com/x42/avldrums.lv2
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib media-libs/glu media-libs/lv2 x11-libs/cairo[X] media-libs/libglvnd[X] x11-libs/libX11 x11-libs/pango
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/x42/avldrums.lv2/archive/refs/tags/v0.4.2.tar.gz -> x42-avldrums-0.4.2.tar.gz https://github.com/x42/robtk/archive/refs/tags/v0.7.5.tar.gz -> robtk-0.7.5.tar.gz
+_md5_=ff6335fe14cdccc67fd4c981f2f0d9d8
diff --git a/metadata/md5-cache/media-plugins/x42-avldrums-9999 b/metadata/md5-cache/media-plugins/x42-avldrums-9999
new file mode 100644
index 000000000000..d1920ffca6bf
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/x42-avldrums-9999
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-libs/glib media-libs/glu media-libs/lv2 x11-libs/cairo[X] media-libs/libglvnd[X] x11-libs/libX11 x11-libs/pango
+DESCRIPTION=AVLinux Drumkits
+EAPI=7
+HOMEPAGE=http://x42-plugins.com/x42/x42-avldrums https://github.com/x42/avldrums.lv2
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=dev-libs/glib media-libs/glu media-libs/lv2 x11-libs/cairo[X] media-libs/libglvnd[X] x11-libs/libX11 x11-libs/pango
+RESTRICT=mirror
+SLOT=0
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=ff6335fe14cdccc67fd4c981f2f0d9d8
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8f3a735fb3f3..5d1cbf23f78e 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/alsa-tools-1.2.2-r1 b/metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
index a59301295d2e..4ed8864dceab 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
 DEPEND=>=media-libs/alsa-lib-1.2.2 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( dev-libs/gobject-introspection x11-libs/gtk+:2 x11-libs/gtk+:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.2.2 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-lib
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/tools/alsa-tools-1.2.2.tar.bz2
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=edfd9d103401b3eac63bb40b6b6710ad
+_md5_=8b6560485302f3a97c56e9f97a0e8b28
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.2 b/metadata/md5-cache/media-sound/alsa-utils-1.2.2
index 3ed567f90006..a23616d21bfa 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.2
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst
 DEPEND=>=media-libs/alsa-lib-1.2.2 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=7
-HOMEPAGE=https://alsa-project.org/
+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 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.2.2 libsamplerate? ( media-libs/libsamplerate )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.2.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=a3ada4559a4029adfba0c0523dbdc8bb
+_md5_=cc3c0bc679959c0648571c50ad8ab1d9
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.3 b/metadata/md5-cache/media-sound/alsa-utils-1.2.3
index d6decd4739e9..223a9e8b948d 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.3
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst
 DEPEND=>=media-libs/alsa-lib-1.2.3 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=7
-HOMEPAGE=https://alsa-project.org/
+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 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.2.3 libsamplerate? ( media-libs/libsamplerate )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.3.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=a3ada4559a4029adfba0c0523dbdc8bb
+_md5_=cc3c0bc679959c0648571c50ad8ab1d9
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.4 b/metadata/md5-cache/media-sound/alsa-utils-1.2.4
index e77818064763..51c37478402c 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.4
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.4
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst
 DEPEND=>=media-libs/alsa-lib-1.2.4 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=7
-HOMEPAGE=https://alsa-project.org/
+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 sparc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.2.4 libsamplerate? ( media-libs/libsamplerate )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.4.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=99c1871d3dd0d775755f27ff401cc312
+_md5_=54e92b278570ee0d217526448053e6c5
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.5 b/metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
similarity index 91%
rename from metadata/md5-cache/media-sound/alsa-utils-1.2.5
rename to metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
index db7586dc6df4..45632b18cfa4 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.5
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install postinst
 DEPEND=>=media-libs/alsa-lib-1.2.5 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=7
-HOMEPAGE=https://alsa-project.org/
+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 ~sparc ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.2.5 libsamplerate? ( media-libs/libsamplerate )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.5.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=55e960a23bd2f7b61ee69e5b8243ec5d
+_md5_=c377e1e2d712df12cae22ec7a63c9d86
diff --git a/metadata/md5-cache/media-sound/aqualung-1.1-r101 b/metadata/md5-cache/media-sound/aqualung-1.1-r101
index 6321abbf2928..dce16ca5039b 100644
--- a/metadata/md5-cache/media-sound/aqualung-1.1-r101
+++ b/metadata/md5-cache/media-sound/aqualung-1.1-r101
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=https://github.com/jeremyevans/aqualung/releases/download/1.1/aqualung-1.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46ab7397445e98aaf2eb9e1bae774fb1
diff --git a/metadata/md5-cache/media-sound/csound-6.15.0-r101 b/metadata/md5-cache/media-sound/csound-6.15.0-r101
index 21ce0983871f..95955dd7beff 100644
--- a/metadata/md5-cache/media-sound/csound-6.15.0-r101
+++ b/metadata/md5-cache/media-sound/csound-6.15.0-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.15.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_html.zip )
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbedbbf9d12c481737a06fd53d494b04
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index 54454d45223e..802294ff7e1e 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate
 REQUIRED_USE=alsa? ( threads ) java? ( cxx ) linear? ( double-precision ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) cxx ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) cxx )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2469e3fcd00780c448ed172a217a7320
diff --git a/metadata/md5-cache/media-sound/entagged-tageditor-0.35 b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
deleted file mode 100644
index 43777cc2f724..000000000000
--- a/metadata/md5-cache/media-sound/entagged-tageditor-0.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-db/hsqldb:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Open-source audiofile tagger
-EAPI=7
-HOMEPAGE=http://entagged.sourceforge.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=virtual/jre-1.5 dev-java/squareness-jlf:0 dev-db/hsqldb:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://gentoo/entagged-tageditor-0.35.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=04124b1294cdb74f472ad7a5b2a4c0c6
diff --git a/metadata/md5-cache/media-sound/gnome-music-40.0 b/metadata/md5-cache/media-sound/gnome-music-40.0
index 4fd06368243e..6d6077fbff96 100644
--- a/metadata/md5-cache/media-sound/gnome-music-40.0
+++ b/metadata/md5-cache/media-sound/gnome-music-40.0
@@ -5,11 +5,11 @@ DESCRIPTION=Music management for Gnome
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Music
 IUSE=python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=dev-libs/glib-2.50:2 >=net-libs/gnome-online-accounts-3.35.90[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.24.7:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] app-misc/tracker:3=[introspection(+)] >=x11-libs/pango-1.44:= python_single_target_python3_8? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_8(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_9(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_9(-)] ) >=media-libs/grilo-0.3.13:0.3[introspection] >=media-plugins/grilo-plugins-0.3.13:0.3 || ( app-misc/tracker-miners:3[gstreamer] app-misc/tracker-miners:3[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/40/gnome-music-40.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f127ff671e22d37cf5ce62a9d3ae84a
+_md5_=f23d0534c2da1f28135c2f74195d1744
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.8 b/metadata/md5-cache/media-sound/mikmod-3.2.8
index 9e5c89089df6..6035127f2370 100644
--- a/metadata/md5-cache/media-sound/mikmod-3.2.8
+++ b/metadata/md5-cache/media-sound/mikmod-3.2.8
@@ -3,9 +3,9 @@ DEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7:0=
 DESCRIPTION=A console MOD-Player based on libmikmod
 EAPI=7
 HOMEPAGE=http://mikmod.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/mikmod-3.2.8.tar.gz
-_md5_=ba0519985f5f14a189cf44cbde8651a7
+_md5_=bf6c647af2c98f18e5c94c34642ffde7
diff --git a/metadata/md5-cache/media-sound/mpg123-1.28.0 b/metadata/md5-cache/media-sound/mpg123-1.28.0
new file mode 100644
index 000000000000..5154fe20525b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpg123-1.28.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
+EAPI=7
+HOMEPAGE=https://www.mpg123.org/
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+SLOT=0
+SRC_URI=https://www.mpg123.org/download/mpg123-1.28.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=07db5d115fcca0692f37d290ab440b59
diff --git a/metadata/md5-cache/media-sound/mumble-9999 b/metadata/md5-cache/media-sound/mumble-9999
index 3bc9e21e121b..5dbfca3fba8a 100644
--- a/metadata/md5-cache/media-sound/mumble-9999
+++ b/metadata/md5-cache/media-sound/mumble-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sq
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bff22d360e9c7a0f959fffbca2d058e6
+_md5_=f26b7d4830a5b72d60e9fd07f69c39a2
diff --git a/metadata/md5-cache/media-sound/protux-0.50.100 b/metadata/md5-cache/media-sound/protux-0.50.100
deleted file mode 100644
index e2bf21ea9987..000000000000
--- a/metadata/md5-cache/media-sound/protux-0.50.100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Professional Audio Tools for GNU/Linux
-EAPI=7
-HOMEPAGE=http://protux.sourceforge.net/
-IUSE=source elibc_FreeBSD
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://protux.sourceforge.net/releases/protux-0.50.100.tar.gz
-_eclasses_=java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e
-_md5_=7826788f96e9c2656019d4540b64f965
diff --git a/metadata/md5-cache/media-sound/rosegarden-21.06 b/metadata/md5-cache/media-sound/rosegarden-21.06
new file mode 100644
index 000000000000..f65b18cbb9d1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rosegarden-21.06
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MIDI and audio sequencer and notation editor
+EAPI=7
+HOMEPAGE=https://www.rosegardenmusic.com/
+IUSE=lirc test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/rosegarden/rosegarden-21.06.tar.bz2
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e40e58666186a16515be9638b20dc209
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8 b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
index 7ea55e9bb919..dac52838cf42 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( media-video/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) 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] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
 DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the XMMS player
 EAPI=7
-HOMEPAGE=https://xmms2.org/wiki/Main_Page
+HOMEPAGE=https://github.com/XMMS2
 IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 ~arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xmms2-0.8DrO_o-949-gca15e830.tar.bz2 https://waf.io/waf-2.0.19.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=28c37e44eab21453e52ee45c2c0b8337
+_md5_=ca94bc18fc01bfe615b8662573377757
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9ffdb98052c9..d538525e8c0d 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/aegisub-3.2.2_p20160518-r101 b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
index ec563de2a46a..c2ff2f05db17 100644
--- a/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
+++ b/metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio puls
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Aegisub/Aegisub/archive/b118fe7e7a5c37540e2f0aa75af105e272bad234.tar.gz -> aegisub-3.2.2_p20160518.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90d63ac2ab38801c2d9a17542a26624a
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index 854bcfcf95b6..9d5232c2415a 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[lua52compat] ) x11-libs/wx
 REQUIRED_USE=^^ ( lua_single_target_luajit ) || ( alsa openal oss portaudio pulseaudio )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b657619c434c41884c2d7a3c1ec9e699
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.4 b/metadata/md5-cache/media-video/ffmpeg-4.4
index 5fee03d7ea97..8211b4e5734f 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 rav1e snappy theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.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(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.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(-)?] ) kvazaar? ( >=media-libs/kvazaar-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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fribidi? ( >=dev-libs/fribidi-0.19.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(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.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(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-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(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[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(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.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(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[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_rc1-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(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg: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(-)?] ) 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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[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=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db1980db2212f4f06fd25ab7f83dfda0
+_md5_=e424d31260d9039bea3efaa33e2c66b6
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.18-r1 b/metadata/md5-cache/media-video/kaffeine-2.0.18-r1
index c1666b793f28..8af9d5b6aa37 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.18-r1
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.18-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Media player with digital TV support by KDE
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/Kaffeine
 IUSE=dvb debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kdbusaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kwindowsystem-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 >=kde-frameworks/solid-5.82.0:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l[dvb] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.18.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ecm	8eb670c6f910afdaaa41ec056d9198a7	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	kde.org	6e4d9db9698dba71a2c9085b861e29b5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=892bacbee71a881ec9988449f2ce9eea
+_md5_=b088fba936b287ba2cfa32ad9d47f684
diff --git a/metadata/md5-cache/media-video/mpv-0.33.1-r1 b/metadata/md5-cache/media-video/mpv-0.33.1-r1
index 9474ea08356a..3f9bae169556 100644
--- a/metadata/md5-cache/media-video/mpv-0.33.1-r1
+++ b/metadata/md5-cache/media-video/mpv-0.33.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.33.1.tar.gz -> mpv-0.33.1.tar.gz https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a4f52bac9f2d68133dc26659b0b0aa1
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index d55453854d85..494161047bfa 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://waf.io/waf-2.0.9
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	pax-utils	d3fc79d3d50544347e324864f95206e2	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	waf-utils	941688efbf28e7ea7a106e516fc9bc91	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59a31cbf9f3aa2114cb8b676bbb6a630
diff --git a/metadata/md5-cache/media-video/obs-studio-26.1.2-r1 b/metadata/md5-cache/media-video/obs-studio-26.1.2-r1
index 8f79e06b5fd7..a0cab7139bde 100644
--- a/metadata/md5-cache/media-video/obs-studio-26.1.2-r1
+++ b/metadata/md5-cache/media-video/obs-studio-26.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtg
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/26.1.2.tar.gz -> obs-studio-26.1.2.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71b673411cb88440c71cbc3fde93c2c2
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index 49c6f0f0170f..8912108275b4 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus sys-libs/zlib virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb alsa? ( media-libs/alsa-lib ) fdk? ( media-libs/fdk-aac:= ) imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) 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] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36709f19dd383453f0c79a7cc135e14d
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.29 b/metadata/md5-cache/media-video/pipewire-0.3.29
new file mode 100644
index 000000000000..deccc62bece1
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.29
@@ -0,0 +1,16 @@
+BDEPEND=app-doc/xmltoman virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+DESCRIPTION=Multimedia processing graphs
+EAPI=7
+HOMEPAGE=https://pipewire.org/
+IUSE=aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses[unicode] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( aac? ( media-libs/fdk-aac ) aptx? ( media-libs/libopenaptx ) ldac? ( media-libs/libldac ) media-libs/sbc >=net-wireless/bluez-4.101:= ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( media-plugins/alsa-plugins[-pulseaudio] !media-plugins/alsa-plugins ) ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=aac? ( bluetooth ) aptx? ( bluetooth ) jack-sdk? ( !jack-client ) ldac? ( bluetooth )
+RESTRICT=!test? ( test )
+SLOT=0/0.3
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.29/pipewire-0.3.29.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=513d19815ddd7c71a1d0ab38bef245d3
diff --git a/metadata/md5-cache/media-video/vcsi-7-r1 b/metadata/md5-cache/media-video/vcsi-7-r1
index b40d7869f615..bd99e590384d 100644
--- a/metadata/md5-cache/media-video/vcsi-7-r1
+++ b/metadata/md5-cache/media-video/vcsi-7-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-video/ffmpeg >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-fonts/dejavu media-video/ffmpeg >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Create thumbnail sheets from video files
 EAPI=7
 HOMEPAGE=https://github.com/amietn/vcsi
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-fonts/dejavu media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] media-fonts/dejavu media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=cefd3a8b28b33cd5d7f0fc008beea48f
+_md5_=5104081ca8fda56e36d5273a4fab5c88
diff --git a/metadata/md5-cache/media-video/vlc-3.0.12.1-r100 b/metadata/md5-cache/media-video/vlc-3.0.12.1-r100
index 57919dcfbe1a..2163797ca386 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.12.1-r100
+++ b/metadata/md5-cache/media-video/vlc-3.0.12.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.12.1/vlc-3.0-3.0.12.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0aff264f462a13709b415432d78bb69
diff --git a/metadata/md5-cache/media-video/vlc-3.0.13 b/metadata/md5-cache/media-video/vlc-3.0.13
index d2b2bae82dbc..cdb413cdd26f 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.13
+++ b/metadata/md5-cache/media-video/vlc-3.0.13
@@ -12,5 +12,5 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.13/vlc-3.0-3.0.13.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8bbd2bb8739368233b74728aaf6aeca
diff --git a/metadata/md5-cache/media-video/vlc-3.0.14 b/metadata/md5-cache/media-video/vlc-3.0.14
index 54af9a3f3621..c4bc406826e8 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.14
+++ b/metadata/md5-cache/media-video/vlc-3.0.14
@@ -12,5 +12,5 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://code.videolan.org/videolan/vlc-3.0/-/archive/3.0.14/vlc-3.0-3.0.14.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfdab603212a985f48fa5e0a3350f22f
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 00bc7436e275..f9ec9c8c90d3 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/lib
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4257b3acd641d02ed5cc1778289943cb
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 9091150c73cb..1c6da8567960 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/lib
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe7f7af41b36ae49d9d361638e8ad22d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 67e827fe95fc..2bff4c6ae987 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/graphite-web-1.1.7 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
index 70c012b33f23..9855efe41b10 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.7
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=Enterprise scalable realtime graphing
 EAPI=7
 HOMEPAGE=https://graphiteapp.org/
-IUSE=+carbon ldap mysql memcached postgres +sqlite python_targets_python3_8
+IUSE=+carbon ldap mysql memcached postgres +sqlite python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) memcached? ( dev-python/python-memcached[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) >=dev-python/django-1.11.19[sqlite?,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/django-tagging-0.4.6[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/cairocffi[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] media-libs/fontconfig python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ldap? ( dev-python/python-ldap[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) memcached? ( dev-python/python-memcached[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/django-1.11.19[sqlite?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/django-tagging-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/fontconfig python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.7.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0e41a06093fac0542eeab53f547708f9
+_md5_=2f5fb45b8b949fb832b2fbf82b2f5112
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.59 b/metadata/md5-cache/net-analyzer/munin-2.0.59
deleted file mode 100644
index ed54532b6b20..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.59
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=7
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.59.tar.gz -> munin-2.0.59.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.59-gentoo-1.tar.xz
-_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=abfb5c102c1f10c0bddcab1b4a6f579f
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67 b/metadata/md5-cache/net-analyzer/munin-2.0.67
deleted file mode 100644
index 6247f4bc7a69..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.67
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
-DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=7
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
-_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f4cbc9a31613b71c5fb3847a63292bcd
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.67-r1
index 3bf8daae5803..22bfd30bc475 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.67-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.67-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Munin Server Monitoring Tool
 EAPI=7
 HOMEPAGE=http://munin-monitoring.org/
 IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=eabca52bb5675497c445024463cdb8bf
+_md5_=6bbe07d9c50fa6290f9748030eb040a9
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.31.0 b/metadata/md5-cache/net-analyzer/netdata-1.31.0
index b7e26c1ce616..8289d3f6ae3a 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.31.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.31.0
@@ -5,11 +5,11 @@ DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=7
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
 IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3+ MIT BSD
 RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) 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_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -> netdata-1.31.0.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	fcaps	da689a8e04bbbb3518888ff668fee45b	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6f0ae0e2046465ca3dfa8f9c97f8b546
+_md5_=10c8eef013dcb23754236f19cd2ac545
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 7ce720b51c05..9de634811470 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 |
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) tor? ( python )
 SLOT=0
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6f0ae0e2046465ca3dfa8f9c97f8b546
+_md5_=10c8eef013dcb23754236f19cd2ac545
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.80-r2 b/metadata/md5-cache/net-analyzer/nmap-7.80-r2
index 999d9c43ed07..93108511470c 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.80-r2
+++ b/metadata/md5-cache/net-analyzer/nmap-7.80-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.80.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=84e9353cee4146a85c663d28fd7093c9
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.91-r2 b/metadata/md5-cache/net-analyzer/nmap-7.91-r2
index 8410f9521254..6397ed1a8241 100644
--- a/metadata/md5-cache/net-analyzer/nmap-7.91-r2
+++ b/metadata/md5-cache/net-analyzer/nmap-7.91-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-li
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://nmap.org/dist/nmap-7.91.tar.bz2 verify-sig? ( https://nmap.org/dist/sigs/nmap-7.91.tar.bz2.asc )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
 _md5_=733a1c5294511f8dc74cd2b5ab54b47e
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index 00c6cf58fbfb..5b8503520d6c 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
 REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b39d441ff0f407af499b068d49ed743e
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
index ee2eea438c40..9ad6c3c66b1e 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2bca8fa56622c31a667f8d715ff2fc4a
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100 b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
index fffcaf44c749..e132a424c27a 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target_luajit ) )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f0b3ac7a50a82df2e25ec66808982301
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.17 b/metadata/md5-cache/net-analyzer/snort-2.9.17
index 8325112184a7..a96e4548accc 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.17
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.17
@@ -11,5 +11,5 @@ RDEPEND=acct-user/snort acct-group/snort dev-libs/libdnet >=dev-libs/libpcre-8.3
 REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target_luajit ) )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.17.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d910ef62929857a1af94a26121034254
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.6 b/metadata/md5-cache/net-analyzer/suricata-5.0.6
index 1ba31b0e3003..4aef4bb94dce 100644
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.6
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.6.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=108d36787d08ed8a19b1d2cb6364acb7
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.2 b/metadata/md5-cache/net-analyzer/suricata-6.0.2
index 9cab49953dca..7314b4aae709 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.2
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6b8504e2eabfe8da7148aa01bf8afc8c
diff --git a/metadata/md5-cache/net-analyzer/testssl-3.0.5 b/metadata/md5-cache/net-analyzer/testssl-3.0.5
new file mode 100644
index 000000000000..4b16189c14e6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/testssl-3.0.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Tool to check TLS/SSL cipher support
+EAPI=7
+HOMEPAGE=https://testssl.sh/
+IUSE=bundled-openssl kerberos
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 bundled-openssl? ( openssl )
+RDEPEND=app-shells/bash[net] net-dns/bind-tools sys-apps/util-linux sys-libs/ncurses:0 sys-process/procps bundled-openssl? ( kerberos? ( sys-libs/zlib virtual/krb5 ) ) !bundled-openssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=https://github.com/drwetter/testssl.sh/archive/3.0.5.tar.gz -> testssl-3.0.5.tar.gz
+_md5_=940de7ecea451c9dd25b746ac6232357
diff --git a/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100 b/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
index bcf491e5ccc2..95e2bdb23337 100644
--- a/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
+++ b/metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tracebox/tracebox/archive/v0.4.4.tar.gz -> tracebox-0.4.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=88e6f088ea3c393da9e17e1fd8c808a0
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.5 b/metadata/md5-cache/net-analyzer/wireshark-3.4.5
index 91f2493d7712..56a97b2f1a64 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.5
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) p
 RESTRICT=test
 SLOT=0/3.4.5
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.5.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0aec676a35f37bfdc380aa76d50aa07
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.6 b/metadata/md5-cache/net-analyzer/wireshark-3.4.6
index b17ddec7447d..64e3f8e1c2ba 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.6
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) p
 RESTRICT=test
 SLOT=0/3.4.6
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.6.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4622edbe6d4a821ebb3df2df6102d562
diff --git a/metadata/md5-cache/net-analyzer/wireshark-9999 b/metadata/md5-cache/net-analyzer/wireshark-9999
index 566d7e4da13a..c94d3e8bcf81 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-9999
+++ b/metadata/md5-cache/net-analyzer/wireshark-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) plugin-ifdemo? ( plugins )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4622edbe6d4a821ebb3df2df6102d562
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 3a6c7194f446..b48270335c7e 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/accel-ppp-1.12.0_p20210430 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
index 8f4ea7c9012e..209f71ba67f6 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
@@ -12,5 +12,5 @@ RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcryp
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.12.0_p20210430.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aef4e5fb05bdef9f66608ed0ee59ecc5
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index ddf803834a7f..98cd63994a5d 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=!libtomcrypt? ( dev-libs/openssl:0= ) libtomcrypt? ( dev-libs/libtomcrypt:0= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3dbd579a08de4016eec7369a579625e1
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index a26e2bee8667..6671c9e1f742 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/dnsdist-1.5.1-r100 b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
index 1c51735cda8a..8462acd93658 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
+++ b/metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.5.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ec34a9e2636e03bb125f9f37c64a7f17
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.6.0 b/metadata/md5-cache/net-dns/dnsdist-1.6.0
index 8224d78bf572..3f8781c1fde9 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.6.0
+++ b/metadata/md5-cache/net-dns/dnsdist-1.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.6.0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1855f56668430061187c5f1472e4086f
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.85 b/metadata/md5-cache/net-dns/dnsmasq-2.85
index 841ac3fa4ea0..7695b81ca9b6 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.85
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.85
@@ -11,5 +11,5 @@ RDEPEND=acct-group/dnsmasq acct-user/dnsmasq dbus? ( sys-apps/dbus:= ) idn? ( !l
 REQUIRED_USE=dhcp-tools? ( dhcp ) dnssec? ( !nettlehash ) lua? ( script ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.85.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e86863c9c2176956c36ca4755fdb1810
diff --git a/metadata/md5-cache/net-dns/maradns-3.5.0020 b/metadata/md5-cache/net-dns/maradns-3.5.0020
new file mode 100644
index 000000000000..17ac83e9c29e
--- /dev/null
+++ b/metadata/md5-cache/net-dns/maradns-3.5.0020
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/maradns acct-user/duende acct-user/maradns
+DESCRIPTION=A security-aware DNS server
+EAPI=7
+HOMEPAGE=https://maradns.samiam.org
+IUSE=examples ipv6
+KEYWORDS=~amd64 ~mips ~ppc ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=acct-group/maradns acct-user/duende acct-user/maradns
+SLOT=0
+SRC_URI=https://maradns.samiam.org/download/3.5/3.5.0020/maradns-3.5.0020.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=38ac22b3ad38f89af13904bb2f11198b
diff --git a/metadata/md5-cache/net-dns/pdns-4.4.0-r100 b/metadata/md5-cache/net-dns/pdns-4.4.0-r100
deleted file mode 100644
index e5da5f924c66..000000000000
--- a/metadata/md5-cache/net-dns/pdns-4.4.0-r100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-DESCRIPTION=The PowerDNS Daemon
-EAPI=7
-HOMEPAGE=https://www.powerdns.com/
-IUSE=debug doc geoip ldap lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf ) acct-user/pdns acct-group/pdns
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) mydns? ( mysql )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-4.4.0.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a478079a67636ce2d0b9c3cde1bf6aa
diff --git a/metadata/md5-cache/net-dns/pdns-4.4.1 b/metadata/md5-cache/net-dns/pdns-4.4.1
index a3e817227880..18cb3fd6b73c 100644
--- a/metadata/md5-cache/net-dns/pdns-4.4.1
+++ b/metadata/md5-cache/net-dns/pdns-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.4.1.tar.bz2
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a478079a67636ce2d0b9c3cde1bf6aa
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d37017b6df667895d2a0cde465d00ebd
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100 b/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
deleted file mode 100644
index 22fa2254e968..000000000000
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:=
-DESCRIPTION=The PowerDNS Recursor
-EAPI=7
-HOMEPAGE=https://www.powerdns.com/
-IUSE=debug dnstap protobuf snmp sodium systemd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) dnstap? ( dev-libs/fstrm ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) dev-libs/openssl:= >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnstap? ( protobuf )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.4.2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be0afeae48df3cba77c939dd8bcf2f0d
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.4.3 b/metadata/md5-cache/net-dns/pdns-recursor-4.4.3
index 2b6668190668..4bc695cd7623 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.4.3
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.4.3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=99aeba585d12cfe5266ba9b2f180c006
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.5.1 b/metadata/md5-cache/net-dns/pdns-recursor-4.5.1
index 90122dc24176..d7b723701f06 100644
--- a/metadata/md5-cache/net-dns/pdns-recursor-4.5.1
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.5.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=371598e65fb1990b77c24c363274ec86
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0a574776e2a2..ad67664ed3c7 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/nfacct-1.0.2 b/metadata/md5-cache/net-firewall/nfacct-1.0.2
index 57ce8c182609..d18559f407cc 100644
--- a/metadata/md5-cache/net-firewall/nfacct-1.0.2
+++ b/metadata/md5-cache/net-firewall/nfacct-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Command line tool to create/retrieve/delete accounting objects in Ne
 EAPI=6
 HOMEPAGE=https://www.netfilter.org/projects/nfacct/
 IUSE=kernel_linux
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libmnl >=net-libs/libnetfilter_acct-1.0.3
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/nfacct/files/nfacct-1.0.2.tar.bz2
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=45ea01f851d08de1603835ce38060b85
+_md5_=7d803902867a872e9568c5c8a4003eb8
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index d865d1baabdf..21df080a1044 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/pidgin-2.14.1 b/metadata/md5-cache/net-im/pidgin-2.14.5
similarity index 83%
rename from metadata/md5-cache/net-im/pidgin-2.14.1
rename to metadata/md5-cache/net-im/pidgin-2.14.5
index 3c146f3cd0e2..e9051eaaa072 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.1
+++ b/metadata/md5-cache/net-im/pidgin-2.14.5
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 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=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1 gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK Instant Messenger client
 EAPI=7
 HOMEPAGE=https://pidgin.im/
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( 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? ( 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] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= )
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0/2
-SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
+SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.5.tar.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=896361fb4600984777ed1de5a0a9e0ba
+_md5_=33771134b8ddf80eea9b5e4d4d2b184d
diff --git a/metadata/md5-cache/net-im/prosody-0.11.9 b/metadata/md5-cache/net-im/prosody-0.11.9
index 60e82bc84783..17287ab5e421 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.9
+++ b/metadata/md5-cache/net-im/prosody-0.11.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_luajit lua_single_target_lua5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/downloads/source/prosody-0.11.9.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f48a823ccd5bf83ee6d659234ea6bdfb
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r102 b/metadata/md5-cache/net-im/swift-4.0.2-r102
index 67b6e1800a12..81e53e9b8e71 100644
--- a/metadata/md5-cache/net-im/swift-4.0.2-r102
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( icu idn ) lua? ( ^^ ( lua_single_target_luajit lua_single_targ
 RESTRICT=test
 SLOT=4/0
 SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	scons-utils	fc8e53815030125602cc608cd1bff857	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c202ff32ea0e57807cf1c7e2f1b5ef2a
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.7.4 b/metadata/md5-cache/net-im/telegram-desktop-2.7.4
deleted file mode 100644
index 0c3525437de0..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= media-libs/opus:= ~media-libs/libtgvoip-2.4.4_p20210302 media-libs/openal ~media-libs/tg_owt-0_pre20210422 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3* dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-IUSE=+dbus enchant +gtk +hunspell +spell wayland webkit +X
-KEYWORDS=~amd64 ~ppc64
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/glibmm:2 dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?] dev-qt/qtimageformats:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png,X(-)?] media-fonts/open-sans media-libs/fontconfig:= media-libs/opus:= ~media-libs/libtgvoip-2.4.4_p20210302 media-libs/openal ~media-libs/tg_owt-0_pre20210422 media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) gtk? ( x11-libs/gtk+:3[X?] ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) webkit? ( net-libs/webkit-gtk:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.7.4/tdesktop-2.7.4-full.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=456a9c5a32592c8e4cd2cf18e6ff397c
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
index f5d1c222bf87..038f8f468a2c 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.7.4/tdesktop-2.7.4-full.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff509db9558cbd8e05dccaca065c678b
+_md5_=6cd78c3b6a3d642ce8fa874b87b46c68
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index e94f8a7016a9..a4bf266d641e 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/epic5-2.0.1 b/metadata/md5-cache/net-irc/epic5-2.0.1
index ed8f6a1a8dd5..a4be17ee7d68 100644
--- a/metadata/md5-cache/net-irc/epic5-2.0.1
+++ b/metadata/md5-cache/net-irc/epic5-2.0.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0= >=sys-libs/ncurses-5.6-r2:0= virtual/lib
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-2.0.1.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-single	dd06178c43afcd54225a7d0fca6342a8	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1f0dba7e83db694a7d724877b9298b0e
+_md5_=f4845b5b4c55caa5bb2ef59f70eb324e
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.3-r100 b/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
index 6baaf7744601..ae4810d87015 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.3-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	5ec14fdbc5446b8767e87e186e3b1a52	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	meson	5ec14fdbc5446b8767e87e186e3b1a52	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=862c7c8d20a755f8920bf37407f8f496
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 7d5cc372dcb6..323c6f0a6654 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) 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] ) ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	meson	5ec14fdbc5446b8767e87e186e3b1a52	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	meson	5ec14fdbc5446b8767e87e186e3b1a52	mono-env	1e55da0e4d9f76af84ddc66821ab501e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42ced4b940b12042803505b1c92304d6
diff --git a/metadata/md5-cache/net-irc/weechat-3.1 b/metadata/md5-cache/net-irc/weechat-3.1
index 796aca30669b..e697761d1d89 100644
--- a/metadata/md5-cache/net-irc/weechat-3.1
+++ b/metadata/md5-cache/net-irc/weechat-3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0/3.1
 SRC_URI=https://weechat.org/files/src/weechat-3.1.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55ccafbe6526146749e9d974a13963ba
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 14dada8536ce..c6169e0c3315 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zli
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c07497f4d9249bb1aafb9ecb29439e34
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 82e76bc85bbd..eb533a23ddcc 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/axtls-2.1.5-r100 b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
index 54da41aacc30..c8827e45c11a 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5-r100
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=28b2063d729fbcdcf37df6393da70f0b
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.1-r2 b/metadata/md5-cache/net-libs/ldns-1.7.1-r2
index da86021158a2..ddfc5cfa9779 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.1-r2
+++ b/metadata/md5-cache/net-libs/ldns-1.7.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax 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
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 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] ) ) ecdsa? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ed25519? ( >=dev-libs/openssl-1.1.0:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ed448? ( >=dev-libs/openssl-1.1.1:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/openssl-1.0.1e: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(-)?]
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/3
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
 _eclasses_=epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6501bd98106274f648fb086779e8d4ca
+_md5_=63f7e23b3b93750109bbe99a16c21d89
diff --git a/metadata/md5-cache/net-libs/libgfbgraph-0.2.4 b/metadata/md5-cache/net-libs/libgfbgraph-0.2.4
index c7ff0859d340..b30927bd9b42 100644
--- a/metadata/md5-cache/net-libs/libgfbgraph-0.2.4
+++ b/metadata/md5-cache/net-libs/libgfbgraph-0.2.4
@@ -5,10 +5,10 @@ DESCRIPTION=A GObject library for Facebook Graph API
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgfbgraph/
 IUSE=+introspection
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] net-libs/libsoup:2.4[introspection?] net-libs/gnome-online-accounts net-libs/rest:0.7[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0.2
 SRC_URI=mirror://gnome/sources/gfbgraph/0.2/gfbgraph-0.2.4.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a9b404668d6ee1372bcfe98440a9c76
+_md5_=80084ac2578762aac5600836373d49d3
diff --git a/metadata/md5-cache/net-libs/libmbim-1.24.8 b/metadata/md5-cache/net-libs/libmbim-1.24.8
new file mode 100644
index 000000000000..1a7938534b6e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmbim-1.24.8
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
+DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper library
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
+IUSE=udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.48:2 udev? ( dev-libs/libgudev:= )
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.24.8.tar.xz
+_md5_=4068871f65ff08e3ffb2ee1958ba38a2
diff --git a/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1 b/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1
index ea9c73f4dcde..bfd422b8c116 100644
--- a/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1
+++ b/metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1
@@ -5,11 +5,11 @@ DESCRIPTION=C library for building NETCONF servers and clients
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/libnetconf2
 IUSE=doc test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libnetconf2/archive/v1.1.43.tar.gz -> libnetconf2-1.1.43.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2177502318cff98f7a98ec4203345b5
+_md5_=3df9729cc93a08aee74dfddba603c6dc
diff --git a/metadata/md5-cache/net-libs/libnetconf2-1.1.46 b/metadata/md5-cache/net-libs/libnetconf2-1.1.46
new file mode 100644
index 000000000000..04d8be6f5e60
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnetconf2-1.1.46
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server] test? ( dev-util/cmocka )
+DESCRIPTION=C library for building NETCONF servers and clients
+EAPI=7
+HOMEPAGE=https://github.com/CESNET/libnetconf2
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:= net-libs/libssh:0=[server]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CESNET/libnetconf2/archive/v1.1.46.tar.gz -> libnetconf2-1.1.46.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe8da58e775311041e0b0623e56f05c6
diff --git a/metadata/md5-cache/net-libs/libqmi-1.28.6 b/metadata/md5-cache/net-libs/libqmi-1.28.6
new file mode 100644
index 000000000000..8d8f6ce3c65c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libqmi-1.28.6
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc )
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
+DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
+IUSE=gtk-doc +mbim
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.48 dev-libs/libgudev mbim? ( >=net-libs/libmbim-1.18.0 )
+SLOT=0/5.7
+SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.28.6.tar.xz
+_md5_=b0589a39ba1dd543b3c94e0115a0fed4
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.2.0 b/metadata/md5-cache/net-libs/libwebsockets-4.2.0
index 8493490da0ad..e7986a112420 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.2.0
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=A flexible pure-C library for implementing network protocols
 EAPI=7
 HOMEPAGE=https://libwebsockets.org/
 IUSE=access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 +lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl threads zip
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:= ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) mbedtls? ( ssl ) smtp? ( libuv ) socks5? ( client http-proxy ) ?? ( libev libevent )
 SLOT=0/18
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.2.0.tar.gz -> libwebsockets-4.2.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91ad4bb5f9d5bdb48841b93a6a72ebd4
+_md5_=c8946c46a560ec914a89cd126bc69ac9
diff --git a/metadata/md5-cache/net-libs/libyang-1.0.240 b/metadata/md5-cache/net-libs/libyang-1.0.240
new file mode 100644
index 000000000000..1a31615a3f9f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libyang-1.0.240
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libpcre[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=YANG data modeling language library
+EAPI=7
+HOMEPAGE=https://github.com/CESNET/libyang
+IUSE=doc 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 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libpcre[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CESNET/libyang/archive/v1.0.240.tar.gz -> libyang-1.0.240.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61f6b2d45c3a55ba3c54b3effcddfb9c
diff --git a/metadata/md5-cache/net-libs/nodejs-16.1.0 b/metadata/md5-cache/net-libs/nodejs-16.1.0
deleted file mode 100644
index 7720288ac9c7..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-16.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10[threads(+)] dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] ) sys-apps/coreutils virtual/pkgconfig systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.1.0/node-v16.1.0.tar.xz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67c4fc06d98152f32c9b0b44719e6b17
diff --git a/metadata/md5-cache/net-libs/nodejs-16.2.0 b/metadata/md5-cache/net-libs/nodejs-16.3.0
similarity index 94%
rename from metadata/md5-cache/net-libs/nodejs-16.2.0
rename to metadata/md5-cache/net-libs/nodejs-16.3.0
index 35e7a1eef6a5..91bd561a783a 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.2.0
+++ b/metadata/md5-cache/net-libs/nodejs-16.3.0
@@ -11,6 +11,6 @@ RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.17.
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0/16
-SRC_URI=https://nodejs.org/dist/v16.2.0/node-v16.2.0.tar.xz
+SRC_URI=https://nodejs.org/dist/v16.3.0/node-v16.3.0.tar.xz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=646cef1dfd759c523a7cafacc3a54ed8
+_md5_=8505b3aa8d61c2099b82117ec7c365f0
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index d398237298f4..7c780ed10ff6 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -12,4 +12,4 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl?
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fac7d995d22ac9b31021a3628eace22
+_md5_=e32bdbe0f5b07c5c42041ccb90708e68
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 554b213dd978..017e3039af52 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.4 b/metadata/md5-cache/net-mail/automx2-2021.4
new file mode 100644
index 000000000000..87833da3d51f
--- /dev/null
+++ b/metadata/md5-cache/net-mail/automx2-2021.4
@@ -0,0 +1,15 @@
+BDEPEND=acct-user/automx2 test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-migrate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Email client autoconfiguration service
+EAPI=7
+HOMEPAGE=https://automx.org/
+IUSE=doc test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-migrate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rseichter/automx2/archive/2021.4.tar.gz -> automx2-2021.4.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2743bceae6e0e7dfb8cef4718ac60c3f
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.13-r100 b/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
index 030d0ee10e1f..282871342e94 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.13-r100
@@ -11,5 +11,5 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.13.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.13.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=97ffef4e9fe051f2be6c25c3eb69f566
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.14 b/metadata/md5-cache/net-mail/dovecot-2.3.14
index 21c27e609fcc..a612f4f3ffc3 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.14
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.14
@@ -11,5 +11,5 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.14.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.14.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=fdcb8e9b02330f447eefc35b38a2b12d
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.19 b/metadata/md5-cache/net-mail/fetchmail-6.4.19
index fc3644427743..235af869e82d 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.19
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.19
@@ -5,11 +5,11 @@ DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=https://www.fetchmail.info/
 IUSE=ssl nls kerberos tk socks python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
 RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
 REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.19.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=bad62d727d0aae9619ebb995438fb8dd
+_md5_=4e812c97efc0391b0c99a589d0b2492f
diff --git a/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8 b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
new file mode 100644
index 000000000000..b2d80b8c681b
--- /dev/null
+++ b/metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
+DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
+EAPI=7
+HOMEPAGE=https://www.fetchmail.info/
+IUSE=kerberos nls +python socks +ssl tk python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 public-domain
+RDEPEND=acct-user/fetchmail ssl? ( >=dev-libs/openssl-1.1.1:= ) kerberos? ( virtual/krb5 >=dev-libs/openssl-1.0.2:= ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
+REQUIRED_USE=tk? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-7.0.0-alpha8.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c06f6e1b55c60458fb8b2fd67cab681c
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index bdf1229a539a..040c583ec7bf 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/asterisk-13.38.2 b/metadata/md5-cache/net-misc/asterisk-13.38.2
index 6e4fa11e76a9..53a788cefa48 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a6f39033984f6331139102f869ecfef1
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2-r2 b/metadata/md5-cache/net-misc/asterisk-13.38.2-r2
index 212af9febae2..22c787f7458b 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2-r2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2-r2
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2ccb42d4392416477ea62844d56bb348
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2-r3 b/metadata/md5-cache/net-misc/asterisk-13.38.2-r3
index 6ed46f470f45..8485e3f6f938 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2-r3
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2-r3
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=10e7d8587f333bac6eaf728cc3b07a4b
diff --git a/metadata/md5-cache/net-misc/asterisk-16.18.0-r1 b/metadata/md5-cache/net-misc/asterisk-16.18.0-r1
index d496b5bf49c5..86fd35a57e1a 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.18.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-16.18.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.18.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=59bace5bfbabc8a2b2d578c7a55f0ae4
diff --git a/metadata/md5-cache/net-misc/asterisk-18.4.0-r1 b/metadata/md5-cache/net-misc/asterisk-18.4.0-r1
index 573ba50df24d..9144d4025ea9 100644
--- a/metadata/md5-cache/net-misc/asterisk-18.4.0-r1
+++ b/metadata/md5-cache/net-misc/asterisk-18.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=d
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
 SLOT=0/18
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.4.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4beba488cee46adec04241188f919284
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1 b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1
index 00540b727f56..0d05719df86e 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.2_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.2_p1
@@ -5,10 +5,10 @@ DESCRIPTION=ISC Dynamic Host Configuration Protocol (DHCP) client/server
 EAPI=7
 HOMEPAGE=https://www.isc.org/dhcp
 IUSE=+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl:0= ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax ) virtual/tmpfiles
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.2-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=96e3ce86c4d20b086733d066b2e9081f
+_md5_=b318cbdbe35dd717db414b5dacd9a194
diff --git a/metadata/md5-cache/net-misc/econnman-1.1-r2 b/metadata/md5-cache/net-misc/econnman-1.1-r2
index d2149d197ea8..1a0036120676 100644
--- a/metadata/md5-cache/net-misc/econnman-1.1-r2
+++ b/metadata/md5-cache/net-misc/econnman-1.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+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] )
 DESCRIPTION=ConnMan User Interface written with EFL & python
 EAPI=7
 HOMEPAGE=https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/efl[X,connman] python_single_target_python3_8? ( dev-python/python-efl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-efl[python_targets_python3_9(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-libs/efl[X,connman] python_single_target_python3_8? ( dev-python/python-efl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-efl[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-efl[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://download.enlightenment.org/rel/apps/econnman/econnman-1.1.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=aff949b1d723045422559eda8cb135ef
+_md5_=477b396a9a3b87a3d42630ffb7743e89
diff --git a/metadata/md5-cache/net-misc/gerbera-1.8.0 b/metadata/md5-cache/net-misc/gerbera-1.8.2
similarity index 95%
rename from metadata/md5-cache/net-misc/gerbera-1.8.0
rename to metadata/md5-cache/net-misc/gerbera-1.8.2
index f9bedfa7e511..dede8bf3dc3f 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.8.0
+++ b/metadata/md5-cache/net-misc/gerbera-1.8.2
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape:= ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv
 SLOT=0
-SRC_URI=https://github.com/gerbera/gerbera/archive/v1.8.0.tar.gz -> gerbera-1.8.0.tar.gz
+SRC_URI=https://github.com/gerbera/gerbera/archive/v1.8.2.tar.gz -> gerbera-1.8.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=082ea0065a6b5831c357404ce6bb7f0b
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r1 b/metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r1
index 650e3de099d7..575780bc40bb 100644
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r1
+++ b/metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Crawls through your online content
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
 IUSE=flickr
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-2:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] media-libs/grilo:0.3 >=net-libs/gnome-online-accounts-3.13.3:= >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-online-miners/3.34/gnome-online-miners-3.34.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3937dfff0c604cbde4c0641802aa6a4c
+_md5_=3e2bacf5504d03f343c8c55318fda6e0
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.16.6 b/metadata/md5-cache/net-misc/modemmanager-1.16.6
new file mode 100644
index 000000000000..60bdef5f9be9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/modemmanager-1.16.6
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) qmi? ( >=net-libs/libqmi-1.28.6:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modem and mobile broadband management libraries
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
+IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) qmi? ( >=net-libs/libqmi-1.28.6:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
+REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
+SLOT=0/1
+SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.16.6.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f23aca9d1325108b160d2d3bda1c269
diff --git a/metadata/md5-cache/net-misc/netopeer2-1.1.70-r1 b/metadata/md5-cache/net-misc/netopeer2-1.1.70-r1
index 5dc9ea29cb52..eea2a0008dee 100644
--- a/metadata/md5-cache/net-misc/netopeer2-1.1.70-r1
+++ b/metadata/md5-cache/net-misc/netopeer2-1.1.70-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-1.4.122:= <net-misc
 DESCRIPTION=Server for implementing NETCONF configuration management
 EAPI=7
 HOMEPAGE=https://github.com/CESNET/netopeer2
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-1.4.122:= <net-misc/sysrepo-2.0.0:= >=net-libs/libnetconf2-1.1.43:= <net-libs/libnetconf2-2.0.0:= net-libs/libssh:= >=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:=
 SLOT=0
 SRC_URI=https://github.com/CESNET/netopeer2/archive/v1.1.70.tar.gz -> netopeer2-1.1.70.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=003095dbf8edf542ef25c43a46caaf1e
+_md5_=ceca23fc3c9a368c936816803a3fe35a
diff --git a/metadata/md5-cache/net-misc/netopeer2-1.1.76 b/metadata/md5-cache/net-misc/netopeer2-1.1.76
new file mode 100644
index 000000000000..7f63a64f53c3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/netopeer2-1.1.76
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-1.4.140:= <net-misc/sysrepo-2.0.0:= >=net-libs/libnetconf2-1.1.46:= <net-libs/libnetconf2-2.0.0:= net-libs/libssh:= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:=
+DESCRIPTION=Server for implementing NETCONF configuration management
+EAPI=7
+HOMEPAGE=https://github.com/CESNET/netopeer2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-1.4.140:= <net-misc/sysrepo-2.0.0:= >=net-libs/libnetconf2-1.1.46:= <net-libs/libnetconf2-2.0.0:= net-libs/libssh:= >=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:=
+SLOT=0
+SRC_URI=https://github.com/CESNET/netopeer2/archive/v1.1.76.tar.gz -> netopeer2-1.1.76.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=59a0b365987fd7e4b5117e83c30a17d3
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.15.0 b/metadata/md5-cache/net-misc/openvswitch-2.15.0
new file mode 100644
index 000000000000..98bd63c2438b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.15.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/ovs-2.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/twisted[conch,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] debug? ( dev-lang/perl ) sys-apps/util-linux[caps] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=7
+HOMEPAGE=https://www.openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux kernel_linux kernel_linux dist-kernel python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/ovs-2.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/twisted[conch,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] debug? ( dev-lang/perl ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.15.0.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=cb04bd84c990d1377dff3139397d6cf3
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.7.5.3180 b/metadata/md5-cache/net-misc/owncloud-client-2.7.5.3180
deleted file mode 100644
index 7474ac0a0c1e..000000000000
--- a/metadata/md5-cache/net-misc/owncloud-client-2.7.5.3180
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Synchronize files from ownCloud Server with your computer
-EAPI=7
-HOMEPAGE=https://owncloud.org/
-IUSE=doc dolphin gnome-keyring nautilus test
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.7.5.3180/source/ownCloud-2.7.5.3180.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=414de50c0a0c68943730b794af10b011
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.7.4.2934 b/metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246
similarity index 97%
rename from metadata/md5-cache/net-misc/owncloud-client-2.7.4.2934
rename to metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246
index b756ea61f140..75fb63ca767d 100644
--- a/metadata/md5-cache/net-misc/owncloud-client-2.7.4.2934
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246
@@ -10,6 +10,6 @@ LICENSE=CC-BY-3.0 GPL-2
 RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[gnome-keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.7.4.2934/source/ownCloud-2.7.4.2934.tar.xz
+SRC_URI=https://download.owncloud.com/desktop/ownCloud/stable/2.8.2.4246/source/ownCloud-2.8.2.4246.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=414de50c0a0c68943730b794af10b011
diff --git a/metadata/md5-cache/net-misc/proxytunnel-1.10.20210604 b/metadata/md5-cache/net-misc/proxytunnel-1.10.20210604
new file mode 100644
index 000000000000..fb4c50577aea
--- /dev/null
+++ b/metadata/md5-cache/net-misc/proxytunnel-1.10.20210604
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/openssl:= app-text/asciidoc app-text/xmlto
+DESCRIPTION=Connect stdin and stdout to a server via an HTTPS proxy
+EAPI=7
+HOMEPAGE=https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/
+IUSE=static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:=
+SLOT=0
+SRC_URI=https://github.com/proxytunnel/proxytunnel/archive/v1.10.20210604.tar.gz -> proxytunnel-1.10.20210604.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2693e0cf30f824ff63ce268d2008f454
diff --git a/metadata/md5-cache/net-misc/putty-0.75 b/metadata/md5-cache/net-misc/putty-0.75
index 706a0bf9ff7f..3b77b9d10c23 100644
--- a/metadata/md5-cache/net-misc/putty-0.75
+++ b/metadata/md5-cache/net-misc/putty-0.75
@@ -5,11 +5,11 @@ DESCRIPTION=A Free Telnet/SSH Client
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 IUSE=doc +gtk gtk2 ipv6 gssapi
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.75/putty-0.75.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b7bf62749e685f94dc92ecd80edb5e2
+_md5_=20c5e084e0afae555b608857737482c0
diff --git a/metadata/md5-cache/net-misc/sysrepo-1.4.122-r1 b/metadata/md5-cache/net-misc/sysrepo-1.4.122-r1
index fa55c6de6691..2bfc0c908d96 100644
--- a/metadata/md5-cache/net-misc/sysrepo-1.4.122-r1
+++ b/metadata/md5-cache/net-misc/sysrepo-1.4.122-r1
@@ -5,11 +5,11 @@ DESCRIPTION=YANG-based configuration and operational state data store
 EAPI=7
 HOMEPAGE=https://www.sysrepo.org
 IUSE=doc test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/libyang-1.0.225:= <net-libs/libyang-2.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sysrepo/sysrepo/archive/v1.4.122.tar.gz -> sysrepo-1.4.122.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c79631d552b8fc5aeae2137839268de
+_md5_=0d4ab64a11b6c525062dc532a0ee5775
diff --git a/metadata/md5-cache/net-misc/sysrepo-1.4.140 b/metadata/md5-cache/net-misc/sysrepo-1.4.140
new file mode 100644
index 000000000000..bc4d86002b55
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sysrepo-1.4.140
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:=
+DESCRIPTION=YANG-based configuration and operational state data store
+EAPI=7
+HOMEPAGE=https://www.sysrepo.org
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/libyang-1.0.240:= <net-libs/libyang-2.0.0:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sysrepo/sysrepo/archive/v1.4.140.tar.gz -> sysrepo-1.4.140.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9208182692232bb632126a1dfc01291
diff --git a/metadata/md5-cache/net-misc/usbip-4.13-r1 b/metadata/md5-cache/net-misc/usbip-4.13-r1
index b42c3e492e55..f6ee7e2c17ed 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13-r1
+++ b/metadata/md5-cache/net-misc/usbip-4.13-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtu
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	kernel-2	4f32d83b54879e33911296cb0d0d8567	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7d8cd139f4cd66e96ed87d0eb695bde3
diff --git a/metadata/md5-cache/net-misc/wget-1.21.1 b/metadata/md5-cache/net-misc/wget-1.21.1
index 22047bbb6908..d9430f61778c 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.1
+++ b/metadata/md5-cache/net-misc/wget-1.21.1
@@ -5,7 +5,7 @@ DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( cookie_check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d1be2d0d73268c2415325136d698fe66
+_md5_=4c0301025c5640b67e465cfdf5424f13
diff --git a/metadata/md5-cache/net-misc/whois-5.5.10 b/metadata/md5-cache/net-misc/whois-5.5.10
new file mode 100644
index 000000000000..dfc7b353b950
--- /dev/null
+++ b/metadata/md5-cache/net-misc/whois-5.5.10
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1 )
+DESCRIPTION=improved Whois Client
+EAPI=7
+HOMEPAGE=https://github.com/rfc1036/whois
+IUSE=iconv idn nls xcrypt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rfc1036/whois/archive/v5.5.10.tar.gz -> whois-5.5.10.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=67d95d289b6d717f82b99f289d7208a5
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1525 b/metadata/md5-cache/net-misc/you-get-0.4.1525
index 3b9862e51478..64056f54bd79 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1525
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1525
@@ -4,11 +4,11 @@ DESCRIPTION=Utility to download media contents from the web
 EAPI=7
 HOMEPAGE=https://you-get.org
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1525/you-get-0.4.1525.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b0351101424226711b8b897af1523046
+_md5_=254598baaef83620bac9fd12127849e5
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1520 b/metadata/md5-cache/net-misc/you-get-0.4.1527
similarity index 95%
rename from metadata/md5-cache/net-misc/you-get-0.4.1520
rename to metadata/md5-cache/net-misc/you-get-0.4.1527
index c930d2079e73..70f9cf50e026 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1520
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1527
@@ -4,11 +4,11 @@ DESCRIPTION=Utility to download media contents from the web
 EAPI=7
 HOMEPAGE=https://you-get.org
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-video/ffmpeg python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1520/you-get-0.4.1520.tar.gz
+SRC_URI=https://github.com/soimort/you-get/releases/download/v0.4.1527/you-get-0.4.1527.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=254598baaef83620bac9fd12127849e5
+_md5_=b0351101424226711b8b897af1523046
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.05.16 b/metadata/md5-cache/net-misc/youtube-dl-2021.05.16
index 941a4d1d04f6..1912036f60d4 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.05.16
+++ b/metadata/md5-cache/net-misc/youtube-dl-2021.05.16
@@ -4,7 +4,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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://youtube-dl.org/downloads/2021.05.16/youtube-dl-2021.05.16.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=0c30ec206e6d88a2fed36de205a4a9de
+_md5_=11ca9a645945f289c38d35ce2f6f5e60
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2021.04.26 b/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
similarity index 84%
rename from metadata/md5-cache/net-misc/youtube-dl-2021.04.26
rename to metadata/md5-cache/net-misc/youtube-dl-2021.06.06
index 407e62edeabe..09b018f99078 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2021.04.26
+++ b/metadata/md5-cache/net-misc/youtube-dl-2021.06.06
@@ -4,12 +4,12 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=public-domain
-RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2021.04.26/youtube-dl-2021.04.26.tar.gz
+SRC_URI=https://youtube-dl.org/downloads/2021.06.06/youtube-dl-2021.06.06.tar.gz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=11ca9a645945f289c38d35ce2f6f5e60
+_md5_=75a1eec6e2a2a59d2084ff75bc727cf3
diff --git a/metadata/md5-cache/net-misc/youtube-dl-9999 b/metadata/md5-cache/net-misc/youtube-dl-9999
index e2651c2c1831..59ca6bd25321 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-9999
+++ b/metadata/md5-cache/net-misc/youtube-dl-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=public-domain
 PROPERTIES=live
-RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=31002982accf16863c9143049617023a
+_md5_=c298b4a4d3aa70e4574675e9375a8dc8
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 4245a193541d..b724033a3237 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/bittornado-0.4.1_p20160925-r3 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
index 611db364cbe3..fd239d7a58f6 100644
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
+++ b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
@@ -5,7 +5,7 @@ DESCRIPTION=John Hoffman's fork of the original bittorrent
 EAPI=7
 HOMEPAGE=https://github.com/effigies/BitTornado
 IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT GPL-2
 RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 REQUIRED_USE=|| ( 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/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a3ea43e35a7c914c1ae04d29ec934ce2
+_md5_=1d83c7216d1d0fe28b86809947850afd
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
index f5fd33be532b..3cdd84255418 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-libs/openssl:0= sys-apps/attr sys-libs/zlib virtual/l
 REQUIRED_USE=dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/eiskaltdcpp/Sources/eiskaltdcpp-2.4.2.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=455cc9ba2e1016d4245bf943bb59ea4f
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index 31f42af2da42..bb99826b6fae 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2 dev-libs/openssl:0= sys-apps/attr sys-libs/zlib virtual/libiconv virtual/libintl cli? ( dev-lang/perl dev-perl/Data-Dump dev-perl/Term-ShellUI virtual/perl-Getopt-Long dev-perl/JSON-RPC ) daemon? ( dev-libs/jsoncpp:= ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango x11-themes/hicolor-icon-theme libcanberra? ( media-libs/libcanberra ) libnotify? ( x11-libs/libnotify ) ) idn? ( net-dns/libidn ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) javascript? ( dev-qt/qtdeclarative:5 dev-qt/qtscript:5 ) spell? ( app-text/aspell ) sqlite? ( dev-qt/qtsql:5[sqlite] ) ) upnp? ( net-libs/miniupnpc )
 REQUIRED_USE=dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3d586f3ec984d6a9d3d00af7955a52e
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488-r1
similarity index 63%
rename from metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
rename to metadata/md5-cache/net-p2p/freenet-0.7.5_p1488-r1
index 3448373dcb12..f863ad493200 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:1.54 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
 DESCRIPTION=An encrypted network without censorship
 EAPI=6
 HOMEPAGE=https://freenetproject.org/
@@ -7,9 +7,9 @@ IUSE=+nss test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
 PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01488.zip -> freenet-0.7.5_p1488.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aca7212e6f81bccbca36727da79b1ae3
+_md5_=29f756ebac17c2dfcb804b3dc1568b5c
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.6.0 b/metadata/md5-cache/net-p2p/vuze-5.7.6.0
deleted file mode 100644
index fe90a2cdc90d..000000000000
--- a/metadata/md5-cache/net-p2p/vuze-5.7.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-java/log4j:0 dev-java/swt:3.8[cairo] dev-java/commons-cli:1 dev-java/json-simple:0 dev-java/commons-lang:2.1 app-arch/unzip dev-util/desktop-file-utils >=virtual/jdk-1.8 >=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=BitTorrent client in Java, formerly called Azureus
-EAPI=7
-HOMEPAGE=http://www.vuze.com/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 BSD
-PDEPEND=~net-p2p/vuze-coreplugins-5.7.6.0
-RDEPEND=dev-java/log4j:0 dev-java/swt:3.8[cairo] dev-java/commons-cli:1 dev-java/json-simple:0 dev-java/commons-lang:2.1 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5760/Vuze_5760_source.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49ea9640fc89ebae1f13c5f086d1c5aa
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 3c3eac7a6aef..93ba3442d384 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/i2p-0.9.47 b/metadata/md5-cache/net-vpn/i2p-0.9.47
deleted file mode 100644
index 7762af21e27e..000000000000
--- a/metadata/md5-cache/net-vpn/i2p-0.9.47
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 dev-java/eclipse-ecj:* nls? ( >=sys-devel/gettext-0.19 ) virtual/jdk:1.8 test? ( dev-java/ant-junit4:0 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A privacy-centric, anonymous network
-EAPI=7
-HOMEPAGE=https://geti2p.net
-IUSE=nls test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/bcprov:1.50 dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/commons-logging:0 dev-java/slf4j-simple:0 java-virtuals/servlet-api:3.1 acct-user/i2p acct-group/i2p virtual/jre:1.8 net-libs/nativebiginteger:0 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.i2p2.de/releases/0.9.47/i2psource_0.9.47.tar.bz2
-_eclasses_=java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7c83de85fa7cb85aa58285a5af7ddf2d
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.2 b/metadata/md5-cache/net-vpn/strongswan-5.9.2
index ae1aa1ed8d4a..3403c2be4a87 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.2
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.2
@@ -5,10 +5,10 @@ DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
 EAPI=7
 HOMEPAGE=https://www.strongswan.org/
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.2.tar.bz2
 _eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=801e5cc38cd583dd2a2bd21b7d1eaa67
+_md5_=5d499797ebda5c4e20a11ef2633957db
diff --git a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210424 b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
similarity index 96%
rename from metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210424
rename to metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
index d58738fe362e..b25a561bf8cd 100644
--- a/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210424
+++ b/metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=module? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
-SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210424.tar.xz
+SRC_URI=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210606.tar.xz
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	linux-mod	2356a95549dd8cb503f063d05e88c0c8	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50125427e4d052d0666f6f50dc2c2d03
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 12ccfccf86a7..e9a5e3f47c48 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-5.58 b/metadata/md5-cache/net-wireless/bluez-5.58
index 917db22d6c45..0fa0626a90a0 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.58
+++ b/metadata/md5-cache/net-wireless/bluez-5.58
@@ -5,7 +5,7 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=7
 HOMEPAGE=http://www.bluez.org
 IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session kernel_linux python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm arm64 ~hppa ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.58.tar.xz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=4926343588b3bd1d0c60ba5597f2ed91
+_md5_=9c6ab563855ae98c4a4934b04ab286b6
diff --git a/metadata/md5-cache/net-wireless/bluez-5.58-r1 b/metadata/md5-cache/net-wireless/bluez-5.58-r1
new file mode 100644
index 000000000000..8e3a13db8038
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.58-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=7
+HOMEPAGE=http://www.bluez.org
+IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session kernel_linux python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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_8? ( >=dev-python/dbus-python-1[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test-programs? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.58.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=ae58e4a69c74e318bd3c138afc6519ed
diff --git a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0 b/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
deleted file mode 100644
index e8eb3f5d38c6..000000000000
--- a/metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl/Pollution/Portability
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Devel-PPPort
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/W/WO/WOLFSAGE/Devel-PPPort-3.31.tar.gz
-_eclasses_=alternatives	a580929f7549ac1059e6cc32551a942e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=161840910429112ddab666e3a9470647
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 9b39bb166133..a94315caf84e 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/Time-Local-1.230.0-r1 b/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
deleted file mode 100644
index e1250f384ca5..000000000000
--- a/metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Implements timelocal() and timegm()
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Time-Local
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.2300.tar.gz
-_eclasses_=alternatives	a580929f7549ac1059e6cc32551a942e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3a98021e861849d6b060a81471e9d57b
diff --git a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0 b/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
deleted file mode 100644
index 4d68659a0b93..000000000000
--- a/metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
-DESCRIPTION=Unicode Normalization Forms
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Unicode-Normalize
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/K/KH/KHW/Unicode-Normalize-1.25.tar.gz
-_eclasses_=alternatives	a580929f7549ac1059e6cc32551a942e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e47c61518b80af4a8f6ac8af82b86f4
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 3eff79856548..61772f03d84a 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100 b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
index 8c68977e68ca..4aae3add997e 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libfmt:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:
 REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=https://github.com/CelestiaProject/Celestia/archive/df508a0c597a3d96c1c039fa4a973e294021cfba.tar.gz -> celestia-1.7.0_pre20200316.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=665d97840627c5749ae5265abb0ce4c2
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index fb31a8dd0f63..a154fde83d4d 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libfmt:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
 REQUIRED_USE=|| ( glut qt5 ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fbf8c75800f345c70fcfa2af23a871e
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.20.4 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.4
index 48a418384221..f37264a5bf7c 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.20.4
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.20.4
@@ -5,11 +5,11 @@ DESCRIPTION=3D photo-realistic skies in real time
 EAPI=7
 HOMEPAGE=https://stellarium.org/
 IUSE=debug deep-sky doc gps media nls stars telescope test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2+ SGI-B-2.0
 RDEPEND=dev-libs/qtcompress:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) telescope? ( sci-libs/indilib:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.4/stellarium-0.20.4.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.12/catalog.dat -> stellarium-dso-catalog-3.12.dat ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v0.20.4/stellarium_user_guide-0.20.4-1.pdf ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d13d6957b0c8b915043e629bdc7ad24b
+_md5_=f42d82d7d176d65d75106416838915ea
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 30f6a18d7ca7..704373e3a532 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/amap-2.2-r3 b/metadata/md5-cache/sci-biology/amap-2.2-r4
similarity index 76%
rename from metadata/md5-cache/sci-biology/amap-2.2-r3
rename to metadata/md5-cache/sci-biology/amap-2.2-r4
index a067aa088e2a..3664b2dedeff 100644
--- a/metadata/md5-cache/sci-biology/amap-2.2-r3
+++ b/metadata/md5-cache/sci-biology/amap-2.2-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DEPEND=java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
 DESCRIPTION=Protein multiple-alignment-based sequence annealing
 EAPI=6
-HOMEPAGE=http://bio.math.berkeley.edu/amap/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=java elibc_FreeBSD java elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://baboon.math.berkeley.edu/amap/download/amap.2.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6bd792e8b76c06ee993b88f83e48b907
+_md5_=857434504156a8892f1335babe24f9f0
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 57e7c3f25857..f1ee4d146a06 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/pcalc-4 b/metadata/md5-cache/sci-calculators/pcalc-4
index 86bd8c4d5db4..97ed62bae78e 100644
--- a/metadata/md5-cache/sci-calculators/pcalc-4
+++ b/metadata/md5-cache/sci-calculators/pcalc-4
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=the programmers calculator
 EAPI=7
 HOMEPAGE=https://github.com/vapier/pcalc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pcalc/pcalc-4.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c6e38b33a6dcaddaf772c7cdf48bac89
+_md5_=62052d465ba9cfab28a368540bee3aea
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index cf84dcae65ae..bfefa710b718 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
deleted file mode 100644
index a10cc9cab622..000000000000
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 virtual/fortran
-DESCRIPTION=Molecular Graphics Visualisation Tool
-EAPI=5
-HOMEPAGE=http://www.openrasmol.org/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 RASLIC )
-RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
-SLOT=0
-SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d406f29d329bb6071162ebfd2ff4e486
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index aaecf8458673..2e62d584afb2 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-5.1.10
similarity index 88%
rename from metadata/md5-cache/sci-electronics/kicad-5.1.9
rename to metadata/md5-cache/sci-electronics/kicad-5.1.10
index 3e863fcdbade..15d92e3ce419 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.10
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[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] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( sci-libs/opencascade:=[vtk(+)] ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[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] ) ) python? ( >=dev-lang/swig-3.0:0 )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=7
 HOMEPAGE=https://www.kicad.org
 IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[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] ) ) sci-electronics/electronics-menu
+RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( sci-libs/opencascade:=[vtk(+)] ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[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] ) ) sci-electronics/electronics-menu
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ?? ( occ oce )
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.9/kicad-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.10/kicad-5.1.10.tar.bz2
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8665eb29077b27c6bca87c88deed8c8
+_md5_=62bdb514661c5f90a9653ffa3c45131c
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.10
similarity index 95%
rename from metadata/md5-cache/sci-electronics/kicad-footprints-5.1.9
rename to metadata/md5-cache/sci-electronics/kicad-footprints-5.1.10
index a0329ddd9f06..636bced46dde 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.10
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/5.1.9/kicad-footprints-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/5.1.10/kicad-footprints-5.1.10.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=614cd55c5b2b6dc08bc5a02283ee6658
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10
similarity index 90%
rename from metadata/md5-cache/sci-electronics/kicad-i18n-5.1.9
rename to metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10
index 829bd5e60e5a..75e1605bc67a 100644
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.6
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad-i18n/-/archive/5.1.9/kicad-i18n-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/code/kicad-i18n/-/archive/5.1.10/kicad-i18n-5.1.10.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=940237e69e4cf0a21455d029ce6af16c
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.10
new file mode 100644
index 000000000000..f368b8fd6a4c
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=7
+HOMEPAGE=http://www.kicad.org
+IUSE=doc minimal nls
+KEYWORDS=~amd64 ~arm64
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-5.1.10 >=sci-electronics/kicad-symbols-5.1.10 >=sci-electronics/kicad-footprints-5.1.10 doc? ( >=app-doc/kicad-doc-5.1.10 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.10 >=sci-electronics/kicad-templates-5.1.10 ) nls? ( >=sci-electronics/kicad-i18n-5.1.10 )
+SLOT=0
+_md5_=16d2e53c3d98c9aedc50654a685aa4b6
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.9
deleted file mode 100644
index bf4df9a26bda..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
-EAPI=7
-HOMEPAGE=http://www.kicad.org
-IUSE=doc minimal nls
-KEYWORDS=~amd64 ~arm64
-LICENSE=metapackage
-RDEPEND=>=sci-electronics/kicad-5.1.9 >=sci-electronics/kicad-symbols-5.1.9 >=sci-electronics/kicad-footprints-5.1.9 doc? ( >=app-doc/kicad-doc-5.1.9 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.9 >=sci-electronics/kicad-templates-5.1.9 ) nls? ( >=sci-electronics/kicad-i18n-5.1.9 )
-SLOT=0
-_md5_=16d2e53c3d98c9aedc50654a685aa4b6
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
similarity index 92%
rename from metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.9
rename to metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
index 10536cf7558c..4aa8c855d48b 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
@@ -9,6 +9,6 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.9/kicad-packages3D-5.1.9.tar.bz2 -> kicad-packages3d-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.10/kicad-packages3D-5.1.10.tar.bz2 -> kicad-packages3d-5.1.10.tar.bz2
 _eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fbe8d50d971c5704d44acc3ac9caa85
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.10
similarity index 95%
rename from metadata/md5-cache/sci-electronics/kicad-symbols-5.1.9
rename to metadata/md5-cache/sci-electronics/kicad-symbols-5.1.10
index 2e8328616a40..2e04e6a32ce3 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.10
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/5.1.9/kicad-symbols-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/5.1.10/kicad-symbols-5.1.10.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3537ac089683cf48ea4f7692d3b430d5
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.9 b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.10
similarity index 95%
rename from metadata/md5-cache/sci-electronics/kicad-templates-5.1.9
rename to metadata/md5-cache/sci-electronics/kicad-templates-5.1.10
index 4463f8c602a4..91ccc588ed34 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.9
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.10
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/5.1.9/kicad-templates-5.1.9.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/5.1.10/kicad-templates-5.1.10.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=143c6af5f9e39af64f9cd4ed19d46e2f
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 1b6927d91e9e..482dffeb4287 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/gnome-maps-40.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-40.2
new file mode 100644
index 000000000000..cc92f94cecf7
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-40.2
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-0.84:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A map application for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Maps
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-0.84:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/40/gnome-maps-40.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e71b148f77c93d89784e0a3df505a22e
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100 b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
index a9ff74077710..e79375e896be 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/1.4.0.tar.gz -> osm2pgsql-1.4.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1405061709269b7f0bce5a324d0e631e
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index e36e6a687613..03c16257d1e6 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-li
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5cfea20bd6d7bcef0bd8db1c55ea1ae
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
index 14e3436ee960..767ab7c1560a 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
@@ -1,13 +1,13 @@
 BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=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:= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=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:= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GPS mapping utility
 EAPI=7
 HOMEPAGE=https://github.com/Maproom/qmapshack/wiki
 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:=
+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	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cba4f3993c725047fcc493868f32708a
+_md5_=635c3492d7971627c64a937c709676cb
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 06b8e61e2ba2..2ee0e5e6105e 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/cbflib-0.9.3.3 b/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
deleted file mode 100644
index 1ab46f573bc8..000000000000
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/hdf5:= sys-devel/make >=dev-util/cmake-3.9.6 virtual/fortran
-DESCRIPTION=Library providing a simple mechanism for accessing CBF files and imgCIF files
-EAPI=5
-HOMEPAGE=http://www.bernstein-plus-sons.com/software/CBF/
-IUSE=doc test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sci-libs/hdf5:= virtual/fortran
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.3.3.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b3e72b9f32c8a9f265805656fd1f2f9
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.14.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.14.0
index 5419248de6db..8b173810b80d 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.14.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.14.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 ) >=dev-cpp/eigen-3.3.4:3 doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme ) lapack? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) >=dev-cpp/eigen-3.3.4:3 doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) lapack? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd sci-libs/camd sci-libs/ccolamd sci-libs/cholmod[metis(+)] sci-libs/colamd sci-libs/spqr )
 DESCRIPTION=Nonlinear least-squares minimizer
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org/ceres-solver-1.14.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c1483133bd276b6f345d4956641b856
+_md5_=5224a4ef6e6717e09c54567fad81b19c
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2-r100 b/metadata/md5-cache/sci-libs/libsc-2.2-r100
index ca5532deeddd..54474cc058f1 100644
--- a/metadata/md5-cache/sci-libs/libsc-2.2-r100
+++ b/metadata/md5-cache/sci-libs/libsc-2.2-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e15087fd7d75027baf01aec757af2e52
diff --git a/metadata/md5-cache/sci-libs/libsc-9999 b/metadata/md5-cache/sci-libs/libsc-9999
index b9749601f51a..df3f8b1d5a5d 100644
--- a/metadata/md5-cache/sci-libs/libsc-9999
+++ b/metadata/md5-cache/sci-libs/libsc-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d0bd523b37765b314d3ae4dfff112879
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.25 b/metadata/md5-cache/sci-libs/libsvm-3.25
new file mode 100644
index 000000000000..12deeb42bfb4
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libsvm-3.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=java? ( >=virtual/jdk-1.8:* ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Library for Support Vector Machines
+EAPI=7
+HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/libsvm/
+IUSE=java openmp python tools elibc_FreeBSD java python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=java? ( >=virtual/jre-1.8:* ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+SLOT=0/2
+SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.25.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f7aa461354603d81ddd50a6c9375cdf9
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.5.1 b/metadata/md5-cache/sci-libs/opencascade-7.5.1-r1
similarity index 98%
rename from metadata/md5-cache/sci-libs/opencascade-7.5.1
rename to metadata/md5-cache/sci-libs/opencascade-7.5.1-r1
index eef4cbe6af82..61d68592dfb2 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.5.1
+++ b/metadata/md5-cache/sci-libs/opencascade-7.5.1-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=7.5
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_5_1;sf=tgz -> opencascade-7.5.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f0ca1560757d8580e02dd17ac485868
+_md5_=d14329f767e9ca47ea8123fff5ba22b7
diff --git a/metadata/md5-cache/sci-libs/openlibm-0.7.4 b/metadata/md5-cache/sci-libs/openlibm-0.7.4
deleted file mode 100644
index 9c37993874f1..000000000000
--- a/metadata/md5-cache/sci-libs/openlibm-0.7.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=High quality system independent, open source libm
-EAPI=7
-HOMEPAGE=https://github.com/JuliaLang/openlibm
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=public-domain MIT ISC BSD-2 LGPL-2.1+
-SLOT=0/3
-SRC_URI=https://github.com/JuliaMath/openlibm/archive/v0.7.4.tar.gz -> openlibm-0.7.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9c0592ebaaeb8deb1f571720fbc6dd3
diff --git a/metadata/md5-cache/sci-libs/p4est-2.2-r100 b/metadata/md5-cache/sci-libs/p4est-2.2-r100
index 04867081104c..62114eed7660 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.2-r100
+++ b/metadata/md5-cache/sci-libs/p4est-2.2-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) romio? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/cburstedde/p4est/archive/v2.2.tar.gz -> p4est-2.2.tar.gz https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5b9d80a2c39cd47b0a752b0d15230e9d
diff --git a/metadata/md5-cache/sci-libs/p4est-9999 b/metadata/md5-cache/sci-libs/p4est-9999
index 6a8835faba2b..8a7cb2ab308c 100644
--- a/metadata/md5-cache/sci-libs/p4est-9999
+++ b/metadata/md5-cache/sci-libs/p4est-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ~sci-libs/libsc-9999[lua_single_target_lua5-1(-)?,lua_single_target_lua5-2(-)?,lua_single_target_lua5-3(-)?,mpi=,openmp=,romio=,static-libs=,threads=] sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) romio? ( mpi )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5b68577f1ef9b64ea8812ad1ff1d03ba
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r101 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r101
deleted file mode 100644
index 521bae169d5d..000000000000
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.5 dev-lang/swig ) lua? ( dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Multi-language scientific plotting library
-EAPI=7
-HOMEPAGE=http://plplot.sourceforge.net/
-IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X elibc_FreeBSD java +lua_single_target_lua5-1 +python_single_target_python3_8 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 ) ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )
-RESTRICT=!test? ( test ) octave? ( test )
-SLOT=0/14
-SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64598e3f4fcef67ebb5499d2905f41e5
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r102 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
new file mode 100644
index 000000000000..a8180e81eb06
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r102
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/make dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) 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_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.8:* dev-lang/swig ) lua? ( dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Multi-language scientific plotting library
+EAPI=7
+HOMEPAGE=http://plplot.sourceforge.net/
+IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X elibc_FreeBSD java +lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.8:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( dev-lang/ocaml dev-ml/camlidl ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) 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_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] qt5? ( dev-python/PyQt5[python_targets_python3_9(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )
+RESTRICT=!test? ( test ) octave? ( test )
+SLOT=0/14
+SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	fortran-2	b4796813ccda91c9c0d3463fc90aa969	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74432df7396875048cdb601dd5cb018d
diff --git a/metadata/md5-cache/sci-libs/rtree-0.9.7 b/metadata/md5-cache/sci-libs/rtree-0.9.7
new file mode 100644
index 000000000000..cbf000263ecf
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rtree-0.9.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-),-python_single_target_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) test? ( sci-libs/libspatialindex >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
+DESCRIPTION=R-Tree spatial index for Python GIS
+EAPI=7
+HOMEPAGE=https://rtree.readthedocs.io
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sci-libs/libspatialindex python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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/R/Rtree/Rtree-0.9.7.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7f047b9647920d13925b05c05f198633
diff --git a/metadata/md5-cache/sci-libs/volk-2.5.0 b/metadata/md5-cache/sci-libs/volk-2.5.0
new file mode 100644
index 000000000000..6bc0b4699a84
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/volk-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install 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] ) !<net-wireless/gnuradio-3.8 dev-libs/boost:= orc? ( dev-lang/orc ) python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] )
+DESCRIPTION=vector optimized library of kernels
+EAPI=7
+HOMEPAGE=http://libvolk.org
+IUSE=orc test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !<net-wireless/gnuradio-3.8 dev-libs/boost:= orc? ( dev-lang/orc )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0/2.5
+SRC_URI=https://github.com/gnuradio/volk/releases/download/v2.5.0/volk-2.5.0.tar.xz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7944ad2e29cab8587b7e3872c85afa55
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 85a8e399045f..0407157719ac 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/z3-4.8.11 b/metadata/md5-cache/sci-mathematics/z3-4.8.11
new file mode 100644
index 000000000000..20a1de8eade1
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.11
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm 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] ) gmp? ( dev-libs/gmp:0=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
+DESCRIPTION=An efficient theorem prover
+EAPI=7
+HOMEPAGE=https://github.com/Z3Prover/z3/
+IUSE=doc examples gmp isabelle java python 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
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+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] ) gmp? ( dev-libs/gmp:0=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0/4.8
+SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.11.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	cmake-multilib	ec7d503d01bc4e2f2692f8bf90a64e41	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1980107c80c55c004b7bc992831963df
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 40db4fbd5580..bd9e7fa170d2 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
index 40c44983d38a..dae47a681b1f 100644
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/pytables[python_targets_python3_9(-)] dev-python/QtPy[gui,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] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DESCRIPTION=A graphical tool for browsing / editing files in both PyTables and HDF5 formats
 EAPI=6
 HOMEPAGE=https://vitables.org/
-IUSE=+python_single_target_python3_8
+IUSE=python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 )
+RDEPEND=python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/pytables[python_targets_python3_9(-)] dev-python/QtPy[gui,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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e33916ac081b228b538475c1bc3fc19e
+_md5_=edae016613ec9e4f62507b3d986621ec
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.2 b/metadata/md5-cache/sci-misc/vitables-3.0.2
new file mode 100644
index 000000000000..fdfb621113eb
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_8? ( <dev-python/sip-5[python_targets_python3_8(-)] dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/sip-5[python_targets_python3_9(-)] dev-python/nose[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/numexpr[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/numexpr[python_targets_python3_9(-)] dev-python/pytables[python_targets_python3_9(-)] dev-python/QtPy[gui,python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-4.5.0[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] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/numexpr[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/numexpr[python_targets_python3_9(-)] dev-python/pytables[python_targets_python3_9(-)] dev-python/QtPy[gui,python_targets_python3_9(-)] )
+DESCRIPTION=A graphical tool for browsing / editing files in both PyTables and HDF5 formats
+EAPI=7
+HOMEPAGE=https://vitables.org/
+IUSE=test python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/numexpr[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/numexpr[python_targets_python3_9(-)] dev-python/pytables[python_targets_python3_9(-)] dev-python/QtPy[gui,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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/V/ViTables/ViTables-3.0.2.tar.gz
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2915683e2ddb920b6c71be22ce3fe241
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 68722e2aa80d..b9bd26eee85f 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1 b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
deleted file mode 100644
index cd021588f4cf..000000000000
--- a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 latex? ( dev-texlive/texlive-pstricks:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java program for drawing Feynman diagrams
-EAPI=5
-HOMEPAGE=http://jaxodraw.sourceforge.net/
-IUSE=latex elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jaxodraw/jaxodraw-2.0-1_src.tar.gz http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	51fb0a4707d58382310390ad47ab0ab0	java-pkg-2	45c44ec10db6affb3ebee1ac72039888	java-utils-2	2440f41421207d084e5e3f1fb001b34e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d00c8c4d729b2c9236c28f880a19bdc
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 514d1a042274..8dce95bbbd5a 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100 b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
index 715d858fa27d..2773e98d7289 100644
--- a/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
+++ b/metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/wojdyr/fityk/releases/download/v1.3.1/fityk-1.3.1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28bfd92b7cf704abc40d6eada11844fc
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
index 18452940578e..b1ab97119b7a 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
 _md5_=bcc360bc00f3d21eace54926a45c5b0c
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
index 0bae6343ee39..13195a431ff9 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
@@ -11,5 +11,5 @@ RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
 _md5_=e2df9ff1fcc7cd804b3baab971004da8
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1 b/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
index bfa6b4c461fc..3927a679c848 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	41fd66c54c0faced4c91afc0ef1cc050
 _md5_=0b68d4b73cda70e8a4292515f215df6d
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index cb7893491952..8bae0dda05b3 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4 b/metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
deleted file mode 100644
index 7c22b4caeca0..000000000000
--- a/metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of profiles for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=minimal
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.13/2.13.4/+download/apparmor-2.13.4.tar.gz
-_md5_=e0d91e346022a66b7037aa56509bad33
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0 b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
deleted file mode 100644
index 958130ca88b3..000000000000
--- a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of profiles for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=minimal
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
-_md5_=62dbf868daca00f9fa9200791a90cac9
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0-r1 b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0-r1
deleted file mode 100644
index 24ada6f4bb63..000000000000
--- a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of profiles for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=minimal
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
-_md5_=49a9ec61b8d6020a770e4c68a3b3ca77
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5c14a3c005c9..385881b8f163 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/acl-2.2.53-r1 b/metadata/md5-cache/sys-apps/acl-2.2.53-r1
deleted file mode 100644
index b8e7fcee6ffb..000000000000
--- a/metadata/md5-cache/sys-apps/acl-2.2.53-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/attr-2.4.47-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(-)?]
-DESCRIPTION=Access control list utilities, libraries, and headers
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/acl
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://nongnu/acl/acl-2.2.53.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07d695ff87675f01c9cb7ba063fbc786
diff --git a/metadata/md5-cache/sys-apps/acl-2.3.0 b/metadata/md5-cache/sys-apps/acl-2.3.0
deleted file mode 100644
index 4665c7147b24..000000000000
--- a/metadata/md5-cache/sys-apps/acl-2.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/attr-2.4.47-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(-)?]
-DESCRIPTION=Access control list utilities, libraries, and headers
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/acl
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://nongnu/acl/acl-2.3.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a660f1024e4f6973654b0a1eb5011bd1
diff --git a/metadata/md5-cache/sys-apps/apparmor-2.13.4 b/metadata/md5-cache/sys-apps/apparmor-2.13.4
deleted file mode 100644
index 92f8cbbcb7d6..000000000000
--- a/metadata/md5-cache/sys-apps/apparmor-2.13.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=~sys-libs/libapparmor-2.13.4 dev-lang/perl sys-devel/bison sys-devel/gettext sys-devel/flex doc? ( dev-tex/latex2html )
-DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~sys-libs/libapparmor-2.13.4
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.13/2.13.4/+download/apparmor-2.13.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=836819f4c8b3ba3c26aab6a2096e56fd
diff --git a/metadata/md5-cache/sys-apps/apparmor-3.0.0 b/metadata/md5-cache/sys-apps/apparmor-3.0.0
deleted file mode 100644
index 4f7767ea5c23..000000000000
--- a/metadata/md5-cache/sys-apps/apparmor-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=~sys-libs/libapparmor-3.0.0 dev-lang/perl sys-devel/bison sys-devel/gettext sys-devel/flex doc? ( dev-tex/latex2html )
-DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~sys-libs/libapparmor-3.0.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=9dd82b8c6a2269254912692f255169be
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48-r4 b/metadata/md5-cache/sys-apps/attr-2.4.48-r4
deleted file mode 100644
index 116c6a6c00ca..000000000000
--- a/metadata/md5-cache/sys-apps/attr-2.4.48-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Extended attributes tools
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/attr
-IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1293eb5120c368ab7f45839162cf5c4e
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.48-r5 b/metadata/md5-cache/sys-apps/attr-2.4.48-r5
deleted file mode 100644
index 3f9137bd4d7c..000000000000
--- a/metadata/md5-cache/sys-apps/attr-2.4.48-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extended attributes tools
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/attr
-IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=effd42a5a69d811f0bbab945801cbaac
diff --git a/metadata/md5-cache/sys-apps/attr-2.5.0 b/metadata/md5-cache/sys-apps/attr-2.5.0
deleted file mode 100644
index 4e900db1b583..000000000000
--- a/metadata/md5-cache/sys-apps/attr-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extended attributes tools
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/attr
-IUSE=debug nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://nongnu/attr/attr-2.5.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e915a68cf8d1329cb8e0892a2647c0cf
diff --git a/metadata/md5-cache/sys-apps/bolt-0.9.1 b/metadata/md5-cache/sys-apps/bolt-0.9.1
new file mode 100644
index 000000000000..476003714077
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bolt-0.9.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
+DESCRIPTION=Userspace system daemon to enable security levels for Thunderbolt 3
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/bolt/bolt
+IUSE=doc systemd kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.56.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd ) doc? ( app-text/asciidoc )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.9.1/bolt-0.9.1.tar.gz
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e1d50be433d6073ce0408abe6b4f59a9
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-27 b/metadata/md5-cache/sys-apps/dbus-broker-27
deleted file mode 100644
index 82d4cc335f2c..000000000000
--- a/metadata/md5-cache/sys-apps/dbus-broker-27
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( dev-python/docutils ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=Linux D-Bus Message Broker
-EAPI=7
-HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
-IUSE=audit doc +launcher selinux
-KEYWORDS=~amd64 ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux ) launcher? ( sys-apps/dbus )
-SLOT=0
-SRC_URI=https://github.com/bus1/dbus-broker/archive/v27/dbus-broker-27.tar.gz https://github.com/c-util/c-shquote/archive/95e4713a0de475688a5727a5d776dccbc69d3d28/c-shquote-95e4713a0de475688a5727a5d776dccbc69d3d28.tar.gz https://github.com/c-util/c-utf8/archive/af5bf7f330078d285e5f58584abd6de01c4cfd7d/c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz https://github.com/c-util/c-stdaux/archive/346623b40eb8137cae7568a69ee42253ff098ff7/c-stdaux-346623b40eb8137cae7568a69ee42253ff098ff7.tar.gz https://github.com/c-util/c-list/archive/96455db9f04a6c9101a00957161551aea700b6aa/c-list-96455db9f04a6c9101a00957161551aea700b6aa.tar.gz https://github.com/c-util/c-dvar/archive/70f0f21e86a34577e674e202d5d09ef167102f02/c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz https://github.com/c-util/c-ini/archive/867f06a12a702c6869924575503877caa0adde75/c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz https://github.com/c-util/c-rbtree/archive/a3b1f80548d1c736208c55e9251c49ada649dd62/c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz
-_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b9febd1a39a38a7682632bb58d42d9fd
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-29 b/metadata/md5-cache/sys-apps/dbus-broker-29
new file mode 100644
index 000000000000..ca82474d8691
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dbus-broker-29
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/docutils ) virtual/pkgconfig >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=audit? ( >=sys-process/audit-3.0 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( >=sys-libs/libselinux-3.2 )
+DESCRIPTION=Linux D-Bus Message Broker
+EAPI=7
+HOMEPAGE=https://github.com/bus1/dbus-broker/wiki
+IUSE=audit doc +launcher selinux
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=audit? ( >=sys-process/audit-3.0 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( >=sys-libs/libselinux-3.2 ) launcher? ( sys-apps/dbus )
+SLOT=0
+SRC_URI=https://github.com/bus1/dbus-broker/archive/v29/dbus-broker-29.tar.gz https://github.com/c-util/c-shquote/archive/83ccc2893385fcca1424b188f0f6c45a62f2b38d/c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz https://github.com/c-util/c-utf8/archive/0837214a9780b7d771a3b3ce9a49196ac0a9d52f/c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz https://github.com/c-util/c-stdaux/archive/8652c488b8f1c29629a5179d4551d0a691ae5901/c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz https://github.com/c-util/c-list/archive/a0970f12f1f406a5578a5dedf3580cd682e55812/c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz https://github.com/c-util/c-dvar/archive/c8ea9712a94186512c22c32f32c421d6a2db6feb/c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz https://github.com/c-util/c-ini/archive/204410a08d3a6c8221f6f0baf0355ce5af0232ed/c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz https://github.com/c-util/c-rbtree/archive/8aa7bd1828eedb19960f9eef98d15543ec9f34eb/c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz
+_eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a625978e66bb099c0f9b682721af0616
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.11.1 b/metadata/md5-cache/sys-apps/flatpak-1.11.1
new file mode 100644
index 000000000000..4918d46ccacc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/flatpak-1.11.1
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/automake-1.13.4 >=sys-devel/gettext-0.18.2 virtual/pkgconfig dev-util/gdbus-codegen sys-devel/bison introspection? ( >=dev-libs/gobject-introspection-1.40 ) doc? ( >=dev-util/gtk-doc-1.20 dev-libs/libxslt ) || ( ( dev-lang/python:3.9 dev-python/pyparsing[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pyparsing[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Linux application sandboxing and distribution framework
+EAPI=7
+HOMEPAGE=https://flatpak.org/
+IUSE=doc gtk kde introspection policykit seccomp systemd kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=gtk? ( sys-apps/xdg-desktop-portal-gtk ) kde? ( kde-plasma/xdg-desktop-portal-kde )
+RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= >=net-libs/libsoup-2.4:= sys-apps/bubblewrap sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy x11-apps/xauth x11-libs/gdk-pixbuf:2= x11-libs/libXau:= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.11.1/flatpak-1.11.1.tar.xz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1dd124486ac2997f7c9a2f2637b8cf94
diff --git a/metadata/md5-cache/sys-apps/less-586 b/metadata/md5-cache/sys-apps/less-590
similarity index 90%
rename from metadata/md5-cache/sys-apps/less-586
rename to metadata/md5-cache/sys-apps/less-590
index 6809d31032dd..a024dee55d34 100644
--- a/metadata/md5-cache/sys-apps/less-586
+++ b/metadata/md5-cache/sys-apps/less-590
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
 SLOT=0
-SRC_URI=http://www.greenwoodsoftware.com/less/less-586.tar.gz
+SRC_URI=http://www.greenwoodsoftware.com/less/less-590.tar.gz
 _md5_=1d7e109b987cf768a58c3fe064ee01d1
diff --git a/metadata/md5-cache/sys-apps/likwid-4.3.4 b/metadata/md5-cache/sys-apps/likwid-4.3.4
index c9a183fbdb57..98af98bc8c41 100644
--- a/metadata/md5-cache/sys-apps/likwid-4.3.4
+++ b/metadata/md5-cache/sys-apps/likwid-4.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://ftp.fau.de/pub/likwid/likwid-4.3.4.tar.gz
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	b4796813ccda91c9c0d3463fc90aa969	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	fortran-2	b4796813ccda91c9c0d3463fc90aa969	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2e45d804ed79ec12750fd4e07c45bd5f
diff --git a/metadata/md5-cache/sys-apps/lsvpd-1.7.12 b/metadata/md5-cache/sys-apps/lsvpd-1.7.12
new file mode 100644
index 000000000000..3ad4fae411bc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lsvpd-1.7.12
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=dev-db/sqlite:3 sys-apps/hwids sys-apps/sg3_utils:0= sys-libs/librtas sys-libs/libvpd sys-libs/zlib virtual/os-headers
+DESCRIPTION=Utility to List Device Vital Product Data (VPD)
+EAPI=7
+HOMEPAGE=https://github.com/power-ras/lsvpd
+KEYWORDS=~ppc64
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-db/sqlite:3 sys-apps/hwids sys-apps/sg3_utils:0= sys-libs/librtas sys-libs/libvpd sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/power-ras/lsvpd/archive/v1.7.12.tar.gz -> lsvpd-1.7.12.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=689fdb2bb2722205a9f29a120bf2720f
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20210531 b/metadata/md5-cache/sys-apps/osinfo-db-20210531
new file mode 100644
index 000000000000..21ee5126f744
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20210531
@@ -0,0 +1,10 @@
+BDEPEND=sys-apps/osinfo-db-tools
+DEFINED_PHASES=install unpack
+DESCRIPTION=osinfo database files
+EAPI=7
+HOMEPAGE=https://libosinfo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20210531.tar.xz
+_md5_=00d7f9104a552daefa925d15a1f2d912
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.1 b/metadata/md5-cache/sys-apps/pkgcore-0.12.1
index 44a78a9cdab6..04b31e691016 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.1
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=a framework for package management
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=BSD MIT
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.1.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=545bb27ad81b0335b83720fd06e13422
+_md5_=04bfd7e9b8c974d88c83723fa15bb37e
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index 00b69def5757..fef8e2262019 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -1,14 +1,14 @@
-BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] dev-vcs/git ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=a framework for package management
 EAPI=7
 HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ~dev-python/snakeoil-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a5bc2fe7c03baed3da93fb69857dd31a
+_md5_=04bfd7e9b8c974d88c83723fa15bb37e
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.19 b/metadata/md5-cache/sys-apps/portage-3.0.19
index b936695f6e6e..46316b109f7e 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.19
+++ b/metadata/md5-cache/sys-apps/portage-3.0.19
@@ -1,17 +1,17 @@
-BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 kernel_linux
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portage/portage-3.0.19.tar.gz
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=3e21aef01e2206fa206b1035a5e54ceb
+_md5_=b0ac8aad046e24517c5d762d6f1d1e68
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index a88de4388353..aae116d57d08 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 kernel_linux
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 kernel_linux
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 PROPERTIES=live
-RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=06ec2cd02f7e0a446aee97e84aeafc83
+_md5_=3962ef097e326fd71658b423c19c1f34
diff --git a/metadata/md5-cache/sys-apps/ppc64-diag-2.7.7 b/metadata/md5-cache/sys-apps/ppc64-diag-2.7.7
new file mode 100644
index 000000000000..3fb39d04924e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ppc64-diag-2.7.7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=virtual/libudev:= rtas? ( sys-libs/ncurses:0= sys-libs/librtas sys-libs/libservicelog sys-libs/libvpd )
+DESCRIPTION=Diagnostic tools for PowerLinux
+EAPI=7
+HOMEPAGE=https://github.com/power-ras/ppc64-diag
+IUSE=rtas
+KEYWORDS=~ppc64
+LICENSE=GPL-2+
+RDEPEND=virtual/libudev:= rtas? ( sys-libs/ncurses:0= sys-libs/librtas sys-libs/libservicelog sys-libs/libvpd )
+SLOT=0
+SRC_URI=https://github.com/power-ras/ppc64-diag/archive/v2.7.7.tar.gz -> ppc64-diag-2.7.7.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=12b2270d3f127a8abc9ba0f892aa7278
diff --git a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100 b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
index 40ec18324c8e..4c41318ebe5e 100644
--- a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
+++ b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2.orig.tar.gz mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2-6.diff.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=1ce439e95323f7b5fc99c04df29f1410
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
index f2d382545f2d..bf6f98f25d6b 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-l
 REQUIRED_USE=input_devices_roccat_ryosmk? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryosmkfx? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) input_devices_roccat_ryostkl? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.9.0.tar.bz2
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fe4d87bba4d278e3d8de6bfa73521b0
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.24 b/metadata/md5-cache/sys-apps/sandbox-2.24
index 82c48f0de5bb..4a8b450e3e22 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.24
+++ b/metadata/md5-cache/sys-apps/sandbox-2.24
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Sandbox
 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/sandbox-2.24.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2581ef6718709e10ff43b00deaafbf55
+_md5_=279ef3249af453f939b2108cc6c2f50d
diff --git a/metadata/md5-cache/sys-apps/servicelog-1.1.15 b/metadata/md5-cache/sys-apps/servicelog-1.1.15
index f223b8e51e09..424e598ad433 100644
--- a/metadata/md5-cache/sys-apps/servicelog-1.1.15
+++ b/metadata/md5-cache/sys-apps/servicelog-1.1.15
@@ -3,11 +3,11 @@ DEFINED_PHASES=prepare
 DEPEND=sys-libs/libservicelog
 DESCRIPTION=Provides utilities for logging service-related events
 EAPI=7
-HOMEPAGE=http://linux-diag.sourceforge.net/servicelog/
+HOMEPAGE=https://github.com/power-ras/servicelog
 KEYWORDS=ppc ppc64
 LICENSE=GPL-2+
 RDEPEND=sys-libs/libservicelog virtual/logger
 SLOT=0
 SRC_URI=https://github.com/power-ras/servicelog/archive/v1.1.15.tar.gz -> servicelog-1.1.15.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6e7daba2ebadc6d134030ba9e7dffa3e
+_md5_=20e9eb89291d0cb6290935f950385abb
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
index 10265b6a8ede..710acf11b91f 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
@@ -5,10 +5,10 @@ DESCRIPTION=Desktop integration portal
 EAPI=7
 HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
 IUSE=geolocation screencast
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.8.1/xdg-desktop-portal-1.8.1.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f6fced94925762cefdd432c5bbc7693e
+_md5_=2569f04e5e7af85bae8894e194d60c76
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 5c40f5e7d3b8..6a819a7dc1b2 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/elogind-246.10-r1 b/metadata/md5-cache/sys-auth/elogind-246.10-r1
index a85e4a0bb010..bde69435de8e 100644
--- a/metadata/md5-cache/sys-auth/elogind-246.10-r1
+++ b/metadata/md5-cache/sys-auth/elogind-246.10-r1
@@ -12,4 +12,4 @@ RDEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v246.10.tar.gz -> elogind-246.10.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d173b00ae8d29bdaf0c5bda6d75af372
+_md5_=02ea9561fab365408bc574ce8a784a6b
diff --git a/metadata/md5-cache/sys-auth/elogind-246.9.2 b/metadata/md5-cache/sys-auth/elogind-246.9.2
index 5b705ee4a3cf..fc721d107e6a 100644
--- a/metadata/md5-cache/sys-auth/elogind-246.9.2
+++ b/metadata/md5-cache/sys-auth/elogind-246.9.2
@@ -12,4 +12,4 @@ RDEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v246.9.2.tar.gz -> elogind-246.9.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	b097695df28f3974e3af860d6704d4f2	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=663f103ad94349a8fe3aa8440702d583
+_md5_=416ca20244ead3f89ce67688a2103a87
diff --git a/metadata/md5-cache/sys-auth/polkit-0.119 b/metadata/md5-cache/sys-auth/polkit-0.119
index 81abaec1846f..2eadfd2dd6da 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.119
+++ b/metadata/md5-cache/sys-auth/polkit-0.119
@@ -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=elogind examples gtk +introspection kde nls 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 elogind? ( sys-auth/elogind ) pam? ( sys-auth/pambase sys-libs/pam ) systemd? ( sys-apps/systemd:0=[policykit] ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.119.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	pax-utils	d3fc79d3d50544347e324864f95206e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e69fcb4d60dbfe43995b8c747ddff799
+_md5_=4f3db8661ba217485294da8874c8feaa
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 1e017c82793f..3f784632b2bd 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/fio-3.27 b/metadata/md5-cache/sys-block/fio-3.27
new file mode 100644
index 000000000000..cd55178e33f8
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-3.27
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) static? ( aio? ( dev-libs/libaio[static-libs(+)] ) curl? ( net-misc/curl:=[static-libs(+)] dev-libs/openssl:0=[static-libs(+)] ) glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) gtk? ( dev-libs/glib:2[static-libs(+)] ) io-uring? ( sys-libs/liburing:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) rdma? ( sys-fabric/libibverbs[static-libs(+)] sys-fabric/librdmacm[static-libs(+)] ) tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( dev-util/cunit )
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=7
+HOMEPAGE=https://brick.kernel.dk/snaps/
+IUSE=aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-fabric/libibverbs sys-fabric/librdmacm ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9 dev-python/pandas[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pandas[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) gnuplot? ( sci-visualization/gnuplot )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) gnuplot? ( python ) io-uring? ( aio )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://brick.kernel.dk/snaps/fio-3.27.tar.bz2
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=81f732d7bc49a3c4438b2701857800f9
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 079793cc4bb7..5478f03793c6 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/lilo-24.2 b/metadata/md5-cache/sys-boot/lilo-24.2
index ae814d3a3a4f..81a74ee64225 100644
--- a/metadata/md5-cache/sys-boot/lilo-24.2
+++ b/metadata/md5-cache/sys-boot/lilo-24.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
 DEPEND=>=sys-devel/bin86-0.15.5
-DESCRIPTION=Standard Linux boot loader
+DESCRIPTION=LInux LOader, the original Linux bootloader
 EAPI=7
-HOMEPAGE=https://alioth.debian.org/projects/lilo/
+HOMEPAGE=https://www.joonet.de/lilo/
 IUSE=static minimal pxeserial device-mapper
 KEYWORDS=-* amd64 x86
 LICENSE=BSD GPL-2
 RDEPEND=device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 SLOT=0
-SRC_URI=http://lilo.alioth.debian.org/ftp/sources/lilo-24.2.tar.gz mirror://gentoo/dolilo-0.6.tar.bz2
+SRC_URI=https://www.joonet.de/lilo/ftp/sources/lilo-24.2.tar.gz mirror://gentoo/dolilo-0.6.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=267cc9b3c896a65eb910109a0834c0b9
+_md5_=9f9860d44f9bfa538d2b926754c73cbd
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c7e3ea58ccbd..006acc8f12b2 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.4 b/metadata/md5-cache/sys-cluster/ceph-16.2.4
index 41a3a29d50ec..506d01fa8e9d 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.4
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ^^ ( lua_s
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.4.tar.gz
-_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	check-reqs	97b90bd8fb799993925e6b3a683184e5	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a588ece683dd7aebd5009958d033ffd3
diff --git a/metadata/md5-cache/sys-cluster/lmod-8.4.20 b/metadata/md5-cache/sys-cluster/lmod-8.4.20
index 2e0052315770..1989bdac65cc 100644
--- a/metadata/md5-cache/sys-cluster/lmod-8.4.20
+++ b/metadata/md5-cache/sys-cluster/lmod-8.4.20
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TACC/Lmod/archive/8.4.20.tar.gz -> lmod-8.4.20.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=72b3e46524570cf45c10805a27d381e7
diff --git a/metadata/md5-cache/sys-cluster/lmod-9999 b/metadata/md5-cache/sys-cluster/lmod-9999
index e7f028a9dce7..9213d5b876b0 100644
--- a/metadata/md5-cache/sys-cluster/lmod-9999
+++ b/metadata/md5-cache/sys-cluster/lmod-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c25c6054bd26dcd3796e41b4de26da7e
diff --git a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101 b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
index 5f14b5ec2581..f6ddeca73b39 100644
--- a/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
+++ b/metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SchedMD/slurm/archive/slurm-20-11-0-1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	b097695df28f3974e3af860d6704d4f2	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cd185fc539fe4a2f37767f35a3f0091b
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index 4d8c04fd4801..b43fa281b815 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -3,12 +3,12 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
 DESCRIPTION=OpenVZ ConTainers control utility
 EAPI=7
-HOMEPAGE=http://openvz.org/
+HOMEPAGE=https://openvz.org/
 IUSE=+ploop +vzmigrate
 KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
 SLOT=0
-SRC_URI=http://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
+SRC_URI=https://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
 _eclasses_=bash-completion-r1	8e7c071081c68c2c398b77fe3a1d6908	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=5def098f5a98a8f244bb9e67b7c5db34
+_md5_=348bda5e701de72e6dbbc07e7d5aa657
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 159ce9a1029a..b5376630bd0c 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/gcc-10.3.0 b/metadata/md5-cache/sys-devel/gcc-10.3.0
index d5fdf4aa6400..c2277cc42d70 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto zstd
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-10.3.0-patches-1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	toolchain	c8a8b283b452824fecc5ec0e6c34d52f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=69a5608564eeb42f115fc7244572a7f5
+_md5_=2262381a31a63dbf42632428c9e531ef
diff --git a/metadata/md5-cache/sys-devel/gdb-10.2 b/metadata/md5-cache/sys-devel/gdb-10.2
index 2c4c1e8b602a..438a7dea5957 100644
--- a/metadata/md5-cache/sys-devel/gdb-10.2
+++ b/metadata/md5-cache/sys-devel/gdb-10.2
@@ -5,7 +5,7 @@ DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash 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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib lzma? ( app-arch/xz-utils ) 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] ) ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-10.2.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-10.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d0791bd6c266d8e8b5e0564884edd419
+_md5_=7899ae844c8e65c78d80c540603e4361
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1-r1 b/metadata/md5-cache/sys-devel/lld-10.0.1-r1
index 8b1c18ef7895..2cc94ff42616 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1-r1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=amd64 arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-10.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=170e887bd1f5b2a12f5f8ca79f433517
+_md5_=c672edecf6e61f046bf6329e67e4b8a0
diff --git a/metadata/md5-cache/sys-devel/lld-11.1.0-r1 b/metadata/md5-cache/sys-devel/lld-11.1.0-r1
index e728541d2cf6..fdc09e942c42 100644
--- a/metadata/md5-cache/sys-devel/lld-11.1.0-r1
+++ b/metadata/md5-cache/sys-devel/lld-11.1.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test test
-KEYWORDS=amd64 arm ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-11.1.0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.1.0.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	llvm.org	947bf87d74971ddf91feb19e4fa5f92f	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4df68fe9d70a311f292dd18e4c5b6e69
+_md5_=010f922fa94859184daae40a7f590ac6
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 6eb8fbf4db0e..8ef3366c781d 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/alsa-firmware-1.2.1 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
index f70d03408c77..2600967413ce 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DESCRIPTION=Advanced Linux Sound Architecture firmware
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 IUSE=alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-1.2.1.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=3c8f92445da158a50062ab0d5212d84b
+_md5_=452c009a4c580144e84fefc6d6031299
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
index c708b19284ca..4dd2fe6029e6 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DESCRIPTION=Advanced Linux Sound Architecture firmware
 EAPI=7
-HOMEPAGE=https://alsa-project.org/
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 IUSE=alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
 KEYWORDS=amd64 ~ppc ppc64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-1.2.4.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=b81ea27b747f098ed662e967272c1be4
+_md5_=c53f44ba936864a24cce6f193bb3f116
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index cc983edd5689..e05179e8dc80 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/aufs-util-4.14_p20190603 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
index b0810f48c8ce..96875f9d675a 100644
--- a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://aufs.sourceforge.net/
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20190603.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31bbbf6bb3f1632545b77d300fe48d79
+_eclasses_=linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=942f860bca1d1700cd24b01960883808
diff --git a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5 b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
index 48fb598294c3..2ee981ec10e4 100644
--- a/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+++ b/metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45
 SLOT=0
 SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c85ce224078e612c490fc9190c91fe64
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=29b7aa385d09e87efac63393a71aafd3
diff --git a/metadata/md5-cache/sys-fs/fuse-3.10.3 b/metadata/md5-cache/sys-fs/fuse-3.10.3
index 81ec453438ad..f58d6265772d 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.10.3
+++ b/metadata/md5-cache/sys-fs/fuse-3.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=7
 HOMEPAGE=https://github.com/libfuse/libfuse
 IUSE=+suid 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.10.3/fuse-3.10.3.tar.xz
 _eclasses_=meson	5ec14fdbc5446b8767e87e186e3b1a52	meson-multilib	485215fef459a86936e377c0eaa513a0	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=c2a473fa13d274059e6166ddad7679aa
+_md5_=2c8f5a2d5e467524c56d24dd5da94056
diff --git a/metadata/md5-cache/sys-fs/growpart-0.0.32 b/metadata/md5-cache/sys-fs/growpart-0.0.32
new file mode 100644
index 000000000000..30a30d31e86f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/growpart-0.0.32
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A script that can grow your rootfs on first boot
+EAPI=6
+HOMEPAGE=http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-apps/gptfdisk
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/growpart/growpart-0.0.32.gz
+_md5_=c8eaf458dae5965fc621c1f9c34119cd
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-129 b/metadata/md5-cache/sys-fs/libeatmydata-129
new file mode 100644
index 000000000000..deaf2e91d8c2
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/libeatmydata-129
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=test? ( dev-util/strace )
+DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
+EAPI=7
+HOMEPAGE=https://www.flamingspork.com/projects/libeatmydata/
+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 ~x86
+LICENSE=GPL-3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=74f4cc4e4fb8f2026f0d119dfd3fcb05
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-129-r1 b/metadata/md5-cache/sys-fs/libeatmydata-129-r1
new file mode 100644
index 000000000000..ccc4f23150a0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/libeatmydata-129-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=test? ( dev-util/strace )
+DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
+EAPI=7
+HOMEPAGE=https://www.flamingspork.com/projects/libeatmydata/
+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 ~x86
+LICENSE=GPL-3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129.tar.gz
+_eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bf24991b0379eb9368122213e6bb95f2
diff --git a/metadata/md5-cache/sys-fs/reiser4progs-2.0.5 b/metadata/md5-cache/sys-fs/reiser4progs-2.0.5
index c92458413848..40bcba2d435b 100644
--- a/metadata/md5-cache/sys-fs/reiser4progs-2.0.5
+++ b/metadata/md5-cache/sys-fs/reiser4progs-2.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=reiser4progs: mkfs, fsck, etc...
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/reiser4/
 IUSE=debug readline static static-libs split-usr
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 -sparc x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 -sparc x86
 LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/libaal-1.0.7:= readline? ( sys-libs/readline:0= ) ) static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/reiser4/reiser4progs-2.0.5.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9
-_md5_=116782012d42bf0f88dc4eb0fcfd906b
+_md5_=448664274b4fa78a00b2690f16439ea5
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1cbb4c24780b..2fdcdeaa1c21 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
index 7f64c3593cdd..be6c35a662a9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.228
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-238.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-238.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-238.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-238.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-238.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-238.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-238.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-238.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-238.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bae3253751071047e5198ee5bcb7791f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.231 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.231
index 0b1c20c31973..8ffc42cede6d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.231
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.231
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.231
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-241.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-241.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-241.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-241.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-241.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-241.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-241.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-241.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-241.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=805a144d37052a31a64c53f9efed1982
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.232 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.232
index 4a33902911e7..3bbdd5f1ba97 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.232
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.232
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.232
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-242.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-242.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-242.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-242.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-242.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-242.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-242.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-242.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-242.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d9fd5610d6021256c70faa8e384ac738
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.233 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.233
index ecd38df1ed12..dab1bb3b4a78 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.233
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.233
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.233
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-243.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-243.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-243.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-243.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-243.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-243.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-243.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-243.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-243.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=342764900482ecb98281826a05c106e4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
index d5c55a4edebd..6e0277e608dd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.234
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-244.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-244.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-244.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-244.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-244.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-244.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-244.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-244.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-244.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=fef188df7aca6fd875546dbff5957909
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
index 4bcd9d119c5c..01d2eda4057d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.235
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-245.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-245.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-245.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-245.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-245.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-245.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-245.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-245.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-245.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=94709ed017a2f7b70b0bafb8550ba890
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
index fff82fea8a0d..401c91519b25 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.184
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-183.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-183.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-183.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-183.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-183.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-183.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-183.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-183.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-183.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=bdb5335d66f2907ce55bc72594620a60
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.188 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.188
index dd2acb5b7f7c..6fe97a39bafb 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.188
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.188
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.188
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-187.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-187.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-187.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-187.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-187.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-187.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-187.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-187.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-187.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=37f9e236a575fecd6aab819b2904a8b5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.189 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.189
index 260a5367b986..bd82170b3d76 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.189
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.189
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.189
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-188.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-188.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-188.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-188.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-188.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-188.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-188.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-188.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-188.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2db7e7e58bfabbd271d4dbb69225e265
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.190 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.190
index 03a8cc9db87a..280e856baf78 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.190
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.190
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.190
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-189.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-189.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-189.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-189.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-189.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-189.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-189.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-189.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-189.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=adc197c5ec8803eb32f408e0ca94cb5b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.191 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.191
index a5d17fe83c8b..0c3466e6d133 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.191
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.191
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.191
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-190.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-190.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-190.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-190.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-190.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-190.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-190.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-190.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-190.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c07c0f233fcb1fa2154a86da875104d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
index 651b2eddd695..a17a4702a347 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.192
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-191.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-191.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-191.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-191.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-191.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-191.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-191.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-191.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-191.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=40ff19ce562780c68d2310baece237d9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
index f63386d57237..01c2cc0adb8d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.193
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-192.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-192.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-192.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-192.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-192.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-192.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-192.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-192.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-192.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d7d1aeb4eb3fe65e1cc092dacd4b4089
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
index 2755bc12e91a..3837e8af1bbb 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.264
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-266.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-266.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-266.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-266.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-266.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-266.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-266.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-266.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-266.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=79f69c2e22802a17303504a3c0f5bf81
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.267 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.267
index e7d75834f9ec..5eb441853b17 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.267
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.267
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.267
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-269.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-269.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-269.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-269.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-269.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-269.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-269.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-269.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-269.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d2ffc88ec1bad63b2d2dbd32041d74aa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.268 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.268
index 4a274d86cf47..4296ede237a8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.268
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.268
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.268
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-270.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-270.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-270.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-270.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-270.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-270.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-270.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-270.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-270.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=98b81c65ef2b5dfceef5f486d784ebe6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.269 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.269
index 6d6ea4a91408..54959bcb1e1c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.269
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.269
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.269
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-271.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-271.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-271.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-271.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-271.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-271.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-271.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-271.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-271.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=24225231e42d2c074e398be0b6141653
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
index 52cca21541b5..9b21ef4d8a63 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.270
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-272.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-272.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-272.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-272.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-272.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-272.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-272.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-272.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-272.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ec1ae1481150fe445916d8cbff668445
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
index f897696aefb0..046e212954e7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.271
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-273.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-273.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-273.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-273.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-273.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-273.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-273.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-273.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-273.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=72e66e960b29795c5d2152d9f7e4403b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
index c0ddbffb03e3..ec6ab31198b9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.264
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-268.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-268.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-268.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-268.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-268.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-268.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-268.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-268.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-268.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b2fa91ae1d5c87c66431cb83d9f50f9c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.267 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.267
index 81cc4809fdaa..2edc796fce9e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.267
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.267
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.267
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-271.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-271.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-271.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-271.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-271.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-271.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-271.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-271.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-271.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=24225231e42d2c074e398be0b6141653
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.268 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.268
index a56fd2016790..08932d0301d7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.268
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.268
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.268
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-272.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-272.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-272.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-272.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-272.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-272.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-272.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-272.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-272.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ec1ae1481150fe445916d8cbff668445
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.269 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.269
index 636cd1674901..2a9c767a931a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.269
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.269
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.269
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-273.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-273.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-273.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-273.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-273.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-273.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-273.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-273.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-273.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=2eba5c56ac805785476c695ba65cb33f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
index 3e7779bc551d..c7e62a9d5e20 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.270
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-274.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-274.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-274.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-274.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-274.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-274.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-274.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-274.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-274.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=cc3c1eebc6ad0debb2fd40176f0037d5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
index 00e318d03be0..e8ccb1e3d4ed 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.271
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-275.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-275.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-275.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-275.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-275.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-275.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-275.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-275.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-275.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=129b592c56acb21c22361008dbae22fc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
index 9dba6393cf5a..171b7aac221a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.27
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-30.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-30.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-30.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-30.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-30.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-30.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-30.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-30.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-30.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9a20525df8766f45b1ab99d9f9555358
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.37 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.37
index e7fadaac90e4..063968bbd1ae 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.37
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.37
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.37
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-40.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-40.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-40.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-40.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-40.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-40.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-40.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-40.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-40.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=204e4f1953de255f4b0c1d1ac6b7cfc4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.38 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.38
index ad40e80979b2..0ac799a340cc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.38
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.38
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.38
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-41.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-41.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-41.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-41.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-41.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-41.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-41.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30046ad7cfe5dd90d800dfa67319d744
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.39 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.39
index fd9cc92cf161..3bd0d93c6269 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.39
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.39
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.39
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-42.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-42.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-42.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-42.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-42.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-42.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-42.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-42.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-42.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=42729a1e8994955b52833fbacf14497a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
index 2190e7e5f227..b4210c2c8e2f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.40
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-43.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-43.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-43.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-43.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-43.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-43.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-43.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-43.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-43.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=609a2d1610788a3c3fe8d490b03da940
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
index e4d82dc7f5f1..84e1c316e34b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.41
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-44.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-44.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-44.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-44.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-44.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-44.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-44.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-44.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6bfab688b0406ee3968ac3cfd09a1944
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
index 7c8f66b5ac7e..d32f804becef 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.42
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-45.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-45.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-45.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-45.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-45.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-45.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-45.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-45.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-45.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=eac6e1c199f38c804e7021299942c099
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.22 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.22
index 31b1d71b8e0e..1375c3dce04b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.22
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.22
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11.22
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-25.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-25.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-25.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-25.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-25.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-25.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-25.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-25.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-25.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6d0e086cc4fbc34fd8a048219ec0adea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.4
index 5e035433971e..262721d75222 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-5.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-5.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-5.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-5.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a92c294aa0ebf1d80bbd29959190edb1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.5
index e68f4044f719..c07442d1ce96 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.5
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-6.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c0521476546b0f36dc00eb53014c2526
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.6
index a051eff87f92..ea05338e3a54 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.6
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-7.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-7.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-7.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-7.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-7.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-7.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8c64ce809e10f72c8e7f900d3a488864
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
index d57235d34c95..0a0ea25addf7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-8.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=17044596e01bdbfb5ec162f71671df16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
index 476ea2d0d6cf..c4d5b27821d8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-9.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4edb4038fe406edb7656824dee29f708
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
index a359022d2921..b129416c6033 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.9
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-10.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9e120c4716a97df2b2dd3cec9b8f0285
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
index 6c95da7abdde..629573981078 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.109
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-112.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-112.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-112.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-112.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-112.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-112.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-112.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e886bbb89d7c0aec453cf8d0feff0c73
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.120
index b02c979a1c6a..ad9ceac4f957 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.120
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.120
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.120
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-123.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-123.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-123.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-123.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-123.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-123.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-123.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a2441185831da7387e08b0842dfb3a91
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.121 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.121
index 401b7a4febf4..9a4bb4f42406 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.121
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.121
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.121
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-124.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-124.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-124.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-124.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-124.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-124.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-124.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-124.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-124.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7d32f17f18e3cbad91b02132e7ae1de6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.122 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.122
index 197192e8ef50..40bcde2bb390 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.122
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.122
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.122
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-125.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-125.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-125.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-125.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-125.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-125.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-125.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-125.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-125.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f498c550a45371e330ba40f26180f21f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
index 535241f8be57..54ed32de8d94 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.123
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-126.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-126.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-126.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-126.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-126.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-126.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-126.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-126.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-126.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b7d05f648834816e29bfb9d8354f9023
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
index be96be21ede1..089e35824462 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.124
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-127.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-127.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-127.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-127.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-127.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-127.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-127.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-127.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-127.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=34a3444e8f25923feeb673df89426b67
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc1
index 8c5d6dba19ea..2604c5d72c55 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.13_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.13-rc1/v5.12 -> patch-5.13-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0fdc5785a5a238c37a80ade6e079ca1a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc2
index 16a08852980a..a5d99937cc68 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.13_rc2
 SRC_URI=https://git.kernel.org/torvalds/p/v5.13-rc2/v5.12 -> patch-5.13-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0fdc5785a5a238c37a80ade6e079ca1a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc3
index dcac3ee6ab01..2d24ef3a01ac 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.13_rc3
 SRC_URI=https://git.kernel.org/torvalds/p/v5.13-rc3/v5.12 -> patch-5.13-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0fdc5785a5a238c37a80ade6e079ca1a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc4
index cbff5ca3442d..054d8402766a 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.13_rc4
 SRC_URI=https://git.kernel.org/torvalds/p/v5.13-rc4/v5.12 -> patch-5.13-rc4.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=0fdc5785a5a238c37a80ade6e079ca1a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.13_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc5
new file mode 100644
index 000000000000..a98370d9842f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.13_rc5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.13_rc5
+SRC_URI=https://git.kernel.org/torvalds/p/v5.13-rc5/v5.12 -> patch-5.13-rc5.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0fdc5785a5a238c37a80ade6e079ca1a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 8075999e6fa6..d3718d3a3b35 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a3cceb0baa1fed5fcf441163c3d03fa0
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index be8ff5bac144..9ae40286a830 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c10177e2a073bb1bff06485b98ab4fb7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index ddff5ec89d78..880180f7f6b4 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3a98d9a2e66b9c05a988677fb8c37a81
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index b442c6439f74..9ceae30248a5 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=c10177e2a073bb1bff06485b98ab4fb7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index fbb4cb05fc96..647c55c26ca3 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8509ec7db12dfecf2382d994c36199f5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.10 b/metadata/md5-cache/sys-kernel/linux-headers-5.10
index 733e14e0034f..c8c114e3a707 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.10
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz mirror://gentoo/gentoo-headers-5.10-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.10-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=11c52cfb2ab64427a6628141e21aee20
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.11 b/metadata/md5-cache/sys-kernel/linux-headers-5.11
index ec9de2b90259..be673a847128 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.11
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz mirror://gentoo/gentoo-headers-5.11-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.11-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ebc39cb156ab9ab057f02ab71f5cfe21
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.12 b/metadata/md5-cache/sys-kernel/linux-headers-5.12
index 2a78e2725d12..2ed09c6a2754 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.12
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz mirror://gentoo/gentoo-headers-5.12-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.12-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=7a3881cac1b5011cfe78f7b87b0a1dcd
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
index 3f07b8f15e35..82524cc6a3e1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz mirror://gentoo/gentoo-headers-5.4-2.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.4-2.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=690ae49eb92940298888c530e37b88b5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.9 b/metadata/md5-cache/sys-kernel/linux-headers-5.9
index 3596ff5bc0b7..540a16184783 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz mirror://gentoo/gentoo-headers-5.9-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.9-1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=ebc39cb156ab9ab057f02ab71f5cfe21
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.232 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.235
similarity index 70%
rename from metadata/md5-cache/sys-kernel/mips-sources-4.14.232
rename to metadata/md5-cache/sys-kernel/mips-sources-4.14.235
index 6ca99d87053b..878785570ea7 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.232
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.235
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed )
+DEPEND=!build? ( sys-apps/sed )
 DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
@@ -8,7 +8,7 @@ KEYWORDS=-* ~mips
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.232
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.232.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v3.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=fd0d028f73ecc62e98d40fc711d05964
+SLOT=4.14.235
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.235.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v3.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1ed7adf6847acfc540291270be1d2c8f
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.190 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.193
similarity index 68%
rename from metadata/md5-cache/sys-kernel/mips-sources-4.19.190
rename to metadata/md5-cache/sys-kernel/mips-sources-4.19.193
index 871286da36c1..c8173f52c409 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.190
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.193
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed )
+DEPEND=!build? ( sys-apps/sed )
 DESCRIPTION=Kernel.org sources for MIPS-based machines
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
@@ -8,7 +8,7 @@ KEYWORDS=-* ~mips
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.190
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.190.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v3.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=5a1b794bbc2708e5c7ec40c46df245a3
+SLOT=4.19.193
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.193.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v3.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=55bd8534fc23bc13622dbb2837220609
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-5.4.120 b/metadata/md5-cache/sys-kernel/mips-sources-5.4.124
similarity index 68%
rename from metadata/md5-cache/sys-kernel/mips-sources-5.4.120
rename to metadata/md5-cache/sys-kernel/mips-sources-5.4.124
index 95f5f8e7f25f..0610b12fe102 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-5.4.120
+++ b/metadata/md5-cache/sys-kernel/mips-sources-5.4.124
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-6.5.0 >=sys-devel/patch-2.7.6 !build? ( sys-apps/sed )
+DEPEND=!build? ( sys-apps/sed )
 DESCRIPTION=Kernel.org sources for MIPS-based machines
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
@@ -8,7 +8,7 @@ KEYWORDS=-* ~mips
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.120
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.120.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a9581578f754e36c51001dc3ba3f86d5
+SLOT=5.4.124
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.124.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v4.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=4b69886b78caa6dd6790eec84f883c3f
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12 b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
index d18b83b45691..c65881f89263 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10_p12
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf12.diff -> pf-sources-5.10_p12.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=54a58c81dcab848f18df9010256f5264
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
index 738e0761f112..7f779335bd0f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11_p8
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf8.diff -> pf-sources-5.11_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5020_BMQ-and-PDS-io-scheduler-v5.11-r2.patch https://dev.gentoo.org/~mpagano/genpatches/trunk/5.11/5021_BMQ-and-PDS-gentoo-defaults-v5.11-r2.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4b0ab021a3784308f684f27c417054f8
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
index 2864258f420d..8fc1ac1fceed 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p1
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf1.diff -> pf-sources-5.12_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e7968761cc64f9fc04974bd0a5e8fa09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
index e7acf04f2b64..c4180104ab25 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p2
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf2.diff -> pf-sources-5.12_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=e7968761cc64f9fc04974bd0a5e8fa09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
index 0a0f124060c2..46906e07e594 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p3
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf3.diff -> pf-sources-5.12_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b80cd6c61b9e74c40d2aa4bd378bbfa3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
index 3da13843bff3..a4a4f45aa849 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12_p4
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.12...v5.12-pf4.diff -> pf-sources-5.12_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.12-1.extras.tar.xz https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5020_BMQ-and-PDS-io-scheduler-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/5021_BMQ-and-PDS-gentoo-defaults-v5.12-r0.patch https://raw.githubusercontent.com/GKernelCI/linux-patches/5.12/1510_fs-enable-link-security-restrictions-by-default.patch -> 1510_fs-enable-link-security-restrictions-by-default-5.12.patch
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=28eb43615ee2e75fd85e2f5accb57740
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
index fdfd7634bb50..14f012ce5d76 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.9_p7
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.9...v5.9-pf7.diff -> pf-sources-5.9_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=31cdb42e03dfb5e21e7677d52e13296e
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index 501d84f26062..1d2ae6d5cdcf 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.9999
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8dcf97f6c79d5b87810786fcf985d174
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
index 545605a79ca3..4c0bc893f948 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.11_p20210201
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20210201-1.tar.gz -> linux-5.10.11_p20210201-raspberrypi.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d0380caac1d34c67e6098390a73074bf
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
index 1b79117a385c..03ca36b42e9f 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.79_p20201201-r1
 SRC_URI=https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.20201201-1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=6ba6316e29200e170550333f6501eded
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
index da67213da267..841f78de85c7 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.9999
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=8dcf97f6c79d5b87810786fcf985d174
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
index e1b4106bd9cd..95fbccdb92a1 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.214_p104
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.214.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.214-rt104.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.214-rt104.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
index 6f4e405bc607..e3dd051ac6c3 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.226_p109
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.226.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.226-rt109.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.226-rt109.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
index 9e47a57f227d..f54d3f0c9ed7 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.165_p70
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.165.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.165-rt70.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.165-rt70.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
index 71281741e91d..1b621b2074bf 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.188_p77
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.188.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/patch-4.19.188-rt77.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patch-4.19.188-rt77.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
index b321cc318b1f..177b8a92ecda 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.249_p212
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.249.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.249-rt212.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.249-rt212.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
index 758ac5f5bf3b..94fd0753a782 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.267_p221
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.267.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.267-rt221.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.267-rt221.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
index a81430ec1513..4bfde4203f93 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.247_p162
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.247.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.247-rt162.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.247-rt162.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
index 8123b109f5e0..ed07bc1ea335 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.263_p177
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.263.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.263-rt177.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.263-rt177.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=77ef8ba38cd6cd4ee6a3beb217a142d6
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
index e74da681834b..d14214be222d 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.30_p37
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.30.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.30-rt37.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.30-rt37.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
index 6c0ac1100960..be837bf7ddab 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.4_p22
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.4-rt22.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.4-rt22.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11 b/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
index c1f662beb2b3..371648014c7a 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.11.4_p11
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.11-gnu/deblob-5.11 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.11-gnu/deblob-check -> deblob-check-5.11 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.11/patch-5.11.4-rt11.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.11/older/patch-5.11.4-rt11.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
index bf041456b40c..530a8c4c1ff9 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.109_p56
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.109.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.109-rt56.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.109-rt56.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47 b/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
index 989875b4277a..98c4087aae60 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.84_p47
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.84.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-5.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.4-gnu/deblob-check -> deblob-check-5.4 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.84-rt47.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.84-rt47.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=30e10915a43e18095020124626754a13
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.235 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.235
index 0b2fdbaa0884..09a78d202fba 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.235
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.235
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.235
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.235.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.193 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.193
index f1d031379889..3e595f70f242 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.193
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.193
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.193
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.193.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.271 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.271
index f9cbedd16b1c..859cb7ffe1d9 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.271
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.271
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.271
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.271.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.271 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.271
index a0184f1a0ff5..f2cf1413e442 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.271
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.271
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.271
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.271.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.42 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.42
index 2bbe02aff54b..02c9b1b4be86 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.42
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.42
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.10.42
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.42.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.9 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.9
index 0bd38b068bc1..81d7f137fd93 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.9
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.12.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.9
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.12.9.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.124 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.124
index 8f58e80cff1d..aa09b3f93624 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.124
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.124
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.4.124
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.124.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-5.12.9 b/metadata/md5-cache/sys-kernel/zen-sources-5.12.9
index e5306e9a90a4..19efce2bcdb9 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-5.12.9
+++ b/metadata/md5-cache/sys-kernel/zen-sources-5.12.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.12.9
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.12-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.12-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.12-1.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v5.12.9-zen1/v5.12.9-zen1.patch.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	c2fd42f2d934e63b6fc62411049efaf5	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	4f32d83b54879e33911296cb0d0d8567	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=f8bb216e718225a26e69b38539a7f01a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0d8f0add667e..44678f97584b 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 8705247161cd..f1cfb9752a45 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 ~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_=78a5be6c74124cd39da7b4ab57c20b8e
+_md5_=7d0819b42e41396c192898bfbdacfe69
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1 b/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
deleted file mode 100644
index 91505d3fb5bf..000000000000
--- a/metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Standard GNU database libraries
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gdbm/
-IUSE=+berkdb nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/6
-SRC_URI=mirror://gnu/gdbm/gdbm-1.18.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=40c59bc5f5f6c8e4c918d4a3284e5f7a
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r8 b/metadata/md5-cache/sys-libs/glibc-2.32-r8
index cddc17c6987d..6c6a2f6d7eab 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r8
@@ -5,7 +5,7 @@ DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-8.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	de7d8e2b10085ed5ff09ad70e4753e5c	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b15b497e91a7247f81145cf7a5c7baa6
+_md5_=96c332a9f9119098f3c7539721a609e2
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.13.4 b/metadata/md5-cache/sys-libs/libapparmor-2.13.4
deleted file mode 100644
index 29e782c32d0a..000000000000
--- a/metadata/md5-cache/sys-libs/libapparmor-2.13.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) 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=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-DESCRIPTION=Library to support AppArmor userspace utilities
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=doc +perl +python static-libs python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.13/2.13.4/+download/apparmor-2.13.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f83324b86494c4aae54eec145f132d15
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.0 b/metadata/md5-cache/sys-libs/libapparmor-3.0.0
deleted file mode 100644
index ae6aa2af6698..000000000000
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) 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=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-DESCRIPTION=Library to support AppArmor userspace utilities
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=doc +perl +python static-libs python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0/+download/apparmor-3.0.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b50d42f8ec01c899f4b2637c43129dbc
diff --git a/metadata/md5-cache/sys-libs/libcap-2.43 b/metadata/md5-cache/sys-libs/libcap-2.43
deleted file mode 100644
index f4e6800b74f3..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-2.43
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/attr-2.4.47-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(-)?] pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/fullycapable/
-IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 BSD )
-PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.43.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=efbd78b23b61b9177a938048515e40da
diff --git a/metadata/md5-cache/sys-libs/libcap-2.48 b/metadata/md5-cache/sys-libs/libcap-2.48
deleted file mode 100644
index a90cec3fb547..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-2.48
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-apps/attr-2.4.47-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(-)?] pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/fullycapable/
-IUSE=pam static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 BSD )
-PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RDEPEND=>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.48.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8cb0879c309d4490b7738cf7730f8d62
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.7.11 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.11
deleted file mode 100644
index aef749e9e71a..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python? ( >=dev-lang/swig-2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://people.redhat.com/sgrubb/libcap-ng/
-IUSE=python static-libs python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.11.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6b1e7afc2c11798f7184fdca07e0106
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.8 b/metadata/md5-cache/sys-libs/libcap-ng-0.8
deleted file mode 100644
index 55d58cdb2171..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python? ( >=dev-lang/swig-2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://people.redhat.com/sgrubb/libcap-ng/
-IUSE=python static-libs python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=61e18029e58fa58e47c1e3104865adb8
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1 b/metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1
deleted file mode 100644
index 57d5878c44bf..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python? ( >=dev-lang/swig-2 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://people.redhat.com/sgrubb/libcap-ng/
-IUSE=python static-libs python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.1.tar.gz https://src.fedoraproject.org/rpms/libcap-ng/raw/49e3114cf75fabe9919300e42f7b151eee9e37d1/f/libcap-ng-0.8.2-apply.patch https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dc895855a141d18902e9ac1d94d9b76
diff --git a/metadata/md5-cache/sys-libs/libselinux-3.2 b/metadata/md5-cache/sys-libs/libselinux-3.2
index 68098e6d3441..56bd4dc88619 100644
--- a/metadata/md5-cache/sys-libs/libselinux-3.2
+++ b/metadata/md5-cache/sys-libs/libselinux-3.2
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) ruby? ( >=dev-lang/swig-2.0.9 )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
+DEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=SELinux userland library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libselinux-3.2.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8ecabef4c162332bd1720e1df02798cb
+_md5_=2ac038666594b5711a4429a6d4c420b1
diff --git a/metadata/md5-cache/sys-libs/libservicelog-1.1.19 b/metadata/md5-cache/sys-libs/libservicelog-1.1.19
new file mode 100644
index 000000000000..1d414faea7d2
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libservicelog-1.1.19
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-db/sqlite:= sys-libs/librtas
+DESCRIPTION=Provides a library for logging service-related events
+EAPI=7
+HOMEPAGE=https://github.com/power-ras/libservicelog
+IUSE=static-libs
+KEYWORDS=~ppc ~ppc64
+LICENSE=GPL-2+
+RDEPEND=dev-db/sqlite:= sys-libs/librtas virtual/logger
+SLOT=0
+SRC_URI=https://github.com/power-ras/libservicelog/archive/refs/tags/v1.1.19.tar.gz -> libservicelog-1.1.19.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b39561faded318a6bbb58215a02ce007
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.2-r2 b/metadata/md5-cache/sys-libs/musl-1.2.2-r2
index 77a351207416..f378c16a7dd8 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.2-r2
+++ b/metadata/md5-cache/sys-libs/musl-1.2.2-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst setup unpack
 DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
 EAPI=7
-HOMEPAGE=http://www.musl-libc.org/
+HOMEPAGE=https://musl.libc.org
 IUSE=headers-only
 KEYWORDS=-* amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.2.2.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd99d7e6dad5300fd8631555728e872e
+_md5_=7b8178f2013b6ab8902f61ceac2a0145
diff --git a/metadata/md5-cache/sys-libs/musl-9999 b/metadata/md5-cache/sys-libs/musl-9999
index 5f1e3ce40de0..e0eed34365a0 100644
--- a/metadata/md5-cache/sys-libs/musl-9999
+++ b/metadata/md5-cache/sys-libs/musl-9999
@@ -2,11 +2,11 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst setup unpack
 DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
 EAPI=7
-HOMEPAGE=http://www.musl-libc.org/
+HOMEPAGE=https://musl.libc.org
 IUSE=headers-only
 LICENSE=MIT LGPL-2 GPL-2
 PROPERTIES=live
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8877e2e8d3586f6fa64f873c7a0dc4e0
+_md5_=21b4b976ecc4ca71d975137822b882da
diff --git a/metadata/md5-cache/sys-libs/readline-8.0_p4 b/metadata/md5-cache/sys-libs/readline-8.0_p4
deleted file mode 100644
index 604309040868..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.0_p4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,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=Another cute console display library
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,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/8
-SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-001 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-002 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-003 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-004 mirror://gnu/readline/readline-8.0-patches/readline80-001 mirror://gnu/readline/readline-8.0-patches/readline80-002 mirror://gnu/readline/readline-8.0-patches/readline80-003 mirror://gnu/readline/readline-8.0-patches/readline80-004
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd0b331e96c58540dd0dd8dfd1f76a4a
diff --git a/metadata/md5-cache/sys-libs/readline-8.1 b/metadata/md5-cache/sys-libs/readline-8.1
deleted file mode 100644
index ff6e910c10dc..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,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=Another cute console display library
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,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/8
-SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=07a94f0115e958b145a6bcb750bba390
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 14b7ff7ee1d5..a32391e4fb05 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/thermald-2.4.1-r1 b/metadata/md5-cache/sys-power/thermald-2.4.1-r1
deleted file mode 100644
index ed1898e9df27..000000000000
--- a/metadata/md5-cache/sys-power/thermald-2.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:= dev-util/gtk-doc dev-util/glib-utils
-DESCRIPTION=Thermal daemon for Intel architectures
-EAPI=7
-HOMEPAGE=https://01.org/linux-thermal-daemon https://github.com/intel/thermal_daemon
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:=
-SLOT=0
-SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.4.1.tar.gz -> thermald-2.4.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=e8a8eac09faab555da6953eafd0a328f
diff --git a/metadata/md5-cache/sys-power/thermald-2.4.3 b/metadata/md5-cache/sys-power/thermald-2.4.3
index 272604994366..9b5e1795e608 100644
--- a/metadata/md5-cache/sys-power/thermald-2.4.3
+++ b/metadata/md5-cache/sys-power/thermald-2.4.3
@@ -4,10 +4,10 @@ DEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev
 DESCRIPTION=Thermal daemon for Intel architectures
 EAPI=7
 HOMEPAGE=https://01.org/linux-thermal-daemon https://github.com/intel/thermal_daemon
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:=
 SLOT=0
 SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.4.3.tar.gz -> thermald-2.4.3.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=327981d9b58fcb145a1168584339afcb
+_md5_=e8a8eac09faab555da6953eafd0a328f
diff --git a/metadata/md5-cache/sys-power/thermald-2.4.2 b/metadata/md5-cache/sys-power/thermald-2.4.5
similarity index 91%
rename from metadata/md5-cache/sys-power/thermald-2.4.2
rename to metadata/md5-cache/sys-power/thermald-2.4.5
index 659af780652f..4322d94a8160 100644
--- a/metadata/md5-cache/sys-power/thermald-2.4.2
+++ b/metadata/md5-cache/sys-power/thermald-2.4.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev sys-power/upower sys-apps/dbus:=
 SLOT=0
-SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.4.2.tar.gz -> thermald-2.4.2.tar.gz
+SRC_URI=https://github.com/intel/thermal_daemon/archive/v2.4.5.tar.gz -> thermald-2.4.5.tar.gz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=327981d9b58fcb145a1168584339afcb
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 707c4add97cb..6620d9e7d7a7 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.3-r100 b/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
index 638b42d14e2d..8d9c279cb1b3 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.3-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz
-_eclasses_=apache-module	6d6745b832afba32cbcfba34e3ee328f	autotools	9e63f92c2a5d867fea55ecb160c7d354	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=apache-module	6d6745b832afba32cbcfba34e3ee328f	autotools	9e63f92c2a5d867fea55ecb160c7d354	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9c7a817e54af093889f5d0a31ab780b5
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.7 b/metadata/md5-cache/www-apache/passenger-6.0.7
deleted file mode 100644
index 198c08c4f05a..000000000000
--- a/metadata/md5-cache/www-apache/passenger-6.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby27(-)] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
-EAPI=6
-HOMEPAGE=https://www.phusionpassenger.com/
-IUSE=apache2 debug test apache2 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby27(-)] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.7.tar.gz
-_eclasses_=apache-module	6d6745b832afba32cbcfba34e3ee328f	depend.apache	d54e0d0bd6b36c476594edc2cee2e332	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee3d2dadafa67fbd1c19688c7bb08c02
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 52d47b3d8a51..43deb97c0621 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.3-r100 b/metadata/md5-cache/www-apps/cgit-1.2.3-r100
index fd59aed75279..b465b1a6c5a0 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.3-r100
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r100
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	990ad6a000cf18d1ef87117e8c7b0a54
 _md5_=dec97d6e78016fa9ba29ce527657f168
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.3-r200 b/metadata/md5-cache/www-apps/cgit-1.2.3-r200
index 6645d73bd0a6..4926e7fee570 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.3-r200
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r200
@@ -11,5 +11,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	990ad6a000cf18d1ef87117e8c7b0a54
 _md5_=99d24f8adf841ef550bb69088a8117ab
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
index d3e1a74667f5..8782a104ef3d 100644
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ b/metadata/md5-cache/www-apps/cgit-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/cgit acct-user/cgit dev-vcs/git highlight? ( || ( dev-python/
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	990ad6a000cf18d1ef87117e8c7b0a54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	webapp	990ad6a000cf18d1ef87117e8c7b0a54
 _md5_=234dd0ad5e78bdbec722fddf77cebfee
diff --git a/metadata/md5-cache/www-apps/owncloud-10.6.0 b/metadata/md5-cache/www-apps/owncloud-10.6.0
deleted file mode 100644
index 12bb2b94eefe..000000000000
--- a/metadata/md5-cache/www-apps/owncloud-10.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based storage application where all your data is under your own control
-EAPI=7
-HOMEPAGE=https://owncloud.org
-IUSE=+curl mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=10.6.0
-SRC_URI=https://download.owncloud.org/community/owncloud-10.6.0.tar.bz2
-_eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=a52ddaf30c0bd9f7ba507454aff66bbd
diff --git a/metadata/md5-cache/www-apps/owncloud-10.5.0 b/metadata/md5-cache/www-apps/owncloud-10.7.0
similarity index 83%
rename from metadata/md5-cache/www-apps/owncloud-10.5.0
rename to metadata/md5-cache/www-apps/owncloud-10.7.0
index 5567fd670205..473b9c9d8be0 100644
--- a/metadata/md5-cache/www-apps/owncloud-10.5.0
+++ b/metadata/md5-cache/www-apps/owncloud-10.7.0
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=10.5.0
-SRC_URI=https://download.owncloud.org/community/owncloud-10.5.0.tar.bz2
+SLOT=10.7.0
+SRC_URI=https://download.owncloud.org/community/owncloud-10.7.0.tar.bz2
 _eclasses_=webapp	990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=6c40d624237a9f33f579584231731374
+_md5_=f4e96a589d106a6ef14d4702981b6cc2
diff --git a/metadata/md5-cache/www-apps/webmcp-1.2.6-r1 b/metadata/md5-cache/www-apps/webmcp-1.2.6-r1
index 3e6d68c00e1d..4eaff744477e 100644
--- a/metadata/md5-cache/www-apps/webmcp-1.2.6-r1
+++ b/metadata/md5-cache/www-apps/webmcp-1.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://www.public-software-group.org/pub/projects/webmcp/v1.2.6/webmcp-v1.2.6.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=5964b916928bcb4c68b7bc50ade3096c
diff --git a/metadata/md5-cache/www-apps/webmcp-2.1.0 b/metadata/md5-cache/www-apps/webmcp-2.1.0
index c4aac19126f7..895163abc09c 100644
--- a/metadata/md5-cache/www-apps/webmcp-2.1.0
+++ b/metadata/md5-cache/www-apps/webmcp-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3?
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://www.public-software-group.org/pub/projects/webmcp/v2.1.0/webmcp-v2.1.0.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=68999ae24a6215e85ce5a6331c9a5b1c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 4289a292a462..a806f99123ce 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-93.0.4530.5 b/metadata/md5-cache/www-client/chromium-93.0.4530.5
new file mode 100644
index 000000000000..a2e39cedb03b
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-93.0.4530.5
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.8[xml] ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl dev-lang/python:2.7[xml] >=dev-util/gn-0.1807 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libxkbcommon:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxcb:= x11-libs/libxshmfence:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-69.1:= )
+REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-93.0.4530.5.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-93-patchset-1/chromium-93-patchset-1.tar.xz arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+_eclasses_=check-reqs	97b90bd8fb799993925e6b3a683184e5	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	portability	c10bdc40668533b1faf15b1d89df0303	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4a7715074f669c89ae68cdc0e988a201
diff --git a/metadata/md5-cache/www-client/elinks-0.13.5-r100 b/metadata/md5-cache/www-client/elinks-0.13.5-r100
index d55cd0a5a7fb..5491675386f6 100644
--- a/metadata/md5-cache/www-client/elinks-0.13.5-r100
+++ b/metadata/md5-cache/www-client/elinks-0.13.5-r100
@@ -11,5 +11,5 @@ RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
 SRC_URI=https://github.com/rkd77/felinks/archive/v0.13.5.tar.gz -> elinks-0.13.5.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=b17ce320dac80d70b7b0b2fd2e39a871
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index a41da51694c9..0a498de70109 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
 SLOT=0
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9cdca28ac991932f4a878c551ec30a6f
diff --git a/metadata/md5-cache/www-client/epiphany-40.2 b/metadata/md5-cache/www-client/epiphany-40.2
new file mode 100644
index 000000000000..7a6a13d1c0ef
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-40.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.64.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.31.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.1.0:1= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.64.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.31.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.1.0:1= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/40/epiphany-40.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e14d1c9cb7087b473a93076bdd3c02c
diff --git a/metadata/md5-cache/www-client/firefox-78.11.0 b/metadata/md5-cache/www-client/firefox-78.11.0
index ebcfa53d4b68..b2a428f61741 100644
--- a/metadata/md5-cache/www-client/firefox-78.11.0
+++ b/metadata/md5-cache/www-client/firefox-78.11.0
@@ -5,11 +5,11 @@ DESCRIPTION=Firefox Web Browser
 EAPI=7
 HOMEPAGE=https://www.mozilla.com/firefox
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
 REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland ) wifi? ( dbus )
 SLOT=0/esr78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/source/firefox-78.11.0esr.source.tar.xz -> firefox-78.11.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-14.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-14.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.11.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.11.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.11.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.11.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.11.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.11.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.11.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.11.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.11.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.11.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.11.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.11.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.11.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.11.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.11.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.11.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.11.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.11.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.11.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.11.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.11.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.11.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.11.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.11.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.11.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.11.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.11.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.11.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.11.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.11.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.11.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.11.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.11.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.11.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.11.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.11.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.11.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.11.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.11.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.11.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.11.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.11.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.11.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.11.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.11.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.11.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.11.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.11.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.11.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.11.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.11.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.11.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.11.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.11.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.11.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.11.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.11.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.11.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.11.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.11.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.11.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.11.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.11.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.11.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.11.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.11.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.11.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.11.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.11.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.11.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.11.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.11.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.11.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.11.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.11.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.11.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.11.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.11.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.11.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.11.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.11.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.11.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.11.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.11.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.11.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.11.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.11.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.11.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.11.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.11.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.11.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.11.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.11.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.11.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.11.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.11.0esr-zh-TW.xpi )
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	check-reqs	97b90bd8fb799993925e6b3a683184e5	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	e00745e3b8d63dc13bfe5a2d7310ee6b	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d843dcd056fa3644506f71cddfd8c76b
+_md5_=6cde9c03250c56b5e07e0e6ea0ecc69a
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-92.0.4515.40 b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4530.5
similarity index 96%
rename from metadata/md5-cache/www-client/google-chrome-unstable-92.0.4515.40
rename to metadata/md5-cache/www-client/google-chrome-unstable-93.0.4530.5
index d759530ec9a6..220bd647f4b7 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-92.0.4515.40
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-93.0.4530.5
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_92.0.4515.40-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4530.5-1_amd64.deb
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bcc54f6c33b23e21a948dc2d14b06bdc
diff --git a/metadata/md5-cache/www-client/luakit-2.2.1-r100 b/metadata/md5-cache/www-client/luakit-2.2.1-r100
index 6acb88cef783..8648920dcc5b 100644
--- a/metadata/md5-cache/www-client/luakit-2.2.1-r100
+++ b/metadata/md5-cache/www-client/luakit-2.2.1-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luakit/luakit/archive/2.2.1.tar.gz -> luakit-2.2.1.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=048cc38680f9da4986a56416889b0124
diff --git a/metadata/md5-cache/www-client/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index 2235aef31283..dbf428ab3705 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 net-libs/webkit-gtk:4= x11-libs/gtk+:3 l
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93eae3a94199d6e5a9b8544c7e429f28
diff --git a/metadata/md5-cache/www-client/surf-2.1 b/metadata/md5-cache/www-client/surf-2.1
new file mode 100644
index 000000000000..d420e9d74443
--- /dev/null
+++ b/metadata/md5-cache/www-client/surf-2.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11
+DESCRIPTION=a simple web browser based on WebKit/GTK+
+EAPI=7
+HOMEPAGE=https://surf.suckless.org/
+IUSE=tabbed savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !sci-chemistry/surf !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st ) tabbed? ( x11-misc/tabbed )
+SLOT=0
+SRC_URI=https://dl.suckless.org/surf/surf-2.1.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2846483837638b6e30cd12d1acc7cec5
diff --git a/metadata/md5-cache/www-client/surf-9999 b/metadata/md5-cache/www-client/surf-9999
index aece69a6aebd..8b161b45bc2e 100644
--- a/metadata/md5-cache/www-client/surf-9999
+++ b/metadata/md5-cache/www-client/surf-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 virtual/pkgconfig
+DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11
 DESCRIPTION=a simple web browser based on WebKit/GTK+
 EAPI=7
 HOMEPAGE=https://surf.suckless.org/
 IUSE=tabbed savedconfig
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=!sci-chemistry/surf app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( >=x11-misc/dmenu-4.7 net-misc/curl x11-apps/xprop x11-terms/st ) tabbed? ( x11-misc/tabbed )
+RDEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !sci-chemistry/surf !savedconfig? ( net-misc/curl x11-apps/xprop x11-misc/dmenu x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
 _eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	c10bdc40668533b1faf15b1d89df0303	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=91591362b317b7031f936a39402c81db
+_md5_=ec6f093b41858bbae1b0cab06d7be896
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.11
similarity index 91%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.3
rename to metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.11
index 9b38971b8f66..c08a8503e789 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.11
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.3-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.3-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.3-1_armhf.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.11-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.11-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.11-1_armhf.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c18238329aadececd6635ffb411871eb
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.13 b/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.13
new file mode 100644
index 000000000000..3fb5a9746a2b
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=proprietary-codecs widevine kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.13-1_amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.13-1_arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_4.0.2312.13-1_armhf.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c18238329aadececd6635ffb411871eb
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 7d94d9755688..cecb4af3777a 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.40_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4530.5_alpha
similarity index 90%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.40_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4530.5_alpha
index c6c66fc71696..70a2711e9337 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.40_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4530.5_alpha
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_92.0.4515.40-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_93.0.4530.5-1_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=5f3ea21bdfa8ac8a2d6473433e7959b2
diff --git a/metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0 b/metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
new file mode 100644
index 000000000000..5d8d7b4d946f
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=dev-libs/libxml2:2 sys-apps/pcsc-lite:0 virtual/libusb:0
+DESCRIPTION=Crypto-provider browser plugin for russian e-gov site https://gosuslugi.ru/
+EAPI=7
+HOMEPAGE=http://gosuslugi.ru/
+IUSE=multilib
+KEYWORDS=~amd64 ~x86 x64-macos x86-macos
+LICENSE=EULA
+RDEPEND=dev-libs/libxml2:2 sys-apps/pcsc-lite:0 virtual/libusb:0
+REQUIRED_USE=amd64? ( multilib )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=amd64? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-x86_64.deb -> gosuslugi-plugin-3.1.1.0_amd64.deb ) x86? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-i386.deb -> gosuslugi-plugin-3.1.1.0_x86.deb ) x64-macos? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin.pkg -> gosuslugi-plugin-3.1.1.0_mac.pkg )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4b1d47e74513a5cfb0045e2b7fea71fd
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 6b90d3b005ef..eaaaa029574f 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/apache-2.4.46-r6 b/metadata/md5-cache/www-servers/apache-2.4.46-r6
index 8c67ffd276a5..7cff9659c724 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.46-r6
+++ b/metadata/md5-cache/www-servers/apache-2.4.46-r6
@@ -12,5 +12,5 @@ RDEPEND=apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lu
 REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.46.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	180c38b784f982b4eaf90a4e1d9002fe	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=apache-2	180c38b784f982b4eaf90a4e1d9002fe	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a8dadcf1e82a58ce77847cdd3bed84e
diff --git a/metadata/md5-cache/www-servers/apache-2.4.47 b/metadata/md5-cache/www-servers/apache-2.4.47
index 98041a754d25..8554ee6a1f7a 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.47
+++ b/metadata/md5-cache/www-servers/apache-2.4.47
@@ -12,5 +12,5 @@ RDEPEND=apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lu
 REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.47.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	180c38b784f982b4eaf90a4e1d9002fe	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=apache-2	180c38b784f982b4eaf90a4e1d9002fe	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a8dadcf1e82a58ce77847cdd3bed84e
diff --git a/metadata/md5-cache/www-servers/apache-2.4.48 b/metadata/md5-cache/www-servers/apache-2.4.48
index 82a9dd83ec3d..0dc55545fa00 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.48
+++ b/metadata/md5-cache/www-servers/apache-2.4.48
@@ -12,5 +12,5 @@ RDEPEND=apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lu
 REQUIRED_USE=apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.48.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	180c38b784f982b4eaf90a4e1d9002fe	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=apache-2	180c38b784f982b4eaf90a4e1d9002fe	autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1a8dadcf1e82a58ce77847cdd3bed84e
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100 b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
index a6e6b9b7663d..7c017ba4c26c 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=kerberos? ( ssl ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a25ddebbdf9b489fb95e88ab4e1f1876
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.58 b/metadata/md5-cache/www-servers/lighttpd-1.4.58
index 6f6ce40fffd6..c930b604f025 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.58
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.58
@@ -12,5 +12,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6252f9d0fbd25916607abb655696bcd5
diff --git a/metadata/md5-cache/www-servers/moonbridge-1.0.1 b/metadata/md5-cache/www-servers/moonbridge-1.0.1
index d5413c8fe990..d84106a18fa0 100644
--- a/metadata/md5-cache/www-servers/moonbridge-1.0.1
+++ b/metadata/md5-cache/www-servers/moonbridge-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3?
 REQUIRED_USE=^^ ( lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://www.public-software-group.org/pub/projects/moonbridge/v1.0.1/moonbridge-v1.0.1.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4968c82c8cbc1f4bee34e941d41ee378
diff --git a/metadata/md5-cache/www-servers/nginx-1.20.1 b/metadata/md5-cache/www-servers/nginx-1.20.1
index e01c5e48b531..f42491d4f4fb 100644
--- a/metadata/md5-cache/www-servers/nginx-1.20.1
+++ b/metadata/md5-cache/www-servers/nginx-1.20.1
@@ -13,5 +13,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_h
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.20.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.5.3.tar.gz -> njs-0.5.3.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.5.3.tar.gz -> njs-0.5.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ca2b13b952db99f03737a1954bb57032
diff --git a/metadata/md5-cache/www-servers/nginx-1.21.0 b/metadata/md5-cache/www-servers/nginx-1.21.0
index 89302d5775b7..0d15b866c3cc 100644
--- a/metadata/md5-cache/www-servers/nginx-1.21.0
+++ b/metadata/md5-cache/www-servers/nginx-1.21.0
@@ -13,5 +13,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_h
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.21.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.5.3.tar.gz -> njs-0.5.3.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.3.tar.gz -> ngx_http_geoip2_module-3.3.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.5.3.tar.gz -> njs-0.5.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	d3fc79d3d50544347e324864f95206e2	perl-functions	f1ee42d38920b69fd6b6229cef80b7f4	perl-module	58b5d72d607014c48b5a1e106318d584	ssl-cert	f89abc915c0b80c4a66bd4c321169d3d	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=856cf0992ef48784708fb03a7bd4e230
diff --git a/metadata/md5-cache/www-servers/puma-3.12.5-r1 b/metadata/md5-cache/www-servers/puma-3.12.5-r1
deleted file mode 100644
index 785d0819bcec..000000000000
--- a/metadata/md5-cache/www-servers/puma-3.12.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=7
-HOMEPAGE=https://puma.io/
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v3.12.5.tar.gz -> puma-3.12.5.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=60ca0a6d810a5617f91f34a48be314d5
diff --git a/metadata/md5-cache/www-servers/puma-5.1.1 b/metadata/md5-cache/www-servers/puma-5.1.1
deleted file mode 100644
index 9784c266d072..000000000000
--- a/metadata/md5-cache/www-servers/puma-5.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=7
-HOMEPAGE=https://puma.io/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v5.1.1.tar.gz -> puma-5.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=63ed86d269d5662fade6fc6d8cbf2a29
diff --git a/metadata/md5-cache/www-servers/puma-5.2.2 b/metadata/md5-cache/www-servers/puma-5.2.2
deleted file mode 100644
index 8efa7a4dcb6d..000000000000
--- a/metadata/md5-cache/www-servers/puma-5.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=7
-HOMEPAGE=https://puma.io/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v5.2.2.tar.gz -> puma-5.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=627fe7bf75435da0e39bf23eeb48f8bc
diff --git a/metadata/md5-cache/www-servers/puma-5.3.0 b/metadata/md5-cache/www-servers/puma-5.3.0
deleted file mode 100644
index ad51a9a6d839..000000000000
--- a/metadata/md5-cache/www-servers/puma-5.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=7
-HOMEPAGE=https://puma.io/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v5.3.0.tar.gz -> puma-5.3.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=627fe7bf75435da0e39bf23eeb48f8bc
diff --git a/metadata/md5-cache/www-servers/puma-5.3.1 b/metadata/md5-cache/www-servers/puma-5.3.1
deleted file mode 100644
index 800c0ff7f348..000000000000
--- a/metadata/md5-cache/www-servers/puma-5.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] test? ( dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] test? ( dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] test? ( dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=7
-HOMEPAGE=https://puma.io/
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v5.3.1.tar.gz -> puma-5.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=627fe7bf75435da0e39bf23eeb48f8bc
diff --git a/metadata/md5-cache/www-servers/puma-5.3.2 b/metadata/md5-cache/www-servers/puma-5.3.2
index 46b29b6b6c42..bea548123617 100644
--- a/metadata/md5-cache/www-servers/puma-5.3.2
+++ b/metadata/md5-cache/www-servers/puma-5.3.2
@@ -5,7 +5,7 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=7
 HOMEPAGE=https://puma.io/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0 ruby_targets_ruby25? ( dev-ruby/nio4r:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/nio4r:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/nio4r:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v5.3.2.tar.gz -> puma-5.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	5e2d0d0c89a1e9425bc8dacd73e7e940	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=627fe7bf75435da0e39bf23eeb48f8bc
+_md5_=d5ee3f1d8ce0be4cc5521196bc03eb2c
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
index b9b2211da8ef..f871883982af 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 ) ) python-asyncio? ( || ( python_targets_python3_8 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c487914609e8643d9dde3715ab4fe0c0
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r101 b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r101
index 9b6ce4dd037e..5e858cdd221e 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r101
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r101
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio python-gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-asyncio? ( || ( python_targets_python3_8 python_targets_python3_9 ) ) python-gevent? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.19.1.tar.gz -> uwsgi-2.0.19.1.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	d3fc79d3d50544347e324864f95206e2	php-ext-source-r3	59705d3e8b4658c589d46b4c7f90150c	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	ruby-ng	b97a1a9a3103f9a66f622ea3eb2ce12b	ruby-utils	03dfa7f54d59d740c2964dc7256d2820	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=78fdde5ef945e81b3abc955fb9b33a51
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ca18ec5ddfcb..674e339916a3 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.2 b/metadata/md5-cache/x11-libs/libX11-1.7.2
new file mode 100644
index 000000000000..91d8cafda947
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libxcb-1.11.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(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org X11 library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
+IUSE=ipv6 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 doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.11.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(-)?] !<x11-base/xorg-proto-2019.2 x11-misc/compose-tables
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=b08fa6aebbb0b73fcfba460d180261a5
diff --git a/metadata/md5-cache/x11-libs/vte-0.64.2 b/metadata/md5-cache/x11-libs/vte-0.64.2
new file mode 100644
index 000000000000..75c29f7eb5d2
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/vte-0.64.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.13 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/gtk+-3.24.14:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
+IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=>=x11-libs/gtk+-3.24.14:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.91
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.64.2/vte-0.64.2.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.64.1-command-notify.patch.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vala	167a20a57e4418cc17272186272b021a	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4aa14eecbf1aab90278a8b28cc27d089
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 679e0398a9e6..b4c516db8944 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/compose-tables-1.7.2 b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
new file mode 100644
index 000000000000..965aa9b96529
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.2
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
+DESCRIPTION=X.Org Compose Key tables from libX11
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=MIT
+RDEPEND=!<x11-libs/libX11-1.7.0
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.2.tar.bz2
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	212a355607d8ee9cf75132010ead368c
+_md5_=2da942363138e3c043d2346abe992f1c
diff --git a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100 b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
index c762db580269..3d62b3dffcc2 100644
--- a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
+++ b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz
-_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4f38972efbcc854a06b76a945f7d8b0c
diff --git a/metadata/md5-cache/x11-misc/dex-0.8.0 b/metadata/md5-cache/x11-misc/dex-0.8.0
index 7ef712d8def8..f47a533742f7 100644
--- a/metadata/md5-cache/x11-misc/dex-0.8.0
+++ b/metadata/md5-cache/x11-misc/dex-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install
-DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] doc? ( dev-python/sphinx )
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] doc? ( dev-python/sphinx )
 DESCRIPTION=DesktopEntry eXecution - tool to manage and launch autostart entries
 EAPI=7
 HOMEPAGE=http://e-jc.de/
-IUSE=doc python_targets_python3_8
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_8 )
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/jceb/dex/archive/v0.8.0.tar.gz -> dex-0.8.0.tar.gz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=60a5e7489d6d392e6102044454a25681
+_md5_=3e38308b79be1686a6a03b098d5694cf
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2 b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
index 0b7ece5f6a74..79a5ce21a2fb 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-python/python-distutils-extra[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Advanced freedesktop.org compliant menu editor
 EAPI=7
-HOMEPAGE=https://bluesabre.org/projects/menulibre/
+HOMEPAGE=https://bluesabre.org/menulibre/
 IUSE=python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=937519a9e0a5aa6fc29f115a69e183be
+_eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8bdd80d785e6dc384eb4672eb43447d3
diff --git a/metadata/md5-cache/x11-misc/read-edid-1.4.2 b/metadata/md5-cache/x11-misc/read-edid-1.4.2
deleted file mode 100644
index 393567d93a5e..000000000000
--- a/metadata/md5-cache/x11-misc/read-edid-1.4.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Get EDID information from a PnP monitor
-EAPI=6
-HOMEPAGE=http://www.polypux.org/projects/read-edid/
-KEYWORDS=~alpha amd64 ppc ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-1.4.2.tar.gz
-_md5_=31a11266c182112a5583425ff1c6d9b6
diff --git a/metadata/md5-cache/x11-misc/read-edid-3.0.2 b/metadata/md5-cache/x11-misc/read-edid-3.0.2
deleted file mode 100644
index bf39a64d0da4..000000000000
--- a/metadata/md5-cache/x11-misc/read-edid-3.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libx86-1.1 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Program that can get information from a PnP monitor
-EAPI=6
-HOMEPAGE=http://www.polypux.org/projects/read-edid/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libx86-1.1
-SLOT=0
-SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-3.0.2.tar.gz
-_eclasses_=cmake-utils	12008d68ebfd61f49a377c49f83558a8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=532a793a3c5ec982cc57010dd70711d2
diff --git a/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1 b/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
index 1c33312f03d0..6a9dd8f0a425 100644
--- a/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
+++ b/metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Program that can get information from a PnP monitor
 EAPI=7
 HOMEPAGE=http://www.polypux.org/projects/read-edid/
 IUSE=vbe-mode kernel_linux
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=vbe-mode? ( >=dev-libs/libx86-1.1 )
 SLOT=0
 SRC_URI=http://www.polypux.org/projects/read-edid/read-edid-3.0.2.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	30ded7f9adbdd03d3e848cdd74f6c395	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3e20efc653c89b57655e6541f79d547
+_md5_=772085c569116cd8f3e94812d53f04e1
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4 b/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
index 9a875696e6f3..8079d02a67a4 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
@@ -1,7 +1,7 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A modular screen saver and locker for the X Window System
+DESCRIPTION=modular screen saver and locker for the X Window System
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama
@@ -11,5 +11,5 @@ RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appr
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.44.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a2437ca89c6cbec03f36ec545be24bc9
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b0d56e1eb0ef6ec89c0179d8e1944cfb
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45 b/metadata/md5-cache/x11-misc/xscreensaver-5.45
index 341d65cb1f0b..2c684a499759 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.45
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45
@@ -1,7 +1,7 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-221 ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A modular screen saver and locker for the X Window System
+DESCRIPTION=modular screen saver and locker for the X Window System
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama
@@ -11,5 +11,5 @@ RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appr
 REQUIRED_USE=gdk-pixbuf? ( gtk )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7bda68503114475ca79a1baf88a9bf9d
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	e142388219c7fee6ff016fe1c78a10a5	pam	b097695df28f3974e3af860d6704d4f2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c3544eb48df0c88c5c7fbc0a74c28e8f
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 66570963421b..9000bc1132e7 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/gnome-terminal-3.40.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.40.2
new file mode 100644
index 000000000000..65482a43b675
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.40.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.64.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Gnome Terminal
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
+IUSE=debug +gnome-shell +nautilus vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.64.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-terminal/3.40/gnome-terminal-3.40.2.tar.xz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3afdedb4c6d2ba654f3e7636c408880d
diff --git a/metadata/md5-cache/x11-terms/sakura-3.7.1 b/metadata/md5-cache/x11-terms/sakura-3.7.1
index 0bb52e6e9c77..ea3bb9019d6e 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.7.1
+++ b/metadata/md5-cache/x11-terms/sakura-3.7.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.20:2 >=x11-libs/gtk+-3.20:3[X] x11-libs/libX11 >=x11-l
 SLOT=0
 SRC_URI=https://launchpad.net/sakura/trunk/3.7.1/+download/sakura-3.7.1.tar.bz2
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb6fe3ba41a4d79046c5758f7963be0b
+_md5_=5166fab04b8b17e04e43f98504af56e9
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.1 b/metadata/md5-cache/x11-terms/terminator-2.1.1
index 86b428588e34..29ce258b6b1d 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.1
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Multiple GNOME terminals in one window
 EAPI=7
 HOMEPAGE=https://github.com/gnome-terminator/terminator
 IUSE=test test python_targets_python3_8 python_targets_python3_9 verify-sig test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycairo[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.1/terminator-2.1.1.tar.gz.asc )
 _eclasses_=distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	e142388219c7fee6ff016fe1c78a10a5	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b29c7bc9415be3c2d37c691fa82ba5e8
+_md5_=f9379f8da9df2ed07d638b33b3590c0f
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 8d85f8f4b17a..3847a24431c4 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
deleted file mode 100644
index 70ec6be3dfc2..000000000000
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= x11-libs/gtk+:3[X]
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= x11-libs/gtk+:3[X]
-DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
-EAPI=7
-HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.6:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= x11-libs/gtk+:3[X]
-SLOT=0
-SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.6.1.tar.gz -> QGnomePlatform-0.6.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	dc74fe3891abc25e80dad5cd3d7c6e47	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=163687b62b73a56052d5536e786f9c05
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.8.0 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.8.0
new file mode 100644
index 000000000000..a3308845879d
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.8.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.12:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.3.1 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.12:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.3.1
+DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
+EAPI=7
+HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.12:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.3.1
+SLOT=0
+SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.8.0.tar.gz -> QGnomePlatform-0.8.0.tar.gz
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dea686fd3f1f3c8e1aa86fa22e1223ab
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4 b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
deleted file mode 100644
index ad07e618e2d1..000000000000
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-DESCRIPTION=A style to bend Qt applications to look like they belong into GNOME Shell
-EAPI=7
-HOMEPAGE=https://github.com/FedoraQt/adwaita-qt
-IUSE=gnome
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gnome? ( x11-themes/QGnomePlatform )
-SLOT=0
-SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.1.4/adwaita-qt-1.1.4.tar.gz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a2f43a6288e91e938852aae098772cd
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.3.0 b/metadata/md5-cache/x11-themes/adwaita-qt-1.3.1
similarity index 92%
rename from metadata/md5-cache/x11-themes/adwaita-qt-1.3.0
rename to metadata/md5-cache/x11-themes/adwaita-qt-1.3.1
index f3b78c437fbe..e1cf0a4e3027 100644
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.3.0
+++ b/metadata/md5-cache/x11-themes/adwaita-qt-1.3.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2 LGPL-2
 PDEPEND=gnome? ( x11-themes/QGnomePlatform )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
-SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.3.0/adwaita-qt-1.3.0.tar.gz
+SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.3.1/adwaita-qt-1.3.1.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc2652b56c4a64f5fb250b8bb2fe51d8
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100 b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
index d135a9af3d52..0c411ccfd736 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
+++ b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	c311a933538fe97b72600926696ea66f	multilib-minimal	12533389e8f5cc25f70ffcddbc9b3d29	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d2347f14ae71b243de25364a4ecb01b
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
index 69147a3a3429..37181671ea6a 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
@@ -3,9 +3,9 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free and open source SVG icon theme
 EAPI=7
 HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20210401.tar.gz -> papirus-icon-theme-20210401.tar.gz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8bc0cb49c7b0db8b2120749bddcd075
+_md5_=3d8b0317eec7f8b6b9798dbb32cdd52b
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210501 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210501
index 8469880c1b74..0219b6c3d8d4 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210501
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210501
@@ -3,9 +3,9 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free and open source SVG icon theme
 EAPI=7
 HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20210501.tar.gz -> papirus-icon-theme-20210501.tar.gz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=845f8831ddbfd25d8ca5a49eefba4b6c
+_md5_=3d8b0317eec7f8b6b9798dbb32cdd52b
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210601 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210601
index 7e4c1443e0cf..0e061ae9977b 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20210601
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20210601
@@ -3,9 +3,9 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free and open source SVG icon theme
 EAPI=7
 HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20210601.tar.gz -> papirus-icon-theme-20210601.tar.gz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=845f8831ddbfd25d8ca5a49eefba4b6c
+_md5_=41a1da4d87eaec5c558d37dbb21f99b3
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 8d023fb5f306..420055acdd20 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/awesome-4.3-r101 b/metadata/md5-cache/x11-wm/awesome-4.3-r101
index 8d9790fc78c4..d042933ffefc 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.3-r101
+++ b/metadata/md5-cache/x11-wm/awesome-4.3-r101
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.3.tar.xz
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b218af7fd0b341d93ce2878699d16894
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index 32288fd8c10a..ecf7a248e150 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	d3fc79d3d50544347e324864f95206e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b88f4902eddb626b8585be2ec95c6d72
diff --git a/metadata/md5-cache/x11-wm/ctwm-4.0.3 b/metadata/md5-cache/x11-wm/ctwm-4.0.3
index b04223faaa4f..55881c594f8a 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.3
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=A clean, light window manager
 EAPI=7
 HOMEPAGE=https://ctwm.org/
 IUSE=jpeg rplay test xpm test
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt jpeg? ( virtual/jpeg ) rplay? ( media-sound/rplay ) xpm? ( x11-libs/libXpm )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://ctwm.org/dist/ctwm-4.0.3.tar.xz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa8c246cf541548b94743530a8bf0345
+_md5_=83a480adca5c5d9a0651368431b5ac2c
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.2 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
similarity index 58%
rename from metadata/md5-cache/x11-wm/herbstluftwm-0.9.2
rename to metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
index 2ade3d04b82b..b85ecc0d292f 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.2
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/pkgconfig doc? ( app-text/asciidoc ) dev-util/ninja dev-util/cmake
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 DESCRIPTION=A manual tiling window manager for X
 EAPI=7
 HOMEPAGE=https://herbstluftwm.org/
-IUSE=doc examples python python_targets_python3_8 python_targets_python3_9
+IUSE=+doc python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.2.tar.gz
+SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.3.tar.gz
 _eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6287312d486f5dd1f9eaf35f8bf17ba3
+_md5_=f2e9ea8150b4ca2fdd42eecad15a4f7c
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 6312052fe598..fb86fb7825ee 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -1,13 +1,14 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig doc? ( app-text/asciidoc ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
+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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] virtual/pkgconfig doc? ( app-text/asciidoc ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 DESCRIPTION=A manual tiling window manager for X
 EAPI=7
 HOMEPAGE=https://herbstluftwm.org/
-IUSE=doc examples
+IUSE=+doc python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr app-shells/bash
+RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash 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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-),-python_single_target_python3_10(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
-_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	17241a11501065ff3651350040875aa9	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7a2c978aebde16d1492d108bc82fb32d
+_eclasses_=cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	distutils-r1	c21cf58c1e3c67e0ea53c96a7b37eddd	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	26e4ad0a4190b14f70973dc253e86535	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f2e9ea8150b4ca2fdd42eecad15a4f7c
diff --git a/metadata/md5-cache/x11-wm/icewm-2.3.3 b/metadata/md5-cache/x11-wm/icewm-2.4.0
similarity index 96%
rename from metadata/md5-cache/x11-wm/icewm-2.3.3
rename to metadata/md5-cache/x11-wm/icewm-2.4.0
index e3c014748333..6caa7ab392cb 100644
--- a/metadata/md5-cache/x11-wm/icewm-2.3.3
+++ b/metadata/md5-cache/x11-wm/icewm-2.4.0
@@ -11,6 +11,6 @@ RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/li
 REQUIRED_USE=|| ( alsa ao )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.3.3/icewm-2.3.3.tar.lz
+SRC_URI=https://github.com/ice-wm/icewm/releases/download/2.4.0/icewm-2.4.0.tar.lz
 _eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	unpacker	517f16af48ee3ab88180dd58b5143213
 _md5_=5babf10b1421abe9fa23bc4253aa2bc3
diff --git a/metadata/md5-cache/x11-wm/mutter-40.1-r1 b/metadata/md5-cache/x11-wm/mutter-40.1-r1
index c372b27cd79b..ad096ec32935 100644
--- a/metadata/md5-cache/x11-wm/mutter-40.1-r1
+++ b/metadata/md5-cache/x11-wm/mutter-40.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] >=dev-libs/glib-2.67.3:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] gnome-base/gnome-desktop:3= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus media-libs/mesa[X(+),egl] sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 ) wayland? ( >=dev-libs/wayland-protocols-1.19 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl,gbm,wayland,gles2] >=dev-libs/libinput-1.15.0 systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) x11-base/xorg-server[wayland] ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:0/0.3 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gnome-extra/zenity
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/mutter/40/mutter-40.1.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-40.1-r1-patchset.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	df5c6c53843e1be0aad724138e78bbc3	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	5ec14fdbc5446b8767e87e186e3b1a52	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	0a780e1ab49c75da33a78ede35ab8f9c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fdd964561208960872b559baa21fc39
+_md5_=7e82848b0dde2e631ef104c43d714a22
diff --git a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100 b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
index aff128dbca49..cb128b9d5bba 100644
--- a/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
+++ b/metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) xrandr? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/raboof/notion/archive/3-2015061300.tar.gz -> notion-3_p2015061300.tar.gz
-_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=72c4d9ecc074c3c5564901e84e43cb47
diff --git a/metadata/md5-cache/x11-wm/notion-9999 b/metadata/md5-cache/x11-wm/notion-9999
index 8d17cc3785f8..fff0b3c4d257 100644
--- a/metadata/md5-cache/x11-wm/notion-9999
+++ b/metadata/md5-cache/x11-wm/notion-9999
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) xrandr? ( xinerama )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	f89d52950f35686c55327aa60782641c	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=14f6b62be50d3d5389ff773075dba54d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 18a978d5ed12..23065f547d9e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 11861 BLAKE2B d964248c41b84f886b574b202797bf5ca4e4daab43a2ee89f91980217bef4cc4a2db4ba62bee9d776df1576310929094ba5de5d0d663333246e62b97cf9e80e9 SHA512 abeda169eddbea3816fe422e67f34fd8eb940bb77b9ef57b12823dcd839e1b9c8ad5acba22b2820d822a4d458310b63680bfda958293f405fe662e7a722b227c
-TIMESTAMP 2021-06-04T04:39:09Z
+TIMESTAMP 2021-06-07T14:08:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC5rm1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmC+KHZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCRKw/+Lg3oFhrjMR4e6h2/+t4cNJqm7Di6Eg1F552DLiHub5Sszb3dEovSA9aJ
-2RIWUpaZ644hnjFi3zRp9l9RxlGZOIivnswFJ/1EMY5lgZ/8vXuCnoDJ0E6fUYAY
-k3YeHL2rtjsBbrTjzYpLnGJXxA9KsLZO/ojh4ZJzel+y6ovIXaSH2+efUR5fDRv4
-qtgpkZdg14PF7YzfxF+PlMnear1X5vaSlYPMeH/dyIQKRyACTj0mRy/fpmCYHkLv
-PhtB1lw318BEthgCbndITeA+ucMRRcyB8JSnvcCnFiV5G7aQk1ZQ6Cw49yn5nNBp
-BBFBoipC1FkDLASbvf8sFM0ypYRHuhQ59ZpREaPNeLohVknutRt9jNOkcxcmlWjT
-ivz8yrr8mxMvCCA2P+CyeGyij3TJsL3/rrjYd1Q9DvHvPi5gC6i9H05CGngCw/tD
-4htOpAMe0JE4/0vb8T0Bgv9xkvSbSNLzrhKPVVSmBic5qPXR0WuozJVSm+Ok110W
-isRe9TPpw2mF7Stmm4faRr6G+21z+ZwqgIoJbV9yuo+KbfrNOLvpZBHDKMswf5Il
-LPURVjCAaXX+UCbOqLXC+/rDotxVQemZMusD+mmTvuqk2oMxnoR6Tp4q97fu1xjD
-k0TLCRzL/ACwkI11ASOPoCznKWBIHO1od4zIj7rpU3Exo9lbL/I=
-=wVOZ
+klBsYRAArUqi5edigvrZkb+P2KsvVR3M/jSkvd+Paj50+9yKCiT1tGV5bF1fnsBZ
+UC6VTlNdp3MboadQ2rsV/kXTqjCfseFrE28h98TLybhpt2DLNkMf/IFd1PeGqvp9
+cwT2j2hJoG65OViaeZq5DZE0pplZIa0PI1pcgKVYFoCaAdpJ+0exZaIuer9xhIL8
+itgxoO3CZqh+HeTh0Z7sLM1vza3TS5GG4N+p+iq0NHpLyYbFdjc/CavNiNDdraDC
+HFlb1W+vxmkHahWxUcCbx2L8JQFH5KIUNUPH+ayrVuYMpJo7IbCIhP187ZaaLKpu
+MTK5v7HI4aVZkM73KhoI7oQ8OJXlkahaBHDAtLfUxs/p4B6Bw4PveWBm/iSIYmc3
+swNTAmla560Ogdq+Y9gMH/WsaRVEHaXk1ubyeQgmSgMKRTYxcC8U4CndP9K0fP/a
+zvFsMRO83b7W0uH1vDgQCPcNwcz1CALLBKkNIIl262UoRs5hBiwQN6o9TbSbD69I
+Mjyrsy7FYeYYhdOhJ4Vkd9G9zsZeVCr5N4iKxptq5eQTJPZcUQ7HxYVRjiPEUeiS
+TXu2dei52X79atI/59jfIGRtcyoS3oKxGo8gW4yjpmqNQezuVQqKHkrM3fowN2a3
+91x/h3C8KOya5OrUfckhnGMUaUpiK2eDUCSIyvo4jdjyplsXNdI=
+=bE7p
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1eeae90b630d..c8259c60f7ba 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Jun 2021 04:39:05 +0000
+Mon, 07 Jun 2021 14:08:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1e004e124aab..f7b2197853f4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun  4 04:39:05 AM UTC 2021
+Mon Jun  7 02:08:50 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index ab9e806dd483..ddbe93bb3974 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -700,6 +700,7 @@
 2104150839 ./app-accessibility/accerciser/accerciser-3.38.0.ebuild
 2106040440 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
 2106040440 ./app-accessibility/at-spi2-core/at-spi2-core-2.40.1.ebuild
+2106070109 ./app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
 2104190539 ./app-accessibility/brltty/brltty-6.1.ebuild
 2105311839 ./app-accessibility/caribou/caribou-0.4.21-r3.ebuild
 2012281739 ./app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -734,8 +735,9 @@
 2012221309 ./app-admin/ansible-cmdb/ansible-cmdb-1.30.ebuild
 2101310342 ./app-admin/ansible-cmdb/ansible-cmdb-1.28.ebuild
 2102261739 ./app-admin/ansible-lint/ansible-lint-5.0.2.ebuild
-2104161439 ./app-admin/ansible/ansible-9999.ebuild
 2104180639 ./app-admin/ansible/ansible-2.10.7.ebuild
+2106060639 ./app-admin/ansible/ansible-2.11.1.ebuild
+2106060639 ./app-admin/ansible/ansible-9999.ebuild
 2105131709 ./app-admin/apache-tools/apache-tools-2.4.46.ebuild
 2105131709 ./app-admin/apache-tools/apache-tools-2.4.47.ebuild
 2105261039 ./app-admin/apache-tools/apache-tools-2.4.48.ebuild
@@ -804,7 +806,7 @@
 2104060140 ./app-admin/eselect/eselect-1.4.16.ebuild
 2104060140 ./app-admin/eselect/eselect-1.4.17.ebuild
 1910042139 ./app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
-2105281009 ./app-admin/exo/exo-1.30.0.ebuild
+2106071009 ./app-admin/exo/exo-1.31.0.ebuild
 2104130239 ./app-admin/fam/fam-2.7.0_p17_p3.ebuild
 1907151839 ./app-admin/fetchlog/fetchlog-1.4-r1.ebuild
 1705160027 ./app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild
@@ -844,6 +846,7 @@
 2101070439 ./app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild
 2104040109 ./app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
 2105081009 ./app-admin/hcloud/hcloud-1.22.1.ebuild
+2106071009 ./app-admin/hcloud/hcloud-1.23.0.ebuild
 2012311940 ./app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
 2010250909 ./app-admin/helm/helm-3.3.4.ebuild
 2011282239 ./app-admin/helm/helm-3.4.1.ebuild
@@ -943,8 +946,7 @@
 2101061609 ./app-admin/pwgen/pwgen-2.08.ebuild
 2101310343 ./app-admin/pwman3/pwman3-0.10.0-r1.ebuild
 2105231239 ./app-admin/pwman3/pwman3-0.11.1.ebuild
-2101310343 ./app-admin/pydf/pydf-12-r1.ebuild
-2106031139 ./app-admin/pydf/pydf-12-r2.ebuild
+2106070939 ./app-admin/pydf/pydf-12-r2.ebuild
 2002112050 ./app-admin/qpage/qpage-3.3.ebuild
 2104050539 ./app-admin/qtpass/qtpass-1.3.2-r2.ebuild
 2104060140 ./app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -961,12 +963,8 @@
 2102212309 ./app-admin/restart-services/restart-services-0.17.0.ebuild
 2104031909 ./app-admin/rex/rex-1.13.3.ebuild
 2104031909 ./app-admin/rex/rex-9999.ebuild
-2105021239 ./app-admin/rsyslog/rsyslog-8.2010.0.ebuild
-2105021239 ./app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
-2105021239 ./app-admin/rsyslog/rsyslog-8.2012.0.ebuild
 2105021239 ./app-admin/rsyslog/rsyslog-8.2104.0.ebuild
 2105160309 ./app-admin/rsyslog/rsyslog-8.2102.0.ebuild
-2105311239 ./app-admin/rsyslog/rsyslog-8.2008.0.ebuild
 1712251809 ./app-admin/sagan-rules/sagan-rules-20140617.ebuild
 2103111109 ./app-admin/sagan-rules/sagan-rules-20210208.ebuild
 2103111109 ./app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -1054,16 +1052,16 @@
 2103221739 ./app-admin/graylog/graylog-4.0.5.ebuild
 2105282239 ./app-admin/graylog/graylog-3.3.13.ebuild
 2105282239 ./app-admin/graylog/graylog-4.0.7.ebuild
-2104161439 ./app-admin/ansible-base/ansible-base-2.10.4.ebuild
 2105140539 ./app-admin/ansible-base/ansible-base-2.10.9.ebuild
+2106060639 ./app-admin/ansible-base/ansible-base-2.10.10.ebuild
 2105181809 ./app-admin/xkcdpass/xkcdpass-1.17.6-r1.ebuild
 2105281739 ./app-admin/xkcdpass/xkcdpass-1.19.2.ebuild
 2010020009 ./app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
 2011030939 ./app-admin/selint/selint-9999.ebuild
 2012201939 ./app-admin/selint/selint-1.1.0.ebuild
 2105122339 ./app-admin/selint/selint-1.2.0.ebuild
-2104071539 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.25.1.ebuild
 2105271139 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.4.ebuild
+2106041039 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.26.5.ebuild
 2101251809 ./app-admin/undertaker-scripts/undertaker-scripts-1.ebuild
 2102141809 ./app-admin/doctl/doctl-9999.ebuild
 2102281209 ./app-admin/doctl/doctl-1.57.0.ebuild
@@ -1082,7 +1080,8 @@
 2105291139 ./app-admin/awscli/awscli-1.19.84.ebuild
 2106020141 ./app-admin/awscli/awscli-1.19.85.ebuild
 2106030240 ./app-admin/awscli/awscli-1.19.86.ebuild
-2106040109 ./app-admin/awscli/awscli-1.19.87.ebuild
+2106041939 ./app-admin/awscli/awscli-1.19.87.ebuild
+2106051139 ./app-admin/awscli/awscli-1.19.88.ebuild
 2104302039 ./app-antivirus/clamav/clamav-0.103.2.ebuild
 2105122239 ./app-antivirus/clamtk/clamtk-6.11.ebuild
 2105141239 ./app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild
@@ -1116,7 +1115,7 @@
 2105311239 ./app-arch/dpkg/dpkg-1.19.0.5.ebuild
 2105311239 ./app-arch/dpkg/dpkg-1.19.6.ebuild
 2105311239 ./app-arch/dpkg/dpkg-1.19.7.ebuild
-2106030309 ./app-arch/dpkg/dpkg-1.20.7.1.ebuild
+2106041739 ./app-arch/dpkg/dpkg-1.20.7.1.ebuild
 2011141839 ./app-arch/duff/duff-0.5.2.ebuild
 2104080209 ./app-arch/dump/dump-0.4.47.ebuild
 2009071209 ./app-arch/engrampa/engrampa-1.24.0-r1.ebuild
@@ -1126,6 +1125,7 @@
 1712291639 ./app-arch/funzix/funzix-1.0.ebuild
 2104060140 ./app-arch/gcab/gcab-1.4.ebuild
 2105291839 ./app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
+2106070109 ./app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
 2103050309 ./app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
 2104060140 ./app-arch/gzip/gzip-1.10.ebuild
 1906201239 ./app-arch/hardlink/hardlink-0.3.2.ebuild
@@ -1148,6 +1148,7 @@
 2101061609 ./app-arch/lzop/lzop-1.04.ebuild
 2104031909 ./app-arch/makeself/makeself-2.2.0-r2.ebuild
 2105220439 ./app-arch/makeself/makeself-2.4.3.ebuild
+2106050739 ./app-arch/makeself/makeself-2.4.4.ebuild
 2012311940 ./app-arch/mscompress/mscompress-0.3-r1.ebuild
 2104031909 ./app-arch/mt-st/mt-st-1.3.ebuild
 2104031909 ./app-arch/mt-st/mt-st-9999.ebuild
@@ -1245,6 +1246,7 @@
 2105182009 ./app-backup/bacula/bacula-9.6.6.ebuild
 2105182009 ./app-backup/bacula/bacula-9.6.7.ebuild
 2105262009 ./app-backup/bacula/bacula-11.0.3.ebuild
+2106061209 ./app-backup/bacula/bacula-11.0.5.ebuild
 2104302039 ./app-backup/bareos/bareos-17.2.10.ebuild
 2104302039 ./app-backup/bareos/bareos-18.2.10.ebuild
 2104302039 ./app-backup/bareos/bareos-19.2.9.ebuild
@@ -1281,7 +1283,7 @@
 2104031909 ./app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
 2002180939 ./app-backup/rdedup/rdedup-1.0.2.ebuild
 2101310343 ./app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
-2106031139 ./app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
+2106071639 ./app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
 1908281239 ./app-backup/rdumpfs/rdumpfs-0.1.ebuild
 2104161439 ./app-backup/rdup/rdup-1.1.15.ebuild
 2104302039 ./app-backup/rear/rear-2.4.ebuild
@@ -1293,9 +1295,9 @@
 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
-2002231739 ./app-backup/snapper/snapper-0.5.6-r1.ebuild
-2006040608 ./app-backup/snapper/snapper-0.8.9-r1.ebuild
-2101160039 ./app-backup/snapper/snapper-0.8.15-r1.ebuild
+2106060939 ./app-backup/snapper/snapper-0.8.15-r1.ebuild
+2106060939 ./app-backup/snapper/snapper-0.8.16.ebuild
+2106070409 ./app-backup/snapper/snapper-0.9.0.ebuild
 2104031909 ./app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
 2105082209 ./app-backup/tarsnap/tarsnap-1.0.39.ebuild
 2104180939 ./app-backup/tsm/tsm-8.1.6.0-r1.ebuild
@@ -1410,10 +1412,9 @@
 2101310343 ./app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
 2101310343 ./app-crypt/acme-tiny/acme-tiny-9999.ebuild
 2103031909 ./app-crypt/acme/acme-9999.ebuild
-2104032239 ./app-crypt/acme/acme-1.13.0.ebuild
-2105060439 ./app-crypt/acme/acme-1.15.0.ebuild
 2105092109 ./app-crypt/acme/acme-1.14.0.ebuild
 2106021839 ./app-crypt/acme/acme-1.16.0.ebuild
+2106060709 ./app-crypt/acme/acme-1.15.0.ebuild
 1809280333 ./app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
 2102241939 ./app-crypt/aescrypt/aescrypt-3.14.ebuild
 1809280333 ./app-crypt/aespipe/aespipe-2.4e.ebuild
@@ -1429,22 +1430,19 @@
 2101250209 ./app-crypt/ccid/ccid-1.4.34.ebuild
 2101061609 ./app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
 2101061609 ./app-crypt/ccrypt/ccrypt-1.11.ebuild
-2104032239 ./app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
-2105060439 ./app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
 2105092109 ./app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
 2106021839 ./app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
 2106021839 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
+2106060709 ./app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
 2101310343 ./app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
-2104032239 ./app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
-2105060439 ./app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
 2105092109 ./app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
 2106021839 ./app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
 2106021839 ./app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
-2104032239 ./app-crypt/certbot/certbot-1.13.0.ebuild
-2105060439 ./app-crypt/certbot/certbot-1.15.0.ebuild
+2106060709 ./app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
 2105092109 ./app-crypt/certbot/certbot-1.14.0.ebuild
 2106021839 ./app-crypt/certbot/certbot-1.16.0.ebuild
 2106021839 ./app-crypt/certbot/certbot-9999.ebuild
+2106060709 ./app-crypt/certbot/certbot-1.15.0.ebuild
 2005060209 ./app-crypt/cfssl/cfssl-1.4.1.ebuild
 2105022009 ./app-crypt/chntpw/chntpw-140201.ebuild
 1702282250 ./app-crypt/ckpass/ckpass-0.2-r1.ebuild
@@ -1522,7 +1520,7 @@
 2101061609 ./app-crypt/libb2/libb2-0.98.1-r3.ebuild
 2104060140 ./app-crypt/libb2/libb2-0.98.1-r2.ebuild
 2104031909 ./app-crypt/libmd/libmd-9999.ebuild
-2106030309 ./app-crypt/libmd/libmd-1.0.3.ebuild
+2106041739 ./app-crypt/libmd/libmd-1.0.3.ebuild
 2101242039 ./app-crypt/libnitrokey/libnitrokey-9999.ebuild
 2103150509 ./app-crypt/libnitrokey/libnitrokey-3.6.ebuild
 2002030009 ./app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1782,8 +1780,8 @@
 2106031739 ./app-dicts/myspell-pt/myspell-pt-20120420.ebuild
 2106031739 ./app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
 2012311940 ./app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
-2106031739 ./app-dicts/myspell-ru/myspell-ru-20180627.ebuild
 2106031739 ./app-dicts/myspell-ru/myspell-ru-20200606.ebuild
+2106070939 ./app-dicts/myspell-ru/myspell-ru-20180627.ebuild
 2012311940 ./app-dicts/myspell-sk/myspell-sk-20110224.ebuild
 2106031739 ./app-dicts/myspell-sk/myspell-sk-20200501.ebuild
 2012311940 ./app-dicts/myspell-sl/myspell-sl-2012.01.04.ebuild
@@ -2276,7 +2274,6 @@
 2105131709 ./app-doc/abs-guide/abs-guide-10.ebuild
 2104060140 ./app-doc/autobook/autobook-1.5.ebuild
 2104060140 ./app-doc/blas-docs/blas-docs-3.1.1.ebuild
-1811281409 ./app-doc/cantera-docs/cantera-docs-2.4.0.ebuild
 2103011139 ./app-doc/cantera-docs/cantera-docs-2.5.1.ebuild
 1912210209 ./app-doc/casting-spels-emacs/casting-spels-emacs-19-r2.ebuild
 2101310343 ./app-doc/cppman/cppman-0.5.1.ebuild
@@ -2309,7 +2306,7 @@
 2105051309 ./app-doc/gnucash-docs/gnucash-docs-4.5.ebuild
 2011290239 ./app-doc/halibut/halibut-1.2.ebuild
 2004032241 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
-2102222209 ./app-doc/kicad-doc/kicad-doc-5.1.9.ebuild
+2106050239 ./app-doc/kicad-doc/kicad-doc-5.1.10.ebuild
 2104060140 ./app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
 2104060140 ./app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
 2104060140 ./app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
@@ -2409,7 +2406,7 @@
 2104180939 ./app-editors/amyedit/amyedit-1.0-r3.ebuild
 2102072339 ./app-editors/bluefish/bluefish-2.2.12.ebuild
 1911201439 ./app-editors/bvi/bvi-1.4.1.ebuild
-2101070439 ./app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
+2106071139 ./app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
 2011010839 ./app-editors/dav/dav-0.8.5-r2.ebuild
 2104130239 ./app-editors/dhex/dhex-0.69.ebuild
 1902091039 ./app-editors/diakonos/diakonos-0.9.4.ebuild
@@ -2424,7 +2421,7 @@
 2105310909 ./app-editors/emacs/emacs-27.1-r4.ebuild
 2105310909 ./app-editors/emacs/emacs-27.2.9999.ebuild
 2105310909 ./app-editors/emacs/emacs-28.0.9999.ebuild
-2106031939 ./app-editors/emacs/emacs-27.2.ebuild
+2106070939 ./app-editors/emacs/emacs-27.2.ebuild
 2105152239 ./app-editors/emact/emact-2.58.0-r1.ebuild
 1910022239 ./app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
 2005101338 ./app-editors/fe/fe-2.0.ebuild
@@ -2524,6 +2521,7 @@
 2102150509 ./app-editors/zile/zile-2.4.15.ebuild
 2105251909 ./app-editors/pyvim/pyvim-3.0.2.ebuild
 2105271139 ./app-editors/vscode/vscode-1.56.2.ebuild
+2106041109 ./app-editors/vscodium/vscodium-1.56.2.ebuild
 1908231509 ./app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
 1910171639 ./app-emacs/adaptive-wrap/adaptive-wrap-0.7.ebuild
 1908271439 ./app-emacs/analog/analog-1.9.99.ebuild
@@ -2657,6 +2655,7 @@
 2009160939 ./app-emacs/magit-popup/magit-popup-2.13.3.ebuild
 1902092209 ./app-emacs/magit/magit-2.13.1.ebuild
 1912131109 ./app-emacs/magit/magit-2.90.1.ebuild
+2106051109 ./app-emacs/magit/magit-3.0.0.ebuild
 1911181439 ./app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
 2101021239 ./app-emacs/markdown-mode/markdown-mode-2.4.ebuild
 2101061639 ./app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
@@ -2785,6 +2784,7 @@
 2009020709 ./app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
 2104020139 ./app-emacs/emacs-common/emacs-common-1.8.ebuild
 2105270939 ./app-emacs/transient/transient-0.3.4.ebuild
+2106051109 ./app-emacs/libegit2/libegit2-0.0.20200515.ebuild
 2104060239 ./app-emulation/aqemu/aqemu-0.9.2.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
 2002241439 ./app-emulation/bochs/bochs-9999.ebuild
@@ -2877,7 +2877,7 @@
 2104201739 ./app-emulation/libvirt/libvirt-7.1.0-r1.ebuild
 2104201739 ./app-emulation/libvirt/libvirt-7.2.0-r1.ebuild
 2105170809 ./app-emulation/libvirt/libvirt-7.3.0.ebuild
-2105170809 ./app-emulation/libvirt/libvirt-9999.ebuild
+2106051440 ./app-emulation/libvirt/libvirt-9999.ebuild
 2010200909 ./app-emulation/lxc-templates/lxc-templates-3.0.4.ebuild
 2104302209 ./app-emulation/lxc/lxc-4.0.6.ebuild
 2106011209 ./app-emulation/lxc/lxc-4.0.9-r1.ebuild
@@ -2900,7 +2900,7 @@
 2105061039 ./app-emulation/qemu/qemu-5.2.0-r3.ebuild
 2105151709 ./app-emulation/qemu/qemu-9999.ebuild
 2105171109 ./app-emulation/qemu/qemu-5.2.0-r50.ebuild
-2105261009 ./app-emulation/qemu/qemu-6.0.0.ebuild
+2106070939 ./app-emulation/qemu/qemu-6.0.0.ebuild
 1912100639 ./app-emulation/reg/reg-0.16.1.ebuild
 2105131409 ./app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
 2105131409 ./app-emulation/runc/runc-1.0.0_rc93.ebuild
@@ -2911,7 +2911,7 @@
 2105231339 ./app-emulation/sen/sen-0.6.1_p20200905.ebuild
 2005281909 ./app-emulation/simh/simh-3.11.1.ebuild
 2005070009 ./app-emulation/simplevirt/simplevirt-0.0_p20181012-r1.ebuild
-2009271209 ./app-emulation/ski/ski-1.3.2-r4.ebuild
+2106051409 ./app-emulation/ski/ski-1.3.2-r4.ebuild
 2002090509 ./app-emulation/skopeo/skopeo-0.1.41.ebuild
 2005021739 ./app-emulation/skopeo/skopeo-0.2.0.ebuild
 2008300209 ./app-emulation/skopeo/skopeo-1.1.0.ebuild
@@ -2941,14 +2941,15 @@
 2101090639 ./app-emulation/vice/vice-3.5.ebuild
 2102130409 ./app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild
 2102130409 ./app-emulation/virt-manager/virt-manager-3.1.0.ebuild
-2102130409 ./app-emulation/virt-manager/virt-manager-9999.ebuild
 2105142139 ./app-emulation/virt-manager/virt-manager-3.2.0.ebuild
+2106051440 ./app-emulation/virt-manager/virt-manager-9999.ebuild
 1811051909 ./app-emulation/virt-viewer/virt-viewer-7.0.ebuild
 2003181409 ./app-emulation/virt-viewer/virt-viewer-8.0.ebuild
 2007011009 ./app-emulation/virt-viewer/virt-viewer-9.0.ebuild
 1812071609 ./app-emulation/virt-what/virt-what-1.19.ebuild
 1911302339 ./app-emulation/virt-what/virt-what-1.20.ebuild
 2012311940 ./app-emulation/virt-what/virt-what-1.18.ebuild
+2106070739 ./app-emulation/virt-what/virt-what-1.21.ebuild
 2101181209 ./app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild
 2101220510 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.18.ebuild
 2104300009 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild
@@ -2974,34 +2975,20 @@
 2002230040 ./app-emulation/wine-gecko/wine-gecko-2.47-r1.ebuild
 2004132009 ./app-emulation/wine-gecko/wine-gecko-2.47.1.ebuild
 2105042239 ./app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
-1808240739 ./app-emulation/wine-mono/wine-mono-4.6.4.ebuild
-1808240739 ./app-emulation/wine-mono/wine-mono-4.7.0.ebuild
-1808240739 ./app-emulation/wine-mono/wine-mono-4.7.1.ebuild
-1808240739 ./app-emulation/wine-mono/wine-mono-4.7.3.ebuild
-1906041809 ./app-emulation/wine-mono/wine-mono-4.7.5.ebuild
-1903171739 ./app-emulation/wine-mono/wine-mono-4.8.0.ebuild
-1904160509 ./app-emulation/wine-mono/wine-mono-4.8.1.ebuild
-1905030139 ./app-emulation/wine-mono/wine-mono-4.8.3.ebuild
-1906230109 ./app-emulation/wine-mono/wine-mono-4.9.0.ebuild
-1908172039 ./app-emulation/wine-mono/wine-mono-4.9.2.ebuild
-1909282039 ./app-emulation/wine-mono/wine-mono-4.9.3.ebuild
-2004132009 ./app-emulation/wine-mono/wine-mono-4.9.4.ebuild
-2004260039 ./app-emulation/wine-mono/wine-mono-5.0.0.ebuild
-2006200709 ./app-emulation/wine-mono/wine-mono-5.1.0.ebuild
-2102132309 ./app-emulation/wine-mono/wine-mono-6.0.0.ebuild
 2102281909 ./app-emulation/wine-mono/wine-mono-5.1.1.ebuild
 2104112039 ./app-emulation/wine-mono/wine-mono-6.1.1.ebuild
-2105042239 ./app-emulation/wine-staging/wine-staging-6.6.ebuild
+2106051909 ./app-emulation/wine-mono/wine-mono-6.2.0.ebuild
 2105042239 ./app-emulation/wine-staging/wine-staging-6.7.ebuild
-2105042239 ./app-emulation/wine-staging/wine-staging-9999.ebuild
 2105081809 ./app-emulation/wine-staging/wine-staging-6.8.ebuild
 2105231809 ./app-emulation/wine-staging/wine-staging-6.9.ebuild
+2106051909 ./app-emulation/wine-staging/wine-staging-6.10.ebuild
+2106051909 ./app-emulation/wine-staging/wine-staging-9999.ebuild
 2105042239 ./app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
-2105042239 ./app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild
 2105042239 ./app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild
-2105042239 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
 2105081809 ./app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild
 2105231809 ./app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
+2106051909 ./app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
+2106051909 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
 2101180709 ./app-emulation/winetricks/winetricks-99999999.ebuild
 2104112339 ./app-emulation/winetricks/winetricks-20210206.ebuild
 2012311940 ./app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -3026,8 +3013,8 @@
 2008262109 ./app-emulation/distrobuilder/distrobuilder-1.1.ebuild
 2103302109 ./app-emulation/firecracker-bin/firecracker-bin-0.24.1.ebuild
 2103302109 ./app-emulation/firecracker-bin/firecracker-bin-0.24.2.ebuild
-2011272339 ./app-emulation/snapd/snapd-2.47.1-r1.ebuild
 2101050109 ./app-emulation/snapd/snapd-2.48.ebuild
+2106052309 ./app-emulation/snapd/snapd-2.51.ebuild
 2104051839 ./app-emulation/docker-cli/docker-cli-20.10.2.ebuild
 2104051839 ./app-emulation/docker-cli/docker-cli-20.10.3.ebuild
 2104051839 ./app-emulation/docker-cli/docker-cli-20.10.4.ebuild
@@ -3075,6 +3062,7 @@
 2102211109 ./app-eselect/eselect-rails/eselect-rails-0.25.ebuild
 1708300215 ./app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild
 2105142039 ./app-eselect/eselect-repository/eselect-repository-10.ebuild
+2106062039 ./app-eselect/eselect-repository/eselect-repository-11.ebuild
 2101061639 ./app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
 2101061639 ./app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
 2104060140 ./app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -3228,7 +3216,7 @@
 2004101309 ./app-i18n/librime/librime-1.5.3-r1.ebuild
 2105091709 ./app-i18n/librime/librime-1.6.0.ebuild
 2105091709 ./app-i18n/librime/librime-1.6.1.ebuild
-2106031939 ./app-i18n/librime/librime-1.7.3.ebuild
+2106042309 ./app-i18n/librime/librime-1.7.3.ebuild
 2009021739 ./app-i18n/libskk/libskk-1.0.2.ebuild
 2009021739 ./app-i18n/libskk/libskk-1.0.5.ebuild
 1910191409 ./app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
@@ -3450,7 +3438,7 @@
 2104220039 ./app-misc/ckb/ckb-0.4.4-r1.ebuild
 2104250839 ./app-misc/ckermit/ckermit-9.0.302.ebuild
 1908261239 ./app-misc/clockywock/clockywock-0.3.1a.ebuild
-2103261439 ./app-misc/cmatrix/cmatrix-2.0-r2.ebuild
+2106051039 ./app-misc/cmatrix/cmatrix-2.0-r3.ebuild
 2104040109 ./app-misc/color/color-1.2-r2.ebuild
 2101061639 ./app-misc/colordiff/colordiff-1.0.18.ebuild
 2101061639 ./app-misc/colordiff/colordiff-1.0.19.ebuild
@@ -3469,7 +3457,7 @@
 2012172109 ./app-misc/datovka/datovka-4.15.3.ebuild
 2009181139 ./app-misc/ddate/ddate-0.2.2_p20160627.ebuild
 2104161439 ./app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
-2008040239 ./app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
+2106071139 ./app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
 1902270009 ./app-misc/ddcutil/ddcutil-0.9.1.ebuild
 2005190208 ./app-misc/ddcutil/ddcutil-0.9.5.ebuild
 2007310239 ./app-misc/ddcutil/ddcutil-0.9.9.ebuild
@@ -3524,7 +3512,7 @@
 2104192239 ./app-misc/gcal/gcal-4.1.ebuild
 2102270109 ./app-misc/gcalcli/gcalcli-4.2.0-r1.ebuild
 2106032139 ./app-misc/gcstar/gcstar-1.7.1-r2.ebuild
-2101121409 ./app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+2106071139 ./app-misc/geekcode/geekcode-1.7.3-r1.ebuild
 2005131138 ./app-misc/geneweb/geneweb-6.08.01.ebuild
 2104161439 ./app-misc/geneweb/geneweb-7.0.0-r2.ebuild
 1907241139 ./app-misc/gentoo-elections/gentoo-elections-0_p20190710.ebuild
@@ -3555,7 +3543,7 @@
 1908210209 ./app-misc/hello/hello-2.10-r1.ebuild
 2104192239 ./app-misc/hexcompare/hexcompare-1.0.4.ebuild
 2012311940 ./app-misc/hilite/hilite-1.5-r1.ebuild
-2106012309 ./app-misc/hivex/hivex-1.3.18.ebuild
+2106071139 ./app-misc/hivex/hivex-1.3.18.ebuild
 2006040009 ./app-misc/i2bits/i2bits-0.1.0.ebuild
 2101310343 ./app-misc/icdiff/icdiff-1.9.5.ebuild
 1808230009 ./app-misc/imgurbash2/imgurbash2-9999.ebuild
@@ -3565,8 +3553,7 @@
 1803180108 ./app-misc/interceptty/interceptty-0.6-r1.ebuild
 1907151839 ./app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
 2104180939 ./app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
-2104040239 ./app-misc/jail/jail-2.0-r4.ebuild
-1702282250 ./app-misc/jitac/jitac-0.3.0.ebuild
+2106071139 ./app-misc/jail/jail-2.0-r4.ebuild
 2104040109 ./app-misc/jot/jot-9.0-r1.ebuild
 2002222009 ./app-misc/joy2key/joy2key-1.6.3-r1.ebuild
 2009262309 ./app-misc/joymouse/joymouse-0.5-r1.ebuild
@@ -3602,7 +3589,7 @@
 2004032241 ./app-misc/mencal/mencal-3.0.ebuild
 1802221208 ./app-misc/mepl/mepl-0.45-r1.ebuild
 2104060140 ./app-misc/mime-types/mime-types-9.ebuild
-2005022139 ./app-misc/mkcert/mkcert-1.4.1.ebuild
+2106070939 ./app-misc/mkcert/mkcert-1.4.1.ebuild
 2103302139 ./app-misc/mmv/mmv-1.01b_p19.ebuild
 2105022309 ./app-misc/mosquitto/mosquitto-1.6.10.ebuild
 2105022309 ./app-misc/mosquitto/mosquitto-1.6.12.ebuild
@@ -3644,7 +3631,6 @@
 2101061639 ./app-misc/ondir/ondir-0.2.4.ebuild
 2104151009 ./app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
 2101061639 ./app-misc/pal/pal-0.4.3-r2.ebuild
-2104161339 ./app-misc/pax-utils/pax-utils-1.2.9.ebuild
 2105222239 ./app-misc/pax-utils/pax-utils-1.3.1.ebuild
 2102190239 ./app-misc/pdfpc/pdfpc-4.4.1.ebuild
 1702282250 ./app-misc/perltrash/perltrash-0.3-r1.ebuild
@@ -3703,7 +3689,7 @@
 2102100209 ./app-misc/skim/skim-0.9.3.ebuild
 2104130239 ./app-misc/sl/sl-5.02.ebuild
 1702282250 ./app-misc/smtm/smtm-1.6.10-r1.ebuild
-2005212139 ./app-misc/socnetv/socnetv-2.2.ebuild
+2106071139 ./app-misc/socnetv/socnetv-2.2.ebuild
 2102280539 ./app-misc/solaar/solaar-9999.ebuild
 2104111439 ./app-misc/solaar/solaar-1.0.5-r2.ebuild
 2104190809 ./app-misc/sonypid/sonypid-1.9.ebuild
@@ -3754,8 +3740,8 @@
 2105291839 ./app-misc/tracker-miners/tracker-miners-3.1.1.ebuild
 2104140039 ./app-misc/tracker/tracker-2.3.5.ebuild
 2105291839 ./app-misc/tracker/tracker-3.1.1.ebuild
-2103291909 ./app-misc/trash-cli/trash-cli-0.20.11.23-r1.ebuild
 2105160309 ./app-misc/trash-cli/trash-cli-0.20.12.26-r1.ebuild
+2106070839 ./app-misc/trash-cli/trash-cli-0.21.5.25.ebuild
 2006040009 ./app-misc/ttyload/ttyload-0.5.3.ebuild
 2101061639 ./app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
 2009152309 ./app-misc/ttysnoop/ttysnoop-0.12d.ebuild
@@ -3802,6 +3788,7 @@
 2104240639 ./app-misc/wildq/wildq-1.1.10.ebuild
 2105212009 ./app-misc/ddcui/ddcui-0.1.2.ebuild
 2106031039 ./app-misc/filebus/filebus-0.2.0.ebuild
+2106071039 ./app-misc/filebus/filebus-0.3.0.ebuild
 2101310343 ./app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild
 1702282250 ./app-mobilephone/anyremote/anyremote-6.5.ebuild
 1710020727 ./app-mobilephone/dfu-util/dfu-util-0.9.ebuild
@@ -3836,7 +3823,6 @@
 2007080909 ./app-office/gtg/gtg-0.4.0.ebuild
 2102272009 ./app-office/homebank/homebank-5.4.3.ebuild
 2105061339 ./app-office/homebank/homebank-5.5.1.ebuild
-1705171809 ./app-office/hourglass/hourglass-0.7.2-r1.ebuild
 2104042209 ./app-office/impressive/impressive-0.13.0_beta2.ebuild
 2105161409 ./app-office/kexi/kexi-3.2.0-r1.ebuild
 2104042209 ./app-office/kmymoney/kmymoney-5.1.1.ebuild
@@ -3917,11 +3903,11 @@
 1907192139 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
 2101061639 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
 2105022339 ./app-portage/deltup/deltup-0.4.6-r1.ebuild
-2004032241 ./app-portage/demerge/demerge-0.047-r3.ebuild
 2105231109 ./app-portage/diffmask/diffmask-0.3.3-r4.ebuild
 2105231109 ./app-portage/diffmask/diffmask-9999.ebuild
 2103281309 ./app-portage/distpatch/distpatch-0.1.2-r2.ebuild
 2104060140 ./app-portage/eix/eix-0.34.12.ebuild
+2106060909 ./app-portage/eix/eix-0.35.0.ebuild
 2101310343 ./app-portage/elicense/elicense-9999.ebuild
 2104060140 ./app-portage/elicense/elicense-1.0.2.ebuild
 2101310343 ./app-portage/elogv/elogv-0.7.8-r3.ebuild
@@ -3953,8 +3939,8 @@
 2103020709 ./app-portage/gentoolkit/gentoolkit-9999.ebuild
 2104060140 ./app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
 2105111909 ./app-portage/gentoolkit/gentoolkit-0.5.1.ebuild
-2101080239 ./app-portage/gentoopm/gentoopm-9999.ebuild
-2104280239 ./app-portage/gentoopm/gentoopm-0.3.3.ebuild
+2106041309 ./app-portage/gentoopm/gentoopm-0.3.3.ebuild
+2106041309 ./app-portage/gentoopm/gentoopm-9999.ebuild
 2104180939 ./app-portage/getdelta/getdelta-0.7.9-r2.ebuild
 1902251309 ./app-portage/golop/golop-0.0.1-r1.ebuild
 1902251309 ./app-portage/golop/golop-9999.ebuild
@@ -3985,7 +3971,6 @@
 2104161439 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
 2104031909 ./app-portage/no-distcc-env/no-distcc-env-9999.ebuild
 2101310343 ./app-portage/overlint/overlint-0.5.3-r2.ebuild
-2012311940 ./app-portage/perl-info/perl-info-0.16.ebuild
 2101310343 ./app-portage/pfl/pfl-3.1-r1.ebuild
 2105022339 ./app-portage/portage-utils/portage-utils-0.87.ebuild
 2105022339 ./app-portage/portage-utils/portage-utils-0.90.1.ebuild
@@ -3999,14 +3984,13 @@
 2106022209 ./app-portage/prefix-toolkit/prefix-toolkit-9.ebuild
 2008291939 ./app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
 2008291939 ./app-portage/repo-commit/repo-commit-9999.ebuild
-2101310343 ./app-portage/repoman/repoman-9999.ebuild
 2104060140 ./app-portage/repoman/repoman-2.3.23.ebuild
 2104060140 ./app-portage/repoman/repoman-3.0.2.ebuild
-2104112139 ./app-portage/repoman/repoman-3.0.3-r1.ebuild
-2101080239 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
-2103281609 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
+2106041209 ./app-portage/repoman/repoman-3.0.3-r1.ebuild
+2106060939 ./app-portage/repoman/repoman-9999.ebuild
+2106041309 ./app-portage/smart-live-rebuild/smart-live-rebuild-1.3.7.ebuild
+2106041309 ./app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
 2101080239 ./app-portage/tatt/tatt-9999.ebuild
-2104251239 ./app-portage/tatt/tatt-0.7-r1.ebuild
 2104251239 ./app-portage/tatt/tatt-0.8.ebuild
 2003261841 ./app-portage/ufed/ufed-9999.ebuild
 2012311940 ./app-portage/ufed/ufed-0.96.ebuild
@@ -4019,6 +4003,7 @@
 2009011409 ./app-portage/pgo/pgo-0.0.2.ebuild
 2009011409 ./app-portage/pgo/pgo-9999.ebuild
 2010031009 ./app-portage/pgo/pgo-0.0.3.ebuild
+2106061039 ./app-portage/kuroneko/kuroneko-0.1.0.ebuild
 2103090009 ./app-shells/autojump/autojump-22.5.3.ebuild
 2106020439 ./app-shells/autojump/autojump-22.5.3-r1.ebuild
 2101310343 ./app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -4039,6 +4024,7 @@
 1707171556 ./app-shells/ccsh/ccsh-0.0.4-r4.ebuild
 2007091038 ./app-shells/ctypes-sh/ctypes-sh-1.2.ebuild
 2101112239 ./app-shells/dash/dash-0.5.11.3-r1.ebuild
+2106051709 ./app-shells/dash/dash-0.5.11.4.ebuild
 2012271709 ./app-shells/dsh/dsh-0.25.10-r1.ebuild
 2104212309 ./app-shells/esh/esh-0.8.5-r2.ebuild
 2102262039 ./app-shells/fish/fish-3.1.2.ebuild
@@ -4110,7 +4096,7 @@
 2105311239 ./app-text/a2ps/a2ps-4.14-r6.ebuild
 1708012356 ./app-text/agrep/agrep-2.04-r2.ebuild
 2012311940 ./app-text/aiksaurus/aiksaurus-1.2.1.ebuild
-2105190939 ./app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+2106061909 ./app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
 2012311940 ./app-text/an/an-1.2_p6.ebuild
 2102081239 ./app-text/ansifilter/ansifilter-2.18.ebuild
 2102250739 ./app-text/ansifilter/ansifilter-2.17.ebuild
@@ -4205,8 +4191,8 @@
 2102182339 ./app-text/docx2txt/docx2txt-1.4.ebuild
 2102141809 ./app-text/dos2unix/dos2unix-7.4.2.ebuild
 2104060140 ./app-text/dvipng/dvipng-1.17.ebuild
-2104021139 ./app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
 2104060140 ./app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
+2106051440 ./app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
 2101150409 ./app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
 2102191939 ./app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
 2102182039 ./app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
@@ -4372,8 +4358,8 @@
 2105050209 ./app-text/poppler/poppler-9999.ebuild
 2106011409 ./app-text/poppler/poppler-21.05.0.ebuild
 2104060140 ./app-text/ps2eps/ps2eps-1.68.ebuild
-2104021109 ./app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
 2104060140 ./app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
+2106051440 ./app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
 2002280339 ./app-text/psiconv/psiconv-0.8.3-r1.ebuild
 2001220109 ./app-text/pspdftool/pspdftool-0.03.ebuild
 1805290208 ./app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -4436,11 +4422,12 @@
 2105311239 ./app-text/tesseract/tesseract-3.05.02.ebuild
 2104060140 ./app-text/texi2html/texi2html-5.0-r1.ebuild
 2101061709 ./app-text/texlive-core/texlive-core-2020-r12.ebuild
-2104031539 ./app-text/texlive-core/texlive-core-2021.ebuild
-2104041209 ./app-text/texlive/texlive-2021.ebuild
+2106051440 ./app-text/texlive-core/texlive-core-2021.ebuild
 2104060140 ./app-text/texlive/texlive-2020-r9.ebuild
+2106051440 ./app-text/texlive/texlive-2021.ebuild
 2102281609 ./app-text/tidy-html5/tidy-html5-5.6.0.ebuild
 2103220009 ./app-text/tidy-html5/tidy-html5-5.7.28.ebuild
+2106042309 ./app-text/tidy-html5/tidy-html5-5.7.28-r1.ebuild
 2012311940 ./app-text/tkinfo/tkinfo-2.8-r1.ebuild
 2104180939 ./app-text/tkman/tkman-2.2-r1.ebuild
 1812102009 ./app-text/tofrodos/tofrodos-1.7.13.ebuild
@@ -4448,7 +4435,7 @@
 2106010409 ./app-text/trang/trang-20151127.ebuild
 2104060140 ./app-text/tree/tree-1.8.0.ebuild
 2105010239 ./app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
-2105010239 ./app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+2106051440 ./app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
 2104192239 ./app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
 2012311940 ./app-text/txt2man/txt2man-1.7.1.ebuild
 2104192239 ./app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
@@ -4491,7 +4478,7 @@
 2103052109 ./app-text/xmlformat/xmlformat-1.04.ebuild
 2101312309 ./app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
 2104192239 ./app-text/xmlto/xmlto-0.0.28-r3.ebuild
-2105312109 ./app-text/xmlto/xmlto-0.0.28-r6.ebuild
+2106041139 ./app-text/xmlto/xmlto-0.0.28-r6.ebuild
 1903092239 ./app-text/xournal/xournal-9999.ebuild
 2002222339 ./app-text/xournal/xournal-0.4.8.2016.ebuild
 2102091309 ./app-text/xpdf/xpdf-4.03.ebuild
@@ -4773,6 +4760,7 @@
 2105022339 ./app-vim/iris/iris-1.0.0.ebuild
 2008240909 ./app-vim/mediawiki/mediawiki-20151115.ebuild
 2102270609 ./app-vim/vim-jq/vim-jq-0.0_pre20210226.ebuild
+2106042109 ./app-vim/Vim-Jinja2-Syntax/Vim-Jinja2-Syntax-0.0_pre20210604.ebuild
 2002112051 ./app-xemacs/ada/ada-1.14.ebuild
 2002112051 ./app-xemacs/ada/ada-1.16.ebuild
 2004051339 ./app-xemacs/apel/apel-1.32.ebuild
@@ -5105,45 +5093,44 @@
 2105091109 ./app-xemacs/xwem/xwem-1.27.ebuild
 2002112051 ./app-xemacs/zenirc/zenirc-1.16.ebuild
 2002112051 ./app-xemacs/zenirc/zenirc-1.18.ebuild
-1911032339 ./dev-ada/asis/asis-2016-r1.ebuild
 1911032339 ./dev-ada/asis/asis-2019-r1.ebuild
-2106011939 ./dev-ada/aunit/aunit-2020-r1.ebuild
-2106011939 ./dev-ada/aunit/aunit-2020.ebuild
-2106021509 ./dev-ada/aunit/aunit-2021.ebuild
-1910211009 ./dev-ada/aws/aws-2018-r2.ebuild
+2106051639 ./dev-ada/aunit/aunit-2020.ebuild
+2106051639 ./dev-ada/aunit/aunit-2021.ebuild
 1910211009 ./dev-ada/aws/aws-2019-r1.ebuild
-2008020009 ./dev-ada/aws/aws-2020.ebuild
+2106042239 ./dev-ada/aws/aws-2018-r2.ebuild
+2106051139 ./dev-ada/aws/aws-2020-r1.ebuild
+2106051139 ./dev-ada/aws/aws-2020.ebuild
+2106051139 ./dev-ada/aws/aws-2021.ebuild
 2104101709 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2016-r1.ebuild
 2104101709 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2017-r1.ebuild
 2104101709 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2018-r1.ebuild
-2104101709 ./dev-ada/gnat-suite-bin/gnat-suite-bin-2019-r1.ebuild
-1910182009 ./dev-ada/gnat_util/gnat_util-2017-r2.ebuild
 1910182009 ./dev-ada/gnat_util/gnat_util-2018-r2.ebuild
 1910182009 ./dev-ada/gnat_util/gnat_util-2019-r1.ebuild
-2101011339 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
-2105221709 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
-2105221409 ./dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
-2106032209 ./dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+2106051639 ./dev-ada/gnat_util/gnat_util-2017-r2.ebuild
+2106042239 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r1.ebuild
+2106042239 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020-r2.ebuild
+2106042239 ./dev-ada/gnatcoll-bindings/gnatcoll-bindings-2021.ebuild
 2106032209 ./dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild
-2008051239 ./dev-ada/gnatmem/gnatmem-2019-r1.ebuild
-2106021339 ./dev-ada/gnatmem/gnatmem-2020.ebuild
-2106021339 ./dev-ada/gnatmem/gnatmem-2021.ebuild
+2106042239 ./dev-ada/gnatcoll-core/gnatcoll-core-2020-r1.ebuild
+2106042239 ./dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
+2106051639 ./dev-ada/gnatmem/gnatmem-2019-r1.ebuild
+2106051639 ./dev-ada/gnatmem/gnatmem-2020.ebuild
+2106051639 ./dev-ada/gnatmem/gnatmem-2021.ebuild
 1910182039 ./dev-ada/gnatsymbolize/gnatsymbolize-2019-r1.ebuild
 2106021439 ./dev-ada/gnatsymbolize/gnatsymbolize-2020.ebuild
 2106021509 ./dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
-2105142139 ./dev-ada/gprbuild/gprbuild-2017-r2.ebuild
 2105142139 ./dev-ada/gprbuild/gprbuild-2020-r1.ebuild
 2105142139 ./dev-ada/gprbuild/gprbuild-2020.ebuild
 2106021509 ./dev-ada/gprbuild/gprbuild-2021-r1.ebuild
-2105262239 ./dev-ada/gtkada/gtkada-2019-r1.ebuild
-2105262239 ./dev-ada/gtkada/gtkada-2019-r2.ebuild
-2105272339 ./dev-ada/gtkada/gtkada-2020.ebuild
-2105202039 ./dev-ada/libgpr/libgpr-2020-r1.ebuild
-2105202039 ./dev-ada/libgpr/libgpr-2020.ebuild
+2106050039 ./dev-ada/gtkada/gtkada-2019-r1.ebuild
+2106050039 ./dev-ada/gtkada/gtkada-2019-r2.ebuild
+2106050039 ./dev-ada/gtkada/gtkada-2020.ebuild
+2106050039 ./dev-ada/gtkada/gtkada-2021.ebuild
 2106021739 ./dev-ada/libgpr/libgpr-2021.ebuild
-2105192339 ./dev-ada/xmlada/xmlada-2020.ebuild
-2105311239 ./dev-ada/xmlada/xmlada-2020-r1.ebuild
-2106021509 ./dev-ada/xmlada/xmlada-2021.ebuild
+2106042239 ./dev-ada/libgpr/libgpr-2020-r1.ebuild
+2106051639 ./dev-ada/libgpr/libgpr-2020.ebuild
+2106051639 ./dev-ada/xmlada/xmlada-2020.ebuild
+2106051639 ./dev-ada/xmlada/xmlada-2021.ebuild
 2012231444 ./dev-cpp/ETL/ETL-0.04.15-r1.ebuild
 2009281609 ./dev-cpp/aixlog/aixlog-9999.ebuild
 2103021509 ./dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -5172,7 +5159,7 @@
 2106040440 ./dev-cpp/glibmm/glibmm-2.66.1.ebuild
 2106040440 ./dev-cpp/glibmm/glibmm-2.68.1.ebuild
 2007121239 ./dev-cpp/glog/glog-0.4.0.ebuild
-2104021809 ./dev-cpp/glog/glog-0.3.4-r1.ebuild
+2106042309 ./dev-cpp/glog/glog-0.5.0.ebuild
 1912110241 ./dev-cpp/gstreamermm/gstreamermm-1.10.0.ebuild
 2101310343 ./dev-cpp/gtest/gtest-9999.ebuild
 2104060140 ./dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -5225,6 +5212,7 @@
 2104302239 ./dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
 2105150539 ./dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
 2105251439 ./dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
+2106050239 ./dev-cpp/abseil-cpp/abseil-cpp-20210324.2.ebuild
 2101241709 ./dev-cpp/cpp-taskflow/cpp-taskflow-3.0.0.ebuild
 2007211409 ./dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
 2007211409 ./dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
@@ -5238,7 +5226,7 @@
 2101220539 ./dev-cpp/string-theory/string-theory-3.3.ebuild
 2102250039 ./dev-cpp/string-theory/string-theory-3.4.ebuild
 2104291039 ./dev-cpp/notcurses/notcurses-2.2.8.ebuild
-2105311739 ./dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
+2106070939 ./dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
 2104180939 ./dev-db/apgdiff/apgdiff-2.4.ebuild
 2102091739 ./dev-db/barman/barman-2.12.ebuild
 1801032109 ./dev-db/bucardo/bucardo-5.4.1.ebuild
@@ -5450,7 +5438,7 @@
 2105061309 ./dev-db/redis/redis-6.2.3-r1.ebuild
 2105101639 ./dev-db/redis/redis-6.0.13-r1.ebuild
 2106011839 ./dev-db/redis/redis-6.2.4.ebuild
-2106031139 ./dev-db/redis/redis-6.0.14.ebuild
+2106070939 ./dev-db/redis/redis-6.0.14.ebuild
 2101040109 ./dev-db/repmgr/repmgr-5.1.0.ebuild
 2102282339 ./dev-db/rqlite/rqlite-5.10.2.ebuild
 2101310343 ./dev-db/sadisplay/sadisplay-0.4.9.ebuild
@@ -5482,7 +5470,7 @@
 2103052109 ./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
-2104060140 ./dev-db/unixODBC/unixODBC-2.3.9.ebuild
+2106071139 ./dev-db/unixODBC/unixODBC-2.3.9.ebuild
 2103132339 ./dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
 2104050039 ./dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
 2010311439 ./dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
@@ -5720,7 +5708,7 @@
 2104071539 ./dev-games/tiled/tiled-1.5.0.ebuild
 2104190439 ./dev-games/wfmath/wfmath-1.0.2.ebuild
 2009191909 ./dev-games/irrlicht-headers/irrlicht-headers-1.8.4.ebuild
-2011231639 ./dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
+2106051209 ./dev-games/openscenegraph-openmw/openscenegraph-openmw-3.4_p20200425-r100.ebuild
 2007080909 ./dev-games/recastnavigation/recastnavigation-1.5.1_p20200511.ebuild
 2102250039 ./dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild
 1702282250 ./dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild
@@ -6096,7 +6084,6 @@
 2008011139 ./dev-haskell/keys/keys-3.12.3.ebuild
 2008031109 ./dev-haskell/language-bash/language-bash-0.9.0.ebuild
 2008080209 ./dev-haskell/language-c/language-c-0.7.1.ebuild
-2008080209 ./dev-haskell/language-c/language-c-0.8.3.ebuild
 2010241309 ./dev-haskell/language-c/language-c-0.4.7.ebuild
 2105051109 ./dev-haskell/language-c/language-c-0.8.3-r1.ebuild
 2008182039 ./dev-haskell/language-css/language-css-0.0.3.ebuild
@@ -6376,7 +6363,6 @@
 2103151239 ./dev-haskell/transformers/transformers-0.5.6.2.ebuild
 1912141539 ./dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
 2008051009 ./dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild
-2008201009 ./dev-haskell/unicode-transforms/unicode-transforms-0.3.7.ebuild
 2105221209 ./dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1.ebuild
 2011011609 ./dev-haskell/uniplate/uniplate-1.6.12.ebuild
 2104161439 ./dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
@@ -6496,6 +6482,7 @@
 2008011139 ./dev-haskell/http-download/http-download-0.2.0.0.ebuild
 2008182039 ./dev-haskell/infer-license/infer-license-0.2.0.ebuild
 2008011139 ./dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
+2106070939 ./dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1.ebuild
 2008011139 ./dev-haskell/invariant/invariant-0.5.3.ebuild
 2008182039 ./dev-haskell/ipynb/ipynb-0.1.ebuild
 2008011139 ./dev-haskell/iwlib/iwlib-0.1.0.ebuild
@@ -6657,25 +6644,15 @@
 2104141939 ./dev-java/bcel/bcel-6.5.0.ebuild
 2104161709 ./dev-java/bcel/bcel-6.5.0-r1.ebuild
 2007250538 ./dev-java/bcmail/bcmail-1.50-r3.ebuild
-2007250538 ./dev-java/bcmail/bcmail-1.52-r3.ebuild
-2101062239 ./dev-java/bcmail/bcmail-1.38-r6.ebuild
 2101062239 ./dev-java/bcmail/bcmail-1.45-r5.ebuild
 1803011208 ./dev-java/bcpg/bcpg-1.50-r1.ebuild
 1804251038 ./dev-java/bcpg/bcpg-1.50-r2.ebuild
-1803011208 ./dev-java/bcpg/bcpg-1.52-r1.ebuild
-1804251038 ./dev-java/bcpg/bcpg-1.52-r2.ebuild
 2007250538 ./dev-java/bcpkix/bcpkix-1.50-r2.ebuild
-2007250538 ./dev-java/bcpkix/bcpkix-1.52-r1.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.38-r4.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.45-r2.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.50-r2.ebuild
-1803011208 ./dev-java/bcprov/bcprov-1.52-r1.ebuild
-1804090208 ./dev-java/bcprov/bcprov-1.52-r2.ebuild
-2007200439 ./dev-java/bcprov/bcprov-1.54.ebuild
-2007250538 ./dev-java/bcprov/bcprov-1.50-r4.ebuild
-2007250538 ./dev-java/bcprov/bcprov-1.52-r3.ebuild
-2010091139 ./dev-java/bcprov/bcprov-1.66.ebuild
-2102241209 ./dev-java/bcprov/bcprov-1.68.ebuild
+2106051009 ./dev-java/bcprov/bcprov-1.45-r2.ebuild
+2106051009 ./dev-java/bcprov/bcprov-1.50-r2.ebuild
+2106051009 ./dev-java/bcprov/bcprov-1.50-r4.ebuild
+2106051009 ./dev-java/bcprov/bcprov-1.52-r2.ebuild
+2106061139 ./dev-java/bcprov/bcprov-1.68-r2.ebuild
 1702282250 ./dev-java/bctsp/bctsp-1.45-r1.ebuild
 1709062352 ./dev-java/beansbinding/beansbinding-1.2.1-r3.ebuild
 1702282250 ./dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -6694,7 +6671,6 @@
 1702282250 ./dev-java/cdi-api/cdi-api-1.2-r1.ebuild
 2104180939 ./dev-java/cdi-api/cdi-api-1.2.ebuild
 2104070939 ./dev-java/cglib/cglib-3.3.0.ebuild
-1702282250 ./dev-java/cldc-api/cldc-api-1.1-r1.ebuild
 1702282250 ./dev-java/cofoja/cofoja-1.2.ebuild
 1806241809 ./dev-java/cofoja/cofoja-1.3.ebuild
 2104180939 ./dev-java/colt/colt-1.2.0-r3.ebuild
@@ -7062,19 +7038,12 @@
 2008271939 ./dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
 1803011208 ./dev-java/portletapi/portletapi-1.0-r1.ebuild
 1702282250 ./dev-java/portletapi/portletapi-2.0-r1.ebuild
-2101062239 ./dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
-2104060309 ./dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.0.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.1.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.2.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.3.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.4.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.5.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.6.ebuild
-2104100139 ./dev-java/protobuf-java/protobuf-java-3.15.7.ebuild
-2106010209 ./dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
-2106010209 ./dev-java/protobuf-java/protobuf-java-9999.ebuild
-2106031009 ./dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+2106062009 ./dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+2106062009 ./dev-java/protobuf-java/protobuf-java-3.16.0.ebuild
+2106062009 ./dev-java/protobuf-java/protobuf-java-3.17.0.ebuild
+2106062009 ./dev-java/protobuf-java/protobuf-java-3.17.1.ebuild
+2106062009 ./dev-java/protobuf-java/protobuf-java-3.17.2.ebuild
+2106062009 ./dev-java/protobuf-java/protobuf-java-9999.ebuild
 2101062239 ./dev-java/qdox/qdox-1.6.3-r2.ebuild
 2104161439 ./dev-java/qdox/qdox-1.12.1-r2.ebuild
 1702282250 ./dev-java/rat/rat-0.11.ebuild
@@ -7124,7 +7093,7 @@
 2101062239 ./dev-java/sun-jaf/sun-jaf-1.1.1-r1.ebuild
 1911100039 ./dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
 2104180939 ./dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
-2105211009 ./dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
+2106070939 ./dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
 1909232039 ./dev-java/sun-jimi/sun-jimi-1.0-r3.ebuild
 2105201339 ./dev-java/sun-jms/sun-jms-1.1-r3.ebuild
 1702282250 ./dev-java/super-csv/super-csv-2.3.1.ebuild
@@ -7137,7 +7106,6 @@
 2104180939 ./dev-java/swt/swt-3.8.2-r3.ebuild
 2105162239 ./dev-java/swt/swt-4.10-r1.ebuild
 1908241309 ./dev-java/tablelayout/tablelayout-1.0.ebuild
-2101062239 ./dev-java/tagsoup/tagsoup-1.2.1.ebuild
 1702282250 ./dev-java/telnetd/telnetd-2.0-r1.ebuild
 2005172009 ./dev-java/testng/testng-6.9.10.ebuild
 1702282250 ./dev-java/texhyphj/texhyphj-1.1.ebuild
@@ -7230,7 +7198,7 @@
 2105150510 ./dev-java/junitparams/junitparams-1.1.1.ebuild
 2105251039 ./dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1.ebuild
 2104112209 ./dev-lang/R/R-4.0.4.ebuild
-2104101639 ./dev-lang/R/R-4.0.5.ebuild
+2106062109 ./dev-lang/R/R-4.0.5-r1.ebuild
 2009200209 ./dev-lang/bas/bas-2.4.ebuild
 1912130439 ./dev-lang/bashforth/bashforth-0.58a.ebuild
 2104060140 ./dev-lang/bff/bff-1.0.5.ebuild
@@ -7253,6 +7221,7 @@
 2105110109 ./dev-lang/erlang/erlang-23.3.4.ebuild
 2105161639 ./dev-lang/erlang/erlang-24.0.ebuild
 2105220139 ./dev-lang/erlang/erlang-24.0.1.ebuild
+2106051409 ./dev-lang/erlang/erlang-24.0.2.ebuild
 1702282250 ./dev-lang/esco/esco-0.512.ebuild
 1711152307 ./dev-lang/execline/execline-2.3.0.3.ebuild
 1801110039 ./dev-lang/execline/execline-2.3.0.4.ebuild
@@ -7266,9 +7235,10 @@
 1912151609 ./dev-lang/fpc/fpc-3.0.4.ebuild
 2101310343 ./dev-lang/gdl/gdl-1.0.0_rc3.ebuild
 2101032139 ./dev-lang/gforth/gforth-0.7.3-r1.ebuild
-2104202239 ./dev-lang/ghc/ghc-8.10.4.ebuild
 2104202239 ./dev-lang/ghc/ghc-8.8.4.ebuild
 2104202239 ./dev-lang/ghc/ghc-9.0.1.ebuild
+2106061309 ./dev-lang/ghc/ghc-8.10.4.ebuild
+2106061709 ./dev-lang/ghc/ghc-8.10.5.ebuild
 2105192039 ./dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
 2105192039 ./dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
 2105192039 ./dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@@ -7279,6 +7249,8 @@
 2104212209 ./dev-lang/go/go-9999.ebuild
 2105220439 ./dev-lang/go/go-1.15.12.ebuild
 2105220439 ./dev-lang/go/go-1.16.4.ebuild
+2106062309 ./dev-lang/go/go-1.15.13.ebuild
+2106062309 ./dev-lang/go/go-1.16.5.ebuild
 2104212209 ./dev-lang/gprolog/gprolog-1.4.5.ebuild
 2106010339 ./dev-lang/hy/hy-0.20.0.ebuild
 2101062239 ./dev-lang/icon/icon-9.5.1-r1.ebuild
@@ -7331,7 +7303,6 @@
 2104060140 ./dev-lang/mujs/mujs-1.1.0.ebuild
 2105311509 ./dev-lang/mujs/mujs-1.1.2.ebuild
 2010071039 ./dev-lang/nasm/nasm-2.15.05.ebuild
-2104162239 ./dev-lang/nim/nim-1.4.6.ebuild
 2105260209 ./dev-lang/nim/nim-1.4.8.ebuild
 2102150339 ./dev-lang/nqp/nqp-2020.11.ebuild
 2102150339 ./dev-lang/nqp/nqp-2020.12.ebuild
@@ -7355,6 +7326,8 @@
 2105071809 ./dev-lang/php/php-8.0.6.ebuild
 2105120009 ./dev-lang/php/php-7.3.28.ebuild
 2105120009 ./dev-lang/php/php-7.4.19.ebuild
+2106041039 ./dev-lang/php/php-7.4.20.ebuild
+2106041039 ./dev-lang/php/php-8.0.7.ebuild
 2011170309 ./dev-lang/polyml/polyml-5.8.ebuild
 2104060140 ./dev-lang/python-exec/python-exec-2.4.6-r4.ebuild
 2105041609 ./dev-lang/python/python-3.10.0_beta1.ebuild
@@ -7370,11 +7343,11 @@
 2105121639 ./dev-lang/python/python-3.9.5_p1.ebuild
 2105312239 ./dev-lang/python/python-3.10.0_beta2.ebuild
 2106030210 ./dev-lang/python/python-2.7.18_p9.ebuild
-2106031909 ./dev-lang/python/python-2.7.18_p10.ebuild
-2106031909 ./dev-lang/python/python-3.6.13_p5.ebuild
-2106031909 ./dev-lang/python/python-3.7.10_p6.ebuild
-2106031909 ./dev-lang/python/python-3.8.10_p2.ebuild
-2106031909 ./dev-lang/python/python-3.9.5_p2.ebuild
+2106051309 ./dev-lang/python/python-2.7.18_p10.ebuild
+2106051309 ./dev-lang/python/python-3.6.13_p5.ebuild
+2106051309 ./dev-lang/python/python-3.7.10_p6.ebuild
+2106051309 ./dev-lang/python/python-3.8.10_p2.ebuild
+2106051309 ./dev-lang/python/python-3.9.5_p2.ebuild
 2105152009 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2102150339 ./dev-lang/rakudo/rakudo-2020.11.ebuild
 2102150339 ./dev-lang/rakudo/rakudo-2020.12.ebuild
@@ -7442,6 +7415,7 @@
 2105210409 ./dev-lang/vala/vala-0.48.12.ebuild
 2105291839 ./dev-lang/vala/vala-0.50.7.ebuild
 2105291839 ./dev-lang/vala/vala-0.52.3.ebuild
+2106070109 ./dev-lang/vala/vala-0.52.4.ebuild
 2012271409 ./dev-lang/whitespace/whitespace-0.4.ebuild
 2105081809 ./dev-lang/xsb/xsb-3.8.0.ebuild
 2105151010 ./dev-lang/xsb/xsb-4.0.0.ebuild
@@ -7455,9 +7429,9 @@
 2105152039 ./dev-lang/cxprolog/cxprolog-0.98.2.ebuild
 2104060140 ./dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
 2105240239 ./dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild
+2106041039 ./dev-lang/typescript/typescript-4.3.2.ebuild
 2101090709 ./dev-libs/9libs/9libs-1.0-r4.ebuild
-2104302109 ./dev-libs/Ice/Ice-3.6.5-r1.ebuild
-2104302109 ./dev-libs/Ice/Ice-3.6.5.ebuild
+2106061039 ./dev-libs/Ice/Ice-3.6.5-r1.ebuild
 2104180939 ./dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
 2104180939 ./dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
 2104180939 ./dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -7469,7 +7443,7 @@
 2104040139 ./dev-libs/antlr-c/antlr-c-3.5.2-r1.ebuild
 2104131809 ./dev-libs/appstream-glib/appstream-glib-0.7.18.ebuild
 2012162309 ./dev-libs/appstream/appstream-0.12.11-r1.ebuild
-2103270039 ./dev-libs/appstream/appstream-0.14.3.ebuild
+2106051409 ./dev-libs/appstream/appstream-0.14.3.ebuild
 2104302109 ./dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
 2105111209 ./dev-libs/apr/apr-1.6.3-r5.ebuild
 2105111209 ./dev-libs/apr/apr-1.6.5-r2.ebuild
@@ -7556,12 +7530,12 @@
 2012311940 ./dev-libs/dotconf/dotconf-1.3-r1.ebuild
 2012311940 ./dev-libs/double-conversion/double-conversion-3.1.5.ebuild
 2102270839 ./dev-libs/eb/eb-4.4.1-r1.ebuild
-2002261639 ./dev-libs/editline/editline-1.17.1.ebuild
+2106051409 ./dev-libs/editline/editline-1.17.1.ebuild
 2105232239 ./dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
 2105120909 ./dev-libs/efl/efl-1.25.1-r11.ebuild
 2104222339 ./dev-libs/elfutils/elfutils-0.183.ebuild
 2105111109 ./dev-libs/elfutils/elfutils-0.184.ebuild
-2105232109 ./dev-libs/elfutils/elfutils-0.185.ebuild
+2106070009 ./dev-libs/elfutils/elfutils-0.185.ebuild
 2003291509 ./dev-libs/ell/ell-9999.ebuild
 2104290109 ./dev-libs/ell/ell-0.39.ebuild
 2105042109 ./dev-libs/ell/ell-0.40.ebuild
@@ -7583,7 +7557,7 @@
 2105090839 ./dev-libs/gdl/gdl-3.34.0.ebuild
 2104060140 ./dev-libs/geoip/geoip-1.6.12.ebuild
 2104031909 ./dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
-2008251339 ./dev-libs/gf2x/gf2x-1.3.0.ebuild
+2106060039 ./dev-libs/gf2x/gf2x-1.3.0.ebuild
 2005022309 ./dev-libs/girara/girara-9999.ebuild
 2101091939 ./dev-libs/girara/girara-0.3.5.ebuild
 2011061839 ./dev-libs/gjs/gjs-1.64.4.ebuild
@@ -7631,7 +7605,7 @@
 2011031509 ./dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
 2104231639 ./dev-libs/intel-neo/intel-neo-20.44.18297.ebuild
 2104060140 ./dev-libs/isl/isl-0.23-r1.ebuild
-2105030039 ./dev-libs/isl/isl-0.24.ebuild
+2106070939 ./dev-libs/isl/isl-0.24.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
 2104060140 ./dev-libs/jansson/jansson-2.13.1-r1.ebuild
 2104161439 ./dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
@@ -7651,8 +7625,8 @@
 2104130239 ./dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
 2102150339 ./dev-libs/keystone/keystone-0.9.1-r1.ebuild
 2102150339 ./dev-libs/keystone/keystone-9999.ebuild
-2104021039 ./dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
 2104060140 ./dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
+2106051440 ./dev-libs/kpathsea/kpathsea-6.3.3_p20210325.ebuild
 2001121639 ./dev-libs/kproperty/kproperty-3.2.0.ebuild
 2104161439 ./dev-libs/kqoauth/kqoauth-0.98-r3.ebuild
 2101071809 ./dev-libs/kreport/kreport-3.2.0-r1.ebuild
@@ -7841,7 +7815,7 @@
 2103302109 ./dev-libs/libnsfb/libnsfb-0.2.2-r1.ebuild
 2103302109 ./dev-libs/libnsutils/libnsutils-0.1.0-r1.ebuild
 2103091309 ./dev-libs/libofx/libofx-0.10.1-r1.ebuild
-2105301309 ./dev-libs/libofx/libofx-0.10.2.ebuild
+2106070939 ./dev-libs/libofx/libofx-0.10.2.ebuild
 2102250309 ./dev-libs/liboil/liboil-0.3.17-r3.ebuild
 2101310343 ./dev-libs/liborcus/liborcus-0.15.4.ebuild
 2103131909 ./dev-libs/liborcus/liborcus-9999.ebuild
@@ -7883,9 +7857,6 @@
 2101310343 ./dev-libs/librdkafka/librdkafka-1.6.0.ebuild
 2105111839 ./dev-libs/librdkafka/librdkafka-1.7.0.ebuild
 2105150609 ./dev-libs/librdkafka/librdkafka-1.6.1.ebuild
-2105021909 ./dev-libs/librelp/librelp-1.8.0.ebuild
-2105021909 ./dev-libs/librelp/librelp-1.9.0.ebuild
-2105160309 ./dev-libs/librelp/librelp-1.7.0.ebuild
 2106031939 ./dev-libs/librelp/librelp-1.10.0.ebuild
 2101072209 ./dev-libs/librep/librep-0.92.7.ebuild
 2008250139 ./dev-libs/libreport/libreport-2.13.1.ebuild
@@ -7945,7 +7916,7 @@
 2103080509 ./dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
 2104060140 ./dev-libs/libuv/libuv-1.40.0.ebuild
 2105030209 ./dev-libs/libuv/libuv-9999.ebuild
-2106032309 ./dev-libs/libuv/libuv-1.41.0.ebuild
+2106070939 ./dev-libs/libuv/libuv-1.41.0.ebuild
 2105292209 ./dev-libs/libvarlink/libvarlink-16.ebuild
 2105292209 ./dev-libs/libvarlink/libvarlink-18.ebuild
 2105292209 ./dev-libs/libvarlink/libvarlink-19.ebuild
@@ -8011,6 +7982,7 @@
 2104072109 ./dev-libs/mxml/mxml-3.2.ebuild
 2105180009 ./dev-libs/nanomsg/nanomsg-1.1.5.ebuild
 2104161339 ./dev-libs/nettle/nettle-3.7.2.ebuild
+2106071539 ./dev-libs/nettle/nettle-3.7.3.ebuild
 2105181809 ./dev-libs/newt/newt-0.52.21-r1.ebuild
 2104180939 ./dev-libs/nmeap/nmeap-0.3-r1.ebuild
 2104060140 ./dev-libs/npth/npth-1.6-r1.ebuild
@@ -8059,22 +8031,15 @@
 2011151839 ./dev-libs/ppl/ppl-1.2-r3.ebuild
 1912110241 ./dev-libs/processor-trace/processor-trace-2.0.ebuild
 2104060140 ./dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
-2104060140 ./dev-libs/protobuf/protobuf-3.13.0.ebuild
-2105161609 ./dev-libs/protobuf/protobuf-3.14.0.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.0.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.1.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.2.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.3.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.4.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.5.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.6.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-3.15.7.ebuild
 2106010209 ./dev-libs/protobuf/protobuf-3.16.0.ebuild
-2106010209 ./dev-libs/protobuf/protobuf-9999.ebuild
 2106022009 ./dev-libs/protobuf/protobuf-3.15.8.ebuild
+2106062009 ./dev-libs/protobuf/protobuf-3.17.0.ebuild
+2106062009 ./dev-libs/protobuf/protobuf-3.17.1.ebuild
+2106062009 ./dev-libs/protobuf/protobuf-3.17.2.ebuild
+2106062009 ./dev-libs/protobuf/protobuf-9999.ebuild
 1805090108 ./dev-libs/pslib/pslib-0.4.5.ebuild
-2104021139 ./dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
 2104060140 ./dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
+2106051440 ./dev-libs/ptexenc/ptexenc-1.3.9_p20210325.ebuild
 1912312039 ./dev-libs/pugixml/pugixml-9999.ebuild
 2102150909 ./dev-libs/pugixml/pugixml-1.11.4.ebuild
 2006040939 ./dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
@@ -8091,9 +8056,8 @@
 2101051739 ./dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
 2105251509 ./dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
 2012311940 ./dev-libs/rasqal/rasqal-0.9.33.ebuild
-2011220639 ./dev-libs/re2/re2-0.2020.11.01.ebuild
-2103261809 ./dev-libs/re2/re2-0.2021.02.02.ebuild
 2105100109 ./dev-libs/re2/re2-0.2021.04.01.ebuild
+2106042309 ./dev-libs/re2/re2-0.2021.06.01.ebuild
 2101310343 ./dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
 2012311940 ./dev-libs/redland/redland-1.0.17-r2.ebuild
 1911180309 ./dev-libs/replicant/replicant-0.8.1.ebuild
@@ -8189,6 +8153,7 @@
 2105071940 ./dev-libs/uthash/uthash-2.3.0.ebuild
 2104040239 ./dev-libs/uulib/uulib-0.5.20-r1.ebuild
 2105312109 ./dev-libs/vala-common/vala-common-0.52.3.ebuild
+2106070109 ./dev-libs/vala-common/vala-common-0.52.4.ebuild
 2105251739 ./dev-libs/vc/vc-1.4.1-r1.ebuild
 2105111209 ./dev-libs/voikko-fi/voikko-fi-2.4.ebuild
 2101310343 ./dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
@@ -8244,7 +8209,7 @@
 2008242039 ./dev-libs/level-zero/level-zero-1.0.0.ebuild
 2011031509 ./dev-libs/level-zero/level-zero-0.91.10.ebuild
 2010080539 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.1.1.ebuild
-2105030209 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
+2106051409 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.3.0.ebuild
 2103230809 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
 2101060409 ./dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
 2012272109 ./dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -8273,7 +8238,7 @@
 2102260409 ./dev-libs/rocksdb/rocksdb-6.15.5.ebuild
 2103210639 ./dev-libs/rocksdb/rocksdb-6.17.3.ebuild
 2103300709 ./dev-libs/tree-sitter/tree-sitter-9999.ebuild
-2104070639 ./dev-libs/tree-sitter/tree-sitter-0.19.4-r1.ebuild
+2106042209 ./dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
 2104212339 ./dev-libs/libmpack/libmpack-1.0.5.ebuild
 2103072339 ./dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
 2105170610 ./dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
@@ -8368,15 +8333,14 @@
 2104212339 ./dev-lua/luaossl/luaossl-20200709-r100.ebuild
 2104291739 ./dev-lua/luaposix/luaposix-35.0-r102.ebuild
 2106032309 ./dev-lua/luarocks/luarocks-3.7.0.ebuild
-2104302109 ./dev-lua/luasec/luasec-1.0.ebuild
-2106032309 ./dev-lua/luasec/luasec-1.0.1.ebuild
+2106042139 ./dev-lua/luasec/luasec-1.0.1.ebuild
 2104210039 ./dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
 2104222239 ./dev-lua/luassert/luassert-1.8.0-r101.ebuild
 2104222239 ./dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
 2102081839 ./dev-lua/lutok/lutok-0.4-r10.ebuild
 2103091939 ./dev-lua/luv/luv-1.36.0.0.ebuild
 2104222239 ./dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
-2012042039 ./dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
+2106071139 ./dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
 2106030139 ./dev-lua/mpack/mpack-1.0.8-r100.ebuild
 2105290110 ./dev-lua/penlight/penlight-1.10.0.ebuild
 2104222239 ./dev-lua/say/say-1.3_p1-r101.ebuild
@@ -8423,6 +8387,7 @@
 2103131509 ./dev-ml/cryptokit/cryptokit-1.16.1-r1.ebuild
 2104161439 ./dev-ml/cudf/cudf-0.9.ebuild
 2104161439 ./dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+2106070309 ./dev-ml/dose3/dose3-6.0.1_p2.ebuild
 2103140409 ./dev-ml/dune/dune-2.8.2.ebuild
 2104161439 ./dev-ml/dune/dune-1.11.4.ebuild
 2104161439 ./dev-ml/dune/dune-2.1.0.ebuild
@@ -8486,6 +8451,7 @@
 2104120442 ./dev-ml/octavius/octavius-1.2.2.ebuild
 2103140409 ./dev-ml/ocurl/ocurl-0.9.1.ebuild
 2103140409 ./dev-ml/opam/opam-2.0.8-r1.ebuild
+2106070309 ./dev-ml/opam/opam-2.0.8-r2.ebuild
 2103140409 ./dev-ml/parmap/parmap-1.2.ebuild
 2104250939 ./dev-ml/parmap/parmap-1.2.1.ebuild
 2103020009 ./dev-ml/patience_diff/patience_diff-0.14.0.ebuild
@@ -8557,15 +8523,21 @@
 2103140409 ./dev-ml/mccs/mccs-1.1.11.ebuild
 2105292209 ./dev-ml/mmap/mmap-1.1.0.ebuild
 2103140409 ./dev-ml/opam-client/opam-client-2.0.8.ebuild
+2106070309 ./dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
 2103140409 ./dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
 2103140409 ./dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
 2106030409 ./dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
 2103140409 ./dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+2106070309 ./dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
 2103150709 ./dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
 2105101839 ./dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+2106070309 ./dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
 2103140409 ./dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+2106070309 ./dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
 2103140409 ./dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+2106070309 ./dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
 2103140409 ./dev-ml/opam-state/opam-state-2.0.8.ebuild
+2106070309 ./dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
 2102081109 ./dev-ml/ounit2/ounit2-2.2.4.ebuild
 2103140409 ./dev-ml/ounit2/ounit2-2.2.3.ebuild
 2103140409 ./dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -8846,7 +8818,7 @@
 2105051939 ./dev-perl/Config-ApacheFormat/Config-ApacheFormat-1.200.0-r2.ebuild
 2006270909 ./dev-perl/Config-Auto/Config-Auto-0.440.0-r1.ebuild
 1912110241 ./dev-perl/Config-AutoConf/Config-AutoConf-0.315.0.ebuild
-2106021739 ./dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
+2106070939 ./dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
 1705261704 ./dev-perl/Config-Crontab/Config-Crontab-1.450.0.ebuild
 2101070139 ./dev-perl/Config-General/Config-General-2.630.0.ebuild
 1912110241 ./dev-perl/Config-Grammar/Config-Grammar-1.120.0.ebuild
@@ -8961,7 +8933,7 @@
 2104060140 ./dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
 2105221939 ./dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
 1801051639 ./dev-perl/DBI-Shell/DBI-Shell-11.950.0-r2.ebuild
-2105261139 ./dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
+2106070939 ./dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
 2104060140 ./dev-perl/DBI/DBI-1.643.0.ebuild
 2007090909 ./dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.50.0-r1.ebuild
 2007132309 ./dev-perl/DBIx-Class-DynamicDefault/DBIx-Class-DynamicDefault-0.40.0-r1.ebuild
@@ -9082,7 +9054,7 @@
 2101070139 ./dev-perl/Devel-CheckLib/Devel-CheckLib-1.130.0.ebuild
 2105240909 ./dev-perl/Devel-CheckLib/Devel-CheckLib-1.140.0.ebuild
 2102111109 ./dev-perl/Devel-CheckOS/Devel-CheckOS-1.830.0.ebuild
-2106031139 ./dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
+2106070939 ./dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
 2007290409 ./dev-perl/Devel-Cover/Devel-Cover-1.360.0.ebuild
 2105240209 ./dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
 2007300539 ./dev-perl/Devel-Declare/Devel-Declare-0.6.22.ebuild
@@ -9252,10 +9224,10 @@
 2105301909 ./dev-perl/File-Flock/File-Flock-2014.10.0-r1.ebuild
 1710211138 ./dev-perl/File-Grep/File-Grep-0.20.0-r2.ebuild
 2101070139 ./dev-perl/File-HomeDir/File-HomeDir-1.2.0.ebuild
-2106031939 ./dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
+2106070939 ./dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
 2003281839 ./dev-perl/File-KeePass/File-KeePass-2.30.0-r1.ebuild
 2012311940 ./dev-perl/File-LibMagic/File-LibMagic-1.150.0.ebuild
-2106021739 ./dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
+2106070939 ./dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
 2104060140 ./dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild
 2105301909 ./dev-perl/File-Listing/File-Listing-6.140.0.ebuild
 2106031939 ./dev-perl/File-Listing/File-Listing-6.70.0.ebuild
@@ -9273,23 +9245,22 @@
 2106010009 ./dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
 2101070139 ./dev-perl/File-Remove/File-Remove-1.570.0.ebuild
 2106010009 ./dev-perl/File-Remove/File-Remove-1.600.0.ebuild
-2106031939 ./dev-perl/File-Remove/File-Remove-1.580.0.ebuild
+2106070939 ./dev-perl/File-Remove/File-Remove-1.580.0.ebuild
 2004032241 ./dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
 2106031139 ./dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
 2104120442 ./dev-perl/File-Scan-ClamAV/File-Scan-ClamAV-1.950.0-r1.ebuild
 2008311239 ./dev-perl/File-SearchPath/File-SearchPath-0.70.0-r1.ebuild
 2004032241 ./dev-perl/File-Share/File-Share-0.250.0.ebuild
 2104060140 ./dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
-2106031939 ./dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
+2106070939 ./dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
 1912110241 ./dev-perl/File-ShareDir-ProjectDistDir/File-ShareDir-ProjectDistDir-1.0.9.ebuild
 2104060140 ./dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
 2106010039 ./dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
-2106021839 ./dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
+2106070939 ./dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
 2106022209 ./dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r1.ebuild
 2104060140 ./dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild
-2106031939 ./dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
-2101070139 ./dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
-2106031139 ./dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
+2106070939 ./dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
+2106070939 ./dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
 2102271939 ./dev-perl/File-Sort/File-Sort-1.10.0-r2.ebuild
 2101070139 ./dev-perl/File-Spec-Native/File-Spec-Native-1.4.0.ebuild
 2106022209 ./dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r2.ebuild
@@ -9299,25 +9270,25 @@
 2106022209 ./dev-perl/File-Type/File-Type-0.220.0-r2.ebuild
 2104060140 ./dev-perl/File-Which/File-Which-1.220.0.ebuild
 2106022209 ./dev-perl/File-Which/File-Which-1.270.0.ebuild
-2106032309 ./dev-perl/File-Which/File-Which-1.230.0.ebuild
+2106070939 ./dev-perl/File-Which/File-Which-1.230.0.ebuild
 2104060140 ./dev-perl/File-chdir/File-chdir-0.101.100.ebuild
 2105291739 ./dev-perl/File-chmod/File-chmod-0.420.0-r1.ebuild
 2101070139 ./dev-perl/File-pushd/File-pushd-1.14.0.ebuild
-2106031939 ./dev-perl/File-pushd/File-pushd-1.16.0.ebuild
+2106070939 ./dev-perl/File-pushd/File-pushd-1.16.0.ebuild
 2004032241 ./dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
-2106031139 ./dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
+2106070939 ./dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
 2106022209 ./dev-perl/Filesys-Df/Filesys-Df-0.920.0-r3.ebuild
 1907081439 ./dev-perl/Filesys-DiskSpace/Filesys-DiskSpace-0.50.0-r2.ebuild
 2004032241 ./dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.120.0.ebuild
-2106031939 ./dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
+2106070939 ./dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
 2009101809 ./dev-perl/Filesys-SmbClient/Filesys-SmbClient-3.200.0-r4.ebuild
 2106022209 ./dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0-r1.ebuild
 2101070139 ./dev-perl/Filter/Filter-1.570.0.ebuild
-2106032309 ./dev-perl/Filter/Filter-1.600.0.ebuild
+2106070939 ./dev-perl/Filter/Filter-1.600.0.ebuild
 2008291639 ./dev-perl/Finance-Quote/Finance-Quote-1.470.0.ebuild
 2102111109 ./dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild
 1806242309 ./dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0-r1.ebuild
-2106031939 ./dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
+2106070939 ./dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
 2106022209 ./dev-perl/Font-AFM/Font-AFM-1.200.0-r3.ebuild
 2106020609 ./dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
 2009171839 ./dev-perl/Format-Human-Bytes/Format-Human-Bytes-0.60.0-r2.ebuild
@@ -9327,33 +9298,40 @@
 1910111840 ./dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r2.ebuild
 2106032239 ./dev-perl/GD-SVG/GD-SVG-0.330.0-r2.ebuild
 2003261841 ./dev-perl/GD/GD-2.660.0.ebuild
-2106032239 ./dev-perl/GD/GD-2.730.0-r1.ebuild
+2106070939 ./dev-perl/GD/GD-2.730.0-r1.ebuild
 1912110241 ./dev-perl/GDGraph/GDGraph-1.540.0.ebuild
 1910111840 ./dev-perl/GDTextUtil/GDTextUtil-0.860.0-r2.ebuild
 2104060140 ./dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
 1912110241 ./dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.940.0-r2.ebuild
 1912110241 ./dev-perl/Gearman-Server/Gearman-Server-1.130.1-r1.ebuild
 1912110241 ./dev-perl/Gearman/Gearman-2.4.9.ebuild
+2106042139 ./dev-perl/Gearman/Gearman-2.4.15.ebuild
 1912110241 ./dev-perl/Gentoo-App-Pram/Gentoo-App-Pram-0.200.0.ebuild
 2005021639 ./dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.1.ebuild
-2104060140 ./dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
-2101070139 ./dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r1.ebuild
-2004032241 ./dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r1.ebuild
+2106042139 ./dev-perl/Geo-IP/Geo-IP-1.510.0-r1.ebuild
+2106042139 ./dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r2.ebuild
+2106042139 ./dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r2.ebuild
 1710241310 ./dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r2.ebuild
 2101070139 ./dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
-2012311940 ./dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
+2106051839 ./dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
+2106051839 ./dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0-r1.ebuild
 1710240448 ./dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r1.ebuild
 1912110241 ./dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild
+2106051839 ./dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild
 1909281909 ./dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild
-2012311940 ./dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
+2106051839 ./dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
 2012311940 ./dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
+2106051839 ./dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
 1806102039 ./dev-perl/Goo-Canvas/Goo-Canvas-0.60.0-r2.ebuild
 2105081609 ./dev-perl/GooCanvas2/GooCanvas2-0.60.0-r1.ebuild
 1912110241 ./dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild
+2106061639 ./dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild
 2004032241 ./dev-perl/Graph/Graph-0.970.400.ebuild
+2106061639 ./dev-perl/Graph/Graph-0.972.100.ebuild
 1912110241 ./dev-perl/GraphViz/GraphViz-2.240.0.ebuild
 1912110241 ./dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild
 1702282250 ./dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild
+2106061709 ./dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
 1702282250 ./dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
 1710262317 ./dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild
 1806102039 ./dev-perl/Gtk2-Ex-PodViewer/Gtk2-Ex-PodViewer-0.180.0-r2.ebuild
@@ -9446,7 +9424,7 @@
 2004032241 ./dev-perl/IO-Event/IO-Event-0.813.0-r1.ebuild
 2104060140 ./dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
 1912110241 ./dev-perl/IO-Handle-Util/IO-Handle-Util-0.10.0.ebuild
-2009071039 ./dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
+2106070939 ./dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
 2002112051 ./dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild
 1702282250 ./dev-perl/IO-LockedFile/IO-LockedFile-0.230.0-r1.ebuild
 2012311940 ./dev-perl/IO-Multiplex/IO-Multiplex-1.160.0-r1.ebuild
@@ -9484,7 +9462,7 @@
 2104060140 ./dev-perl/Importer/Importer-0.24.0.ebuild
 2010170109 ./dev-perl/Inline-C/Inline-C-0.780.0.ebuild
 2002112051 ./dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
-2101310343 ./dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
+2106070309 ./dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
 2012311940 ./dev-perl/Inline/Inline-0.800.0.ebuild
 2101070139 ./dev-perl/JSON-Any/JSON-Any-1.390.0.ebuild
 2104060140 ./dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
@@ -9549,7 +9527,7 @@
 2101070139 ./dev-perl/List-MoreUtils/List-MoreUtils-0.418.0.ebuild
 2101070139 ./dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild
 2101070139 ./dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
-2106021839 ./dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
+2106070939 ./dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
 2101070139 ./dev-perl/List-SomeUtils-XS/List-SomeUtils-XS-0.550.0.ebuild
 2101070139 ./dev-perl/List-SomeUtils/List-SomeUtils-0.560.0.ebuild
 2101070139 ./dev-perl/List-UtilsBy/List-UtilsBy-0.100.0.ebuild
@@ -9945,9 +9923,6 @@
 1912110241 ./dev-perl/Pod-Strip/Pod-Strip-1.20.0-r1.ebuild
 2101070139 ./dev-perl/Pod-Tests/Pod-Tests-1.190.0-r1.ebuild
 1912110241 ./dev-perl/Pod-Weaver/Pod-Weaver-4.15.0.ebuild
-2104180939 ./dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
-2104180939 ./dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
-2104180939 ./dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
 2012311940 ./dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild
 1702282250 ./dev-perl/PostScript/PostScript-0.60.0-r1.ebuild
 2104060140 ./dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
@@ -10004,7 +9979,6 @@
 1912110241 ./dev-perl/SVG/SVG-2.820.0.ebuild
 1702282250 ./dev-perl/Safe-Hole/Safe-Hole-0.130.0-r1.ebuild
 1912110241 ./dev-perl/Safe-Isa/Safe-Isa-1.0.8.ebuild
-1912110241 ./dev-perl/Sane/Sane-0.50.0-r1.ebuild
 2101070139 ./dev-perl/Scalar-Properties/Scalar-Properties-1.100.860-r1.ebuild
 1808040309 ./dev-perl/Schedule-At/Schedule-At-1.150.0-r2.ebuild
 1912110241 ./dev-perl/Schedule-Cron-Events/Schedule-Cron-Events-1.950.0.ebuild
@@ -10022,6 +9996,7 @@
 1702282250 ./dev-perl/Set-Infinite/Set-Infinite-0.650.0-r1.ebuild
 2012311940 ./dev-perl/Set-IntSpan/Set-IntSpan-1.190.0-r1.ebuild
 1912110241 ./dev-perl/Set-Object/Set-Object-1.380.0.ebuild
+2106061639 ./dev-perl/Set-Object/Set-Object-1.410.0.ebuild
 2101070139 ./dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
 2105061339 ./dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
 2101070139 ./dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
@@ -10291,7 +10266,7 @@
 2008171209 ./dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
 2003261841 ./dev-perl/Tk/Tk-804.34.0.ebuild
 2104060140 ./dev-perl/Tk/Tk-804.33.0.ebuild
-2106021609 ./dev-perl/Tk/Tk-804.36.0.ebuild
+2106041739 ./dev-perl/Tk/Tk-804.36.0.ebuild
 2104060140 ./dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild
 1912110241 ./dev-perl/Tree-Simple/Tree-Simple-1.330.0.ebuild
 2104060140 ./dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
@@ -10302,7 +10277,7 @@
 2012271939 ./dev-perl/UNIVERSAL-can/UNIVERSAL-can-1.201.403.280.ebuild
 2012271939 ./dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.710.120.ebuild
 1912110241 ./dev-perl/UNIVERSAL-moniker/UNIVERSAL-moniker-0.80.0-r1.ebuild
-2101070139 ./dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
+2106070939 ./dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
 1912110241 ./dev-perl/URI-Encode/URI-Encode-1.1.1.ebuild
 1912110241 ./dev-perl/URI-Fetch/URI-Fetch-0.130.0.ebuild
 1912110241 ./dev-perl/URI-Find/URI-Find-20160806.0.0.ebuild
@@ -10565,7 +10540,7 @@
 2105291739 ./dev-perl/HTTP-Exception/HTTP-Exception-0.40.70.ebuild
 2105291739 ./dev-perl/HTTP-Server-Simple-Static/HTTP-Server-Simple-Static-0.140.0.ebuild
 2105291739 ./dev-perl/Test-HTTP-Server-Simple/Test-HTTP-Server-Simple-0.110.0.ebuild
-2106031139 ./dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
+2106070939 ./dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
 2102111109 ./dev-perl/String-Util/String-Util-1.310.0.ebuild
 2106022209 ./dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r3.ebuild
 2009212339 ./dev-perl/Bytes-Random-Secure/Bytes-Random-Secure-0.290.0.ebuild
@@ -10589,7 +10564,7 @@
 2105250339 ./dev-perl/Crypt-PBKDF2/Crypt-PBKDF2-0.161.520.ebuild
 2105250339 ./dev-perl/Digest-SHA3/Digest-SHA3-1.40.0.ebuild
 2105150609 ./dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
-2106011113 ./dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
+2106070939 ./dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
 2003261841 ./dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
 2012150539 ./dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
@@ -10762,6 +10737,7 @@
 2104271739 ./dev-php/composer/composer-1.10.22.ebuild
 2105101009 ./dev-php/composer/composer-2.0.13.ebuild
 2105281209 ./dev-php/composer/composer-2.0.14.ebuild
+2106041039 ./dev-php/composer/composer-2.1.1.ebuild
 1707271806 ./dev-php/cphplib/cphplib-0.51-r1.ebuild
 2003261841 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
 2003261841 ./dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
@@ -10993,8 +10969,7 @@
 2105301139 ./dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
 2104060140 ./dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
 2104161439 ./dev-python/PyECLib/PyECLib-1.6.0.ebuild
-2101310343 ./dev-python/PyGithub/PyGithub-1.54.1.ebuild
-2104261039 ./dev-python/PyGithub/PyGithub-1.55.ebuild
+2106052339 ./dev-python/PyGithub/PyGithub-1.55.ebuild
 2102201839 ./dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
 2106020509 ./dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
 2106020509 ./dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
@@ -11024,25 +10999,20 @@
 2104111439 ./dev-python/aiohttp-socks/aiohttp-socks-0.6.0.ebuild
 2105231609 ./dev-python/aiohttp/aiohttp-3.7.4.ebuild
 2103011239 ./dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
-2104260109 ./dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
 2104290239 ./dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
 2105261009 ./dev-python/aiorpcX/aiorpcX-0.21.1.ebuild
 2105261139 ./dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
+2106052339 ./dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
 2103081039 ./dev-python/aiosmtpd/aiosmtpd-1.4.2.ebuild
 2105181609 ./dev-python/alabaster/alabaster-0.7.12.ebuild
-2104280109 ./dev-python/alembic/alembic-1.5.8.ebuild
-2105041609 ./dev-python/alembic/alembic-1.6.0.ebuild
-2105071109 ./dev-python/alembic/alembic-1.6.2.ebuild
-2105221109 ./dev-python/alembic/alembic-1.6.3.ebuild
-2105250839 ./dev-python/alembic/alembic-1.6.4.ebuild
-2105280209 ./dev-python/alembic/alembic-1.6.5.ebuild
+2106052339 ./dev-python/alembic/alembic-1.6.2.ebuild
+2106051609 ./dev-python/alembic/alembic-1.6.5.ebuild
 2102070309 ./dev-python/amodem/amodem-1.15.1-r1.ebuild
 2105091309 ./dev-python/aniso8601/aniso8601-9.0.1.ebuild
-2102261739 ./dev-python/ansi/ansi-0.2.0.ebuild
-2101310343 ./dev-python/ansi2html/ansi2html-1.6.0.ebuild
-2101310343 ./dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild
-2101310343 ./dev-python/ansicolor/ansicolor-9999.ebuild
-2105051239 ./dev-python/ansicolor/ansicolor-0.3.2.ebuild
+2106051609 ./dev-python/ansi/ansi-0.2.0.ebuild
+2106051609 ./dev-python/ansi2html/ansi2html-1.6.0.ebuild
+2106052339 ./dev-python/ansicolor/ansicolor-0.3.2.ebuild
+2106051609 ./dev-python/ansicolor/ansicolor-9999.ebuild
 2008030009 ./dev-python/anyqt/anyqt-0.0.8-r1.ebuild
 2104241209 ./dev-python/anyqt/anyqt-0.0.12.ebuild
 2105071209 ./dev-python/anyqt/anyqt-0.0.13.ebuild
@@ -11051,50 +11021,41 @@
 2105052009 ./dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
 2105222139 ./dev-python/apispec/apispec-4.4.1.ebuild
 2105250839 ./dev-python/apispec/apispec-4.4.2.ebuild
+2106051139 ./dev-python/apispec/apispec-4.5.0.ebuild
 2105052139 ./dev-python/appdirs/appdirs-1.4.4-r1.ebuild
 2101310343 ./dev-python/apsw/apsw-3.32.2_p1.ebuild
 2105302039 ./dev-python/apsw/apsw-3.35.4_p1.ebuild
-2101310343 ./dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
-2105240309 ./dev-python/argcomplete/argcomplete-1.12.3.ebuild
+2106052339 ./dev-python/argcomplete/argcomplete-1.12.3.ebuild
 2105192139 ./dev-python/argh/argh-0.26.2-r2.ebuild
-2101310343 ./dev-python/arpeggio/arpeggio-1.10.0.ebuild
-2104260109 ./dev-python/arpeggio/arpeggio-1.10.2.ebuild
+2106052339 ./dev-python/arpeggio/arpeggio-1.10.2.ebuild
 2104111439 ./dev-python/arrow/arrow-1.0.3.ebuild
-2104281139 ./dev-python/arrow/arrow-1.1.0.ebuild
-2104060140 ./dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
+2106052339 ./dev-python/arrow/arrow-1.1.0.ebuild
+2106051609 ./dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
 2101310343 ./dev-python/astor/astor-0.8.1.ebuild
-2103192339 ./dev-python/astroid/astroid-2.5.ebuild
-2104260109 ./dev-python/astroid/astroid-2.5.6.ebuild
-2105061309 ./dev-python/astroid/astroid-2.5.3.ebuild
 2105301139 ./dev-python/astroid/astroid-2.5.7.ebuild
+2106052339 ./dev-python/astroid/astroid-2.5.6.ebuild
 2105091309 ./dev-python/async_generator/async_generator-1.10.ebuild
 2101310343 ./dev-python/async_timeout/async_timeout-3.0.1.ebuild
-2101310343 ./dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
+2106051609 ./dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
 2101021239 ./dev-python/atpublic/atpublic-2.1.2.ebuild
 2101310343 ./dev-python/atpublic/atpublic-1.0.ebuild
 2102160339 ./dev-python/atpublic/atpublic-2.1.3.ebuild
 2104141039 ./dev-python/atpublic/atpublic-2.3.ebuild
-2104060140 ./dev-python/attrs/attrs-20.3.0.ebuild
-2105052009 ./dev-python/attrs/attrs-20.3.0_p20210222.ebuild
-2105061209 ./dev-python/attrs/attrs-21.1.0.ebuild
-2105071339 ./dev-python/attrs/attrs-21.2.0.ebuild
+2106052339 ./dev-python/attrs/attrs-21.2.0.ebuild
 2103040739 ./dev-python/audioread/audioread-2.1.8-r2.ebuild
 2103040739 ./dev-python/audioread/audioread-2.1.9.ebuild
 2101310343 ./dev-python/authheaders/authheaders-0.13.0.ebuild
-2101310343 ./dev-python/authres/authres-1.2.0.ebuild
+2106051609 ./dev-python/authres/authres-1.2.0.ebuild
 2105161609 ./dev-python/autobahn/autobahn-21.3.1.ebuild
 2105181509 ./dev-python/automat/automat-20.2.0.ebuild
 2011261139 ./dev-python/automaton/automaton-2.2.0.ebuild
-2103072309 ./dev-python/autopep8/autopep8-1.5.5.ebuild
-2104291339 ./dev-python/autopep8/autopep8-1.5.6.ebuild
-2104301539 ./dev-python/autopep8/autopep8-1.5.7.ebuild
 2104301539 ./dev-python/autopep8/autopep8-9999.ebuild
+2106052339 ./dev-python/autopep8/autopep8-1.5.7.ebuild
 2104121909 ./dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
-2106011039 ./dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
-2104280109 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
-2104291039 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
-2008022209 ./dev-python/babelfish/babelfish-9999.ebuild
-2101310343 ./dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+2106051609 ./dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
+2106052339 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.8.0.ebuild
+2106051609 ./dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+2106051609 ./dev-python/babelfish/babelfish-9999.ebuild
 2105071509 ./dev-python/backcall/backcall-0.2.0.ebuild
 2101310343 ./dev-python/backports-tempfile/backports-tempfile-1.0-r1.ebuild
 2101310343 ./dev-python/backports-weakref/backports-weakref-1.0_p1-r1.ebuild
@@ -11108,13 +11069,12 @@
 2105300039 ./dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
 2101310343 ./dev-python/bert/bert-2.2.0.ebuild
 2106021939 ./dev-python/betamax/betamax-0.8.1.ebuild
-2101310343 ./dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
-2101171409 ./dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
-2105061139 ./dev-python/bitarray/bitarray-2.1.0.ebuild
-2105190339 ./dev-python/bitarray/bitarray-2.0.1.ebuild
-2101310343 ./dev-python/bitstring/bitstring-3.1.7.ebuild
+2106051609 ./dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
+2106051609 ./dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
+2106060009 ./dev-python/bitarray/bitarray-2.1.0.ebuild
+2106051609 ./dev-python/bitstring/bitstring-3.1.7.ebuild
 2106021939 ./dev-python/bleach/bleach-3.3.0.ebuild
-2101310343 ./dev-python/blessings/blessings-1.7-r1.ebuild
+2106051609 ./dev-python/blessings/blessings-1.7-r1.ebuild
 2105071439 ./dev-python/blinker/blinker-1.4-r2.ebuild
 2104042209 ./dev-python/blockdiag/blockdiag-2.0.1.ebuild
 2102191539 ./dev-python/blosc/blosc-1.10.2.ebuild
@@ -11134,8 +11094,9 @@
 2105291139 ./dev-python/boto3/boto3-1.17.84.ebuild
 2106020141 ./dev-python/boto3/boto3-1.17.85.ebuild
 2106030240 ./dev-python/boto3/boto3-1.17.86.ebuild
-2106040109 ./dev-python/boto3/boto3-1.17.87.ebuild
-2106040109 ./dev-python/boto3/boto3-9999.ebuild
+2106041939 ./dev-python/boto3/boto3-1.17.87.ebuild
+2106051139 ./dev-python/boto3/boto3-1.17.88.ebuild
+2106041939 ./dev-python/boto3/boto3-9999.ebuild
 2105182039 ./dev-python/botocore/botocore-1.20.74.ebuild
 2105222139 ./dev-python/botocore/botocore-1.20.54.ebuild
 2105221109 ./dev-python/botocore/botocore-1.20.78.ebuild
@@ -11146,21 +11107,19 @@
 2105291139 ./dev-python/botocore/botocore-1.20.84.ebuild
 2106020141 ./dev-python/botocore/botocore-1.20.85.ebuild
 2106030240 ./dev-python/botocore/botocore-1.20.86.ebuild
-2106040109 ./dev-python/botocore/botocore-1.20.87.ebuild
-2106040109 ./dev-python/botocore/botocore-9999.ebuild
+2106041939 ./dev-python/botocore/botocore-1.20.87.ebuild
+2106051139 ./dev-python/botocore/botocore-1.20.88.ebuild
+2106041939 ./dev-python/botocore/botocore-9999.ebuild
 2105071439 ./dev-python/bottle/bottle-0.12.19.ebuild
 2101310343 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2105221739 ./dev-python/bpython/bpython-0.21.ebuild
-2105011109 ./dev-python/breathe/breathe-4.29.2.ebuild
-2105061339 ./dev-python/breathe/breathe-4.28.0.ebuild
-2105071109 ./dev-python/breathe/breathe-4.30.0.ebuild
+2106052339 ./dev-python/breathe/breathe-4.30.0.ebuild
 2101310343 ./dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
 2105171109 ./dev-python/brython/brython-3.9.0.ebuild
 2103040209 ./dev-python/bsddb3/bsddb3-6.2.9.ebuild
-2101310343 ./dev-python/cached-property/cached-property-1.5.2.ebuild
+2106051609 ./dev-python/cached-property/cached-property-1.5.2.ebuild
 2103301239 ./dev-python/cachelib/cachelib-0.1.1.ebuild
-2102261139 ./dev-python/cachetools/cachetools-4.2.1.ebuild
-2105091439 ./dev-python/cachetools/cachetools-4.2.2.ebuild
+2106052339 ./dev-python/cachetools/cachetools-4.2.2.ebuild
 2101310343 ./dev-python/cairocffi/cairocffi-1.2.0.ebuild
 2106011509 ./dev-python/cangjie/cangjie-1.3-r1.ebuild
 2101310343 ./dev-python/capturer/capturer-3.0.ebuild
@@ -11170,7 +11129,7 @@
 2011291139 ./dev-python/castellan/castellan-3.6.0.ebuild
 2102150339 ./dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
 2102150339 ./dev-python/catkin_pkg/catkin_pkg-9999.ebuild
-2101310343 ./dev-python/cbor/cbor-1.0.0-r1.ebuild
+2106051639 ./dev-python/cbor/cbor-1.0.0-r1.ebuild
 2105041913 ./dev-python/certifi/certifi-10001-r1.ebuild
 2105052239 ./dev-python/cffi/cffi-1.14.5.ebuild
 2104282009 ./dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild
@@ -11202,7 +11161,7 @@
 2105231709 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
 2106011609 ./dev-python/click-log/click-log-0.3.2.ebuild
 2101310343 ./dev-python/click-plugins/click-plugins-1.0.3.ebuild
-2102150539 ./dev-python/click-plugins/click-plugins-1.1.1.ebuild
+2106051639 ./dev-python/click-plugins/click-plugins-1.1.1.ebuild
 2105310009 ./dev-python/click-threading/click-threading-0.5.0.ebuild
 2106011609 ./dev-python/click-threading/click-threading-0.4.4.ebuild
 2105071339 ./dev-python/click/click-7.1.2-r1.ebuild
@@ -11213,6 +11172,7 @@
 2105231239 ./dev-python/clint/clint-0.5.1-r3.ebuild
 2105071439 ./dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
 2105240439 ./dev-python/cmd2/cmd2-1.5.0.ebuild
+2106071009 ./dev-python/cmd2/cmd2-2.0.1.ebuild
 2101310343 ./dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
 2101310343 ./dev-python/colorama/colorama-0.4.3-r1.ebuild
 2105062209 ./dev-python/colorama/colorama-0.4.4.ebuild
@@ -11224,7 +11184,7 @@
 2105062209 ./dev-python/commonmark/commonmark-0.9.1.ebuild
 2104180509 ./dev-python/configargparse/configargparse-1.4.ebuild
 2105111109 ./dev-python/configargparse/configargparse-1.4.1.ebuild
-2101310343 ./dev-python/configclass/configclass-0.2.0.ebuild
+2106052209 ./dev-python/configclass/configclass-0.2.0.ebuild
 2105071339 ./dev-python/configobj/configobj-5.0.6-r1.ebuild
 2101310343 ./dev-python/configshell-fb/configshell-fb-1.1.28.ebuild
 2011251209 ./dev-python/confuse/confuse-1.4.0.ebuild
@@ -11239,14 +11199,14 @@
 2101310343 ./dev-python/cov-core/cov-core-1.15.0-r2.ebuild
 2101310343 ./dev-python/coverage/coverage-4.5.4.ebuild
 2104080209 ./dev-python/coverage/coverage-5.5.ebuild
-2103030039 ./dev-python/crcmod/crcmod-1.7-r4.ebuild
+2106051639 ./dev-python/crcmod/crcmod-1.7-r4.ebuild
 2104282009 ./dev-python/croniter/croniter-1.0.12.ebuild
-2105071209 ./dev-python/croniter/croniter-1.0.13.ebuild
+2106051639 ./dev-python/croniter/croniter-1.0.13.ebuild
 2105240139 ./dev-python/cryptography/cryptography-3.4.7-r1.ebuild
 2101310343 ./dev-python/css-parser/css-parser-1.0.4-r1.ebuild
 2105181239 ./dev-python/css-parser/css-parser-1.0.6.ebuild
 2105181609 ./dev-python/cssselect/cssselect-1.1.0-r1.ebuild
-2101310343 ./dev-python/cssselect2/cssselect2-0.4.1.ebuild
+2106052209 ./dev-python/cssselect2/cssselect2-0.4.1.ebuild
 2104121909 ./dev-python/cssutils/cssutils-2.2.0.ebuild
 2012021739 ./dev-python/cursive/cursive-0.2.2-r1.ebuild
 2102261539 ./dev-python/curtsies/curtsies-0.3.5.ebuild
@@ -11262,6 +11222,7 @@
 2105151209 ./dev-python/dask/dask-2021.5.0.ebuild
 2105261009 ./dev-python/dask/dask-2021.4.1.ebuild
 2105291139 ./dev-python/dask/dask-2021.5.1.ebuild
+2106051139 ./dev-python/dask/dask-2021.6.0.ebuild
 2106012039 ./dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
 2104272139 ./dev-python/dbusmock/dbusmock-0.23.0.ebuild
 2105261009 ./dev-python/ddt/ddt-1.4.2.ebuild
@@ -11277,15 +11238,15 @@
 2106020109 ./dev-python/deprecated/deprecated-1.2.12.ebuild
 2101310343 ./dev-python/deprecation/deprecation-2.1.0.ebuild
 2103041809 ./dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
-2012201939 ./dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
 2101310343 ./dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
+2106051639 ./dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
 2105071439 ./dev-python/dill/dill-0.3.3.ebuild
 2106010409 ./dev-python/discogs-client/discogs-client-2.3.12.ebuild
 2106010339 ./dev-python/discogs-client/discogs-client-9999.ebuild
 2102252209 ./dev-python/diskcache/diskcache-5.2.1.ebuild
 2101310343 ./dev-python/dissononce/dissononce-0.34.3-r1.ebuild
-2104181909 ./dev-python/distro/distro-1.5.0-r1.ebuild
-2101310343 ./dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+2106051639 ./dev-python/distro/distro-1.5.0-r1.ebuild
+2106051639 ./dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
 2104070039 ./dev-python/django-auth-ldap/django-auth-ldap-2.4.0.ebuild
 2101302339 ./dev-python/django-cacheops/django-cacheops-5.1.ebuild
 2101302339 ./dev-python/django-cors-headers/django-cors-headers-3.7.0.ebuild
@@ -11294,11 +11255,7 @@
 2101302339 ./dev-python/django-filter/django-filter-2.4.0.ebuild
 2101302339 ./dev-python/django-js-asset/django-js-asset-1.2.2.ebuild
 2101310343 ./dev-python/django-mptt/django-mptt-0.11.0.ebuild
-2101310343 ./dev-python/django-otp/django-otp-1.0.2.ebuild
-2104041739 ./dev-python/django-otp/django-otp-1.0.3.ebuild
-2104291039 ./dev-python/django-otp/django-otp-1.0.4.ebuild
-2105091139 ./dev-python/django-otp/django-otp-1.0.5.ebuild
-2105291139 ./dev-python/django-otp/django-otp-1.0.6.ebuild
+2106052209 ./dev-python/django-otp/django-otp-1.0.6.ebuild
 2102230139 ./dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
 2012111809 ./dev-python/django-redis/django-redis-4.10.0.ebuild
 2101090709 ./dev-python/django-rq/django-rq-2.4.0.ebuild
@@ -11318,17 +11275,17 @@
 2103301139 ./dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
 2104042209 ./dev-python/dkimpy/dkimpy-1.0.5.ebuild
 2101310343 ./dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
-2102190609 ./dev-python/dnspython/dnspython-2.1.0.ebuild
 2105151509 ./dev-python/dnspython/dnspython-1.16.0-r2.ebuild
+2106051409 ./dev-python/dnspython/dnspython-2.1.0.ebuild
 2105161609 ./dev-python/doc8/doc8-0.6.0.ebuild
-2105192339 ./dev-python/docker-py/docker-py-5.0.0.ebuild
+2106052209 ./dev-python/docker-py/docker-py-5.0.0.ebuild
 2101310343 ./dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
 2105292209 ./dev-python/docopt/docopt-0.6.2-r3.ebuild
-2101310343 ./dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
-2104060140 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
+2106051639 ./dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+2106041309 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
 2104041739 ./dev-python/docutils/docutils-0.17.ebuild
-2104060140 ./dev-python/docutils/docutils-0.16-r1.ebuild
 2105062209 ./dev-python/docutils/docutils-0.17.1.ebuild
+2106041539 ./dev-python/docutils/docutils-0.16-r1.ebuild
 2103020709 ./dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
 2105211109 ./dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
 2103021209 ./dev-python/doit-py/doit-py-0.5.0.ebuild
@@ -11347,7 +11304,7 @@
 2105151509 ./dev-python/ecdsa/ecdsa-0.16.1.ebuild
 2105280239 ./dev-python/ecdsa/ecdsa-0.17.0.ebuild
 2101310343 ./dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
-2101310343 ./dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
+2106051639 ./dev-python/editorconfig-core-py/editorconfig-core-py-0.12.3-r1.ebuild
 2104111439 ./dev-python/elasticsearch-py/elasticsearch-py-7.7.0-r1.ebuild
 2101310343 ./dev-python/emcee/emcee-3.0.2.ebuild
 2101310343 ./dev-python/empy/empy-3.3.4.ebuild
@@ -11355,12 +11312,11 @@
 2101310343 ./dev-python/enzyme/enzyme-0.4.1-r2.ebuild
 2101310343 ./dev-python/enzyme/enzyme-9999.ebuild
 2101310343 ./dev-python/eradicate/eradicate-2.0.0.ebuild
-2101310343 ./dev-python/errorhandler/errorhandler-2.0.1.ebuild
-2101310343 ./dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
-2105231239 ./dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+2106051639 ./dev-python/errorhandler/errorhandler-2.0.1.ebuild
+2106052339 ./dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
 2104101109 ./dev-python/eventlet/eventlet-0.30.0-r1.ebuild
-2105061139 ./dev-python/eventlet/eventlet-0.31.0.ebuild
 2105240209 ./dev-python/eventlet/eventlet-0.30.2-r1.ebuild
+2106071639 ./dev-python/eventlet/eventlet-0.31.0.ebuild
 2105052009 ./dev-python/execnet/execnet-1.8.0.ebuild
 2105291139 ./dev-python/execnet/execnet-1.8.1.ebuild
 2101310343 ./dev-python/expects/expects-0.9.0.ebuild
@@ -11369,27 +11325,28 @@
 2105132239 ./dev-python/falcon/falcon-2.0.0-r1.ebuild
 2105132239 ./dev-python/falcon/falcon-3.0.1-r1.ebuild
 2104101109 ./dev-python/fasteners/fasteners-0.16-r1.ebuild
-2101310343 ./dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
+2106041209 ./dev-python/fasteners/fasteners-0.16.1.ebuild
+2106051639 ./dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
 2104060140 ./dev-python/feedparser/feedparser-5.2.1-r1.ebuild
 2104060140 ./dev-python/feedparser/feedparser-6.0.2.ebuild
 2101310343 ./dev-python/fido2/fido2-0.8.1.ebuild
 2105271909 ./dev-python/fido2/fido2-0.9.1.ebuild
 2101310343 ./dev-python/fields/fields-5.0.0-r2.ebuild
 2105051739 ./dev-python/filelock/filelock-3.0.12-r1.ebuild
-2105231409 ./dev-python/fitsio/fitsio-0.9.11.ebuild
+2106051639 ./dev-python/fitsio/fitsio-0.9.11.ebuild
 2104060140 ./dev-python/fixtures/fixtures-3.0.0-r1.ebuild
 2011171809 ./dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
-2101310343 ./dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
+2106070309 ./dev-python/flake8-polyfill/flake8-polyfill-1.0.2.ebuild
 2101310343 ./dev-python/flake8/flake8-3.8.4.ebuild
 2105091139 ./dev-python/flake8/flake8-3.9.2.ebuild
 2105190639 ./dev-python/flake8/flake8-3.9.1.ebuild
 2105062209 ./dev-python/flaky/flaky-3.7.0-r1.ebuild
 2101310343 ./dev-python/flask-api/flask-api-2.0.ebuild
-2101310343 ./dev-python/flask-babel/flask-babel-2.0.0.ebuild
+2106041809 ./dev-python/flask-babel/flask-babel-2.0.0.ebuild
 2101310343 ./dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
-2103052209 ./dev-python/flask-cors/flask-cors-3.0.10.ebuild
-2101310343 ./dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
-2101310343 ./dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+2106051709 ./dev-python/flask-cors/flask-cors-3.0.10.ebuild
+2106051709 ./dev-python/flask-debug/flask-debug-0.4.3-r1.ebuild
+2106051709 ./dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
 2103150939 ./dev-python/flask-htmlmin/flask-htmlmin-2.1.0.ebuild
 2105210109 ./dev-python/flask-login/flask-login-0.5.0.ebuild
 2101310343 ./dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -11398,7 +11355,7 @@
 2105311009 ./dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
 2104201109 ./dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
 2101310343 ./dev-python/flask-nav/flask-nav-0.6-r2.ebuild
-2102011209 ./dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
+2106051709 ./dev-python/flask-paginate/flask-paginate-0.8.1.ebuild
 2101310343 ./dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
 2101310343 ./dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
 2103040739 ./dev-python/flask-restful/flask-restful-0.3.8.ebuild
@@ -11406,16 +11363,16 @@
 2101310343 ./dev-python/flask-script/flask-script-2.0.6.ebuild
 2104140109 ./dev-python/flask-security/flask-security-3.4.5.ebuild
 2105061339 ./dev-python/flask-security/flask-security-4.0.1.ebuild
-2103040739 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+2106051709 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
 2104221539 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
 2101310343 ./dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
-2105252209 ./dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
+2106041809 ./dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
 2101310343 ./dev-python/flask/flask-1.1.2-r1.ebuild
 2105141139 ./dev-python/flask/flask-1.1.4.ebuild
 2105202339 ./dev-python/flask/flask-2.0.0-r1.ebuild
 2105202339 ./dev-python/flask/flask-9999.ebuild
 2105221109 ./dev-python/flask/flask-2.0.1.ebuild
-2103040739 ./dev-python/flexmock/flexmock-0.10.4.ebuild
+2106051709 ./dev-python/flexmock/flexmock-0.10.4.ebuild
 2101310343 ./dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
 2101021239 ./dev-python/flufl-i18n/flufl-i18n-3.1.4.ebuild
 2101310343 ./dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
@@ -11425,20 +11382,15 @@
 2101310343 ./dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
 2102151139 ./dev-python/flufl-lock/flufl-lock-5.0.5.ebuild
 2105300209 ./dev-python/flufl-lock/flufl-lock-5.1.ebuild
-2104271039 ./dev-python/fonttools/fonttools-4.22.1.ebuild
-2105061339 ./dev-python/fonttools/fonttools-4.22.0.ebuild
-2105141409 ./dev-python/fonttools/fonttools-4.23.1.ebuild
-2105171940 ./dev-python/fonttools/fonttools-4.24.0.ebuild
-2105211139 ./dev-python/fonttools/fonttools-4.24.3.ebuild
 2105261139 ./dev-python/fonttools/fonttools-4.24.4.ebuild
-2103062109 ./dev-python/fqdn/fqdn-1.5.0-r1.ebuild
-2103111213 ./dev-python/fqdn/fqdn-1.5.1.ebuild
+2106052339 ./dev-python/fonttools/fonttools-4.23.1.ebuild
+2106052209 ./dev-python/fqdn/fqdn-1.5.1.ebuild
 2104060140 ./dev-python/freezegun/freezegun-1.1.0.ebuild
 2105080139 ./dev-python/freezegun/freezegun-1.1.0-r1.ebuild
 2103040739 ./dev-python/frozen-flask/frozen-flask-0.15.ebuild
 2106030240 ./dev-python/frozen-flask/frozen-flask-0.17.ebuild
 2104272139 ./dev-python/fs/fs-2.4.13.ebuild
-2101310343 ./dev-python/fudge/fudge-1.1.1.ebuild
+2106051709 ./dev-python/fudge/fudge-1.1.1.ebuild
 2105102309 ./dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
 2103020809 ./dev-python/funcy/funcy-1.15.ebuild
 2105102239 ./dev-python/funcy/funcy-1.16.ebuild
@@ -11453,9 +11405,9 @@
 2103030039 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
 2103150709 ./dev-python/genshi/genshi-0.7.5.ebuild
 2105062209 ./dev-python/genty/genty-1.3.2-r1.ebuild
-2103040739 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+2106051709 ./dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
 2103040739 ./dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
-2104060140 ./dev-python/gevent/gevent-21.1.2.ebuild
+2106042209 ./dev-python/gevent/gevent-21.1.2.ebuild
 2101310343 ./dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
 2101310343 ./dev-python/git-review/git-review-1.28.0.ebuild
 2106011009 ./dev-python/git-review/git-review-2.1.0.ebuild
@@ -11464,57 +11416,49 @@
 2012021739 ./dev-python/glance_store/glance_store-2.3.0.ebuild
 2104060140 ./dev-python/gmpy/gmpy-2.0.8-r2.ebuild
 2106010309 ./dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
-2104291509 ./dev-python/google-api-python-client/google-api-python-client-2.3.0.ebuild
-2105061339 ./dev-python/google-api-python-client/google-api-python-client-2.2.0.ebuild
-2105131209 ./dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
-2105211239 ./dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild
-2105270009 ./dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild
 2106020109 ./dev-python/google-api-python-client/google-api-python-client-2.7.0.ebuild
+2106052339 ./dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
 2103030039 ./dev-python/google-apitools/google-apitools-0.5.31.ebuild
 2105061039 ./dev-python/google-apitools/google-apitools-0.5.32.ebuild
 2104062309 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild
 2101310343 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
 2103042339 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild
 2103301109 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.4.ebuild
-2105150539 ./dev-python/google-auth/google-auth-1.30.0.ebuild
-2105192339 ./dev-python/google-auth/google-auth-1.29.0.ebuild
 2105250839 ./dev-python/google-auth/google-auth-1.30.1.ebuild
+2106052339 ./dev-python/google-auth/google-auth-1.30.0.ebuild
 2105312339 ./dev-python/google-pasta/google-pasta-0.2.0.ebuild
 2101310343 ./dev-python/google-reauth-python/google-reauth-python-0.1.0-r1.ebuild
 2103030039 ./dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
 2102160539 ./dev-python/graph-tool/graph-tool-2.35-r1.ebuild
 2102160539 ./dev-python/graph-tool/graph-tool-9999.ebuild
-2101310343 ./dev-python/graphviz/graphviz-0.16.ebuild
+2106051709 ./dev-python/graphviz/graphviz-0.16.ebuild
 2104060939 ./dev-python/greenlet/greenlet-1.0.0.ebuild
 2105071209 ./dev-python/greenlet/greenlet-1.1.0.ebuild
 2101310343 ./dev-python/greenstalk/greenstalk-1.0.1.ebuild
-2104180409 ./dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
 2104300239 ./dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild
 2105300510 ./dev-python/grpcio-testing/grpcio-testing-1.38.0.ebuild
-2104180409 ./dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
 2104300239 ./dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild
 2105300510 ./dev-python/grpcio-tools/grpcio-tools-1.38.0.ebuild
-2101310343 ./dev-python/grpcio/grpcio-1.32.0-r1.ebuild
-2104300239 ./dev-python/grpcio/grpcio-1.37.1.ebuild
 2105300510 ./dev-python/grpcio/grpcio-1.38.0.ebuild
+2106060009 ./dev-python/grpcio/grpcio-1.37.1.ebuild
 2103120209 ./dev-python/gsd/gsd-2.4.1.ebuild
 2104150939 ./dev-python/gsd/gsd-2.4.2.ebuild
 2103040339 ./dev-python/gst-python/gst-python-1.16.3.ebuild
-2103151039 ./dev-python/guessit/guessit-3.3.1.ebuild
+2106052209 ./dev-python/guessit/guessit-3.3.1.ebuild
 2105182039 ./dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
 2105182039 ./dev-python/h11/h11-0.12.0.ebuild
 2101310343 ./dev-python/h5py/h5py-2.10.0-r1.ebuild
 2105162209 ./dev-python/h5py/h5py-3.2.1.ebuild
 2105261639 ./dev-python/hacking/hacking-4.1.0.ebuild
 2105051039 ./dev-python/hcloud-python/hcloud-python-1.12.0.ebuild
-2101310343 ./dev-python/hiredis/hiredis-1.1.0.ebuild
+2106051709 ./dev-python/hiredis/hiredis-1.1.0.ebuild
 2105091439 ./dev-python/hpack/hpack-4.0.0.ebuild
 2105181509 ./dev-python/hpack/hpack-3.0.0.ebuild
 2105181239 ./dev-python/html2text/html2text-2020.1.16-r1.ebuild
-2104130239 ./dev-python/html5-parser/html5-parser-0.4.9.ebuild
+2106051709 ./dev-python/html5-parser/html5-parser-0.4.9.ebuild
 2105071509 ./dev-python/html5lib/html5lib-1.1.ebuild
-2103032139 ./dev-python/httmock/httmock-1.4.0.ebuild
-2104060140 ./dev-python/http-parser/http-parser-0.9.0.ebuild
+2106051709 ./dev-python/httmock/httmock-1.4.0.ebuild
+2106051709 ./dev-python/http-parser/http-parser-0.9.0.ebuild
 2105100109 ./dev-python/httpauth/httpauth-0.3.ebuild
 2105201709 ./dev-python/httpbin/httpbin-0.7.0-r2.ebuild
 2105310239 ./dev-python/httplib2/httplib2-0.19.1.ebuild
@@ -11525,10 +11469,9 @@
 2105250839 ./dev-python/httpretty/httpretty-1.1.3.ebuild
 2101210409 ./dev-python/humanfriendly/humanfriendly-9.1.ebuild
 2101310343 ./dev-python/humanfriendly/humanfriendly-8.2.ebuild
-2105100009 ./dev-python/humanize/humanize-3.5.0.ebuild
-2105192039 ./dev-python/humanize/humanize-3.4.1.ebuild
-2105292139 ./dev-python/humanize/humanize-3.6.0.ebuild
 2106030240 ./dev-python/humanize/humanize-3.7.0.ebuild
+2106052339 ./dev-python/humanize/humanize-3.5.0.ebuild
+2106061639 ./dev-python/humanize/humanize-3.7.1.ebuild
 2105181509 ./dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
 2105181509 ./dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
 2105181509 ./dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -11546,7 +11489,9 @@
 2105310009 ./dev-python/hypothesis/hypothesis-6.13.10.ebuild
 2106021039 ./dev-python/hypothesis/hypothesis-6.13.11.ebuild
 2106040139 ./dev-python/hypothesis/hypothesis-6.13.12.ebuild
-2101310343 ./dev-python/icalendar/icalendar-4.0.7.ebuild
+2106041039 ./dev-python/hypothesis/hypothesis-6.13.13.ebuild
+2106051139 ./dev-python/hypothesis/hypothesis-6.13.14.ebuild
+2106051709 ./dev-python/icalendar/icalendar-4.0.7.ebuild
 2101310343 ./dev-python/idna/idna-3.0.ebuild
 2104060140 ./dev-python/idna/idna-2.10-r1.ebuild
 2105071439 ./dev-python/idna/idna-3.1.ebuild
@@ -11565,6 +11510,7 @@
 2105280239 ./dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
 2105291139 ./dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
 2106021939 ./dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild
+2106041039 ./dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
 2104060140 ./dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
 2105140109 ./dev-python/importlib_resources/importlib_resources-5.1.3.ebuild
 2105221109 ./dev-python/importlib_resources/importlib_resources-5.1.4.ebuild
@@ -11574,27 +11520,25 @@
 2105261139 ./dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
 2105061809 ./dev-python/inflect/inflect-5.3.0.ebuild
 2105091439 ./dev-python/inflection/inflection-0.5.1.ebuild
-2011090239 ./dev-python/iniparse/iniparse-0.5.ebuild
 2101310343 ./dev-python/iniparse/iniparse-0.4-r2.ebuild
+2106051739 ./dev-python/iniparse/iniparse-0.5.ebuild
 2105150109 ./dev-python/intelhex/intelhex-2.3.0.ebuild
-2105061509 ./dev-python/intervaltree/intervaltree-3.0.2.ebuild
-2105061509 ./dev-python/intervaltree/intervaltree-3.1.0.ebuild
+2106052339 ./dev-python/intervaltree/intervaltree-3.1.0.ebuild
 2105192139 ./dev-python/iocapture/iocapture-0.1.2-r2.ebuild
 2006201739 ./dev-python/ioflo/ioflo-2.0.0.ebuild
 2102270539 ./dev-python/ioflo/ioflo-2.0.2.ebuild
-2103301239 ./dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
+2106051739 ./dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
 2104062309 ./dev-python/ipdb/ipdb-0.13.7.ebuild
 2105270009 ./dev-python/ipdb/ipdb-0.13.8.ebuild
 2106030240 ./dev-python/ipdb/ipdb-0.13.9.ebuild
-2102261139 ./dev-python/ipy/ipy-1.01.ebuild
-2105061439 ./dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+2106051739 ./dev-python/ipy/ipy-1.01.ebuild
 2105141139 ./dev-python/ipykernel/ipykernel-5.5.5.ebuild
-2106020439 ./dev-python/ipykernel/ipykernel-5.5.3-r1.ebuild
+2106052339 ./dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
 2009071209 ./dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
-2105160339 ./dev-python/ipython/ipython-7.23.1.ebuild
 2105191309 ./dev-python/ipython/ipython-7.22.0-r1.ebuild
 2105291139 ./dev-python/ipython/ipython-7.24.0.ebuild
 2106030240 ./dev-python/ipython/ipython-7.24.1.ebuild
+2106071639 ./dev-python/ipython/ipython-7.23.1.ebuild
 2105061509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
 2009051839 ./dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
 2012271209 ./dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
@@ -11626,25 +11570,24 @@
 2104060140 ./dev-python/jinja/jinja-2.11.3.ebuild
 2105121209 ./dev-python/jinja/jinja-3.0.0.ebuild
 2105190109 ./dev-python/jinja/jinja-3.0.1.ebuild
-2103021209 ./dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
-2101310343 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
-2105182039 ./dev-python/jmespath/jmespath-0.10.0.ebuild
+2106052209 ./dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+2106051739 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+2106041809 ./dev-python/jmespath/jmespath-0.10.0.ebuild
 2103150539 ./dev-python/joblib/joblib-1.0.1.ebuild
-2104180509 ./dev-python/josepy/josepy-1.8.0.ebuild
-2103040309 ./dev-python/jsmin/jsmin-2.2.2.ebuild
-2104180409 ./dev-python/json-rpc/json-rpc-1.13.0.ebuild
+2106051739 ./dev-python/josepy/josepy-1.8.0.ebuild
+2106051739 ./dev-python/jsmin/jsmin-2.2.2.ebuild
+2106051739 ./dev-python/json-rpc/json-rpc-1.13.0.ebuild
 2105261139 ./dev-python/jsondiff/jsondiff-1.3.0.ebuild
-2101310343 ./dev-python/jsonext/jsonext-0.4.2.ebuild
-2101240239 ./dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
-2101310343 ./dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+2106070309 ./dev-python/jsonext/jsonext-0.4.2.ebuild
+2106051739 ./dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
 2105231709 ./dev-python/jsonpatch/jsonpatch-1.32.ebuild
 2103170539 ./dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
 2105250109 ./dev-python/jsonpointer/jsonpointer-2.1.ebuild
-2104161439 ./dev-python/jsonref/jsonref-0.1.ebuild
-2101310343 ./dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
-2101310343 ./dev-python/jsonrpclib/jsonrpclib-9999.ebuild
-2105250109 ./dev-python/jsonschema/jsonschema-3.2.0.ebuild
-2103040739 ./dev-python/jsonxs/jsonxs-0.6.ebuild
+2106051739 ./dev-python/jsonref/jsonref-0.1.ebuild
+2106051739 ./dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
+2106051739 ./dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+2106041839 ./dev-python/jsonschema/jsonschema-3.2.0.ebuild
+2106051739 ./dev-python/jsonxs/jsonxs-0.6.ebuild
 2009050939 ./dev-python/jupyter/jupyter-1.0.0-r3.ebuild
 2105192039 ./dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
 2104282009 ./dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
@@ -11659,18 +11602,19 @@
 2106021939 ./dev-python/keyring/keyring-23.0.1.ebuild
 2105161609 ./dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
 2011291139 ./dev-python/keystonemiddleware/keystonemiddleware-9.1.0.ebuild
-2101310343 ./dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+2106051639 ./dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
 2012021139 ./dev-python/kombu/kombu-5.0.1.ebuild
-2101310343 ./dev-python/lazr-config/lazr-config-2.2.2.ebuild
-2101310343 ./dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
+2106070309 ./dev-python/lazr-config/lazr-config-2.2.2.ebuild
+2106070309 ./dev-python/lazr-config/lazr-config-2.2.3.ebuild
+2106070309 ./dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
 2105152239 ./dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
 2101310343 ./dev-python/ldap3/ldap3-2.8.1.ebuild
 2101310343 ./dev-python/ldappool/ldappool-2.4.1.ebuild
 2105231509 ./dev-python/lesscpy/lesscpy-0.14.0.ebuild
 2103041239 ./dev-python/libarchive-c/libarchive-c-2.9.ebuild
 2102261139 ./dev-python/libcloud/libcloud-3.3.0.ebuild
-2105231509 ./dev-python/liblarch/liblarch-3.0.1.ebuild
-2105101009 ./dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+2106051739 ./dev-python/liblarch/liblarch-3.0.1.ebuild
+2106051739 ./dev-python/libnacl/libnacl-1.7.2-r1.ebuild
 2101310343 ./dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
 2101310343 ./dev-python/libtmux/libtmux-0.8.5.ebuild
 2104042109 ./dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -11682,24 +11626,25 @@
 2104231039 ./dev-python/line_profiler/line_profiler-3.2.1.ebuild
 2104301909 ./dev-python/line_profiler/line_profiler-3.2.2.ebuild
 2105011109 ./dev-python/line_profiler/line_profiler-3.2.5.ebuild
+2106051139 ./dev-python/line_profiler/line_profiler-3.3.0.ebuild
 2104060140 ./dev-python/linecache2/linecache2-1.0.0-r1.ebuild
 2101310343 ./dev-python/lit/lit-10.0.1.ebuild
-2101310343 ./dev-python/lit/lit-13.0.0.9999.ebuild
 2105170439 ./dev-python/lit/lit-11.1.0.ebuild
-2105170512 ./dev-python/lit/lit-12.0.0.ebuild
-2105261539 ./dev-python/lit/lit-12.0.1.9999.ebuild
-2105261539 ./dev-python/lit/lit-12.0.1_rc1.ebuild
+2106051739 ./dev-python/lit/lit-12.0.0.ebuild
+2106051739 ./dev-python/lit/lit-12.0.1.9999.ebuild
+2106051739 ./dev-python/lit/lit-12.0.1_rc1.ebuild
+2106051739 ./dev-python/lit/lit-13.0.0.9999.ebuild
 2101310343 ./dev-python/livereload/livereload-2.6.3.ebuild
 2103262139 ./dev-python/llfuse/llfuse-1.4.1.ebuild
 2105101009 ./dev-python/llvmlite/llvmlite-0.36.0.ebuild
-2104200039 ./dev-python/lmdb/lmdb-1.2.1.ebuild
 2105192039 ./dev-python/lmdb/lmdb-1.2.0-r1.ebuild
-2102190709 ./dev-python/locket/locket-0.2.1.ebuild
+2106051739 ./dev-python/lmdb/lmdb-1.2.1.ebuild
+2106052209 ./dev-python/locket/locket-0.2.1.ebuild
 2101310343 ./dev-python/lockfile/lockfile-0.12.2-r2.ebuild
 2101310343 ./dev-python/logbook/logbook-1.5.3.ebuild
 2105302039 ./dev-python/logfury/logfury-0.1.2-r1.ebuild
 2104180409 ./dev-python/loguru/loguru-0.5.3.ebuild
-2102260409 ./dev-python/logutils/logutils-0.3.5.ebuild
+2106051739 ./dev-python/logutils/logutils-0.3.5.ebuild
 2105181609 ./dev-python/lxml/lxml-4.6.3.ebuild
 2106031939 ./dev-python/lxml/lxml-4.6.3-r1.ebuild
 2106022309 ./dev-python/lz4/lz4-3.1.3.ebuild
@@ -11710,8 +11655,8 @@
 2105231509 ./dev-python/mando/mando-0.6.4.ebuild
 2105311539 ./dev-python/manuel/manuel-1.10.1.ebuild
 2103190739 ./dev-python/markdown/markdown-2.6.11.ebuild
-2105210409 ./dev-python/markdown/markdown-3.3.4.ebuild
-2101242339 ./dev-python/markdown2/markdown2-2.4.0.ebuild
+2106052209 ./dev-python/markdown/markdown-3.3.4.ebuild
+2106051739 ./dev-python/markdown2/markdown2-2.4.0.ebuild
 2103060109 ./dev-python/markups/markups-3.1.1.ebuild
 2103072309 ./dev-python/markups/markups-3.1.0.ebuild
 2105052239 ./dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
@@ -11729,13 +11674,14 @@
 2101310343 ./dev-python/mecab-python/mecab-python-0.996.ebuild
 2101310343 ./dev-python/mechanize/mechanize-0.4.5.ebuild
 2101310343 ./dev-python/mediafile/mediafile-0.6.0.ebuild
-2101310343 ./dev-python/memory_profiler/memory_profiler-0.57.ebuild
-2101310343 ./dev-python/mergedict/mergedict-1.0.0.ebuild
+2106051739 ./dev-python/memory_profiler/memory_profiler-0.57.ebuild
+2106051739 ./dev-python/mergedict/mergedict-1.0.0.ebuild
 2009050939 ./dev-python/metakernel/metakernel-0.25.0-r1.ebuild
-2104062309 ./dev-python/micawber/micawber-0.5.3.ebuild
+2106051739 ./dev-python/micawber/micawber-0.5.3.ebuild
 2011261139 ./dev-python/microversion-parse/microversion-parse-1.0.1.ebuild
-2101310343 ./dev-python/mimerender/mimerender-0.6.0.ebuild
+2106051739 ./dev-python/mimerender/mimerender-0.6.0.ebuild
 2105100109 ./dev-python/minidb/minidb-2.0.4.ebuild
+2106061639 ./dev-python/minidb/minidb-2.0.5.ebuild
 2104052009 ./dev-python/minimock/minimock-1.3.0.ebuild
 2102192039 ./dev-python/miniupnpc/miniupnpc-2.2.1.ebuild
 2104062309 ./dev-python/miniupnpc/miniupnpc-2.2.2.ebuild
@@ -11748,8 +11694,7 @@
 2105251839 ./dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
 2101310343 ./dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
 2105052009 ./dev-python/mock/mock-4.0.3.ebuild
-2104291339 ./dev-python/mongoengine/mongoengine-0.23.0.ebuild
-2105041714 ./dev-python/mongoengine/mongoengine-0.23.1.ebuild
+2106061609 ./dev-python/mongoengine/mongoengine-0.23.1.ebuild
 2105052009 ./dev-python/more-itertools/more-itertools-8.7.0.ebuild
 2105221109 ./dev-python/more-itertools/more-itertools-8.8.0.ebuild
 2101310343 ./dev-python/moto/moto-1.3.14-r3.ebuild
@@ -11791,7 +11736,7 @@
 2105192039 ./dev-python/nbsphinx/nbsphinx-0.8.4.ebuild
 2106031339 ./dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
 2103041409 ./dev-python/nbval/nbval-0.9.6.ebuild
-2104060140 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+2106052209 ./dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
 2106010339 ./dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
 2106010339 ./dev-python/neovim-remote/neovim-remote-9999.ebuild
 2101310343 ./dev-python/netaddr/netaddr-0.8.0.ebuild
@@ -11805,11 +11750,9 @@
 2105292139 ./dev-python/nltk/nltk-3.6.2-r1.ebuild
 2101310343 ./dev-python/nnpy/nnpy-1.4.2.ebuild
 2101310343 ./dev-python/node-semver/node-semver-0.8.0.ebuild
-2105142039 ./dev-python/nodeenv/nodeenv-1.6.0.ebuild
-2105261009 ./dev-python/nodeenv/nodeenv-1.3.5.ebuild
+2106061609 ./dev-python/nodeenv/nodeenv-1.6.0.ebuild
 2104060140 ./dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
-2104060140 ./dev-python/nose/nose-1.3.7-r7.ebuild
-2105051609 ./dev-python/nose/nose-1.3.7-r8.ebuild
+2106052339 ./dev-python/nose/nose-1.3.7-r8.ebuild
 2104070939 ./dev-python/nose2/nose2-0.10.0.ebuild
 2103040739 ./dev-python/nose_fixes/nose_fixes-1.3.ebuild
 2101310343 ./dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -11823,7 +11766,9 @@
 2105231509 ./dev-python/nuitka/nuitka-0.6.11.ebuild
 2105250839 ./dev-python/nuitka/nuitka-0.6.15.ebuild
 2106030240 ./dev-python/nuitka/nuitka-0.6.15.1.ebuild
-2103020909 ./dev-python/numexpr/numexpr-2.7.2_p1.ebuild
+2106071539 ./dev-python/nuitka/nuitka-0.6.15.3.ebuild
+2106051809 ./dev-python/numexpr/numexpr-2.7.2_p1.ebuild
+2106051839 ./dev-python/numexpr/numexpr-2.7.3.ebuild
 2105250139 ./dev-python/numpy/numpy-1.20.2-r1.ebuild
 2105250139 ./dev-python/numpy/numpy-1.20.3-r1.ebuild
 2101310343 ./dev-python/numpydoc/numpydoc-1.1.0.ebuild
@@ -11831,10 +11776,10 @@
 2101310343 ./dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
 2102280109 ./dev-python/oauthlib/oauthlib-3.1.0.ebuild
 2106020109 ./dev-python/oauthlib/oauthlib-3.1.1.ebuild
-2101310343 ./dev-python/objgraph/objgraph-3.5.0.ebuild
+2106051809 ./dev-python/objgraph/objgraph-3.5.0.ebuild
 2009181339 ./dev-python/oct2py/oct2py-5.2.0-r1.ebuild
 2009050939 ./dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
-2101310343 ./dev-python/odfpy/odfpy-1.3.6.ebuild
+2106051809 ./dev-python/odfpy/odfpy-1.3.6.ebuild
 2105071509 ./dev-python/olefile/olefile-0.46-r1.ebuild
 2101310343 ./dev-python/onkyo-eiscp/onkyo-eiscp-1.2.7.ebuild
 2105292139 ./dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
@@ -11873,6 +11818,7 @@
 2105232039 ./dev-python/oslotest/oslotest-4.4.1.ebuild
 2101310343 ./dev-python/osprofiler/osprofiler-3.4.0.ebuild
 2101310343 ./dev-python/ovs/ovs-2.13.0.ebuild
+2106060009 ./dev-python/ovs/ovs-2.13.3.ebuild
 2011271909 ./dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
 2012111809 ./dev-python/owslib/owslib-0.20.0.ebuild
 2105052009 ./dev-python/packaging/packaging-20.9.ebuild
@@ -11885,10 +11831,10 @@
 2102212009 ./dev-python/pandas-datareader/pandas-datareader-0.9.0.ebuild
 2104290339 ./dev-python/pandas/pandas-1.2.3-r1.ebuild
 2105192339 ./dev-python/pandas/pandas-1.2.4.ebuild
-2101310343 ./dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
+2106051839 ./dev-python/pandocfilters/pandocfilters-1.4.3.ebuild
 2105140139 ./dev-python/parameterized/parameterized-0.8.1.ebuild
-2101310343 ./dev-python/paramiko/paramiko-2.7.2.ebuild
-2101310343 ./dev-python/parsedatetime/parsedatetime-2.6.ebuild
+2106042109 ./dev-python/paramiko/paramiko-2.7.2.ebuild
+2106051809 ./dev-python/parsedatetime/parsedatetime-2.6.ebuild
 2101310343 ./dev-python/parso/parso-0.7.0-r1.ebuild
 2101310343 ./dev-python/parso/parso-0.7.1-r1.ebuild
 2105061339 ./dev-python/parso/parso-0.8.2.ebuild
@@ -11902,12 +11848,11 @@
 2104060140 ./dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
 2101310343 ./dev-python/pathtools/pathtools-0.1.2-r3.ebuild
 2101310343 ./dev-python/patsy/patsy-0.5.1.ebuild
-2101310343 ./dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
-2104060140 ./dev-python/pbr/pbr-5.5.1.ebuild
-2104271039 ./dev-python/pbr/pbr-5.6.0.ebuild
+2106051809 ./dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+2106052339 ./dev-python/pbr/pbr-5.6.0.ebuild
 2105231939 ./dev-python/pdfrw/pdfrw-0.4_p1.ebuild
 2103310109 ./dev-python/pecan/pecan-1.4.0.ebuild
-2104221539 ./dev-python/peewee/peewee-3.14.4.ebuild
+2106041809 ./dev-python/peewee/peewee-3.14.4.ebuild
 2102230139 ./dev-python/pelican-minify/pelican-minify-0.9.ebuild
 2105052009 ./dev-python/pexpect/pexpect-4.8.0-r1.ebuild
 2103260039 ./dev-python/pgspecial/pgspecial-1.12.1.ebuild
@@ -11917,9 +11862,9 @@
 2105280239 ./dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
 2105061509 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
 2101310343 ./dev-python/pid/pid-3.0.4.ebuild
-2101310343 ./dev-python/piexif/piexif-1.1.3-r1.ebuild
+2106051809 ./dev-python/piexif/piexif-1.1.3-r1.ebuild
 2101310343 ./dev-python/pika/pika-1.1.0.ebuild
-2101310343 ./dev-python/pilkit/pilkit-2.0.ebuild
+2106052109 ./dev-python/pilkit/pilkit-2.0.ebuild
 2105102309 ./dev-python/pillow/pillow-8.2.0.ebuild
 2106032239 ./dev-python/pip/pip-21.1.1.ebuild
 2106032239 ./dev-python/pip/pip-21.1.2.ebuild
@@ -11930,7 +11875,7 @@
 2106040109 ./dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
 2105071509 ./dev-python/pkginfo/pkginfo-1.7.0.ebuild
 2101310343 ./dev-python/plotly/plotly-4.14.1.ebuild
-2101310343 ./dev-python/plotly/plotly-4.14.3.ebuild
+2106051839 ./dev-python/plotly/plotly-4.14.3.ebuild
 2105052009 ./dev-python/pluggy/pluggy-0.13.1-r1.ebuild
 2105171109 ./dev-python/pluginbase/pluginbase-1.0.1.ebuild
 2106010339 ./dev-python/pluginbase/pluginbase-1.0.0.ebuild
@@ -11950,10 +11895,9 @@
 2105052009 ./dev-python/pretend/pretend-1.0.9-r1.ebuild
 2101310343 ./dev-python/pretty-yaml/pretty-yaml-20.4.0.ebuild
 2101310343 ./dev-python/prettytable/prettytable-0.7.2-r1.ebuild
-2105240439 ./dev-python/prettytable/prettytable-2.1.0.ebuild
+2106052109 ./dev-python/prettytable/prettytable-2.1.0.ebuild
 2105071439 ./dev-python/priority/priority-1.3.0.ebuild
-2104060140 ./dev-python/process-tests/process-tests-2.1.1.ebuild
-2105031239 ./dev-python/process-tests/process-tests-2.1.2.ebuild
+2106052339 ./dev-python/process-tests/process-tests-2.1.2.ebuild
 2101310343 ./dev-python/progress/progress-1.5.ebuild
 2101310343 ./dev-python/progressbar/progressbar-2.5.ebuild
 2101310343 ./dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -11961,19 +11905,12 @@
 2105091239 ./dev-python/prometheus_client/prometheus_client-0.10.1.ebuild
 2106020141 ./dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
 2105071339 ./dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild
-2101310343 ./dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.0.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.1.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.2.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.3.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.4.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.5.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.6.ebuild
-2104100139 ./dev-python/protobuf-python/protobuf-python-3.15.7.ebuild
-2105161609 ./dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
-2106010209 ./dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
-2106010209 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
-2106022009 ./dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
+2106062009 ./dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
+2106062009 ./dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
+2106062009 ./dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
+2106062009 ./dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
+2106062009 ./dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
+2106062009 ./dev-python/protobuf-python/protobuf-python-9999.ebuild
 2101310343 ./dev-python/prov/prov-1.5.3.ebuild
 2011241639 ./dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
 2101310343 ./dev-python/psutil/psutil-5.7.2-r1.ebuild
@@ -11990,7 +11927,7 @@
 2105091239 ./dev-python/py-amqp/py-amqp-5.0.6.ebuild
 2101310343 ./dev-python/py-cpuinfo/py-cpuinfo-6.0.0.ebuild
 2101310343 ./dev-python/py-cpuinfo/py-cpuinfo-7.0.0.ebuild
-2104150939 ./dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
+2106052109 ./dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
 2101310343 ./dev-python/py-gfm/py-gfm-0.1.4.ebuild
 2105090939 ./dev-python/py-gfm/py-gfm-1.0.2.ebuild
 2105071439 ./dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
@@ -12001,8 +11938,8 @@
 2106011409 ./dev-python/pyGPG/pyGPG-0.2.ebuild
 2106011409 ./dev-python/pyGPG/pyGPG-9999.ebuild
 2105141439 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
-2104060140 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
-2105061039 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+2106052109 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+2106052339 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
 2101310343 ./dev-python/pyamg/pyamg-4.0.0.ebuild
 2105221409 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
 2105221409 ./dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -12022,7 +11959,7 @@
 2104250839 ./dev-python/pychroot/pychroot-0.10.4.ebuild
 2103040939 ./dev-python/pyclipper/pyclipper-1.2.1.ebuild
 2104060140 ./dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
-2104180509 ./dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
+2106052109 ./dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
 2103131039 ./dev-python/pycollada/pycollada-0.7.1.ebuild
 2105231709 ./dev-python/pycountry/pycountry-20.7.3.ebuild
 2105052239 ./dev-python/pycparser/pycparser-2.20-r1.ebuild
@@ -12038,11 +11975,12 @@
 2101310343 ./dev-python/pydiff/pydiff-0.2-r1.ebuild
 2101310343 ./dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
 2105300909 ./dev-python/pydns/pydns-3.2.1.ebuild
-2103281509 ./dev-python/pydot/pydot-1.4.2.ebuild
-2101310343 ./dev-python/pydotplus/pydotplus-2.0.2.ebuild
-2104060140 ./dev-python/pyelftools/pyelftools-0.27.ebuild
-2101310343 ./dev-python/pyenchant/pyenchant-3.2.0.ebuild
+2106052109 ./dev-python/pydot/pydot-1.4.2.ebuild
+2106052109 ./dev-python/pydotplus/pydotplus-2.0.2.ebuild
+2106052109 ./dev-python/pyelftools/pyelftools-0.27.ebuild
+2106052109 ./dev-python/pyenchant/pyenchant-3.2.0.ebuild
 2106021939 ./dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
+2106042209 ./dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
 2103041309 ./dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
 2104060140 ./dev-python/pyflakes/pyflakes-2.2.0.ebuild
 2106031039 ./dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -12059,37 +11997,33 @@
 2106011509 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
 2102230139 ./dev-python/pyghmi/pyghmi-1.5.22.ebuild
 2102261339 ./dev-python/pygit2/pygit2-1.5.0.ebuild
-2106020109 ./dev-python/pygit2/pygit2-1.6.0.ebuild
+2106052109 ./dev-python/pygit2/pygit2-1.6.0.ebuild
 2105211109 ./dev-python/pyglet/pyglet-1.5.17.ebuild
 2105261239 ./dev-python/pyglet/pyglet-1.5.16.ebuild
-2104100139 ./dev-python/pygments/pygments-2.8.1.ebuild
-2105062209 ./dev-python/pygments/pygments-2.9.0.ebuild
+2106052339 ./dev-python/pygments/pygments-2.9.0.ebuild
 2103210739 ./dev-python/pygobject/pygobject-3.40.0.ebuild
 2104132209 ./dev-python/pygobject/pygobject-3.38.0.ebuild
 2105291839 ./dev-python/pygobject/pygobject-3.40.1.ebuild
 2103151709 ./dev-python/pygpgme/pygpgme-0.3-r3.ebuild
 2101310343 ./dev-python/pygraphviz/pygraphviz-1.6.ebuild
 2101310343 ./dev-python/pygresql/pygresql-5.2.2.ebuild
-2101310343 ./dev-python/pyh2o/pyh2o-1.ebuild
+2106052109 ./dev-python/pyh2o/pyh2o-1.ebuild
 2105110109 ./dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
 2102261839 ./dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
 2106022209 ./dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
 2104060140 ./dev-python/pyinotify/pyinotify-0.9.6.ebuild
 2104042209 ./dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
-2104042209 ./dev-python/pyjwt/pyjwt-2.0.1.ebuild
-2105181909 ./dev-python/pyjwt/pyjwt-2.1.0.ebuild
+2106052339 ./dev-python/pyjwt/pyjwt-2.1.0.ebuild
 2103040939 ./dev-python/pykerberos/pykerberos-1.3.1.ebuild
 2101310343 ./dev-python/pykka/pykka-2.0.2.ebuild
 2101310343 ./dev-python/pykka/pykka-2.0.3.ebuild
-2105051239 ./dev-python/pykka/pykka-3.0.1.ebuild
+2106052109 ./dev-python/pykka/pykka-3.0.1.ebuild
 2103052239 ./dev-python/pykwalify/pykwalify-1.8.0.ebuild
 2012310939 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
-2105251909 ./dev-python/pylast/pylast-4.2.0.ebuild
-2105251909 ./dev-python/pylast/pylast-4.2.1.ebuild
+2106052339 ./dev-python/pylast/pylast-4.2.1.ebuild
 2105181909 ./dev-python/pylibacl/pylibacl-0.6.0.ebuild
-2101310343 ./dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
-2104271039 ./dev-python/pylint/pylint-2.8.2.ebuild
-2105091239 ./dev-python/pylint/pylint-2.7.4.ebuild
+2106052109 ./dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+2106061609 ./dev-python/pylint/pylint-2.8.2.ebuild
 2101310343 ./dev-python/pymad/pymad-0.10.ebuild
 2105231509 ./dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
 2105032009 ./dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
@@ -12102,16 +12036,16 @@
 2101310343 ./dev-python/pymongo/pymongo-3.11.1.ebuild
 2101310343 ./dev-python/pymongo/pymongo-3.11.2.ebuild
 2103261839 ./dev-python/pymongo/pymongo-3.11.3.ebuild
-2105051239 ./dev-python/pymongo/pymongo-3.11.4.ebuild
+2106071639 ./dev-python/pymongo/pymongo-3.11.4.ebuild
 2101310343 ./dev-python/pymountboot/pymountboot-0.2.3.ebuild
 2101310343 ./dev-python/pymountboot/pymountboot-9999.ebuild
 2105192039 ./dev-python/pymssql/pymssql-2.2.1.ebuild
-2103202239 ./dev-python/pymysql/pymysql-1.0.2.ebuild
-2104060140 ./dev-python/pynacl/pynacl-1.4.0.ebuild
+2106052109 ./dev-python/pymysql/pymysql-1.0.2.ebuild
+2106042109 ./dev-python/pynacl/pynacl-1.4.0.ebuild
 2101021239 ./dev-python/pyocr/pyocr-0.8.ebuild
 2101310343 ./dev-python/pyocr/pyocr-0.7.2.ebuild
-2105171809 ./dev-python/pyopencl/pyopencl-2021.1.3.ebuild
-2105251539 ./dev-python/pyopencl/pyopencl-2021.2.2.ebuild
+2106051639 ./dev-python/pyopencl/pyopencl-2021.1.3.ebuild
+2106051639 ./dev-python/pyopencl/pyopencl-2021.2.2.ebuild
 2102251139 ./dev-python/pyopengl/pyopengl-3.1.5.ebuild
 2101310343 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.5.ebuild
 2105202339 ./dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -12124,8 +12058,8 @@
 2106011409 ./dev-python/pypax/pypax-9999.ebuild
 2102031609 ./dev-python/pypcap/pypcap-1.2.3-r1.ebuild
 2101310343 ./dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
-2105240439 ./dev-python/pyperclip/pyperclip-1.8.2.ebuild
-2101310343 ./dev-python/pyphen/pyphen-0.10.0.ebuild
+2106052109 ./dev-python/pyperclip/pyperclip-1.8.2.ebuild
+2106052109 ./dev-python/pyphen/pyphen-0.10.0.ebuild
 2105071439 ./dev-python/pypng/pypng-0.0.20.ebuild
 2011291139 ./dev-python/pypowervm/pypowervm-1.1.24.ebuild
 2105071439 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild
@@ -12141,7 +12075,7 @@
 2106012039 ./dev-python/pyqt-distutils/pyqt-distutils-0.7.3.ebuild
 2104282009 ./dev-python/pyqtgraph/pyqtgraph-0.12.1.ebuild
 2105302309 ./dev-python/pyquery/pyquery-1.4.3.ebuild
-2101310343 ./dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
+2106052109 ./dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
 2105231509 ./dev-python/pyro/pyro-4.80.ebuild
 2102230209 ./dev-python/pyroute2/pyroute2-0.5.14.ebuild
 2102282339 ./dev-python/pyrqlite/pyrqlite-2.1.ebuild
@@ -12180,9 +12114,7 @@
 2105201709 ./dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
 2105242309 ./dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
 2105231509 ./dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
-2103020809 ./dev-python/pytest-mock/pytest-mock-3.5.1.ebuild
-2105061509 ./dev-python/pytest-mock/pytest-mock-3.6.0.ebuild
-2105250439 ./dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
+2106052339 ./dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
 2101310343 ./dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild
 2103091139 ./dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
 2105222139 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
@@ -12191,7 +12123,6 @@
 2105231709 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
 2101310343 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
 2103031109 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2.ebuild
-2102230139 ./dev-python/pytest-testmon/pytest-testmon-1.0.3.ebuild
 2105240609 ./dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
 2104060140 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
 2105052009 ./dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
@@ -12224,7 +12155,7 @@
 2104060140 ./dev-python/python-docs/python-docs-3.8.8.ebuild
 2104060140 ./dev-python/python-docs/python-docs-3.9.2.ebuild
 2105191109 ./dev-python/python-editor/python-editor-1.0.4-r1.ebuild
-2101310343 ./dev-python/python-efl/python-efl-1.25.0.ebuild
+2106060839 ./dev-python/python-efl/python-efl-1.25.0.ebuild
 2101310343 ./dev-python/python-engineio/python-engineio-3.12.1.ebuild
 2103111539 ./dev-python/python-engineio/python-engineio-4.0.1.ebuild
 2104161139 ./dev-python/python-engineio/python-engineio-4.1.0.ebuild
@@ -12239,6 +12170,7 @@
 2101310343 ./dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
 2101310343 ./dev-python/python-ironicclient/python-ironicclient-4.4.0.ebuild
 2105221409 ./dev-python/python-jose/python-jose-3.2.0-r1.ebuild
+2106051139 ./dev-python/python-jose/python-jose-3.3.0.ebuild
 2101310343 ./dev-python/python-keystoneclient/python-keystoneclient-4.1.1.ebuild
 2101310343 ./dev-python/python-ldap/python-ldap-3.3.1.ebuild
 2101310343 ./dev-python/python-ldap/python-ldap-9999.ebuild
@@ -12254,10 +12186,10 @@
 2101310343 ./dev-python/python-magnumclient/python-magnumclient-3.2.1.ebuild
 2101310343 ./dev-python/python-manilaclient/python-manilaclient-2.3.0.ebuild
 2104111439 ./dev-python/python-markdown-math/python-markdown-math-0.8.ebuild
-2101310343 ./dev-python/python-memcached/python-memcached-1.59-r1.ebuild
+2106052109 ./dev-python/python-memcached/python-memcached-1.59-r1.ebuild
 2101310343 ./dev-python/python-mistralclient/python-mistralclient-4.1.1.ebuild
 2101310343 ./dev-python/python-monascaclient/python-monascaclient-2.2.1.ebuild
-2105190239 ./dev-python/python-mpd/python-mpd-3.0.4.ebuild
+2106052109 ./dev-python/python-mpd/python-mpd-3.0.4.ebuild
 2105281739 ./dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
 2104141809 ./dev-python/python-nbxmpp/python-nbxmpp-2.0.2-r1.ebuild
 2101310343 ./dev-python/python-netlink/python-netlink-0.1.ebuild
@@ -12276,18 +12208,18 @@
 2104202339 ./dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild
 2101310343 ./dev-python/python-systemd/python-systemd-234.ebuild
 2101310343 ./dev-python/python-troveclient/python-troveclient-5.1.1.ebuild
-2104011609 ./dev-python/python-utils/python-utils-2.5.6.ebuild
+2106052139 ./dev-python/python-utils/python-utils-2.5.6.ebuild
 2101310343 ./dev-python/python-varlink/python-varlink-30.3.0.ebuild
 2103111039 ./dev-python/python-xlib/python-xlib-0.29.ebuild
 2105160039 ./dev-python/python-xlib/python-xlib-0.30.ebuild
 2011271909 ./dev-python/python-zaqarclient/python-zaqarclient-2.0.1.ebuild
-2101310343 ./dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
+2106052139 ./dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
 2011251109 ./dev-python/python-zunclient/python-zunclient-4.1.1.ebuild
 2101310343 ./dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
 2106012139 ./dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
 2106012139 ./dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
 2102140039 ./dev-python/pythondialog/pythondialog-3.5.1.ebuild
-2101310343 ./dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
+2106052139 ./dev-python/pytidylib/pytidylib-0.3.2-r1.ebuild
 2105150409 ./dev-python/pytools/pytools-2021.2.6.ebuild
 2105150409 ./dev-python/pytools/pytools-9999.ebuild
 2105311009 ./dev-python/pytools/pytools-2021.2.7.ebuild
@@ -12299,51 +12231,46 @@
 2101310343 ./dev-python/pywavelets/pywavelets-1.1.1.ebuild
 2103041309 ./dev-python/pyx/pyx-0.15.ebuild
 2105061509 ./dev-python/pyxattr/pyxattr-0.7.2.ebuild
-2105271739 ./dev-python/pyxdg/pyxdg-0.27.ebuild
+2106052139 ./dev-python/pyxdg/pyxdg-0.27.ebuild
 2105181509 ./dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
 2105181509 ./dev-python/pyyaml/pyyaml-5.4.1.ebuild
-2101310343 ./dev-python/pyzbar/pyzbar-0.1.8.ebuild
+2106052139 ./dev-python/pyzbar/pyzbar-0.1.8.ebuild
 2103040939 ./dev-python/pyzmq/pyzmq-20.0.0.ebuild
-2101310343 ./dev-python/qrcode/qrcode-6.1.ebuild
+2106052139 ./dev-python/qrcode/qrcode-6.1.ebuild
 2101310343 ./dev-python/qscintilla-python/qscintilla-python-2.11.5.ebuild
 2101310343 ./dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
-2101182109 ./dev-python/qtawesome/qtawesome-1.0.2.ebuild
-2104180509 ./dev-python/qtconsole/qtconsole-5.0.3.ebuild
-2105031239 ./dev-python/qtconsole/qtconsole-5.1.0.ebuild
+2106051509 ./dev-python/qtawesome/qtawesome-1.0.2.ebuild
+2106052339 ./dev-python/qtconsole/qtconsole-5.1.0.ebuild
 2105042109 ./dev-python/quex/quex-0.71.2.ebuild
-2101310343 ./dev-python/radon/radon-4.1.0.ebuild
-2105101039 ./dev-python/radon/radon-4.5.1.ebuild
-2105241339 ./dev-python/radon/radon-4.5.2.ebuild
+2106070309 ./dev-python/radon/radon-4.5.2.ebuild
 2101240339 ./dev-python/raet/raet-0.6.8-r1.ebuild
 2102270539 ./dev-python/raet/raet-0.6.8-r2.ebuild
 2105071409 ./dev-python/random2/random2-1.0.1-r1.ebuild
-2101310343 ./dev-python/rarfile/rarfile-3.1.ebuild
+2106052139 ./dev-python/rarfile/rarfile-3.1.ebuild
 2101310343 ./dev-python/ratelimit/ratelimit-1.4.1.ebuild
 2101310343 ./dev-python/rdflib/rdflib-5.0.0.ebuild
 2106021939 ./dev-python/readme_renderer/readme_renderer-29.0.ebuild
-2101310343 ./dev-python/rebulk/rebulk-3.0.1.ebuild
-2103150139 ./dev-python/recommonmark/recommonmark-0.7.1.ebuild
+2106052139 ./dev-python/rebulk/rebulk-3.0.1.ebuild
+2106052139 ./dev-python/recommonmark/recommonmark-0.7.1.ebuild
 2103270409 ./dev-python/redis-py/redis-py-3.5.3.ebuild
 2104180409 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
 2105070239 ./dev-python/regex/regex-2021.4.4.ebuild
 2103052209 ./dev-python/rencode/rencode-1.0.6.ebuild
 2104221539 ./dev-python/reno/reno-3.3.0.ebuild
-2105201739 ./dev-python/reportlab/reportlab-3.5.67.ebuild
+2106052139 ./dev-python/reportlab/reportlab-3.5.67.ebuild
 2101310343 ./dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
 2102140039 ./dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
 2101310343 ./dev-python/requests-cache/requests-cache-0.5.2.ebuild
 2105192139 ./dev-python/requests-cache/requests-cache-0.6.0.ebuild
 2105192139 ./dev-python/requests-cache/requests-cache-0.6.1.ebuild
 2105192139 ./dev-python/requests-cache/requests-cache-0.6.2.ebuild
-2105251439 ./dev-python/requests-cache/requests-cache-0.6.3.ebuild
+2106070239 ./dev-python/requests-cache/requests-cache-0.6.3.ebuild
+2106051139 ./dev-python/requests-cache/requests-cache-0.6.4.ebuild
 2106010339 ./dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
 2101310343 ./dev-python/requests-file/requests-file-1.4.3.ebuild
 2103051339 ./dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
-2101310343 ./dev-python/requests-mock/requests-mock-1.8.0.ebuild
-2104281139 ./dev-python/requests-mock/requests-mock-1.9.0.ebuild
-2104281339 ./dev-python/requests-mock/requests-mock-1.9.1.ebuild
-2104301539 ./dev-python/requests-mock/requests-mock-1.9.2.ebuild
 2105281039 ./dev-python/requests-mock/requests-mock-1.9.3.ebuild
+2106052339 ./dev-python/requests-mock/requests-mock-1.9.2.ebuild
 2103051209 ./dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
 2102280109 ./dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
 2106021939 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12357,8 +12284,8 @@
 2105110109 ./dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
 2105110109 ./dev-python/retrying/retrying-1.3.3.ebuild
 2105081209 ./dev-python/rfc3986/rfc3986-1.4.0.ebuild
-2105081209 ./dev-python/rfc3986/rfc3986-1.5.0.ebuild
-2104060140 ./dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+2106052139 ./dev-python/rfc3986/rfc3986-1.5.0.ebuild
+2106041839 ./dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
 2105062209 ./dev-python/roman/roman-3.3.ebuild
 2105261009 ./dev-python/rope/rope-0.19.0.ebuild
 2105231509 ./dev-python/ropemode/ropemode-0.5.ebuild
@@ -12381,9 +12308,9 @@
 2105310009 ./dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
 2105312239 ./dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild
 2101310343 ./dev-python/ryu/ryu-4.34.ebuild
-2105190239 ./dev-python/s3transfer/s3transfer-0.4.2.ebuild
+2106041939 ./dev-python/s3transfer/s3transfer-0.4.2.ebuild
 2105152239 ./dev-python/sabyenc/sabyenc-4.0.2.ebuild
-2104060140 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
+2106052139 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
 2105240609 ./dev-python/scripttest/scripttest-1.3.0-r1.ebuild
 2105110109 ./dev-python/scrypt/scrypt-0.8.16.ebuild
 2105110109 ./dev-python/scrypt/scrypt-0.8.18.ebuild
@@ -12391,12 +12318,12 @@
 2106021939 ./dev-python/secretstorage/secretstorage-3.3.1.ebuild
 2105192139 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2105220009 ./dev-python/semantic_version/semantic_version-2.8.5.ebuild
-2101310343 ./dev-python/semver/semver-2.13.0.ebuild
+2106052139 ./dev-python/semver/semver-2.13.0.ebuild
 2105302039 ./dev-python/send2trash/send2trash-1.5.0-r1.ebuild
 2105071409 ./dev-python/serpent/serpent-1.30.2.ebuild
 2105101039 ./dev-python/serpent/serpent-1.40.ebuild
-2101230339 ./dev-python/serverfiles/serverfiles-0.3.1.ebuild
 2101310343 ./dev-python/serverfiles/serverfiles-0.2.1.ebuild
+2106052139 ./dev-python/serverfiles/serverfiles-0.3.1.ebuild
 2104060140 ./dev-python/service_identity/service_identity-18.1.0-r1.ebuild
 2105202339 ./dev-python/service_identity/service_identity-21.1.0.ebuild
 2105062209 ./dev-python/setproctitle/setproctitle-1.2.2.ebuild
@@ -12405,15 +12332,15 @@
 2105210639 ./dev-python/setuptools/setuptools-56.2.0.ebuild
 2105271739 ./dev-python/setuptools/setuptools-57.0.0.ebuild
 2105180239 ./dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
-2101310343 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
+2106041809 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1.ebuild
 2104280209 ./dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
 2105231509 ./dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
 2104180509 ./dev-python/sh/sh-1.14.1.ebuild
 2105151010 ./dev-python/sh/sh-1.14.2.ebuild
 2101310343 ./dev-python/simplebayes/simplebayes-1.5.7.ebuild
 2101310343 ./dev-python/simplebayes/simplebayes-1.5.8.ebuild
-2103061239 ./dev-python/simpleeval/simpleeval-0.9.10.ebuild
-2104180939 ./dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+2106052139 ./dev-python/simpleeval/simpleeval-0.9.10.ebuild
+2106052139 ./dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
 2105062209 ./dev-python/simplejson/simplejson-3.17.2-r1.ebuild
 2101310343 ./dev-python/simplekml/simplekml-1.3.5.ebuild
 2102150339 ./dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
@@ -12421,20 +12348,20 @@
 2102150339 ./dev-python/simplespectral/simplespectral-1.0.0.ebuild
 2102150339 ./dev-python/simplespectral/simplespectral-9999.ebuild
 2101310343 ./dev-python/simpy/simpy-3.0.13.ebuild
+2106060009 ./dev-python/simpy/simpy-4.0.1.ebuild
 2106020509 ./dev-python/sip/sip-4.19.25.ebuild
 2106020509 ./dev-python/sip/sip-5.5.0.ebuild
-2105052009 ./dev-python/six/six-1.15.0-r1.ebuild
-2105061139 ./dev-python/six/six-1.16.0.ebuild
+2106052339 ./dev-python/six/six-1.16.0.ebuild
 2105231509 ./dev-python/slimit/slimit-0.8.1-r1.ebuild
 2103021209 ./dev-python/slixmpp/slixmpp-1.7.0.ebuild
-2105011109 ./dev-python/slixmpp/slixmpp-1.7.1.ebuild
 2105231509 ./dev-python/slixmpp/slixmpp-9999.ebuild
+2106061039 ./dev-python/slixmpp/slixmpp-1.7.1.ebuild
 2105131209 ./dev-python/smmap/smmap-4.0.0.ebuild
-2103200339 ./dev-python/snakeoil/snakeoil-0.9.5.ebuild
 2103281909 ./dev-python/snakeoil/snakeoil-0.9.4.ebuild
 2106040209 ./dev-python/snakeoil/snakeoil-0.9.6.ebuild
 2106040209 ./dev-python/snakeoil/snakeoil-9999.ebuild
-2102200509 ./dev-python/snappy/snappy-0.6.0.ebuild
+2106070939 ./dev-python/snakeoil/snakeoil-0.9.5.ebuild
+2106052139 ./dev-python/snappy/snappy-0.6.0.ebuild
 2105181209 ./dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
 2102261739 ./dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
 2101310343 ./dev-python/socketio-client/socketio-client-0.7.2.ebuild
@@ -12442,7 +12369,7 @@
 2105052009 ./dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
 2105171109 ./dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
 2101310343 ./dev-python/sparql-wrapper/sparql-wrapper-1.8.5.ebuild
-2101310343 ./dev-python/speaklater/speaklater-1.3-r1.ebuild
+2106052139 ./dev-python/speaklater/speaklater-1.3-r1.ebuild
 2104070939 ./dev-python/speg/speg-0.3-r2.ebuild
 2105290110 ./dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
 2104060140 ./dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
@@ -12453,32 +12380,31 @@
 2104060140 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
 2103290139 ./dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
 2104221539 ./dev-python/sphinx/sphinx-3.5.4.ebuild
-2105211239 ./dev-python/sphinx/sphinx-4.0.2.ebuild
+2106041509 ./dev-python/sphinx/sphinx-4.0.2.ebuild
 2101310343 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
-2105061309 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
-2101310343 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+2106041539 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.2.ebuild
+2106041509 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
 2105290110 ./dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
 2103290139 ./dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
-2101310343 ./dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
+2106041509 ./dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2.ebuild
 2106031939 ./dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
 2101310343 ./dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
-2106010939 ./dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+2106060009 ./dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
 2101310343 ./dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
-2105230939 ./dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+2106041509 ./dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
 2101310343 ./dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
-2101310343 ./dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
+2106041509 ./dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
 2105290110 ./dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
 2105071639 ./dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
-2101310343 ./dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
+2106041509 ./dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3.ebuild
 2104060140 ./dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
-2105230939 ./dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
-2101310343 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.1.0.ebuild
-2105011109 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
-2104060140 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+2106041509 ./dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
+2106052339 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.2.1.ebuild
+2106041509 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
 2102212039 ./dev-python/spyder-kernels/spyder-kernels-1.10.2.ebuild
 2105192209 ./dev-python/spyder-kernels/spyder-kernels-2.0.3.ebuild
 2105201509 ./dev-python/spyder/spyder-4.2.5.ebuild
-2105221239 ./dev-python/spyder/spyder-5.0.3-r1.ebuild
+2106051409 ./dev-python/spyder/spyder-5.0.3-r2.ebuild
 2103290139 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
 2102281839 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild
 2104221109 ./dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild
@@ -12488,7 +12414,7 @@
 2105071109 ./dev-python/sqlalchemy/sqlalchemy-1.4.14.ebuild
 2105291139 ./dev-python/sqlalchemy/sqlalchemy-1.4.16.ebuild
 2105300209 ./dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild
-2105310939 ./dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+2106071639 ./dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
 2101310343 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2104051739 ./dev-python/ssl-fetch/ssl-fetch-9999.ebuild
 2104060140 ./dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -12501,13 +12427,14 @@
 2105110109 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
 2103281309 ./dev-python/stripe/stripe-2.56.0.ebuild
 2105201039 ./dev-python/stripe/stripe-2.57.0.ebuild
+2106051139 ./dev-python/stripe/stripe-2.58.0.ebuild
 2104060140 ./dev-python/subunit/subunit-1.4.0.ebuild
 2101310343 ./dev-python/suds/suds-0.8.4.ebuild
 2101310343 ./dev-python/sure/sure-1.4.11.ebuild
 2101310343 ./dev-python/svg-path/svg-path-4.0.2.ebuild
 2102171139 ./dev-python/svg-path/svg-path-4.1.ebuild
-2102280109 ./dev-python/svgwrite/svgwrite-1.4.1.ebuild
 2102280109 ./dev-python/svgwrite/svgwrite-1.4.ebuild
+2106052139 ./dev-python/svgwrite/svgwrite-1.4.1.ebuild
 2101301909 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.7.3.ebuild
 2103052239 ./dev-python/sybil/sybil-2.0.1.ebuild
 2105292139 ./dev-python/symengine/symengine-0.7.2-r2.ebuild
@@ -12522,7 +12449,7 @@
 2104070939 ./dev-python/tenacity/tenacity-7.0.0.ebuild
 2105231709 ./dev-python/termcolor/termcolor-1.1.0-r2.ebuild
 2105071639 ./dev-python/terminado/terminado-0.9.4.ebuild
-2105181709 ./dev-python/terminado/terminado-0.10.0.ebuild
+2106052139 ./dev-python/terminado/terminado-0.10.0.ebuild
 2105231709 ./dev-python/terminaltables/terminaltables-3.1.0.ebuild
 2105231709 ./dev-python/terminaltables/terminaltables-9999.ebuild
 2103052239 ./dev-python/testfixtures/testfixtures-6.17.1.ebuild
@@ -12537,26 +12464,25 @@
 2101310343 ./dev-python/thrift/thrift-0.13.0.ebuild
 2106011009 ./dev-python/thrift/thrift-0.14.1.ebuild
 2103020909 ./dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
-2104161309 ./dev-python/tinycss/tinycss-0.4.ebuild
-2102141209 ./dev-python/tinycss2/tinycss2-1.1.0.ebuild
+2106052139 ./dev-python/tinycss/tinycss-0.4.ebuild
+2106052139 ./dev-python/tinycss2/tinycss2-1.1.0.ebuild
 2101310343 ./dev-python/tinyrpc/tinyrpc-1.0.1.ebuild
 2101310343 ./dev-python/tld/tld-0.12.2.ebuild
 2101310343 ./dev-python/tld/tld-0.12.3.ebuild
 2101310343 ./dev-python/tld/tld-0.12.5.ebuild
+2106071009 ./dev-python/tld/tld-0.12.6.ebuild
 2101310343 ./dev-python/tldextract/tldextract-2.2.1.ebuild
 2105052009 ./dev-python/toml/toml-0.10.2.ebuild
 2101310343 ./dev-python/toolz/toolz-0.11.1.ebuild
 2011271909 ./dev-python/tooz/tooz-2.7.1.ebuild
-2104052009 ./dev-python/tox/tox-3.23.0.ebuild
-2106020141 ./dev-python/tox/tox-3.23.1.ebuild
+2106052339 ./dev-python/tox/tox-3.23.1.ebuild
 2105061309 ./dev-python/tqdm/tqdm-4.60.0.ebuild
 2105250839 ./dev-python/tqdm/tqdm-4.61.0.ebuild
 2104060140 ./dev-python/traceback2/traceback2-1.4.0-r1.ebuild
 2011191309 ./dev-python/traitlets/traitlets-5.0.5.ebuild
 2101310343 ./dev-python/traitlets/traitlets-4.3.3.ebuild
 2105091609 ./dev-python/transitions/transitions-0.8.8.ebuild
-2104292309 ./dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
-2105061339 ./dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
+2106052339 ./dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
 2105042239 ./dev-python/treq/treq-20.9.0.ebuild
 2105042239 ./dev-python/treq/treq-21.1.0.ebuild
 2106020009 ./dev-python/trustme/trustme-0.7.0.ebuild
@@ -12571,19 +12497,18 @@
 2104161439 ./dev-python/txgithub/txgithub-15.0.0-r1.ebuild
 2104280209 ./dev-python/txrequests/txrequests-0.9.6.ebuild
 2105201739 ./dev-python/typed-ast/typed-ast-1.4.3.ebuild
-2101310343 ./dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
-2105062209 ./dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
+2106052339 ./dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
 2105302039 ./dev-python/tzlocal/tzlocal-2.1.ebuild
 2105071509 ./dev-python/u-msgpack/u-msgpack-2.7.1.ebuild
-2102261709 ./dev-python/ujson/ujson-4.0.2.ebuild
+2106052139 ./dev-python/ujson/ujson-4.0.2.ebuild
 2101310343 ./dev-python/uncertainties/uncertainties-3.1.4-r1.ebuild
 2105181609 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
-2103072309 ./dev-python/unidecode/unidecode-1.2.0.ebuild
-2101310343 ./dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
+2106052139 ./dev-python/unidecode/unidecode-1.2.0.ebuild
+2106052139 ./dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
 2104060140 ./dev-python/unittest2/unittest2-1.1.0-r1.ebuild
 2105251509 ./dev-python/uranium/uranium-4.8.0-r1.ebuild
 2105071940 ./dev-python/urdf_parser_py/urdf_parser_py-0.4.5.ebuild
-2101310343 ./dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
+2106052139 ./dev-python/uritemplate/uritemplate-3.0.1-r1.ebuild
 2104100139 ./dev-python/urlgrabber/urlgrabber-4.1.0.ebuild
 2105192139 ./dev-python/urllib3/urllib3-1.26.4.ebuild
 2106020009 ./dev-python/urllib3/urllib3-1.26.5.ebuild
@@ -12603,11 +12528,11 @@
 2105252009 ./dev-python/virtualenv/virtualenv-20.4.4.ebuild
 2101310343 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2105112239 ./dev-python/visitor/visitor-0.1.3-r1.ebuild
-2101310343 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
-2104060140 ./dev-python/voluptuous/voluptuous-0.12.1.ebuild
+2106052209 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
+2106052209 ./dev-python/voluptuous/voluptuous-0.12.1.ebuild
 2103121039 ./dev-python/vpython/vpython-7.6.1-r3.ebuild
 2105110109 ./dev-python/waitress/waitress-2.0.0.ebuild
-2105231709 ./dev-python/warlock/warlock-1.3.3.ebuild
+2106052209 ./dev-python/warlock/warlock-1.3.3.ebuild
 2101310343 ./dev-python/watchdog/watchdog-1.0.2.ebuild
 2105192139 ./dev-python/watchdog/watchdog-2.1.1.ebuild
 2105201039 ./dev-python/watchdog/watchdog-2.1.2.ebuild
@@ -12618,13 +12543,11 @@
 2103120209 ./dev-python/weasyprint/weasyprint-52.4.ebuild
 2104181009 ./dev-python/weasyprint/weasyprint-52.5.ebuild
 2102280109 ./dev-python/webassets/webassets-2.0.ebuild
-2104060140 ./dev-python/webcolors/webcolors-1.11.1.ebuild
+2106041839 ./dev-python/webcolors/webcolors-1.11.1.ebuild
 2105071509 ./dev-python/webencodings/webencodings-0.5.1-r1.ebuild
 2105110109 ./dev-python/webob/webob-1.8.7.ebuild
-2104080139 ./dev-python/websocket-client/websocket-client-0.58.0-r1.ebuild
-2105071439 ./dev-python/websocket-client/websocket-client-0.59.0.ebuild
-2105181039 ./dev-python/websocket-client/websocket-client-1.0.0.ebuild
 2105221109 ./dev-python/websocket-client/websocket-client-1.0.1.ebuild
+2106052339 ./dev-python/websocket-client/websocket-client-0.59.0.ebuild
 2101310343 ./dev-python/websockify/websockify-0.9.0-r1.ebuild
 2105302309 ./dev-python/webtest/webtest-2.0.35.ebuild
 2101310343 ./dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
@@ -12632,28 +12555,28 @@
 2105220009 ./dev-python/werkzeug/werkzeug-2.0.0.ebuild
 2106020141 ./dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
 2105052139 ./dev-python/wheel/wheel-0.36.2.ebuild
-2102280109 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
+2106052209 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
 2103041109 ./dev-python/whisper/whisper-1.1.5.ebuild
 2105091439 ./dev-python/whisper/whisper-1.1.7.ebuild
-2104060140 ./dev-python/whoosh/whoosh-2.7.4-r1.ebuild
+2106041509 ./dev-python/whoosh/whoosh-2.7.4-r1.ebuild
 2009111039 ./dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
 2105310239 ./dev-python/wrapt/wrapt-1.12.1.ebuild
 2102280109 ./dev-python/ws4py/ws4py-0.5.1-r1.ebuild
 2102280109 ./dev-python/ws4py/ws4py-9999.ebuild
-2103101839 ./dev-python/wsaccel/wsaccel-0.6.3.ebuild
+2106052209 ./dev-python/wsaccel/wsaccel-0.6.3.ebuild
 2105302309 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
 2008030109 ./dev-python/wsproto/wsproto-0.15.0.ebuild
 2105182039 ./dev-python/wsproto/wsproto-1.0.0.ebuild
 2101310343 ./dev-python/wstools/wstools-0.4.8.ebuild
-2101310343 ./dev-python/wtforms/wtforms-2.3.3.ebuild
-2102280109 ./dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+2106041809 ./dev-python/wtforms/wtforms-2.3.3.ebuild
+2106052209 ./dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
 2101310343 ./dev-python/wxpython/wxpython-4.0.7.ebuild
 2102031109 ./dev-python/wxpython/wxpython-4.0.7-r1.ebuild
 2103020909 ./dev-python/xapp/xapp-2.0.2.ebuild
 2105101009 ./dev-python/xarray/xarray-0.17.0.ebuild
 2105191039 ./dev-python/xarray/xarray-0.18.1.ebuild
 2105201039 ./dev-python/xarray/xarray-0.18.2.ebuild
-2101310343 ./dev-python/xcffib/xcffib-0.11.1.ebuild
+2106052209 ./dev-python/xcffib/xcffib-0.11.1.ebuild
 2105071509 ./dev-python/xlrd/xlrd-2.0.1.ebuild
 2105071639 ./dev-python/xlsxwriter/xlsxwriter-1.3.9.ebuild
 2105071109 ./dev-python/xlsxwriter/xlsxwriter-1.4.2.ebuild
@@ -12661,17 +12584,16 @@
 2105071509 ./dev-python/xlwt/xlwt-1.3.0-r1.ebuild
 2105071439 ./dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
 2105140139 ./dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
-2104121909 ./dev-python/yapf/yapf-0.31.0.ebuild
+2106052209 ./dev-python/yapf/yapf-0.31.0.ebuild
 2102261339 ./dev-python/yappi/yappi-1.3.2.ebuild
-2102280109 ./dev-python/yapsy/yapsy-1.12.2.ebuild
+2106052209 ./dev-python/yapsy/yapsy-1.12.2.ebuild
 2101310343 ./dev-python/yaql/yaql-1.1.3.ebuild
 2105222139 ./dev-python/yarl/yarl-1.6.3.ebuild
 2103051209 ./dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
 2101310343 ./dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
-2101310343 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+2106052209 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
 2106032239 ./dev-python/zeep/zeep-3.4.0.ebuild
-2105061039 ./dev-python/zeroconf/zeroconf-0.29.0.ebuild
-2105061039 ./dev-python/zeroconf/zeroconf-0.30.0.ebuild
+2106052339 ./dev-python/zeroconf/zeroconf-0.30.0.ebuild
 2105221409 ./dev-python/zipp/zipp-3.4.1.ebuild
 2105311539 ./dev-python/zope-component/zope-component-4.4.1.ebuild
 2101310343 ./dev-python/zope-configuration/zope-configuration-4.4.0.ebuild
@@ -12680,7 +12602,7 @@
 2105311539 ./dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
 2105311539 ./dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
 2104251209 ./dev-python/zope-interface/zope-interface-5.3.0.ebuild
-2105051639 ./dev-python/zope-interface/zope-interface-5.4.0.ebuild
+2106071639 ./dev-python/zope-interface/zope-interface-5.4.0.ebuild
 2102091639 ./dev-python/zope-schema/zope-schema-6.1.0.ebuild
 2105051639 ./dev-python/zope-testing/zope-testing-4.9.ebuild
 2101310343 ./dev-python/zope-testrunner/zope-testrunner-5.2.ebuild
@@ -12696,8 +12618,8 @@
 2101310343 ./dev-python/pytest-services/pytest-services-2.2.1.ebuild
 2105110109 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
 2105250109 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
-2105250109 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
-2105061309 ./dev-python/towncrier/towncrier-21.3.0.ebuild
+2106041839 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+2106052139 ./dev-python/towncrier/towncrier-21.3.0.ebuild
 2105191239 ./dev-python/xmlschema/xmlschema-1.6.2.ebuild
 2105300039 ./dev-python/soupsieve/soupsieve-2.2.1.ebuild
 2101310343 ./dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
@@ -12709,8 +12631,8 @@
 2105242309 ./dev-python/intreehooks/intreehooks-1.0.ebuild
 2105242309 ./dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
 2105242209 ./dev-python/requests_download/requests_download-0.1.2.ebuild
-2101310343 ./dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
-2101310343 ./dev-python/ctypescrypto/ctypescrypto-9999.ebuild
+2106051639 ./dev-python/ctypescrypto/ctypescrypto-0.5.ebuild
+2106051639 ./dev-python/ctypescrypto/ctypescrypto-9999.ebuild
 2101310343 ./dev-python/fleep/fleep-1.0.1.ebuild
 2101310343 ./dev-python/fleep/fleep-9999.ebuild
 2101310343 ./dev-python/ament_package/ament_package-0.9.2.ebuild
@@ -12732,24 +12654,26 @@
 2105192339 ./dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild
 2105192139 ./dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild
 2101310343 ./dev-python/helpdev/helpdev-0.7.1.ebuild
-2104121639 ./dev-python/immutables/immutables-0.15.ebuild
-2106031309 ./dev-python/libsass/libsass-0.21.0.ebuild
+2106051739 ./dev-python/immutables/immutables-0.15.ebuild
+2106041409 ./dev-python/libsass/libsass-0.21.0.ebuild
 2101310343 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
 2105190339 ./dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
 2101310343 ./dev-python/qtsass/qtsass-0.3.0.ebuild
 2105101039 ./dev-python/pikepdf/pikepdf-2.12.0.ebuild
 2105192039 ./dev-python/pikepdf/pikepdf-2.11.4.ebuild
-2105221109 ./dev-python/pikepdf/pikepdf-2.12.1.ebuild
+2106041809 ./dev-python/pikepdf/pikepdf-2.12.1.ebuild
+2106071539 ./dev-python/pikepdf/pikepdf-2.12.2.ebuild
 2105132239 ./dev-python/vdf/vdf-3.3.ebuild
 2105230939 ./dev-python/vdf/vdf-3.4.ebuild
-2102112239 ./dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
+2106041809 ./dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r1.ebuild
 2101310343 ./dev-python/casttube/casttube-0.2.0.ebuild
 2105061039 ./dev-python/ifaddr/ifaddr-0.1.7.ebuild
 2102230239 ./dev-python/pychromecast/pychromecast-8.1.0.ebuild
-2011151039 ./dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+2106060009 ./dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
 2105190339 ./dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
 2105071639 ./dev-python/wurlitzer/wurlitzer-2.1.0.ebuild
-2101310343 ./dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+2106051539 ./dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+2106051409 ./dev-python/pytest-qt/pytest-qt-4.0.0.ebuild
 2101310343 ./dev-python/patch-ng/patch-ng-1.17.4.ebuild
 2012111809 ./dev-python/pweave/pweave-0.30.3-r1.ebuild
 2105242309 ./dev-python/snaketrace/snaketrace-0.3.1.ebuild
@@ -12759,7 +12683,7 @@
 2105061509 ./dev-python/ordered-set/ordered-set-4.0.2.ebuild
 2101310343 ./dev-python/scikit-build/scikit-build-0.11.1.ebuild
 2102060039 ./dev-python/ubelt/ubelt-0.9.5.ebuild
-2103101839 ./dev-python/xdoctest/xdoctest-0.15.4.ebuild
+2106060009 ./dev-python/xdoctest/xdoctest-0.15.4.ebuild
 2101310343 ./dev-python/chainmap/chainmap-1.0.3.ebuild
 2101310343 ./dev-python/emoji/emoji-0.5.4.ebuild
 2106011539 ./dev-python/emoji/emoji-1.2.1.ebuild
@@ -12783,59 +12707,60 @@
 2101150039 ./dev-python/python3-saml/python3-saml-1.10.0.ebuild
 2101282239 ./dev-python/python3-saml/python3-saml-1.10.1.ebuild
 2101310343 ./dev-python/python3-saml/python3-saml-1.9.0.ebuild
-2104212209 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
-2101310343 ./dev-python/genson/genson-1.1.0.ebuild
+2106041539 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
+2106051709 ./dev-python/genson/genson-1.1.0.ebuild
 2105280239 ./dev-python/python-libevdev/python-libevdev-0.9.ebuild
 2103041309 ./dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
 2104060140 ./dev-python/sqlparse/sqlparse-0.3.1.ebuild
 2105071339 ./dev-python/sqlparse/sqlparse-0.4.1.ebuild
 2101302339 ./dev-python/django-pglocks/django-pglocks-1.0.4.ebuild
-2105141139 ./dev-python/GitPython/GitPython-3.1.17.ebuild
 2105261009 ./dev-python/GitPython/GitPython-3.1.15.ebuild
+2106042139 ./dev-python/GitPython/GitPython-3.1.17.ebuild
 2005091439 ./dev-python/nltk-data/nltk-data-20200312-r1.ebuild
 2101310343 ./dev-python/exam/exam-0.10.6.ebuild
 2102261739 ./dev-python/zconfig/zconfig-3.5.0.ebuild
 2105181209 ./dev-python/zconfig/zconfig-3.6.0.ebuild
 2101310343 ./dev-python/dbutils/dbutils-1.3.ebuild
 2101310343 ./dev-python/dbutils/dbutils-2.0.ebuild
-2104090209 ./dev-python/dbutils/dbutils-2.0.1.ebuild
+2106051639 ./dev-python/dbutils/dbutils-2.0.1.ebuild
 2102251509 ./dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
 2101310343 ./dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
 2103020639 ./dev-python/mongomock/mongomock-3.22.1.ebuild
-2101310343 ./dev-python/sentinels/sentinels-1.0.0.ebuild
+2106071539 ./dev-python/mongomock/mongomock-3.23.0.ebuild
+2106052139 ./dev-python/sentinels/sentinels-1.0.0.ebuild
 2101310343 ./dev-python/python-caja/python-caja-1.24.0-r1.ebuild
 2101310343 ./dev-python/python-caja/python-caja-1.24.0-r2.ebuild
 2102230139 ./dev-python/slackclient/slackclient-2.5.0.ebuild
 2101310343 ./dev-python/lunr/lunr-0.5.8.ebuild
 2104091509 ./dev-python/lunr/lunr-0.5.9.ebuild
 2104231039 ./dev-python/lunr/lunr-0.6.0.ebuild
-2104131439 ./dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
-2105192209 ./dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
+2106060009 ./dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
+2106060009 ./dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
 2102220739 ./dev-python/distlib/distlib-0.3.1-r1.ebuild
 2105300009 ./dev-python/distlib/distlib-0.3.2.ebuild
 2101310343 ./dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
 2105132239 ./dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
 2105300839 ./dev-python/websockets/websockets-9.1.ebuild
-2101310343 ./dev-python/cppy/cppy-1.1.0.ebuild
+2106051639 ./dev-python/cppy/cppy-1.1.0.ebuild
 2101310343 ./dev-python/blessed/blessed-1.17.11.ebuild
 2101310343 ./dev-python/blessed/blessed-1.17.12.ebuild
 2105092309 ./dev-python/blessed/blessed-1.18.0.ebuild
-2104111439 ./dev-python/pebble/pebble-4.6.1.ebuild
-2103072309 ./dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
+2106051809 ./dev-python/pebble/pebble-4.6.1.ebuild
+2106052109 ./dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
 2101310343 ./dev-python/nose-random/nose-random-1.0.0.ebuild
-2101310343 ./dev-python/python-slugify/python-slugify-1.2.6.ebuild
 2102161139 ./dev-python/python-slugify/python-slugify-4.0.1.ebuild
-2105061039 ./dev-python/python-slugify/python-slugify-5.0.0.ebuild
 2105061039 ./dev-python/python-slugify/python-slugify-5.0.1.ebuild
+2106052339 ./dev-python/python-slugify/python-slugify-5.0.0.ebuild
 2105240609 ./dev-python/csv23/csv23-0.3.2-r1.ebuild
 2101310343 ./dev-python/aiofiles/aiofiles-0.5.0.ebuild
 2103150609 ./dev-python/aiofiles/aiofiles-0.6.0.ebuild
-2105171109 ./dev-python/aiofiles/aiofiles-0.7.0.ebuild
+2106051609 ./dev-python/aiofiles/aiofiles-0.7.0.ebuild
 2105202339 ./dev-python/asgiref/asgiref-3.3.4.ebuild
 2105231709 ./dev-python/snapshottest/snapshottest-0.5.1.ebuild
 2101310343 ./dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
 2105152239 ./dev-python/cbor2/cbor2-5.2.0.ebuild
 2105272109 ./dev-python/cbor2/cbor2-5.3.0.ebuild
+2106051139 ./dev-python/cbor2/cbor2-5.4.0.ebuild
 2101310343 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
 2101310343 ./dev-python/pypugjs/pypugjs-5.9.5.ebuild
 2101310343 ./dev-python/pypugjs/pypugjs-5.9.8.ebuild
@@ -12851,7 +12776,7 @@
 2011191439 ./dev-python/python-vitrageclient/python-vitrageclient-4.1.1.ebuild
 2011300409 ./dev-python/wand/wand-0.6.5.ebuild
 2105091839 ./dev-python/wand/wand-0.6.6.ebuild
-2101310343 ./dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
+2106041809 ./dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
 2105042239 ./dev-python/pynput/pynput-1.6.8.ebuild
 2105042239 ./dev-python/pynput/pynput-9999.ebuild
 2106012039 ./dev-python/pyside2/pyside2-5.15.2.ebuild
@@ -12864,8 +12789,8 @@
 2101310343 ./dev-python/black/black-20.8_beta1.ebuild
 2104281139 ./dev-python/black/black-21.4_beta1.ebuild
 2104291039 ./dev-python/black/black-21.4_beta2.ebuild
-2105102209 ./dev-python/black/black-21.5_beta1.ebuild
 2105312239 ./dev-python/black/black-21.5_beta2.ebuild
+2106071639 ./dev-python/black/black-21.5_beta1.ebuild
 2103290139 ./dev-python/klein/klein-20.6.0.ebuild
 2104301839 ./dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
 2104130209 ./dev-python/tubes/tubes-0.2.0-r1.ebuild
@@ -12878,25 +12803,25 @@
 2101310343 ./dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
 2101310343 ./dev-python/influxdb/influxdb-5.3.0-r1.ebuild
 2104060140 ./dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
-2101310343 ./dev-python/spur/spur-0.3.22.ebuild
+2106052139 ./dev-python/spur/spur-0.3.22.ebuild
 2105091239 ./dev-python/fsspec/fsspec-2021.04.0.ebuild
 2105151209 ./dev-python/fsspec/fsspec-2021.05.0.ebuild
 2103081539 ./dev-python/loky/loky-2.9.0.ebuild
 2105061039 ./dev-python/text-unidecode/text-unidecode-1.3.ebuild
 2101310343 ./dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
 2101310343 ./dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
-2101230709 ./dev-python/latexcodec/latexcodec-2.0.1.ebuild
-2101181239 ./dev-python/pybtex/pybtex-0.24.0.ebuild
+2106051739 ./dev-python/latexcodec/latexcodec-2.0.1.ebuild
 2101310343 ./dev-python/pybtex/pybtex-0.23.0.ebuild
+2106052109 ./dev-python/pybtex/pybtex-0.24.0.ebuild
 2105250139 ./dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
 2101310343 ./dev-python/findimports/findimports-1.5.2.ebuild
 2105101039 ./dev-python/findimports/findimports-2.0.0.ebuild
 2105171109 ./dev-python/findimports/findimports-2.1.0.ebuild
 2101310343 ./dev-python/pony/pony-0.7.14.ebuild
-2101310343 ./dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+2106052209 ./dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
 2105191039 ./dev-python/pyre2/pyre2-1.0.7.ebuild
 2104042209 ./dev-python/pylatex/pylatex-1.4.1.ebuild
-2101310343 ./dev-python/quantities/quantities-0.12.4.ebuild
+2106052139 ./dev-python/quantities/quantities-0.12.4.ebuild
 2105061809 ./dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
 2105052009 ./dev-python/iniconfig/iniconfig-1.1.1.ebuild
 2010131439 ./dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
@@ -12905,8 +12830,7 @@
 2102270539 ./dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
 2103310109 ./dev-python/keep/keep-2.10.1.ebuild
 2101310343 ./dev-python/junit-xml/junit-xml-1.9.ebuild
-2102280109 ./dev-python/xxhash/xxhash-2.0.0.ebuild
-2104150939 ./dev-python/xxhash/xxhash-2.0.2.ebuild
+2106052209 ./dev-python/xxhash/xxhash-2.0.2.ebuild
 2105261639 ./dev-python/asttokens/asttokens-2.0.5.ebuild
 2101310343 ./dev-python/django-allauth/django-allauth-0.42.0.ebuild
 2101310343 ./dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild
@@ -12933,9 +12857,8 @@
 2105170309 ./dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
 2101310343 ./dev-python/fcl/fcl-0.0.12-r1.ebuild
 2103072109 ./dev-python/glooey/glooey-0.3.4-r1.ebuild
-2101190609 ./dev-python/mss/mss-6.1.0.ebuild
-2104271039 ./dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
-2104282009 ./dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.2.ebuild
+2106051509 ./dev-python/mss/mss-6.1.0.ebuild
+2106052339 ./dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
 2105261009 ./dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
 2105202339 ./dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
 2102181209 ./dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
@@ -12947,7 +12870,7 @@
 2101310343 ./dev-python/rcssmin/rcssmin-1.0.6.ebuild
 2101310343 ./dev-python/rjsmin/rjsmin-1.1.0.ebuild
 2101310343 ./dev-python/robot-detection/robot-detection-0.4.0.ebuild
-2010161709 ./dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
+2106051539 ./dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
 2101182109 ./dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
 2106040109 ./dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
 2101310343 ./dev-python/vecrec/vecrec-0.3.0.ebuild
@@ -12958,11 +12881,10 @@
 2101310343 ./dev-python/django-extensions/django-extensions-3.0.9.ebuild
 2101310343 ./dev-python/django-haystack/django-haystack-3.0.ebuild
 2101310343 ./dev-python/django-q/django-q-1.3.3.ebuild
-2104261139 ./dev-python/scipy/scipy-1.6.3.ebuild
 2105311109 ./dev-python/scipy/scipy-1.6.2.ebuild
+2106061039 ./dev-python/scipy/scipy-1.6.3.ebuild
 2105070039 ./dev-python/python-socks/python-socks-1.2.4.ebuild
-2105061139 ./dev-python/fastjsonschema/fastjsonschema-2.15.0.ebuild
-2105061139 ./dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+2106052339 ./dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
 2105121209 ./dev-python/pydantic/pydantic-1.8.2.ebuild
 2101310343 ./dev-python/imread/imread-0.7.3-r1.ebuild
 2102261739 ./dev-python/exdown/exdown-0.8.6.ebuild
@@ -12977,14 +12899,15 @@
 2101310343 ./dev-python/chart-studio/chart-studio-1.1.0.ebuild
 2101310343 ./dev-python/plotly-geo/plotly-geo-1.0.0.ebuild
 2105200039 ./dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
+2106051139 ./dev-python/pyls-black/pyls-black-0.4.7.ebuild
 2105191239 ./dev-python/pyls-spyder/pyls-spyder-0.3.2-r1.ebuild
 2105200939 ./dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
-2012201939 ./dev-python/three-merge/three-merge-0.1.1.ebuild
+2106051839 ./dev-python/three-merge/three-merge-0.1.1.ebuild
 2102161539 ./dev-python/pytaglib/pytaglib-1.4.6.ebuild
 2102041809 ./dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
 2106012139 ./dev-python/pynest2d/pynest2d-4.8.0-r1.ebuild
 2103222139 ./dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
-2105052239 ./dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
+2106071639 ./dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
 2101310343 ./dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
 2105170610 ./dev-python/pysimdjson/pysimdjson-3.2.0.ebuild
 2105242139 ./dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
@@ -13007,7 +12930,6 @@
 2012080909 ./dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
 2101261539 ./dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
 2105091139 ./dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
-2012080909 ./dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
 2105262039 ./dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
 2103111039 ./dev-python/pyspelling/pyspelling-2.7.1.ebuild
 2103211639 ./dev-python/pyspelling/pyspelling-2.7.2.ebuild
@@ -13016,6 +12938,8 @@
 2102242239 ./dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
 2103100009 ./dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
 2105310239 ./dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+2106041609 ./dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+2106041109 ./dev-python/tree-sitter/tree-sitter-0.19.0_p20210506.ebuild
 2105132209 ./dev-python/stomp-py/stomp-py-6.1.0.ebuild
 2105142209 ./dev-python/stomp-py/stomp-py-7.0.0.ebuild
 2105102239 ./dev-python/whatever/whatever-0.6.ebuild
@@ -13023,7 +12947,7 @@
 2105310939 ./dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
 2106012039 ./dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
 2102022039 ./dev-python/cftime/cftime-1.4.1.ebuild
-2105211109 ./dev-python/cftime/cftime-1.5.0.ebuild
+2106051639 ./dev-python/cftime/cftime-1.5.0.ebuild
 2105101409 ./dev-python/pivy/pivy-0.6.6.ebuild
 2105190909 ./dev-python/Faker/Faker-8.2.0.ebuild
 2105221109 ./dev-python/Faker/Faker-8.2.1.ebuild
@@ -13040,13 +12964,11 @@
 2101161109 ./dev-python/oset/oset-0.1.3.ebuild
 2105061509 ./dev-python/pastel/pastel-0.2.1.ebuild
 2102182039 ./dev-python/pendulum/pendulum-2.1.2-r1.ebuild
-2101161109 ./dev-python/pybtex-docutils/pybtex-docutils-0.2.2.ebuild
-2103060109 ./dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
+2106060009 ./dev-python/pybtex-docutils/pybtex-docutils-1.0.0.ebuild
 2105061509 ./dev-python/pylev/pylev-1.2.0.ebuild
 2105310009 ./dev-python/pylev/pylev-1.4.0.ebuild
 2105061509 ./dev-python/pytzdata/pytzdata-2020.1.ebuild
 2105262039 ./dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
-2101161109 ./dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.0.0.ebuild
 2103060109 ./dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.0.ebuild
 2105171109 ./dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.1.ebuild
 2106020109 ./dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.3.0.ebuild
@@ -13054,10 +12976,8 @@
 2104131109 ./dev-python/textdistance/textdistance-4.2.1.ebuild
 2105181609 ./dev-python/smartypants/smartypants-9999.ebuild
 2106030609 ./dev-python/smartypants/smartypants-2.0.1.ebuild
-2101241109 ./dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
-2101242309 ./dev-python/cwcwidth/cwcwidth-0.1.1.ebuild
-2101291209 ./dev-python/cwcwidth/cwcwidth-0.1.2.ebuild
-2102261539 ./dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
+2106051839 ./dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
+2106051639 ./dev-python/cwcwidth/cwcwidth-0.1.4.ebuild
 2101312309 ./dev-python/async-lru/async-lru-1.0.2_p20201029.ebuild
 2105182039 ./dev-python/sniffio/sniffio-1.2.0.ebuild
 2103172309 ./dev-python/phply/phply-1.2.5.ebuild
@@ -13100,7 +13020,7 @@
 2105181209 ./dev-python/rich/rich-10.2.1.ebuild
 2105201039 ./dev-python/rich/rich-10.2.2.ebuild
 2104031539 ./dev-python/xdg/xdg-5.0.1-r2.ebuild
-2104251109 ./dev-python/xdg/xdg-5.0.2.ebuild
+2106052209 ./dev-python/xdg/xdg-5.0.2.ebuild
 2105201709 ./dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
 2105111309 ./dev-python/aesara/aesara-2.0.7.ebuild
 2105121639 ./dev-python/aesara/aesara-2.0.8.ebuild
@@ -13123,9 +13043,9 @@
 2105200510 ./dev-python/fastimport/fastimport-0.9.11.ebuild
 2105192039 ./dev-python/pyicu/pyicu-2.7.3.ebuild
 2105042239 ./dev-python/qstylizer/qstylizer-0.1.10.ebuild
-2104091539 ./dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
-2104101209 ./dev-python/url-normalize/url-normalize-1.4.3.ebuild
-2104141039 ./dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+2106051539 ./dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
+2106070239 ./dev-python/url-normalize/url-normalize-1.4.3.ebuild
+2106070239 ./dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
 2104161439 ./dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
 2104161409 ./dev-python/awxkit/awxkit-19.0.0-r1.ebuild
 2105101039 ./dev-python/awxkit/awxkit-19.1.0.ebuild
@@ -13137,6 +13057,7 @@
 2105261009 ./dev-python/identify/identify-2.2.4.ebuild
 2105311009 ./dev-python/identify/identify-2.2.7.ebuild
 2106040109 ./dev-python/identify/identify-2.2.8.ebuild
+2106051139 ./dev-python/identify/identify-2.2.9.ebuild
 2105261009 ./dev-python/pytest-env/pytest-env-0.6.2.ebuild
 2104221339 ./dev-python/markuppy/markuppy-1.14.ebuild
 2104221239 ./dev-python/tablib/tablib-3.0.0.ebuild
@@ -13144,17 +13065,17 @@
 2104241309 ./dev-python/pgzero/pgzero-1.2.1.ebuild
 2105181609 ./dev-python/unidiff/unidiff-0.6.0.ebuild
 2104282039 ./dev-python/jc/jc-1.15.3.ebuild
-2105160339 ./dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
+2106071639 ./dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
 2105010109 ./dev-python/requests-futures/requests-futures-1.0.0.ebuild
 2105102309 ./dev-python/asyncstdlib/asyncstdlib-3.9.1.ebuild
 2105151209 ./dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
 2105040139 ./dev-python/ssh2-python/ssh2-python-0.26.0.ebuild
 2106030609 ./dev-python/typogrify/typogrify-2.0.7.ebuild
 2105081609 ./dev-python/parallax/parallax-1.0.6.ebuild
-2105151239 ./dev-python/pulsectl/pulsectl-21.5.14.ebuild
 2105151509 ./dev-python/pulsectl/pulsectl-21.5.17.ebuild
+2106051709 ./dev-python/pulsectl/pulsectl-21.5.18.ebuild
 2105201809 ./dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
-2105192209 ./dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
+2106060009 ./dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
 2105201209 ./dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
 2105201709 ./dev-python/python-mpv/python-mpv-0.5.2.ebuild
 2105201709 ./dev-python/python-vlc/python-vlc-3.0.12118.ebuild
@@ -14377,58 +14298,25 @@
 2003061039 ./dev-ruby/acme-client/acme-client-2.0.6.ebuild
 2009190909 ./dev-ruby/acme-client/acme-client-2.0.7.ebuild
 2104300939 ./dev-ruby/acme-client/acme-client-2.0.8.ebuild
-2102131109 ./dev-ruby/actioncable/actioncable-5.2.4.5.ebuild
-2102131309 ./dev-ruby/actioncable/actioncable-6.0.3.5.ebuild
-2102132039 ./dev-ruby/actioncable/actioncable-6.1.2.1.ebuild
-2102211139 ./dev-ruby/actioncable/actioncable-6.1.3.ebuild
-2103271409 ./dev-ruby/actioncable/actioncable-6.1.3.1.ebuild
 2105060909 ./dev-ruby/actioncable/actioncable-6.0.3.7.ebuild
 2105060739 ./dev-ruby/actioncable/actioncable-6.1.3.2.ebuild
 2105070839 ./dev-ruby/actioncable/actioncable-5.2.6.ebuild
-2102131309 ./dev-ruby/actionmailbox/actionmailbox-6.0.3.5.ebuild
-2102211039 ./dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild
-2102211139 ./dev-ruby/actionmailbox/actionmailbox-6.1.3.ebuild
-2103271409 ./dev-ruby/actionmailbox/actionmailbox-6.1.3.1.ebuild
 2105060739 ./dev-ruby/actionmailbox/actionmailbox-6.1.3.2.ebuild
 2105100739 ./dev-ruby/actionmailbox/actionmailbox-6.0.3.7.ebuild
-2102131109 ./dev-ruby/actionmailer/actionmailer-5.2.4.5.ebuild
-2102131309 ./dev-ruby/actionmailer/actionmailer-6.0.3.5.ebuild
-2102211039 ./dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild
-2102211139 ./dev-ruby/actionmailer/actionmailer-6.1.3.ebuild
-2103271409 ./dev-ruby/actionmailer/actionmailer-6.1.3.1.ebuild
 2105060909 ./dev-ruby/actionmailer/actionmailer-6.0.3.7.ebuild
 2105060739 ./dev-ruby/actionmailer/actionmailer-6.1.3.2.ebuild
 2105070839 ./dev-ruby/actionmailer/actionmailer-5.2.6.ebuild
 2009160939 ./dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
 2105160839 ./dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild
 1912151039 ./dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
-2102191009 ./dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
-2102191009 ./dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
-2102201109 ./dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
-2102211139 ./dev-ruby/actionpack/actionpack-6.1.3.ebuild
-2103271409 ./dev-ruby/actionpack/actionpack-6.1.3.1.ebuild
 2105060909 ./dev-ruby/actionpack/actionpack-6.0.3.7.ebuild
 2105060739 ./dev-ruby/actionpack/actionpack-6.1.3.2.ebuild
-2105070839 ./dev-ruby/actionpack/actionpack-5.2.6.ebuild
-2102131309 ./dev-ruby/actiontext/actiontext-6.0.3.5.ebuild
-2102211039 ./dev-ruby/actiontext/actiontext-6.1.2.1.ebuild
-2102211139 ./dev-ruby/actiontext/actiontext-6.1.3.ebuild
-2103271409 ./dev-ruby/actiontext/actiontext-6.1.3.1.ebuild
+2106041139 ./dev-ruby/actionpack/actionpack-5.2.6.ebuild
 2105060739 ./dev-ruby/actiontext/actiontext-6.1.3.2.ebuild
 2105100739 ./dev-ruby/actiontext/actiontext-6.0.3.7.ebuild
-2102131309 ./dev-ruby/actionview/actionview-6.0.3.5.ebuild
-2102132039 ./dev-ruby/actionview/actionview-6.1.2.1.ebuild
-2102201109 ./dev-ruby/actionview/actionview-5.2.4.5.ebuild
-2102211139 ./dev-ruby/actionview/actionview-6.1.3.ebuild
-2103271409 ./dev-ruby/actionview/actionview-6.1.3.1.ebuild
 2105060909 ./dev-ruby/actionview/actionview-6.0.3.7.ebuild
 2105060739 ./dev-ruby/actionview/actionview-6.1.3.2.ebuild
-2105070839 ./dev-ruby/actionview/actionview-5.2.6.ebuild
-2102131109 ./dev-ruby/activejob/activejob-5.2.4.5.ebuild
-2102131309 ./dev-ruby/activejob/activejob-6.0.3.5.ebuild
-2102132039 ./dev-ruby/activejob/activejob-6.1.2.1.ebuild
-2102211139 ./dev-ruby/activejob/activejob-6.1.3.ebuild
-2103271409 ./dev-ruby/activejob/activejob-6.1.3.1.ebuild
+2106041139 ./dev-ruby/actionview/actionview-5.2.6.ebuild
 2105060909 ./dev-ruby/activejob/activejob-6.0.3.7.ebuild
 2105060739 ./dev-ruby/activejob/activejob-6.1.3.2.ebuild
 2105070839 ./dev-ruby/activejob/activejob-5.2.6.ebuild
@@ -14437,39 +14325,19 @@
 2102140939 ./dev-ruby/activeldap/activeldap-6.1.0.ebuild
 1905120840 ./dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild
 2105280839 ./dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild
-2102131309 ./dev-ruby/activemodel/activemodel-6.0.3.5.ebuild
-2102132039 ./dev-ruby/activemodel/activemodel-6.1.2.1.ebuild
-2102201109 ./dev-ruby/activemodel/activemodel-5.2.4.5.ebuild
-2102211139 ./dev-ruby/activemodel/activemodel-6.1.3.ebuild
-2103271409 ./dev-ruby/activemodel/activemodel-6.1.3.1.ebuild
 2105060909 ./dev-ruby/activemodel/activemodel-6.0.3.7.ebuild
 2105060739 ./dev-ruby/activemodel/activemodel-6.1.3.2.ebuild
-2105070839 ./dev-ruby/activemodel/activemodel-5.2.6.ebuild
-2102131109 ./dev-ruby/activerecord/activerecord-5.2.4.5.ebuild
-2102211139 ./dev-ruby/activerecord/activerecord-6.1.3.ebuild
-2103271409 ./dev-ruby/activerecord/activerecord-6.1.3.1.ebuild
-2104120709 ./dev-ruby/activerecord/activerecord-6.0.3.5.ebuild
-2104120709 ./dev-ruby/activerecord/activerecord-6.1.2.1.ebuild
+2106041139 ./dev-ruby/activemodel/activemodel-5.2.6.ebuild
 2105060909 ./dev-ruby/activerecord/activerecord-6.0.3.7.ebuild
 2105060739 ./dev-ruby/activerecord/activerecord-6.1.3.2.ebuild
 2105070839 ./dev-ruby/activerecord/activerecord-5.2.6.ebuild
-2103271139 ./dev-ruby/activestorage/activestorage-5.2.4.5.ebuild
-2103271139 ./dev-ruby/activestorage/activestorage-6.0.3.5.ebuild
-2103271139 ./dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
-2103271409 ./dev-ruby/activestorage/activestorage-6.1.3.1.ebuild
-2103271139 ./dev-ruby/activestorage/activestorage-6.1.3.ebuild
 2105060909 ./dev-ruby/activestorage/activestorage-6.0.3.7.ebuild
 2105060739 ./dev-ruby/activestorage/activestorage-6.1.3.2.ebuild
 2105070839 ./dev-ruby/activestorage/activestorage-5.2.6.ebuild
 2105100739 ./dev-ruby/activestorage/activestorage-6.0.3.7-r1.ebuild
-2102131309 ./dev-ruby/activesupport/activesupport-6.0.3.5.ebuild
-2102132039 ./dev-ruby/activesupport/activesupport-6.1.2.1.ebuild
-2102201109 ./dev-ruby/activesupport/activesupport-5.2.4.5.ebuild
-2102211139 ./dev-ruby/activesupport/activesupport-6.1.3.ebuild
-2103271409 ./dev-ruby/activesupport/activesupport-6.1.3.1.ebuild
 2105060909 ./dev-ruby/activesupport/activesupport-6.0.3.7.ebuild
 2105060739 ./dev-ruby/activesupport/activesupport-6.1.3.2.ebuild
-2105070839 ./dev-ruby/activesupport/activesupport-5.2.6.ebuild
+2106041139 ./dev-ruby/activesupport/activesupport-5.2.6.ebuild
 2101062139 ./dev-ruby/acts_as_list/acts_as_list-1.0.1.ebuild
 2102160909 ./dev-ruby/acts_as_list/acts_as_list-1.0.3.ebuild
 2105160839 ./dev-ruby/acts_as_list/acts_as_list-1.0.4.ebuild
@@ -14574,6 +14442,7 @@
 2104100939 ./dev-ruby/bundler/bundler-2.2.16.ebuild
 2105131009 ./dev-ruby/bundler/bundler-2.2.17.ebuild
 2105310909 ./dev-ruby/bundler/bundler-2.2.18.ebuild
+2106040909 ./dev-ruby/bundler/bundler-2.2.19.ebuild
 2008150909 ./dev-ruby/bunny/bunny-2.16.1.ebuild
 2009151039 ./dev-ruby/bunny/bunny-2.17.0.ebuild
 2008221109 ./dev-ruby/c21e/c21e-1.2.1.ebuild
@@ -14603,7 +14472,7 @@
 2007270539 ./dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
 2008221109 ./dev-ruby/climate_control/climate_control-0.2.0.ebuild
 2002270909 ./dev-ruby/cliver/cliver-0.3.2.ebuild
-2105291109 ./dev-ruby/cliver/cliver-0.3.2-r1.ebuild
+2106041139 ./dev-ruby/cliver/cliver-0.3.2-r1.ebuild
 2005030639 ./dev-ruby/cmdparse/cmdparse-3.0.6.ebuild
 2012090939 ./dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
 2103091009 ./dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -14853,7 +14722,7 @@
 2104041009 ./dev-ruby/i18n/i18n-1.8.10.ebuild
 2104041009 ./dev-ruby/i18n/i18n-1.8.9.ebuild
 2004041009 ./dev-ruby/ice_nine/ice_nine-0.11.2.ebuild
-2105252109 ./dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+2106070939 ./dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
 2004011009 ./dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
 2007200539 ./dev-ruby/image_processing/image_processing-1.10.3.ebuild
 2007200939 ./dev-ruby/image_processing/image_processing-1.11.0.ebuild
@@ -14910,9 +14779,9 @@
 2008092040 ./dev-ruby/log_buddy/log_buddy-0.7.0.ebuild
 2103172309 ./dev-ruby/logue/logue-1.0.18.ebuild
 2011260839 ./dev-ruby/loofah/loofah-2.7.0.ebuild
-2011260839 ./dev-ruby/loofah/loofah-2.8.0.ebuild
-2101151039 ./dev-ruby/loofah/loofah-2.9.0.ebuild
 2104080939 ./dev-ruby/loofah/loofah-2.9.1.ebuild
+2106070809 ./dev-ruby/loofah/loofah-2.10.0.ebuild
+2106070809 ./dev-ruby/loofah/loofah-2.8.0.ebuild
 1902011509 ./dev-ruby/loquacious/loquacious-1.9.1-r2.ebuild
 1902011509 ./dev-ruby/lumberjack/lumberjack-1.0.13.ebuild
 2006270909 ./dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
@@ -15029,6 +14898,7 @@
 2101062139 ./dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
 2105292209 ./dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
 2105292209 ./dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
+2106040909 ./dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
 2101062139 ./dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
 2101062139 ./dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
 2101062139 ./dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
@@ -15144,23 +15014,12 @@
 2004212309 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
 2012202239 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
 2012202239 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
-2102131109 ./dev-ruby/rails/rails-5.2.4.5.ebuild
-2102131309 ./dev-ruby/rails/rails-6.0.3.5.ebuild
-2102211039 ./dev-ruby/rails/rails-6.1.2.1.ebuild
-2102211139 ./dev-ruby/rails/rails-6.1.3.ebuild
-2103271409 ./dev-ruby/rails/rails-6.1.3.1.ebuild
 2105060739 ./dev-ruby/rails/rails-6.1.3.2.ebuild
 2105070839 ./dev-ruby/rails/rails-5.2.6.ebuild
 2105100739 ./dev-ruby/rails/rails-6.0.3.7.ebuild
-2102131309 ./dev-ruby/railties/railties-6.0.3.5.ebuild
-2102132039 ./dev-ruby/railties/railties-6.1.2.1.ebuild
-2102141409 ./dev-ruby/railties/railties-6.1.2.1-r1.ebuild
-2102201109 ./dev-ruby/railties/railties-5.2.4.5.ebuild
-2102211139 ./dev-ruby/railties/railties-6.1.3.ebuild
-2103271409 ./dev-ruby/railties/railties-6.1.3.1.ebuild
 2105060909 ./dev-ruby/railties/railties-6.0.3.7.ebuild
 2105060739 ./dev-ruby/railties/railties-6.1.3.2.ebuild
-2105070839 ./dev-ruby/railties/railties-5.2.6.ebuild
+2106041139 ./dev-ruby/railties/railties-5.2.6.ebuild
 2103251039 ./dev-ruby/rainbow/rainbow-3.0.0.ebuild
 2103131239 ./dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
 2104161439 ./dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -15203,13 +15062,9 @@
 2008221109 ./dev-ruby/redis/redis-4.1.4.ebuild
 2002260939 ./dev-ruby/ref/ref-2.0.0.ebuild
 2003061039 ./dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
-2009091239 ./dev-ruby/regexp_parser/regexp_parser-1.7.1.ebuild
-2012021039 ./dev-ruby/regexp_parser/regexp_parser-2.0.0.ebuild
 2012202239 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
-2101031114 ./dev-ruby/regexp_parser/regexp_parser-2.0.3.ebuild
-2102231009 ./dev-ruby/regexp_parser/regexp_parser-2.1.0.ebuild
 2105180909 ./dev-ruby/regexp_parser/regexp_parser-2.1.1.ebuild
-2105252109 ./dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
+2106070939 ./dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
 2105040839 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
 2104080909 ./dev-ruby/request_store/request_store-1.5.0.ebuild
 2102221009 ./dev-ruby/rest-client/rest-client-2.1.0.ebuild
@@ -15322,9 +15177,8 @@
 2101062139 ./dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
 2103140439 ./dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild
 2103140439 ./dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild
-2104161439 ./dev-ruby/ruby-prof/ruby-prof-1.4.1.ebuild
 2104161439 ./dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
-2105281909 ./dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
+2106041239 ./dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild
 2101062139 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
 2101062139 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
 2004122139 ./dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
@@ -15347,6 +15201,7 @@
 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
 2009081509 ./dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
 2101062139 ./dev-ruby/rubygems/rubygems-2.7.11.ebuild
 2101062139 ./dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -15385,6 +15240,7 @@
 2006010808 ./dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
 2007270539 ./dev-ruby/sassc/sassc-2.2.1.ebuild
 2103091609 ./dev-ruby/sassc/sassc-2.2.1-r1.ebuild
+2106050909 ./dev-ruby/sassc/sassc-2.4.0.ebuild
 2009080909 ./dev-ruby/sawyer/sawyer-0.8.2.ebuild
 2104280809 ./dev-ruby/sdoc/sdoc-1.1.0.ebuild
 2007252039 ./dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
@@ -15483,6 +15339,7 @@
 2104060140 ./dev-ruby/test-unit/test-unit-3.3.3.ebuild
 2104200839 ./dev-ruby/test-unit/test-unit-3.4.1.ebuild
 2105310909 ./dev-ruby/test-unit/test-unit-3.4.2.ebuild
+2106050909 ./dev-ruby/test-unit/test-unit-3.4.4.ebuild
 2007270539 ./dev-ruby/test_construct/test_construct-2.0.2.ebuild
 2101031114 ./dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
 2101062139 ./dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
@@ -15513,6 +15370,7 @@
 2010100909 ./dev-ruby/tins/tins-1.26.0.ebuild
 2012150609 ./dev-ruby/tins/tins-1.20.2.ebuild
 2101151039 ./dev-ruby/tins/tins-1.28.0.ebuild
+2106050909 ./dev-ruby/tins/tins-1.29.1.ebuild
 2006280009 ./dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
 2006061109 ./dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
 2012061039 ./dev-ruby/tomlrb/tomlrb-2.0.0.ebuild
@@ -15770,7 +15628,7 @@
 2105050139 ./dev-tex/biblatex/biblatex-3.16.ebuild
 2002111439 ./dev-tex/bibtex2html/bibtex2html-1.99.ebuild
 2105010239 ./dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
-2105010239 ./dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
+2106051440 ./dev-tex/bibtexu/bibtexu-3.71_p20210325.ebuild
 1909082039 ./dev-tex/catdvi/catdvi-0.14-r2.ebuild
 1702282250 ./dev-tex/cpp2latex/cpp2latex-2.3-r2.ebuild
 2004032241 ./dev-tex/culmus-latex/culmus-latex-0.7-r1.ebuild
@@ -15812,86 +15670,86 @@
 2001131939 ./dev-tex/serienbrief/serienbrief-0.2.5.ebuild
 2104180939 ./dev-tex/sketch/sketch-0.3.7.ebuild
 1912151409 ./dev-tex/style-check/style-check-0.14.ebuild
-2104301439 ./dev-tex/tex4ht/tex4ht-20090611_p1038_p20210428.ebuild
 2105221709 ./dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
+2106051440 ./dev-tex/tex4ht/tex4ht-20090611_p1038_p20210603.ebuild
 2011072109 ./dev-tex/tth/tth-4.08.ebuild
 2001131939 ./dev-tex/vc/vc-0.6.ebuild
-2104041109 ./dev-texlive/texlive-basic/texlive-basic-2021.ebuild
 2104060140 ./dev-texlive/texlive-basic/texlive-basic-2020-r1.ebuild
-2104041109 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
+2106051440 ./dev-texlive/texlive-basic/texlive-basic-2021.ebuild
 2104060140 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2020.ebuild
+2106051440 ./dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2021.ebuild
 2104060140 ./dev-texlive/texlive-context/texlive-context-2020.ebuild
-2104152239 ./dev-texlive/texlive-context/texlive-context-2021.ebuild
-2104041109 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
+2106051440 ./dev-texlive/texlive-context/texlive-context-2021.ebuild
 2104060140 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2020.ebuild
-2104041109 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2021.ebuild
+2106051440 ./dev-texlive/texlive-fontsextra/texlive-fontsextra-2021.ebuild
 2104060140 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2020.ebuild
-2104041109 ./dev-texlive/texlive-fontutils/texlive-fontutils-2021.ebuild
+2106051440 ./dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2021.ebuild
 2104060140 ./dev-texlive/texlive-fontutils/texlive-fontutils-2020.ebuild
-2104041109 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2021.ebuild
+2106051440 ./dev-texlive/texlive-fontutils/texlive-fontutils-2021.ebuild
 2104060140 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
-2104041109 ./dev-texlive/texlive-games/texlive-games-2021.ebuild
+2106051440 ./dev-texlive/texlive-formatsextra/texlive-formatsextra-2021.ebuild
 2104060140 ./dev-texlive/texlive-games/texlive-games-2020.ebuild
-2104041109 ./dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
+2106051440 ./dev-texlive/texlive-games/texlive-games-2021.ebuild
 2104060140 ./dev-texlive/texlive-humanities/texlive-humanities-2020.ebuild
-2104041109 ./dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
+2106051440 ./dev-texlive/texlive-humanities/texlive-humanities-2021.ebuild
 2104060140 ./dev-texlive/texlive-langarabic/texlive-langarabic-2020.ebuild
-2104041109 ./dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
+2106051440 ./dev-texlive/texlive-langarabic/texlive-langarabic-2021.ebuild
 2104060140 ./dev-texlive/texlive-langchinese/texlive-langchinese-2020.ebuild
-2104041109 ./dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
+2106051440 ./dev-texlive/texlive-langchinese/texlive-langchinese-2021.ebuild
 2104060140 ./dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
-2104041109 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
+2106051440 ./dev-texlive/texlive-langcjk/texlive-langcjk-2021.ebuild
 2104060140 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2020.ebuild
+2106051440 ./dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2021.ebuild
 2104060140 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2020.ebuild
-2104060140 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
-2104041109 ./dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
+2106051440 ./dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
 2104060140 ./dev-texlive/texlive-langenglish/texlive-langenglish-2020.ebuild
-2104041109 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
+2106051440 ./dev-texlive/texlive-langenglish/texlive-langenglish-2021.ebuild
 2104060140 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2020.ebuild
-2104041109 ./dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
+2106051440 ./dev-texlive/texlive-langeuropean/texlive-langeuropean-2021.ebuild
 2104060140 ./dev-texlive/texlive-langfrench/texlive-langfrench-2020.ebuild
-2104041109 ./dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
+2106051440 ./dev-texlive/texlive-langfrench/texlive-langfrench-2021.ebuild
 2104060140 ./dev-texlive/texlive-langgerman/texlive-langgerman-2020.ebuild
-2104041109 ./dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
+2106051440 ./dev-texlive/texlive-langgerman/texlive-langgerman-2021.ebuild
 2104060140 ./dev-texlive/texlive-langgreek/texlive-langgreek-2020.ebuild
-2104041109 ./dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
+2106051440 ./dev-texlive/texlive-langgreek/texlive-langgreek-2021.ebuild
 2104060140 ./dev-texlive/texlive-langitalian/texlive-langitalian-2020.ebuild
+2106051440 ./dev-texlive/texlive-langitalian/texlive-langitalian-2021.ebuild
 2104060140 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2020.ebuild
-2104180009 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
-2104041109 ./dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
+2106051440 ./dev-texlive/texlive-langjapanese/texlive-langjapanese-2021.ebuild
 2104060140 ./dev-texlive/texlive-langkorean/texlive-langkorean-2020.ebuild
-2104041109 ./dev-texlive/texlive-langother/texlive-langother-2021.ebuild
+2106051440 ./dev-texlive/texlive-langkorean/texlive-langkorean-2021.ebuild
 2104060140 ./dev-texlive/texlive-langother/texlive-langother-2020.ebuild
-2104041109 ./dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
+2106051440 ./dev-texlive/texlive-langother/texlive-langother-2021.ebuild
 2104060140 ./dev-texlive/texlive-langpolish/texlive-langpolish-2020.ebuild
-2104041109 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
+2106051440 ./dev-texlive/texlive-langpolish/texlive-langpolish-2021.ebuild
 2104060140 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2020.ebuild
-2104041109 ./dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
+2106051440 ./dev-texlive/texlive-langportuguese/texlive-langportuguese-2021.ebuild
 2104060140 ./dev-texlive/texlive-langspanish/texlive-langspanish-2020.ebuild
-2104041109 ./dev-texlive/texlive-latex/texlive-latex-2021.ebuild
+2106051440 ./dev-texlive/texlive-langspanish/texlive-langspanish-2021.ebuild
 2104060140 ./dev-texlive/texlive-latex/texlive-latex-2020.ebuild
-2104041109 ./dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
+2106051440 ./dev-texlive/texlive-latex/texlive-latex-2021.ebuild
 2104060140 ./dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
-2104041109 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild
+2106051440 ./dev-texlive/texlive-latexextra/texlive-latexextra-2021.ebuild
 2104060140 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2020.ebuild
-2104041109 ./dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild
+2106051440 ./dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2021.ebuild
 2104060140 ./dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
-2104041109 ./dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild
+2106051440 ./dev-texlive/texlive-luatex/texlive-luatex-2021.ebuild
 2104060140 ./dev-texlive/texlive-mathscience/texlive-mathscience-2020.ebuild
-2104041609 ./dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
+2106051440 ./dev-texlive/texlive-mathscience/texlive-mathscience-2021.ebuild
 2104060140 ./dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild
-2104041109 ./dev-texlive/texlive-music/texlive-music-2021.ebuild
+2106051440 ./dev-texlive/texlive-metapost/texlive-metapost-2021.ebuild
 2104060140 ./dev-texlive/texlive-music/texlive-music-2020.ebuild
-2104041109 ./dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
+2106051440 ./dev-texlive/texlive-music/texlive-music-2021.ebuild
 2104060140 ./dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
-2104041109 ./dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2021.ebuild
+2106051440 ./dev-texlive/texlive-pictures/texlive-pictures-2021.ebuild
 2104060140 ./dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2020.ebuild
-2104041109 ./dev-texlive/texlive-pstricks/texlive-pstricks-2021.ebuild
+2106051440 ./dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2021.ebuild
 2104060140 ./dev-texlive/texlive-pstricks/texlive-pstricks-2020.ebuild
-2104041109 ./dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
+2106051440 ./dev-texlive/texlive-pstricks/texlive-pstricks-2021.ebuild
 2104060140 ./dev-texlive/texlive-publishers/texlive-publishers-2020.ebuild
-2104041109 ./dev-texlive/texlive-xetex/texlive-xetex-2021.ebuild
+2106051440 ./dev-texlive/texlive-publishers/texlive-publishers-2021.ebuild
 2104060140 ./dev-texlive/texlive-xetex/texlive-xetex-2020.ebuild
+2106051440 ./dev-texlive/texlive-xetex/texlive-xetex-2021.ebuild
 1912110241 ./dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
 1805161038 ./dev-util/abi-compliance-checker/abi-compliance-checker-2.3.ebuild
 1805161038 ./dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
@@ -16032,13 +15890,13 @@
 2105020339 ./dev-util/buildbot/buildbot-3.1.1.ebuild
 2101011509 ./dev-util/bustle/bustle-0.8.0.ebuild
 2105082209 ./dev-util/byacc/byacc-20210109.ebuild
-2105091609 ./dev-util/byacc/byacc-20210328.ebuild
 2105222039 ./dev-util/byacc/byacc-20210520.ebuild
 1911160409 ./dev-util/cargo-ebuild/cargo-ebuild-0.2.0.ebuild
 2005090009 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.0.ebuild
 2008130139 ./dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
 2104042209 ./dev-util/catalyst/catalyst-9999.ebuild
 2104060140 ./dev-util/catalyst/catalyst-3.0.17.ebuild
+2106070209 ./dev-util/catalyst/catalyst-3.0.18.ebuild
 2102191939 ./dev-util/catfish/catfish-4.16.0.ebuild
 2102150339 ./dev-util/catkin/catkin-0.8.9.ebuild
 2102150339 ./dev-util/catkin/catkin-9999.ebuild
@@ -16088,6 +15946,7 @@
 2105240139 ./dev-util/conf2struct/conf2struct-1.3-r1.ebuild
 2103021209 ./dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
 2103021209 ./dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
+2106051409 ./dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
 2101310343 ./dev-util/cppcheck/cppcheck-1.88.ebuild
 2105310709 ./dev-util/cppcheck/cppcheck-2.4.1.ebuild
 2106031139 ./dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -16142,12 +16001,11 @@
 2104060140 ./dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
 2105291209 ./dev-util/devhelp/devhelp-40.0.ebuild
 2104060140 ./dev-util/dialog/dialog-1.3.20200327.ebuild
-2105180210 ./dev-util/dialog/dialog-1.3.20210509.ebuild
 2106022209 ./dev-util/dialog/dialog-1.3.20210530.ebuild
 2011141839 ./dev-util/diffball/diffball-1.0.1-r2.ebuild
 2011272109 ./dev-util/difffilter/difffilter-0.3.3-r1.ebuild
-2105161639 ./dev-util/diffoscope/diffoscope-175.ebuild
 2105292109 ./dev-util/diffoscope/diffoscope-176.ebuild
+2106051409 ./dev-util/diffoscope/diffoscope-177.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.63.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.64.ebuild
 2104272109 ./dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -16161,7 +16019,7 @@
 2104030209 ./dev-util/dmake/dmake-4.13.1.ebuild
 2010010409 ./dev-util/docker-distribution-pruner/docker-distribution-pruner-0_p20170401.ebuild
 2010060809 ./dev-util/docker-ls/docker-ls-0.3.1.ebuild
-2101310343 ./dev-util/dogtail/dogtail-0.9.11.ebuild
+2106070939 ./dev-util/dogtail/dogtail-0.9.11.ebuild
 2103112009 ./dev-util/dput-ng/dput-ng-1.32.ebuild
 2002091639 ./dev-util/drone-cli/drone-cli-0.8.6.ebuild
 2002091639 ./dev-util/drone-cli/drone-cli-1.1.4.ebuild
@@ -16182,6 +16040,7 @@
 2101070210 ./dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
 2101310343 ./dev-util/flawfinder/flawfinder-2.0.11.ebuild
 2106011009 ./dev-util/flawfinder/flawfinder-2.0.15.ebuild
+2106051809 ./dev-util/flawfinder/flawfinder-2.0.17.ebuild
 2012311940 ./dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
 1903072109 ./dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
 1702282250 ./dev-util/fuzz/fuzz-0.6-r1.ebuild
@@ -16223,7 +16082,6 @@
 1709152122 ./dev-util/herdtools7/herdtools7-7.47.ebuild
 1808040009 ./dev-util/herdtools7/herdtools7-7.51.ebuild
 2102201809 ./dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
-2012150939 ./dev-util/howdoi/howdoi-2.0.7.ebuild
 2105280410 ./dev-util/howdoi/howdoi-2.0.15.ebuild
 2002230040 ./dev-util/huc/huc-0.1-r1.ebuild
 2104161439 ./dev-util/hxd/hxd-0.70.02-r2.ebuild
@@ -16247,7 +16105,6 @@
 2104060140 ./dev-util/itstool/itstool-2.0.6-r1.ebuild
 1911032339 ./dev-util/japi-compliance-checker/japi-compliance-checker-9999.ebuild
 1912031509 ./dev-util/japi-compliance-checker/japi-compliance-checker-2.4.ebuild
-1911100109 ./dev-util/jarwizard/jarwizard-2.50.ebuild
 2105080940 ./dev-util/jenkins-bin/jenkins-bin-2.277.4.ebuild
 2105140209 ./dev-util/jenkins-bin/jenkins-bin-2.293.ebuild
 2106030909 ./dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild
@@ -16359,8 +16216,8 @@
 2105231009 ./dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
 2105231009 ./dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild
 2105231009 ./dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
-2105310239 ./dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
-2105310239 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
+2106041109 ./dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
+2106041109 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
 2011252124 ./dev-util/pkgconf/pkgconf-9999.ebuild
 2101081339 ./dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
 2103181839 ./dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -16400,6 +16257,7 @@
 2105020009 ./dev-util/radare2/radare2-4.5.1-r1.ebuild
 2105020009 ./dev-util/radare2/radare2-5.2.1.ebuild
 2105020009 ./dev-util/radare2/radare2-9999.ebuild
+2106051409 ./dev-util/radare2/radare2-5.3.0.ebuild
 2101192239 ./dev-util/ragel/ragel-7.0.3.ebuild
 2104060140 ./dev-util/ragel/ragel-6.10.ebuild
 2104060140 ./dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -16444,8 +16302,8 @@
 2009230939 ./dev-util/sccache/sccache-0.2.13.ebuild
 2102260309 ./dev-util/sccache/sccache-0.2.15.ebuild
 2102260309 ./dev-util/sccache/sccache-9999.ebuild
-2105270139 ./dev-util/schroot/schroot-1.6.10_p12.ebuild
 2105281909 ./dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
+2106050239 ./dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
 2103281509 ./dev-util/scons/scons-4.1.0-r1.ebuild
 2104060140 ./dev-util/sel/sel-0.08.4-r2.ebuild
 2005042039 ./dev-util/serialtalk/serialtalk-9999.ebuild
@@ -16497,6 +16355,7 @@
 2105022109 ./dev-util/sysdig/sysdig-0.27.1-r100.ebuild
 2105022109 ./dev-util/sysdig/sysdig-0.27.1.ebuild
 2102172209 ./dev-util/sysprof/sysprof-3.38.1.ebuild
+2106070439 ./dev-util/sysprof/sysprof-3.40.1.ebuild
 2103190139 ./dev-util/systemtap/systemtap-4.0-r2.ebuild
 2104060140 ./dev-util/systemtap/systemtap-4.0-r1.ebuild
 2105130009 ./dev-util/systemtap/systemtap-4.4.ebuild
@@ -16521,7 +16380,7 @@
 1805290208 ./dev-util/usb-robot/usb-robot-0.2.0.ebuild
 2101071139 ./dev-util/valgrind/valgrind-3.16.1.ebuild
 2101071139 ./dev-util/valgrind/valgrind-9999.ebuild
-2106031939 ./dev-util/valgrind/valgrind-3.17.0.ebuild
+2106071639 ./dev-util/valgrind/valgrind-3.17.0.ebuild
 2012231444 ./dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
 2101310343 ./dev-util/vint/vint-0.3.21.ebuild
 2104192239 ./dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
@@ -16537,7 +16396,7 @@
 2101310343 ./dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
 2101310343 ./dev-util/vulkan-tools/vulkan-tools-9999.ebuild
 2105070139 ./dev-util/vulkan-tools/vulkan-tools-1.2.170.ebuild
-2105311739 ./dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
+2106070939 ./dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
 1702282250 ./dev-util/weka/weka-3.8.0.ebuild
 1912111539 ./dev-util/weka/weka-3.7.13.ebuild
 2104252239 ./dev-util/wiggle/wiggle-1.0.ebuild
@@ -16565,6 +16424,7 @@
 2104090309 ./dev-util/ccls/ccls-0.20210330.ebuild
 2106040440 ./dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
 2106040440 ./dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
+2106070439 ./dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
 2101310343 ./dev-util/ydiff/ydiff-1.2.ebuild
 2008111709 ./dev-util/sysdig-kmod/sysdig-kmod-0.27.0.ebuild
 2010032009 ./dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
@@ -16602,6 +16462,7 @@
 2101230609 ./dev-util/chroot-wrapper/chroot-wrapper-0.9.8.ebuild
 2105032009 ./dev-util/bear/bear-3.0.11-r1.ebuild
 2105071039 ./dev-util/bear/bear-2.4.4.ebuild
+2106050239 ./dev-util/bear/bear-3.0.12.ebuild
 2007211409 ./dev-util/build2/build2-0.13.0.ebuild
 2105011539 ./dev-util/rustup/rustup-1.24.1.ebuild
 2105011539 ./dev-util/rustup/rustup-9999.ebuild
@@ -16613,6 +16474,7 @@
 2105282309 ./dev-util/git-delta/git-delta-0.8.0.ebuild
 2101310343 ./dev-util/watchman/watchman-4.9.0.ebuild
 2012040439 ./dev-util/sysprof-common/sysprof-common-3.38.1.ebuild
+2106070439 ./dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
 2102141139 ./dev-util/hermes/hermes-9999.ebuild
 2104291739 ./dev-util/hermes/hermes-2.8_p20180315.ebuild
 2012270510 ./dev-util/hip/hip-4.0.0.ebuild
@@ -16630,7 +16492,8 @@
 2105311209 ./dev-util/pkgdev/pkgdev-9999.ebuild
 2106032009 ./dev-util/pkgdev/pkgdev-0.1.5.ebuild
 2104200309 ./dev-util/poke/poke-1.2.ebuild
-2105151709 ./dev-util/rizin/rizin-0.2.1.ebuild
+2106061239 ./dev-util/poke/poke-1.3.ebuild
+2106041239 ./dev-util/rizin/rizin-0.2.1.ebuild
 2103300209 ./dev-util/src-cli/src-cli-3.26.2.ebuild
 2104161909 ./dev-util/src-cli/src-cli-3.26.3.ebuild
 2105040109 ./dev-util/src-cli/src-cli-3.27.0.ebuild
@@ -16690,7 +16553,7 @@
 2105171139 ./dev-vcs/git/git-9999-r3.ebuild
 2105171139 ./dev-vcs/git/git-9999.ebuild
 2105300839 ./dev-vcs/git/git-2.31.1.ebuild
-2106021709 ./dev-vcs/git/git-2.32.0_rc3.ebuild
+2106062139 ./dev-vcs/git/git-2.32.0.ebuild
 2101310343 ./dev-vcs/gitg/gitg-3.32.1-r1.ebuild
 2102150339 ./dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
 2102150339 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r1.ebuild
@@ -16701,8 +16564,9 @@
 1805201639 ./dev-vcs/gti/gti-9999.ebuild
 2002112051 ./dev-vcs/guilt/guilt-0.36-r1.ebuild
 2105301139 ./dev-vcs/hg-evolve/hg-evolve-10.3.2.ebuild
-2101310343 ./dev-vcs/hg-git/hg-git-0.9.0.ebuild
 2101310343 ./dev-vcs/hg-git/hg-git-0.9.0_rc1-r1.ebuild
+2106051009 ./dev-vcs/hg-git/hg-git-0.10.1.ebuild
+2106071639 ./dev-vcs/hg-git/hg-git-0.9.0.ebuild
 2105282339 ./dev-vcs/hub/hub-2.14.2-r1.ebuild
 2105161410 ./dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
 2104161439 ./dev-vcs/mercurial/mercurial-5.5.2.ebuild
@@ -16715,7 +16579,7 @@
 2105170839 ./dev-vcs/mr/mr-1.20180726.ebuild
 2104031909 ./dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
 2101310343 ./dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild
-2101310343 ./dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
+2106050339 ./dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
 2011240239 ./dev-vcs/qgit/qgit-2.9.ebuild
 2104180939 ./dev-vcs/rcs/rcs-5.9.3.ebuild
 2104180939 ./dev-vcs/rcs/rcs-5.9.4.ebuild
@@ -16733,8 +16597,8 @@
 2106011439 ./dev-vcs/svneverever/svneverever-1.5.0.ebuild
 2101070210 ./dev-vcs/tig/tig-2.5.1.ebuild
 2101070210 ./dev-vcs/tig/tig-9999.ebuild
-2102130139 ./dev-vcs/tig/tig-2.5.2.ebuild
-2103082209 ./dev-vcs/tig/tig-2.5.3.ebuild
+2106040839 ./dev-vcs/tig/tig-2.5.3-r1.ebuild
+2106062039 ./dev-vcs/tig/tig-2.5.4.ebuild
 2009181139 ./dev-vcs/tkcvs/tkcvs-9.3.2.ebuild
 1902152239 ./dev-vcs/topgit/topgit-0.9-r1.ebuild
 2009181809 ./dev-vcs/topgit/topgit-0.19.12.ebuild
@@ -17002,7 +16866,7 @@
 2104190739 ./games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
 2006220108 ./games-board/gnuchess/gnuchess-6.2.7.ebuild
 2105100209 ./games-board/gnuchess/gnuchess-6.2.8.ebuild
-2106021439 ./games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
+2106070939 ./games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
 2006231538 ./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
@@ -17130,6 +16994,7 @@
 2010271639 ./games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
 2012041739 ./games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild
 2105250309 ./games-emulation/openmsx/openmsx-16.0-r1.ebuild
+2106060709 ./games-emulation/openmsx/openmsx-17.0.ebuild
 2106011209 ./games-engines/box2d/box2d-2.4.1.ebuild
 2104041039 ./games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
 2104061239 ./games-engines/devilutionx/devilutionx-1.2.0.ebuild
@@ -17147,8 +17012,8 @@
 2104041339 ./games-engines/nazghul/nazghul-0.7.1-r1.ebuild
 2103311110 ./games-engines/odamex/odamex-0.9.0.ebuild
 2105291809 ./games-engines/odamex/odamex-0.9.2.ebuild
-2105061639 ./games-engines/openmw/openmw-0.46.0.ebuild
 2105061639 ./games-engines/openmw/openmw-9999.ebuild
+2106060309 ./games-engines/openmw/openmw-0.46.0-r1.ebuild
 2102281539 ./games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild
 2102281539 ./games-engines/openxcom/openxcom-9999.ebuild
 2105311109 ./games-engines/qtads/qtads-3.0.0.ebuild
@@ -17199,7 +17064,7 @@
 2104070509 ./games-fps/quake2-demodata/quake2-demodata-3.14-r1.ebuild
 2104071539 ./games-fps/quake2-icculus/quake2-icculus-0.16.1-r2.ebuild
 2104070509 ./games-fps/quake2-textures/quake2-textures-0_beta8-r1.ebuild
-2104161439 ./games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
+2106071139 ./games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
 2104070009 ./games-fps/qudos/qudos-0.40.1.ebuild
 2104070209 ./games-fps/red-blue-quake2/red-blue-quake2-0.1-r1.ebuild
 2101090739 ./games-fps/redeclipse/redeclipse-1.6.0-r3.ebuild
@@ -17287,7 +17152,7 @@
 2101070210 ./games-misc/sex/sex-1.0-r2.ebuild
 2104042339 ./games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild
 2011152309 ./games-misc/typespeed/typespeed-0.6.5-r2.ebuild
-2105291209 ./games-misc/wtf/wtf-20210130.ebuild
+2106051839 ./games-misc/wtf/wtf-20210416.ebuild
 2104041239 ./games-misc/wumpus/wumpus-1.4-r2.ebuild
 2011130539 ./games-misc/xcowsay/xcowsay-1.5.1.ebuild
 2104160809 ./games-misc/xcruiser/xcruiser-0.30-r1.ebuild
@@ -17348,6 +17213,7 @@
 1805012309 ./games-puzzle/hangman/hangman-0.9.2-r1.ebuild
 2005211309 ./games-puzzle/hexalate/hexalate-1.1.6.ebuild
 2008302139 ./games-puzzle/hitori/hitori-3.36.0.ebuild
+2106070109 ./games-puzzle/hitori/hitori-3.38.2.ebuild
 1805012309 ./games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
 2005162209 ./games-puzzle/ksokoban/ksokoban-9999.ebuild
 2101020239 ./games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
@@ -17364,11 +17230,11 @@
 2006212309 ./games-puzzle/mures/mures-0.5-r1.ebuild
 2002032339 ./games-puzzle/neverball/neverball-1.6.0-r1.ebuild
 2104100939 ./games-puzzle/nightsky/nightsky-20111222-r1.ebuild
-2101081839 ./games-puzzle/nudoku/nudoku-2.1.0.ebuild
+2106071139 ./games-puzzle/nudoku/nudoku-2.1.0.ebuild
 2104250109 ./games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
 2104250109 ./games-puzzle/numptyphysics/numptyphysics-9999.ebuild
-2106020839 ./games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild
-1805012309 ./games-puzzle/pauker/pauker-1.8-r1.ebuild
+2106050839 ./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
 2104192239 ./games-puzzle/picpuz/picpuz-2.5-r1.ebuild
 2101310343 ./games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -17454,7 +17320,7 @@
 2105200039 ./games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
 2105200039 ./games-rpg/freedink-data/freedink-data-1.08.20170409-r1.ebuild
 1806081339 ./games-rpg/freedink/freedink-108.4-r1.ebuild
-1707090132 ./games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
+2106060539 ./games-rpg/freedroid/freedroid-1.2.1.ebuild
 2101310343 ./games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
 2106030939 ./games-rpg/freedroidrpg/freedroidrpg-1.0_rc2-r1.ebuild
 1803160108 ./games-rpg/grimrock/grimrock-20150707.ebuild
@@ -17541,7 +17407,7 @@
 2104070209 ./games-strategy/dominions2/dominions2-2.16-r1.ebuild
 2101010009 ./games-strategy/dopewars/dopewars-1.6.1.ebuild
 2001121439 ./games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild
-2105151939 ./games-strategy/freeciv/freeciv-2.6.4.ebuild
+2106052109 ./games-strategy/freeciv/freeciv-2.6.4.ebuild
 1904140039 ./games-strategy/freecol/freecol-0.11.6-r1.ebuild
 2101310343 ./games-strategy/freeorion/freeorion-0.4.10.1-r1.ebuild
 2101310343 ./games-strategy/freeorion/freeorion-9999.ebuild
@@ -17672,7 +17538,7 @@
 2105291839 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
 2104301939 ./gnome-base/gnome-shell/gnome-shell-3.36.7.ebuild
 2105291839 ./gnome-base/gnome-shell/gnome-shell-40.1.ebuild
-2106030309 ./gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
+2106041139 ./gnome-base/gnome-shell/gnome-shell-40.1-r1.ebuild
 2105021839 ./gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
 2105291209 ./gnome-base/gnome/gnome-40.0.ebuild
 2105090839 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
@@ -17685,7 +17551,9 @@
 2104060140 ./gnome-base/librsvg/librsvg-2.40.21.ebuild
 2105210409 ./gnome-base/librsvg/librsvg-2.50.5.ebuild
 2105291839 ./gnome-base/librsvg/librsvg-2.50.6.ebuild
+2106070109 ./gnome-base/librsvg/librsvg-2.50.7.ebuild
 2105291839 ./gnome-base/nautilus/nautilus-40.1.ebuild
+2106070109 ./gnome-base/nautilus/nautilus-40.2.ebuild
 2103040339 ./gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
 2104120442 ./gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
 2106011939 ./gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
@@ -17707,12 +17575,16 @@
 2106011939 ./gnome-extra/cjs/cjs-4.8.2.ebuild
 2105291209 ./gnome-extra/eiciel/eiciel-0.9.13.ebuild
 2105291839 ./gnome-extra/evolution-data-server/evolution-data-server-3.40.1.ebuild
+2106070109 ./gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild
 2105291209 ./gnome-extra/evolution-ews/evolution-ews-3.40.1.ebuild
+2106070109 ./gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild
 2105090839 ./gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
 2105291209 ./gnome-extra/gnome-boxes/gnome-boxes-40.1.ebuild
+2106070109 ./gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild
 2105291209 ./gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
-2105291209 ./gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
-2105291209 ./gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
+2106070939 ./gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
+2106070939 ./gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
+2106070939 ./gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
 2105291209 ./gnome-extra/gnome-clocks/gnome-clocks-40.0.ebuild
 2103040339 ./gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
 2007020939 ./gnome-extra/gnome-commander/gnome-commander-1.10.3.ebuild
@@ -17721,7 +17593,7 @@
 1912081509 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
 2104281939 ./gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
 2105291209 ./gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild
-2104202339 ./gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
+2106070739 ./gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
 2008302139 ./gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
 2004292309 ./gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
 2005062039 ./gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
@@ -17734,16 +17606,13 @@
 2006291909 ./gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-27.ebuild
 2105291209 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.1.ebuild
 2105291209 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.0.ebuild
-2011271539 ./gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
-2011271539 ./gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
-2104180739 ./gnome-extra/gnome-software/gnome-software-40.0.ebuild
-2105010609 ./gnome-extra/gnome-software/gnome-software-40.1.ebuild
+2106070109 ./gnome-extra/gnome-software/gnome-software-40.2.ebuild
 2105291209 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
 2106040639 ./gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
 2105291209 ./gnome-extra/gnome-user-docs/gnome-user-docs-40.1.ebuild
 2105090839 ./gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
 2003261841 ./gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
-2105291209 ./gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
+2106070939 ./gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
 2004131939 ./gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
 2004032241 ./gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
 2106010539 ./gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
@@ -17762,9 +17631,12 @@
 2105261839 ./gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
 1912291809 ./gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
 2105090839 ./gnome-extra/sushi/sushi-3.38.0.ebuild
+2106070109 ./gnome-extra/sushi/sushi-3.38.1.ebuild
 2005012109 ./gnome-extra/synapse/synapse-0.2.99.4.ebuild
 2105291839 ./gnome-extra/yelp-xsl/yelp-xsl-40.0.ebuild
+2106070109 ./gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
 2105291209 ./gnome-extra/yelp/yelp-40.0.ebuild
+2106070109 ./gnome-extra/yelp/yelp-40.2.ebuild
 2103040339 ./gnome-extra/zenity/zenity-3.32.0.ebuild
 2104042039 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild
 2105310009 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-20.ebuild
@@ -17773,9 +17645,11 @@
 2105041009 ./gnome-extra/filemanager-actions/filemanager-actions-3.4.ebuild
 2105090839 ./gnome-extra/filemanager-actions/filemanager-actions-3.2.4.ebuild
 2105201609 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-32.ebuild
+2106062139 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild
 2103141809 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild
 2105310009 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
 2105310009 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
+2106040939 ./gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
 2009181809 ./gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
 2009181809 ./gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
 1708310022 ./gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
@@ -17853,7 +17727,7 @@
 2009042109 ./gui-apps/grim/grim-1.3.1.ebuild
 2002210439 ./gui-apps/mako/mako-1.4.1.ebuild
 2002210439 ./gui-apps/mako/mako-9999.ebuild
-2105050039 ./gui-apps/mako/mako-1.5.ebuild
+2106060709 ./gui-apps/mako/mako-1.5.ebuild
 2007161809 ./gui-apps/slurp/slurp-9999.ebuild
 2009042109 ./gui-apps/slurp/slurp-1.2.0.ebuild
 2001240739 ./gui-apps/swaybg/swaybg-1.0.ebuild
@@ -17918,7 +17792,8 @@
 2101181209 ./gui-libs/greetd/greetd-0.7.0.ebuild
 2103020439 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.2.0.ebuild
 2105131909 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.3.0.ebuild
-2105131909 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+2106060609 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
+2106060609 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
 2102160539 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0.ebuild
 2106031609 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
 2101251809 ./gui-libs/neatvnc/neatvnc-0.4.0.ebuild
@@ -18050,9 +17925,9 @@
 2105161410 ./kde-apps/kapman/kapman-21.04.1.ebuild
 2105161410 ./kde-apps/kapptemplate/kapptemplate-20.12.3.ebuild
 2105161410 ./kde-apps/kapptemplate/kapptemplate-21.04.1.ebuild
-2105080139 ./kde-apps/kate/kate-20.12.3-r1.ebuild
 2105161410 ./kde-apps/kate/kate-20.12.3.ebuild
 2105161410 ./kde-apps/kate/kate-21.04.1.ebuild
+2106051409 ./kde-apps/kate/kate-20.12.3-r1.ebuild
 2105161410 ./kde-apps/katomic/katomic-20.12.3.ebuild
 2105161410 ./kde-apps/katomic/katomic-21.04.1.ebuild
 2105161410 ./kde-apps/kbackup/kbackup-20.12.3.ebuild
@@ -18166,8 +18041,8 @@
 2104061009 ./kde-apps/kimap/kimap-20.12.3.ebuild
 2105131539 ./kde-apps/kimap/kimap-21.04.1.ebuild
 2104061009 ./kde-apps/kio-extras/kio-extras-20.12.3.ebuild
-2105301509 ./kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
 2105301509 ./kde-apps/kio-extras/kio-extras-21.04.1-r1.ebuild
+2106051409 ./kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
 2104061009 ./kde-apps/kipi-plugins/kipi-plugins-20.12.3.ebuild
 2105131539 ./kde-apps/kipi-plugins/kipi-plugins-21.04.1.ebuild
 2105161410 ./kde-apps/kiriki/kiriki-20.12.3.ebuild
@@ -18230,7 +18105,8 @@
 2105161410 ./kde-apps/kompare/kompare-21.04.1.ebuild
 2105161410 ./kde-apps/konqueror/konqueror-20.12.3.ebuild
 2105161410 ./kde-apps/konqueror/konqueror-21.04.1.ebuild
-2106031439 ./kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
+2106051409 ./kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
+2106051339 ./kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
 2105161410 ./kde-apps/konquest/konquest-20.12.3.ebuild
 2105161410 ./kde-apps/konquest/konquest-21.04.1.ebuild
 2105161410 ./kde-apps/konsole/konsole-20.12.3.ebuild
@@ -18393,9 +18269,9 @@
 2105161410 ./kde-apps/rocs/rocs-21.04.1.ebuild
 2104061009 ./kde-apps/signon-kwallet-extension/signon-kwallet-extension-20.12.3.ebuild
 2105131539 ./kde-apps/signon-kwallet-extension/signon-kwallet-extension-21.04.1.ebuild
-2105080139 ./kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
 2105161410 ./kde-apps/spectacle/spectacle-20.12.3.ebuild
 2105161410 ./kde-apps/spectacle/spectacle-21.04.1.ebuild
+2106051409 ./kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
 2105161410 ./kde-apps/step/step-20.12.3.ebuild
 2105161410 ./kde-apps/step/step-21.04.1.ebuild
 2104061009 ./kde-apps/svgpart/svgpart-20.12.3.ebuild
@@ -18411,164 +18287,164 @@
 2104061009 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-20.12.3.ebuild
 2105131539 ./kde-apps/zeroconf-ioslave/zeroconf-ioslave-21.04.1.ebuild
 2104111539 ./kde-frameworks/attica/attica-5.80.0.ebuild
-2105091539 ./kde-frameworks/attica/attica-5.82.0.ebuild
+2106051409 ./kde-frameworks/attica/attica-5.82.0.ebuild
 2104111539 ./kde-frameworks/baloo/baloo-5.80.0-r1.ebuild
-2105091539 ./kde-frameworks/baloo/baloo-5.82.0.ebuild
+2106051409 ./kde-frameworks/baloo/baloo-5.82.0.ebuild
 2104111539 ./kde-frameworks/bluez-qt/bluez-qt-5.80.0.ebuild
-2105091539 ./kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
+2106051409 ./kde-frameworks/bluez-qt/bluez-qt-5.82.0.ebuild
 2104111539 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.80.0.ebuild
-2105091539 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
+2106051409 ./kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.82.0.ebuild
 2104111539 ./kde-frameworks/breeze-icons/breeze-icons-5.80.0.ebuild
-2105091539 ./kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
+2106051409 ./kde-frameworks/breeze-icons/breeze-icons-5.82.0.ebuild
 2104111739 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild
-2105142239 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
+2106070939 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
 2104111539 ./kde-frameworks/frameworkintegration/frameworkintegration-5.80.0.ebuild
-2105091539 ./kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
+2106051409 ./kde-frameworks/frameworkintegration/frameworkintegration-5.82.0.ebuild
 2104111539 ./kde-frameworks/kactivities-stats/kactivities-stats-5.80.0.ebuild
-2105091539 ./kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
+2106051409 ./kde-frameworks/kactivities-stats/kactivities-stats-5.82.0.ebuild
 2104111539 ./kde-frameworks/kactivities/kactivities-5.80.0.ebuild
-2105091539 ./kde-frameworks/kactivities/kactivities-5.82.0.ebuild
+2106051409 ./kde-frameworks/kactivities/kactivities-5.82.0.ebuild
 2104111539 ./kde-frameworks/kapidox/kapidox-5.80.0.ebuild
-2105091539 ./kde-frameworks/kapidox/kapidox-5.82.0.ebuild
+2106051409 ./kde-frameworks/kapidox/kapidox-5.82.0.ebuild
 2104111539 ./kde-frameworks/karchive/karchive-5.80.0.ebuild
-2105091539 ./kde-frameworks/karchive/karchive-5.82.0.ebuild
+2106051409 ./kde-frameworks/karchive/karchive-5.82.0.ebuild
 2104111539 ./kde-frameworks/kauth/kauth-5.80.0.ebuild
-2105091539 ./kde-frameworks/kauth/kauth-5.82.0.ebuild
+2106051409 ./kde-frameworks/kauth/kauth-5.82.0.ebuild
 2104111539 ./kde-frameworks/kbookmarks/kbookmarks-5.80.0.ebuild
-2105091539 ./kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
+2106051409 ./kde-frameworks/kbookmarks/kbookmarks-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcalendarcore/kcalendarcore-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcalendarcore/kcalendarcore-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcmutils/kcmutils-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcmutils/kcmutils-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcodecs/kcodecs-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcodecs/kcodecs-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcompletion/kcompletion-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcompletion/kcompletion-5.82.0.ebuild
 2104111539 ./kde-frameworks/kconfig/kconfig-5.80.0.ebuild
-2105091539 ./kde-frameworks/kconfig/kconfig-5.82.0.ebuild
+2106051409 ./kde-frameworks/kconfig/kconfig-5.82.0.ebuild
 2104111539 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.80.0.ebuild
-2105091539 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
+2106051409 ./kde-frameworks/kconfigwidgets/kconfigwidgets-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcontacts/kcontacts-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcontacts/kcontacts-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcoreaddons/kcoreaddons-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcoreaddons/kcoreaddons-5.82.0.ebuild
 2104111539 ./kde-frameworks/kcrash/kcrash-5.80.0.ebuild
-2105091539 ./kde-frameworks/kcrash/kcrash-5.82.0.ebuild
+2106051409 ./kde-frameworks/kcrash/kcrash-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdbusaddons/kdbusaddons-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdbusaddons/kdbusaddons-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdeclarative/kdeclarative-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdeclarative/kdeclarative-5.82.0.ebuild
 2104111539 ./kde-frameworks/kded/kded-5.80.0.ebuild
-2105091539 ./kde-frameworks/kded/kded-5.82.0.ebuild
+2106051409 ./kde-frameworks/kded/kded-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdesu/kdesu-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdesu/kdesu-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdesu/kdesu-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdnssd/kdnssd-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdnssd/kdnssd-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdoctools/kdoctools-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdoctools/kdoctools-5.82.0.ebuild
 2104111539 ./kde-frameworks/kemoticons/kemoticons-5.80.0.ebuild
-2105091539 ./kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
+2106051409 ./kde-frameworks/kemoticons/kemoticons-5.82.0.ebuild
 1905280009 ./kde-frameworks/kf-env/kf-env-5.ebuild
 2104111539 ./kde-frameworks/kfilemetadata/kfilemetadata-5.80.0.ebuild
-2105091539 ./kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
+2106051409 ./kde-frameworks/kfilemetadata/kfilemetadata-5.82.0.ebuild
 2104111539 ./kde-frameworks/kglobalaccel/kglobalaccel-5.80.0-r1.ebuild
-2105300039 ./kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
+2106051409 ./kde-frameworks/kglobalaccel/kglobalaccel-5.82.0-r1.ebuild
 2104111539 ./kde-frameworks/kguiaddons/kguiaddons-5.80.0.ebuild
-2105091539 ./kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
+2106051409 ./kde-frameworks/kguiaddons/kguiaddons-5.82.0.ebuild
 2104111539 ./kde-frameworks/kholidays/kholidays-5.80.0.ebuild
-2105091539 ./kde-frameworks/kholidays/kholidays-5.82.0.ebuild
+2106051409 ./kde-frameworks/kholidays/kholidays-5.82.0.ebuild
 2104111539 ./kde-frameworks/khtml/khtml-5.80.0.ebuild
-2105091539 ./kde-frameworks/khtml/khtml-5.82.0.ebuild
+2106051409 ./kde-frameworks/khtml/khtml-5.82.0.ebuild
 2104111539 ./kde-frameworks/ki18n/ki18n-5.80.0.ebuild
-2105091539 ./kde-frameworks/ki18n/ki18n-5.82.0.ebuild
+2106051409 ./kde-frameworks/ki18n/ki18n-5.82.0.ebuild
 2104111539 ./kde-frameworks/kiconthemes/kiconthemes-5.80.0-r1.ebuild
-2105091539 ./kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
+2106051409 ./kde-frameworks/kiconthemes/kiconthemes-5.82.0.ebuild
 2104111539 ./kde-frameworks/kidletime/kidletime-5.80.0.ebuild
-2105091539 ./kde-frameworks/kidletime/kidletime-5.82.0.ebuild
+2106051409 ./kde-frameworks/kidletime/kidletime-5.82.0.ebuild
 2104111539 ./kde-frameworks/kimageformats/kimageformats-5.80.0.ebuild
-2105091539 ./kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
+2106051409 ./kde-frameworks/kimageformats/kimageformats-5.82.0.ebuild
 2104111539 ./kde-frameworks/kinit/kinit-5.80.0.ebuild
-2105091539 ./kde-frameworks/kinit/kinit-5.82.0.ebuild
+2106051409 ./kde-frameworks/kinit/kinit-5.82.0.ebuild
 2104111539 ./kde-frameworks/kio/kio-5.80.1-r2.ebuild
-2105301909 ./kde-frameworks/kio/kio-5.82.0-r2.ebuild
+2106051409 ./kde-frameworks/kio/kio-5.82.0-r2.ebuild
 2104111539 ./kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild
-2105091539 ./kde-frameworks/kirigami/kirigami-5.82.0.ebuild
+2106051409 ./kde-frameworks/kirigami/kirigami-5.82.0.ebuild
 2104111539 ./kde-frameworks/kitemmodels/kitemmodels-5.80.0.ebuild
-2105091539 ./kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
+2106051409 ./kde-frameworks/kitemmodels/kitemmodels-5.82.0.ebuild
 2104111539 ./kde-frameworks/kitemviews/kitemviews-5.80.0.ebuild
-2105091539 ./kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
+2106051409 ./kde-frameworks/kitemviews/kitemviews-5.82.0.ebuild
 2104111539 ./kde-frameworks/kjobwidgets/kjobwidgets-5.80.0.ebuild
-2105091539 ./kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
+2106051409 ./kde-frameworks/kjobwidgets/kjobwidgets-5.82.0.ebuild
 2104111539 ./kde-frameworks/kjs/kjs-5.80.0.ebuild
-2105091539 ./kde-frameworks/kjs/kjs-5.82.0.ebuild
+2106051409 ./kde-frameworks/kjs/kjs-5.82.0.ebuild
 2104111539 ./kde-frameworks/knewstuff/knewstuff-5.80.0.ebuild
-2105091539 ./kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
+2106051409 ./kde-frameworks/knewstuff/knewstuff-5.82.0.ebuild
 2104111539 ./kde-frameworks/knotifications/knotifications-5.80.0.ebuild
-2105091539 ./kde-frameworks/knotifications/knotifications-5.82.0.ebuild
+2106051409 ./kde-frameworks/knotifications/knotifications-5.82.0.ebuild
 2104111539 ./kde-frameworks/knotifyconfig/knotifyconfig-5.80.0.ebuild
-2105091539 ./kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
+2106051409 ./kde-frameworks/knotifyconfig/knotifyconfig-5.82.0.ebuild
 2104111539 ./kde-frameworks/kpackage/kpackage-5.80.0.ebuild
-2105091539 ./kde-frameworks/kpackage/kpackage-5.82.0.ebuild
+2106051409 ./kde-frameworks/kpackage/kpackage-5.82.0.ebuild
 2104111539 ./kde-frameworks/kparts/kparts-5.80.0.ebuild
-2105091539 ./kde-frameworks/kparts/kparts-5.82.0.ebuild
+2106051409 ./kde-frameworks/kparts/kparts-5.82.0.ebuild
 2104111539 ./kde-frameworks/kpeople/kpeople-5.80.0.ebuild
-2105091539 ./kde-frameworks/kpeople/kpeople-5.82.0.ebuild
+2106051409 ./kde-frameworks/kpeople/kpeople-5.82.0.ebuild
 2104111539 ./kde-frameworks/kplotting/kplotting-5.80.0.ebuild
-2105091539 ./kde-frameworks/kplotting/kplotting-5.82.0.ebuild
+2106051409 ./kde-frameworks/kplotting/kplotting-5.82.0.ebuild
 2104111539 ./kde-frameworks/kpty/kpty-5.80.0.ebuild
-2105091539 ./kde-frameworks/kpty/kpty-5.82.0.ebuild
+2106051409 ./kde-frameworks/kpty/kpty-5.82.0.ebuild
 2104111539 ./kde-frameworks/kross/kross-5.80.0.ebuild
-2105091539 ./kde-frameworks/kross/kross-5.82.0.ebuild
+2106051409 ./kde-frameworks/kross/kross-5.82.0.ebuild
 2104111539 ./kde-frameworks/krunner/krunner-5.80.0.ebuild
-2105202309 ./kde-frameworks/krunner/krunner-5.82.0.ebuild
+2106051409 ./kde-frameworks/krunner/krunner-5.82.0.ebuild
 2104111539 ./kde-frameworks/kservice/kservice-5.80.0.ebuild
-2105091539 ./kde-frameworks/kservice/kservice-5.82.0.ebuild
+2106051409 ./kde-frameworks/kservice/kservice-5.82.0.ebuild
 2104111539 ./kde-frameworks/ktexteditor/ktexteditor-5.80.0-r1.ebuild
-2105091539 ./kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
+2106051409 ./kde-frameworks/ktexteditor/ktexteditor-5.82.0.ebuild
 2104111539 ./kde-frameworks/ktextwidgets/ktextwidgets-5.80.0.ebuild
-2105091539 ./kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
+2106051409 ./kde-frameworks/ktextwidgets/ktextwidgets-5.82.0.ebuild
 2104111539 ./kde-frameworks/kunitconversion/kunitconversion-5.80.0.ebuild
-2105091539 ./kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
+2106051409 ./kde-frameworks/kunitconversion/kunitconversion-5.82.0.ebuild
 2104111539 ./kde-frameworks/kwallet/kwallet-5.80.0.ebuild
-2105091539 ./kde-frameworks/kwallet/kwallet-5.82.0.ebuild
+2106051409 ./kde-frameworks/kwallet/kwallet-5.82.0.ebuild
 2104111539 ./kde-frameworks/kwayland/kwayland-5.80.0.ebuild
-2105091539 ./kde-frameworks/kwayland/kwayland-5.82.0.ebuild
+2106051409 ./kde-frameworks/kwayland/kwayland-5.82.0.ebuild
 2104111539 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.80.0.ebuild
-2105091539 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
+2106051409 ./kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.82.0.ebuild
 2104111539 ./kde-frameworks/kwindowsystem/kwindowsystem-5.80.0.ebuild
-2105091539 ./kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
+2106051409 ./kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
 2104111539 ./kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild
-2105091539 ./kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
+2106051409 ./kde-frameworks/kxmlgui/kxmlgui-5.82.0.ebuild
 2104111539 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.80.0.ebuild
-2105091539 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
+2106051409 ./kde-frameworks/modemmanager-qt/modemmanager-qt-5.82.0.ebuild
 2104111539 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.80.0.ebuild
-2105091539 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
+2106051409 ./kde-frameworks/networkmanager-qt/networkmanager-qt-5.82.0.ebuild
 2104111539 ./kde-frameworks/oxygen-icons/oxygen-icons-5.80.0.ebuild
-2105091539 ./kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
+2106051409 ./kde-frameworks/oxygen-icons/oxygen-icons-5.82.0.ebuild
 2104111539 ./kde-frameworks/plasma/plasma-5.80.0.ebuild
-2105091539 ./kde-frameworks/plasma/plasma-5.82.0.ebuild
+2106051409 ./kde-frameworks/plasma/plasma-5.82.0.ebuild
 2104111539 ./kde-frameworks/prison/prison-5.80.0.ebuild
-2105091539 ./kde-frameworks/prison/prison-5.82.0.ebuild
+2106051409 ./kde-frameworks/prison/prison-5.82.0.ebuild
 2104111539 ./kde-frameworks/purpose/purpose-5.80.0.ebuild
-2105091539 ./kde-frameworks/purpose/purpose-5.82.0.ebuild
+2106051409 ./kde-frameworks/purpose/purpose-5.82.0.ebuild
 2104111539 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.80.0.ebuild
-2105091539 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
+2106051409 ./kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.82.0.ebuild
 2104111539 ./kde-frameworks/solid/solid-5.80.0.ebuild
-2105091539 ./kde-frameworks/solid/solid-5.82.0.ebuild
+2106051409 ./kde-frameworks/solid/solid-5.82.0.ebuild
 2104111539 ./kde-frameworks/sonnet/sonnet-5.80.0.ebuild
-2105091539 ./kde-frameworks/sonnet/sonnet-5.82.0.ebuild
+2106051409 ./kde-frameworks/sonnet/sonnet-5.82.0.ebuild
 2104111539 ./kde-frameworks/syndication/syndication-5.80.0.ebuild
-2105091539 ./kde-frameworks/syndication/syndication-5.82.0.ebuild
+2106051409 ./kde-frameworks/syndication/syndication-5.82.0.ebuild
 2104111539 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.80.0-r1.ebuild
-2105091539 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
+2106051409 ./kde-frameworks/syntax-highlighting/syntax-highlighting-5.82.0.ebuild
 2104111539 ./kde-frameworks/threadweaver/threadweaver-5.80.0.ebuild
-2105091539 ./kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
+2106051409 ./kde-frameworks/threadweaver/threadweaver-5.82.0.ebuild
 2104111539 ./kde-frameworks/kquickcharts/kquickcharts-5.80.0.ebuild
-2105091539 ./kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
+2106051409 ./kde-frameworks/kquickcharts/kquickcharts-5.82.0.ebuild
 2104111539 ./kde-frameworks/kdav/kdav-5.80.0.ebuild
-2105091539 ./kde-frameworks/kdav/kdav-5.82.0.ebuild
+2106051409 ./kde-frameworks/kdav/kdav-5.82.0.ebuild
 2003020109 ./kde-misc/basket/basket-2.49b.ebuild
 2005162209 ./kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
 2105161410 ./kde-misc/kdeconnect/kdeconnect-20.12.3.ebuild
@@ -18588,7 +18464,7 @@
 2002182339 ./kde-misc/kshutdown/kshutdown-5.2.ebuild
 1912091439 ./kde-misc/ktoshiba/ktoshiba-5.3.1.ebuild
 2010261709 ./kde-misc/latte-dock/latte-dock-0.9.11.ebuild
-2105202139 ./kde-misc/latte-dock/latte-dock-0.9.12.ebuild
+2106051409 ./kde-misc/latte-dock/latte-dock-0.9.12.ebuild
 1912091439 ./kde-misc/openofficeorg-thumbnail/openofficeorg-thumbnail-1.0.0-r500.ebuild
 2003170039 ./kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
 2003170039 ./kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10-r1.ebuild
@@ -18599,112 +18475,112 @@
 2104052009 ./kde-misc/tellico/tellico-3.3.5.ebuild
 2105161410 ./kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
 2010261709 ./kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
-2103260239 ./kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
 2104061009 ./kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild
+2106051409 ./kde-misc/kio-fuse/kio-fuse-5.0.1.ebuild
 2005132239 ./kde-misc/ultimate-gmail-feed/ultimate-gmail-feed-2.1.ebuild
 2105161410 ./kde-misc/markdownpart/markdownpart-20.12.3.ebuild
 2105161410 ./kde-misc/markdownpart/markdownpart-21.04.1.ebuild
 2101242239 ./kde-plasma/bluedevil/bluedevil-5.20.5.ebuild
-2105141909 ./kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
+2106051409 ./kde-plasma/bluedevil/bluedevil-5.21.5-r1.ebuild
 2101242239 ./kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild
-2105091539 ./kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
+2106051409 ./kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild
 2101242239 ./kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild
-2105091539 ./kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
+2106051409 ./kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild
 2101242239 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild
-2105091539 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
+2106051409 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild
 2101242239 ./kde-plasma/breeze/breeze-5.20.5.ebuild
-2105300039 ./kde-plasma/breeze/breeze-5.21.5-r1.ebuild
+2106051409 ./kde-plasma/breeze/breeze-5.21.5-r1.ebuild
 2105080139 ./kde-plasma/discover/discover-5.20.5-r1.ebuild
-2105091539 ./kde-plasma/discover/discover-5.21.5.ebuild
+2106051409 ./kde-plasma/discover/discover-5.21.5.ebuild
 2101242239 ./kde-plasma/drkonqi/drkonqi-5.20.5.ebuild
-2105121139 ./kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
+2106051409 ./kde-plasma/drkonqi/drkonqi-5.21.5-r1.ebuild
 2101242239 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild
-2105091539 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
+2106051409 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild
 2101242239 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild
-2105091539 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
+2106051409 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild
 2102130009 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild
-2105091539 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
+2106051409 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild
 2101242239 ./kde-plasma/kdecoration/kdecoration-5.20.5.ebuild
-2105091539 ./kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
+2106051409 ./kde-plasma/kdecoration/kdecoration-5.21.5.ebuild
 2104042209 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild
-2105091539 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
+2106051409 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild
 2101242239 ./kde-plasma/kgamma/kgamma-5.20.5.ebuild
-2105091539 ./kde-plasma/kgamma/kgamma-5.21.5.ebuild
+2106051409 ./kde-plasma/kgamma/kgamma-5.21.5.ebuild
 2101242239 ./kde-plasma/khotkeys/khotkeys-5.20.5.ebuild
-2105091539 ./kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
+2106051409 ./kde-plasma/khotkeys/khotkeys-5.21.5.ebuild
 2104042209 ./kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild
-2105091539 ./kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
+2106051409 ./kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
 2101242239 ./kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild
-2105141909 ./kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
+2106051409 ./kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild
 2101242239 ./kde-plasma/kscreen/kscreen-5.20.5.ebuild
-2105091539 ./kde-plasma/kscreen/kscreen-5.21.5.ebuild
+2106051409 ./kde-plasma/kscreen/kscreen-5.21.5.ebuild
 2101242239 ./kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild
-2105091539 ./kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
+2106051409 ./kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild
 2101242239 ./kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild
-2105091539 ./kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
+2106051409 ./kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild
 2102240039 ./kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
-2105091539 ./kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
+2106051409 ./kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
 2102180039 ./kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
-2105091539 ./kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
+2106051409 ./kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild
 2101242239 ./kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild
-2105091539 ./kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
+2106051409 ./kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild
 2101242239 ./kde-plasma/kwin/kwin-5.20.5-r1.ebuild
-2105091539 ./kde-plasma/kwin/kwin-5.21.5.ebuild
+2106051409 ./kde-plasma/kwin/kwin-5.21.5.ebuild
 2101242239 ./kde-plasma/kwrited/kwrited-5.20.5.ebuild
-2105091539 ./kde-plasma/kwrited/kwrited-5.21.5.ebuild
+2106051409 ./kde-plasma/kwrited/kwrited-5.21.5.ebuild
 2101242239 ./kde-plasma/libkscreen/libkscreen-5.20.5.ebuild
-2105091539 ./kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
+2106051409 ./kde-plasma/libkscreen/libkscreen-5.21.5.ebuild
 2101242239 ./kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
-2105091539 ./kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
+2106051409 ./kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
 2101242239 ./kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild
-2105300039 ./kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
+2106051409 ./kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
 2101242239 ./kde-plasma/milou/milou-5.20.5.ebuild
-2105091539 ./kde-plasma/milou/milou-5.21.5.ebuild
+2106051409 ./kde-plasma/milou/milou-5.21.5.ebuild
 2101242239 ./kde-plasma/oxygen/oxygen-5.20.5.ebuild
-2105091539 ./kde-plasma/oxygen/oxygen-5.21.5.ebuild
+2106051409 ./kde-plasma/oxygen/oxygen-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild
 2102180039 ./kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
-2105091539 ./kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild
 2101241539 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild
 2102180039 ./kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
-2105300039 ./kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild
 2101242239 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild
-2105091539 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
+2106051409 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild
 2101242239 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild
-2105091539 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
+2106051409 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild
 2101242239 ./kde-plasma/powerdevil/powerdevil-5.20.5.ebuild
-2105091539 ./kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
+2106051409 ./kde-plasma/powerdevil/powerdevil-5.21.5.ebuild
 2101242239 ./kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild
-2105091539 ./kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
+2106051409 ./kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild
 2104042209 ./kde-plasma/systemsettings/systemsettings-5.20.5.ebuild
-2105091539 ./kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
+2106051409 ./kde-plasma/systemsettings/systemsettings-5.21.5.ebuild
 2101242239 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild
-2105091539 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
+2106051409 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild
 2101242239 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild
-2105091539 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
+2106051409 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild
 2101242239 ./kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild
-2105091539 ./kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
+2106051409 ./kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild
 2101242239 ./kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild
-2105091539 ./kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild
 2102101809 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild
-2105091539 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
-2105091539 ./kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild
+2106051409 ./kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild
 2103151639 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
 2103151639 ./lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
 2103150309 ./lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -18765,6 +18641,7 @@
 1904121039 ./mail-client/cone/cone-1.0.ebuild
 1802082038 ./mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
 2105291209 ./mail-client/evolution/evolution-3.40.1.ebuild
+2106070109 ./mail-client/evolution/evolution-3.40.2.ebuild
 2104170439 ./mail-client/geary/geary-3.36.3.1.ebuild
 2104302009 ./mail-client/geary/geary-40.0.ebuild
 2002091509 ./mail-client/hap/hap-3.7-r1.ebuild
@@ -18780,7 +18657,9 @@
 2105162239 ./mail-client/s-nail/s-nail-14.9.22.ebuild
 2105021839 ./mail-client/sylpheed/sylpheed-3.7.0-r1.ebuild
 2105180309 ./mail-client/thunderbird-bin/thunderbird-bin-78.10.2.ebuild
+2106041039 ./mail-client/thunderbird-bin/thunderbird-bin-78.11.0.ebuild
 2105212039 ./mail-client/thunderbird/thunderbird-78.10.2.ebuild
+2106071009 ./mail-client/thunderbird/thunderbird-78.11.0.ebuild
 2009031539 ./mail-client/trojita/trojita-9999.ebuild
 2012072239 ./mail-client/trojita/trojita-0.7-r6.ebuild
 2104291509 ./mail-client/mutt-wizard/mutt-wizard-3.1.1-r1.ebuild
@@ -18876,8 +18755,8 @@
 2105021209 ./mail-mta/ssmtp/ssmtp-2.64-r4.ebuild
 2106032239 ./mail-mta/notqmail/notqmail-1.08-r3.ebuild
 2106032239 ./mail-mta/notqmail/notqmail-9999.ebuild
-2104271439 ./mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
 2105251539 ./mail-mta/protonmail-bridge/protonmail-bridge-1.8.1.ebuild
+2106050239 ./mail-mta/protonmail-bridge/protonmail-bridge-1.8.3.ebuild
 2104051209 ./mate-base/caja/caja-1.24.0-r2.ebuild
 2104051209 ./mate-base/caja/caja-1.24.0.ebuild
 2008070639 ./mate-base/libmatekbd/libmatekbd-1.24.0-r1.ebuild
@@ -18932,7 +18811,7 @@
 2101310343 ./mate-extra/caja-admin/caja-admin-9999.ebuild
 2101310343 ./mate-extra/caja-hide/caja-hide-0.9.0.ebuild
 2103212239 ./media-fonts/Humor-Sans/Humor-Sans-1.0-r1.ebuild
-2103212239 ./media-fonts/ahem/ahem-1.0.ebuild
+2106070939 ./media-fonts/ahem/ahem-1.0.ebuild
 2103212239 ./media-fonts/alee-fonts/alee-fonts-13-r1.ebuild
 2103212239 ./media-fonts/alegreya-sans/alegreya-sans-2.008.ebuild
 2103212239 ./media-fonts/alegreya-serif/alegreya-serif-2.008.ebuild
@@ -18940,7 +18819,7 @@
 2103212239 ./media-fonts/anonymous-pro/anonymous-pro-1.002-r1.ebuild
 2104060140 ./media-fonts/aquafont/aquafont-2.7-r4.ebuild
 2104060140 ./media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
-2104060140 ./media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+2106070939 ./media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
 2104060140 ./media-fonts/arkpandora/arkpandora-2.04.ebuild
 2104060140 ./media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
 2104060140 ./media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -18951,13 +18830,13 @@
 1910192009 ./media-fonts/cardo/cardo-1.04.ebuild
 2103142309 ./media-fonts/cascadia-code/cascadia-code-2102.25.ebuild
 2104060140 ./media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
-2103212239 ./media-fonts/clearsans/clearsans-1.00.ebuild
+2106070939 ./media-fonts/clearsans/clearsans-1.00.ebuild
 2103212239 ./media-fonts/cm-unicode/cm-unicode-0.7.0-r1.ebuild
 2103212239 ./media-fonts/comic-neue/comic-neue-2.3.ebuild
 2103212239 ./media-fonts/corefonts/corefonts-1-r7.ebuild
 2105071039 ./media-fonts/courier-prime/courier-prime-1.203.ebuild
 2104060140 ./media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
-2103212239 ./media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
+2106070939 ./media-fonts/croscorefonts/croscorefonts-1.31.0.ebuild
 2105071039 ./media-fonts/crosextrafonts-caladea/crosextrafonts-caladea-20130214.ebuild
 2105071039 ./media-fonts/crosextrafonts-carlito/crosextrafonts-carlito-20130920.ebuild
 2104060140 ./media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -19112,7 +18991,7 @@
 2103212239 ./media-fonts/qomolangma/qomolangma-2012.05.ebuild
 2103161909 ./media-fonts/quivira/quivira-4.1.ebuild
 2103212239 ./media-fonts/ricty/ricty-3.2.0-r2.ebuild
-2104180939 ./media-fonts/roboto/roboto-2.138.ebuild
+2106070939 ./media-fonts/roboto/roboto-2.138.ebuild
 2104060140 ./media-fonts/sazanami/sazanami-20040629.ebuild
 2104060140 ./media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
 2104060140 ./media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -19135,14 +19014,15 @@
 2103212239 ./media-fonts/stix-fonts/stix-fonts-2.11.ebuild
 2007041709 ./media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
 2104060140 ./media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
-2105151709 ./media-fonts/terminus-font/terminus-font-4.49.ebuild
+2106060109 ./media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+2106052239 ./media-fonts/terminus-font/terminus-font-4.49.ebuild
 2103212239 ./media-fonts/termsyn/termsyn-1.8.7.ebuild
 2103172309 ./media-fonts/tex-gyre/tex-gyre-2.501.ebuild
 2104060140 ./media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
 2103261509 ./media-fonts/thaifonts-scalable/thaifonts-scalable-0.7.2.ebuild
 1910192139 ./media-fonts/tibetan-machine-font/tibetan-machine-font-1.901.ebuild
 2104212209 ./media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
-2103212239 ./media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
+2106070939 ./media-fonts/ubuntu-font-family/ubuntu-font-family-0.83-r1.ebuild
 2103261509 ./media-fonts/umeplus-fonts/umeplus-fonts-20180604.ebuild
 2104060140 ./media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
 2104060140 ./media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -19214,6 +19094,7 @@
 2104201109 ./media-gfx/entangle/entangle-3.0.ebuild
 2105291209 ./media-gfx/eog-plugins/eog-plugins-3.26.7.ebuild
 2105291209 ./media-gfx/eog/eog-40.1.ebuild
+2106070109 ./media-gfx/eog/eog-40.2.ebuild
 2008090009 ./media-gfx/eom/eom-1.24.0-r2.ebuild
 2009252339 ./media-gfx/eom/eom-1.24.1.ebuild
 2009031339 ./media-gfx/ephoto/ephoto-1.5.ebuild
@@ -19257,8 +19138,7 @@
 2104111139 ./media-gfx/gimp/gimp-2.10.24.ebuild
 2104111139 ./media-gfx/gimp/gimp-9999.ebuild
 2105180239 ./media-gfx/gimp/gimp-2.99.6.ebuild
-2103150109 ./media-gfx/gmic/gmic-2.9.5.ebuild
-2105261009 ./media-gfx/gmic/gmic-2.9.7.ebuild
+2106041139 ./media-gfx/gmic/gmic-2.9.7.ebuild
 2102270009 ./media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
 2105291209 ./media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
 2105291209 ./media-gfx/gnome-photos/gnome-photos-40.0.ebuild
@@ -19423,7 +19303,7 @@
 2101310343 ./media-gfx/termtosvg/termtosvg-1.1.0.ebuild
 2101061739 ./media-gfx/tgif/tgif-4.2.5-r2.ebuild
 1912131839 ./media-gfx/tif22pnm/tif22pnm-0.14.ebuild
-2102100209 ./media-gfx/tintii/tintii-2.10.0-r1.ebuild
+2106071139 ./media-gfx/tintii/tintii-2.10.0-r1.ebuild
 2104160809 ./media-gfx/transfig/transfig-3.2.5e-r1.ebuild
 2006091539 ./media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
 1912111539 ./media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
@@ -19447,8 +19327,7 @@
 2104192239 ./media-gfx/xzgv/xzgv-0.9.1.ebuild
 2010031709 ./media-gfx/yafaray/yafaray-3.4.1.ebuild
 2103131039 ./media-gfx/yafaray/yafaray-3.5.1.ebuild
-2102271939 ./media-gfx/zbar/zbar-0.23-r1.ebuild
-2103161839 ./media-gfx/zbar/zbar-0.23.1.ebuild
+2106041439 ./media-gfx/zbar/zbar-0.23.1.ebuild
 2010050239 ./media-gfx/zgv/zgv-5.9.ebuild
 2010292239 ./media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild
 2009021639 ./media-gfx/word_cloud/word_cloud-1.8.0.ebuild
@@ -19460,12 +19339,13 @@
 2106011639 ./media-gfx/netpaint/netpaint-1.1.2.ebuild
 2102051209 ./media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
 2103052109 ./media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
-2106032239 ./media-gfx/freecad/freecad-0.19.1.ebuild
-2106032239 ./media-gfx/freecad/freecad-0.19.2.ebuild
-2106032239 ./media-gfx/freecad/freecad-9999.ebuild
+2106051509 ./media-gfx/freecad/freecad-0.19.1.ebuild
+2106051739 ./media-gfx/freecad/freecad-0.19.2.ebuild
+2106051739 ./media-gfx/freecad/freecad-9999.ebuild
 2105121509 ./media-gfx/brscan4/brscan4-0.4.10.1.ebuild
 2105241209 ./media-gfx/libredwg/libredwg-0.12.4.ebuild
-2106022309 ./media-gfx/hydrus/hydrus-441.ebuild
+2106051609 ./media-gfx/hydrus/hydrus-441-r1.ebuild
+2106051609 ./media-gfx/hydrus/hydrus-442.ebuild
 2102221039 ./media-libs/Field3D/Field3D-1.7.2.ebuild
 2009220039 ./media-libs/SoXt/SoXt-1.4.0.ebuild
 2101061739 ./media-libs/a52dec/a52dec-0.7.4-r8.ebuild
@@ -19474,11 +19354,11 @@
 2009071209 ./media-libs/allegro/allegro-4.4.3.1.ebuild
 2102142339 ./media-libs/allegro/allegro-5.2.6.0.ebuild
 2104201509 ./media-libs/allegro/allegro-5.2.7.0.ebuild
-2101310343 ./media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
-2101310343 ./media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
-2105281809 ./media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
-2105312239 ./media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
-2012311940 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+2106052339 ./media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+2106052339 ./media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+2106052339 ./media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+2106052339 ./media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
+2106052339 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
 2101070439 ./media-libs/alure/alure-1.2-r2.ebuild
 2011131109 ./media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
 2005011709 ./media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -19597,7 +19477,7 @@
 2011261339 ./media-libs/icclib/icclib-2.14.ebuild
 2101061739 ./media-libs/id3lib/id3lib-3.8.3-r8.ebuild
 2102262039 ./media-libs/ilmbase/ilmbase-2.5.5.ebuild
-2106031939 ./media-libs/ilmbase/ilmbase-2.5.6.ebuild
+2106051309 ./media-libs/ilmbase/ilmbase-2.5.6.ebuild
 2012311940 ./media-libs/imlib/imlib-1.9.15-r5.ebuild
 2104060140 ./media-libs/imlib2/imlib2-1.6.1.ebuild
 2105271739 ./media-libs/imlib2/imlib2-1.7.1.ebuild
@@ -19709,8 +19589,8 @@
 2006222209 ./media-libs/libhdhomerun/libhdhomerun-20190621.ebuild
 2006280009 ./media-libs/libhdhomerun/libhdhomerun-20200521.ebuild
 2104251239 ./media-libs/libheif/libheif-1.11.0.ebuild
-2105061739 ./media-libs/libheif/libheif-1.12.0.ebuild
 2105061739 ./media-libs/libheif/libheif-9999.ebuild
+2106061609 ./media-libs/libheif/libheif-1.12.0.ebuild
 1907140209 ./media-libs/libicns/libicns-0.8.1-r1.ebuild
 2105271739 ./media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
 2102250309 ./media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -19725,6 +19605,7 @@
 2104250939 ./media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
 2104250939 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
 2105281809 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r1.ebuild
+2106041809 ./media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
 2007050339 ./media-libs/libjsw/libjsw-1.5.8.ebuild
 2103271839 ./media-libs/libkate/libkate-0.4.1-r4.ebuild
 2105210139 ./media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild
@@ -19766,6 +19647,7 @@
 2103302109 ./media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
 2012311940 ./media-libs/libofa/libofa-0.9.3-r2.ebuild
 2105281909 ./media-libs/libogg/libogg-1.3.4-r1.ebuild
+2106042139 ./media-libs/libogg/libogg-1.3.5.ebuild
 2012311940 ./media-libs/liboggz/liboggz-1.1.1.ebuild
 2002112051 ./media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
 2104130239 ./media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -19858,7 +19740,7 @@
 2106040440 ./media-libs/mesa/mesa-21.1.2.ebuild
 2106040440 ./media-libs/mesa/mesa-9999.ebuild
 2101240209 ./media-libs/mlt/mlt-6.24.0-r1.ebuild
-2106040139 ./media-libs/mlt/mlt-6.26.1-r1.ebuild
+2106041139 ./media-libs/mlt/mlt-6.26.1-r1.ebuild
 2101310209 ./media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild
 2104032339 ./media-libs/munt-mt32emu/munt-mt32emu-2.5.0.ebuild
 2006042339 ./media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -19875,7 +19757,7 @@
 2103212209 ./media-libs/nv-codec-headers/nv-codec-headers-11.0.10.0.ebuild
 2104231939 ./media-libs/openal/openal-1.21.1-r1.ebuild
 2104180939 ./media-libs/opencollada/opencollada-1.6.68.ebuild
-2106010239 ./media-libs/opencolorio/opencolorio-1.1.1.ebuild
+2106071139 ./media-libs/opencolorio/opencolorio-1.1.1.ebuild
 2102250309 ./media-libs/opencore-amr/opencore-amr-0.1.5-r1.ebuild
 2104192239 ./media-libs/openctm/openctm-1.0.3-r1.ebuild
 2105180140 ./media-libs/opencv/opencv-4.5.0.ebuild
@@ -19883,7 +19765,7 @@
 2106030409 ./media-libs/opencv/opencv-4.5.1.ebuild
 2102262039 ./media-libs/openexr/openexr-2.5.5.ebuild
 2105061039 ./media-libs/openexr/openexr-3.0.1.ebuild
-2106031939 ./media-libs/openexr/openexr-2.5.6.ebuild
+2106051309 ./media-libs/openexr/openexr-2.5.6.ebuild
 2105311239 ./media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
 2105022239 ./media-libs/openglide/openglide-0.09_rc9_p20191120.ebuild
 2012311940 ./media-libs/openh264/openh264-2.1.1.ebuild
@@ -19954,8 +19836,7 @@
 2102150139 ./media-libs/soxr/soxr-0.1.3-r1.ebuild
 2103252239 ./media-libs/spandsp/spandsp-0.0.6.ebuild
 2101061739 ./media-libs/speex/speex-1.2.0-r2.ebuild
-2101061739 ./media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
-2106032309 ./media-libs/speexdsp/speexdsp-1.2.0.ebuild
+2106070939 ./media-libs/speexdsp/speexdsp-1.2.0.ebuild
 2105161609 ./media-libs/sratom/sratom-0.6.8.ebuild
 2002112051 ./media-libs/stimg/stimg-0.1.0.ebuild
 2007211239 ./media-libs/stk/stk-4.6.1.ebuild
@@ -19987,11 +19868,11 @@
 2102170409 ./media-libs/vulkan-layers/vulkan-layers-1.2.162.ebuild
 2105070239 ./media-libs/vulkan-layers/vulkan-layers-1.2.170.ebuild
 2105270839 ./media-libs/vulkan-layers/vulkan-layers-9999.ebuild
-2105311739 ./media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
+2106070939 ./media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
 2101310343 ./media-libs/vulkan-loader/vulkan-loader-9999.ebuild
 2102170409 ./media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
 2105070239 ./media-libs/vulkan-loader/vulkan-loader-1.2.170.ebuild
-2105311739 ./media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
+2106070939 ./media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
 2106040440 ./media-libs/waffle/waffle-1.7.0.ebuild
 2106040440 ./media-libs/waffle/waffle-9999.ebuild
 1902201609 ./media-libs/webrtc-audio-processing/webrtc-audio-processing-0.3.1.ebuild
@@ -20016,14 +19897,14 @@
 2104180939 ./media-libs/zvbi/zvbi-0.2.35-r1.ebuild
 2105021039 ./media-libs/zxing-cpp/zxing-cpp-1.1.1.ebuild
 2105301509 ./media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
-2012311940 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
-2012311940 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
-2105281809 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
-2105312239 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
-2012311940 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
-2012311940 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
-2105281809 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
-2105312239 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
+2106052339 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
+2106052339 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
+2106052339 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
+2106052339 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
+2106052339 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+2106052339 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
+2106052339 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
+2106052339 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
 2105212309 ./media-libs/libopenmpt/libopenmpt-0.5.9.ebuild
 2010162109 ./media-libs/pulseaudio-qt/pulseaudio-qt-1.2.ebuild
 2105032009 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
@@ -20054,7 +19935,8 @@
 2105032309 ./media-libs/libopenaptx/libopenaptx-0.2.1.ebuild
 2104181809 ./media-libs/libltc/libltc-9999.ebuild
 2105182039 ./media-libs/libltc/libltc-1.3.1-r1.ebuild
-2012311940 ./media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
+2106052339 ./media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
+2106052339 ./media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
 1908030939 ./media-plugins/alsaequal/alsaequal-0.7.1.ebuild
 2104180939 ./media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
 2101310343 ./media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
@@ -20547,6 +20429,8 @@
 2105150539 ./media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.3.ebuild
 2105140339 ./media-plugins/kodi-pvr-zattoo/kodi-pvr-zattoo-19.7.9.ebuild
 2105140339 ./media-plugins/kodi-pvr-zattoo/kodi-pvr-zattoo-9999.ebuild
+2106071109 ./media-plugins/x42-avldrums/x42-avldrums-0.4.2.ebuild
+2106071109 ./media-plugins/x42-avldrums/x42-avldrums-9999.ebuild
 1912312209 ./media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
 2105202109 ./media-radio/adifmerg/adifmerg-31-r1.ebuild
 2104031909 ./media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
@@ -20599,11 +20483,11 @@
 2105261209 ./media-sound/abcmidi/abcmidi-2021.05.25.ebuild
 2008111739 ./media-sound/aeolus/aeolus-0.9.9.ebuild
 1703112346 ./media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
-2012030239 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
-2012311940 ./media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
-2012311940 ./media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
-2105281809 ./media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
-2105312239 ./media-sound/alsa-utils/alsa-utils-1.2.5.ebuild
+2106052339 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
+2106052339 ./media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
+2106052339 ./media-sound/alsa-utils/alsa-utils-1.2.3.ebuild
+2106052339 ./media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
+2106052339 ./media-sound/alsa-utils/alsa-utils-1.2.5-r1.ebuild
 1806121839 ./media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
 2012270139 ./media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
 2103092109 ./media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
@@ -20687,7 +20571,6 @@
 2104161439 ./media-sound/ecasound/ecasound-2.9.3.ebuild
 2105161410 ./media-sound/elisa/elisa-20.12.3.ebuild
 2105161410 ./media-sound/elisa/elisa-21.04.1.ebuild
-1911100109 ./media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
 2006211639 ./media-sound/erec/erec-2.2.0.1-r1.ebuild
 2105231309 ./media-sound/exaile/exaile-9999.ebuild
 2105251109 ./media-sound/exaile/exaile-4.1.1.ebuild
@@ -20717,7 +20600,7 @@
 2103161339 ./media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
 2104261339 ./media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild
 2009031339 ./media-sound/gnomad/gnomad-2.9.6.ebuild
-2105291209 ./media-sound/gnome-music/gnome-music-40.0.ebuild
+2106070939 ./media-sound/gnome-music/gnome-music-40.0.ebuild
 2105291209 ./media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
 2104180939 ./media-sound/gnump3d/gnump3d-3.0-r2.ebuild
 2009061309 ./media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -20787,7 +20670,7 @@
 1912100409 ./media-sound/mcdp/mcdp-0.4b.ebuild
 1905260009 ./media-sound/meterbridge/meterbridge-0.9.3.ebuild
 2008241039 ./media-sound/mhwaveedit/mhwaveedit-1.4.24.ebuild
-2012311940 ./media-sound/mikmod/mikmod-3.2.8.ebuild
+2106070939 ./media-sound/mikmod/mikmod-3.2.8.ebuild
 2102041109 ./media-sound/milkytracker/milkytracker-1.03.00.ebuild
 2101281539 ./media-sound/mixxx/mixxx-2.3.9999.ebuild
 2101281539 ./media-sound/mixxx/mixxx-9999.ebuild
@@ -20825,6 +20708,7 @@
 1804182238 ./media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
 2104221539 ./media-sound/mpg123/mpg123-1.26.5.ebuild
 2105090709 ./media-sound/mpg123/mpg123-1.27.2.ebuild
+2106061139 ./media-sound/mpg123/mpg123-1.28.0.ebuild
 2104161439 ./media-sound/mpg321/mpg321-0.3.2.ebuild
 1905282039 ./media-sound/mplay/mplay-0.80.ebuild
 2106011639 ./media-sound/mps-youtube/mps-youtube-0.2.8-r2.ebuild
@@ -20832,7 +20716,7 @@
 2003261841 ./media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
 1910171209 ./media-sound/multimux/multimux-0.2.5.2.ebuild
 2105031209 ./media-sound/mumble/mumble-1.3.4.ebuild
-2105031209 ./media-sound/mumble/mumble-9999.ebuild
+2106060009 ./media-sound/mumble/mumble-9999.ebuild
 1801230038 ./media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
 1805120339 ./media-sound/mup/mup-6.6.ebuild
 2103071509 ./media-sound/murmur/murmur-1.3.3.ebuild
@@ -20881,7 +20765,6 @@
 1802221208 ./media-sound/podracer/podracer-1.4-r2.ebuild
 2009181139 ./media-sound/potamus/potamus-17.ebuild
 2104160239 ./media-sound/pragha/pragha-1.3.99.1.ebuild
-1911101439 ./media-sound/protux/protux-0.50.100.ebuild
 1912100409 ./media-sound/ptabtools/ptabtools-0.5.0.ebuild
 2005301609 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.67.ebuild
 2010071039 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
@@ -20924,6 +20807,7 @@
 2105261539 ./media-sound/rip/rip-1.07-r3.ebuild
 2011141839 ./media-sound/ripperx/ripperx-2.7.3.ebuild
 2101241539 ./media-sound/rosegarden/rosegarden-20.12.ebuild
+2106041109 ./media-sound/rosegarden/rosegarden-21.06.ebuild
 2104060140 ./media-sound/rplay/rplay-3.3.2-r3.ebuild
 1910180209 ./media-sound/saydate/saydate-0.3.0.ebuild
 2104161439 ./media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
@@ -21024,7 +20908,7 @@
 1910102139 ./media-sound/xfmpc/xfmpc-0.3.0.ebuild
 1805272138 ./media-sound/xineadump/xineadump-0.1-r1.ebuild
 2103151239 ./media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
-2105151709 ./media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+2106051410 ./media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
 2005012109 ./media-sound/xnoise/xnoise-0.2.21.ebuild
 2011041539 ./media-sound/xwax/xwax-1.7.ebuild
 2009062009 ./media-sound/yarock/yarock-1.4.0-r1.ebuild
@@ -21135,7 +21019,7 @@
 2105031339 ./media-video/ffmpeg/ffmpeg-4.3.1.ebuild
 2105031339 ./media-video/ffmpeg/ffmpeg-4.3.2.ebuild
 2105091109 ./media-video/ffmpeg/ffmpeg-9999.ebuild
-2105301339 ./media-video/ffmpeg/ffmpeg-4.4.ebuild
+2106070939 ./media-video/ffmpeg/ffmpeg-4.4.ebuild
 2101310343 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
 2010141139 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
 2104130239 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
@@ -21158,7 +21042,7 @@
 2104180939 ./media-video/isight-firmware-tools/isight-firmware-tools-1.6-r1.ebuild
 2011150109 ./media-video/jubler/jubler-5.1.ebuild
 1912251909 ./media-video/kaffeine/kaffeine-2.0.18.ebuild
-2105091539 ./media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
+2106051410 ./media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
 2105311239 ./media-video/kino/kino-1.3.4-r1.ebuild
 2105311239 ./media-video/kino/kino-1.3.4-r2.ebuild
 2101042009 ./media-video/libva-utils/libva-utils-2.8.0-r1.ebuild
@@ -21229,6 +21113,7 @@
 2106040440 ./media-video/pipewire/pipewire-0.3.27-r1.ebuild
 2106040440 ./media-video/pipewire/pipewire-0.3.28.ebuild
 2106040440 ./media-video/pipewire/pipewire-9999.ebuild
+2106041039 ./media-video/pipewire/pipewire-0.3.29.ebuild
 2105150510 ./media-video/pitivi/pitivi-0.999-r4.ebuild
 2005181609 ./media-video/projectx/projectx-0.91.0.10-r2.ebuild
 2104172109 ./media-video/projectx/projectx-0.91.0.10-r3.ebuild
@@ -21274,7 +21159,7 @@
 2102150339 ./media-video/v4l2loopback/v4l2loopback-9999.ebuild
 1911102109 ./media-video/vamps/vamps-0.99.2-r2.ebuild
 2012311940 ./media-video/vcdimager/vcdimager-2.0.1.ebuild
-2102260939 ./media-video/vcsi/vcsi-7-r1.ebuild
+2106070839 ./media-video/vcsi/vcsi-7-r1.ebuild
 2104120442 ./media-video/vdr/vdr-2.4.1-r3.ebuild
 2104212209 ./media-video/vdr/vdr-2.2.0-r6.ebuild
 2105061209 ./media-video/vdr/vdr-2.2.0-r7.ebuild
@@ -21404,7 +21289,7 @@
 2102150539 ./net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
 2102150539 ./net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
 2101310343 ./net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
-2101310343 ./net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+2106052239 ./net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
 2104161439 ./net-analyzer/greenbone-security-assistant/greenbone-security-assistant-20.8.1.ebuild
 2104161439 ./net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild
 2101011809 ./net-analyzer/gspoof/gspoof-3.2-r3.ebuild
@@ -21481,10 +21366,8 @@
 2102252009 ./net-analyzer/multimon-ng/multimon-ng-1.1.9.ebuild
 2102252009 ./net-analyzer/multimon-ng/multimon-ng-9999.ebuild
 1708070747 ./net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild
-2007182209 ./net-analyzer/munin/munin-2.0.59.ebuild
-2102260939 ./net-analyzer/munin/munin-2.0.67.ebuild
 2103012039 ./net-analyzer/munin/munin-2.0.66.ebuild
-2104181109 ./net-analyzer/munin/munin-2.0.67-r1.ebuild
+2106070239 ./net-analyzer/munin/munin-2.0.67-r1.ebuild
 2001182109 ./net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
 2104032309 ./net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild
 2010242039 ./net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
@@ -21529,8 +21412,8 @@
 2102182009 ./net-analyzer/netdata/netdata-1.29.2.ebuild
 2102231739 ./net-analyzer/netdata/netdata-1.29.3.ebuild
 2104190439 ./net-analyzer/netdata/netdata-1.30.1-r1.ebuild
-2104190439 ./net-analyzer/netdata/netdata-9999.ebuild
-2105191809 ./net-analyzer/netdata/netdata-1.31.0.ebuild
+2106070939 ./net-analyzer/netdata/netdata-1.31.0.ebuild
+2106070939 ./net-analyzer/netdata/netdata-9999.ebuild
 2101061739 ./net-analyzer/netdiscover/netdiscover-0.7.ebuild
 2103160239 ./net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild
 2105292209 ./net-analyzer/neti/neti-2.0-r2.ebuild
@@ -21672,6 +21555,7 @@
 2105031639 ./net-analyzer/telegraf/telegraf-1.18.2.ebuild
 2105281909 ./net-analyzer/telegraf/telegraf-1.18.3.ebuild
 2102041109 ./net-analyzer/testssl/testssl-3.0.4.ebuild
+2106041109 ./net-analyzer/testssl/testssl-3.0.5.ebuild
 2104032209 ./net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
 2104032209 ./net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
 2011271109 ./net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild
@@ -21809,6 +21693,7 @@
 2104212209 ./net-dns/libidn2/libidn2-2.3.0.ebuild
 2105180140 ./net-dns/libidn2/libidn2-2.3.1.ebuild
 2105050139 ./net-dns/maradns/maradns-3.5.0005.ebuild
+2106070839 ./net-dns/maradns/maradns-3.5.0020.ebuild
 2009161109 ./net-dns/mdns-repeater/mdns-repeater-1.11.ebuild
 2105161609 ./net-dns/mydns/mydns-1.2.8.31-r2.ebuild
 2002230040 ./net-dns/ndu/ndu-0.4-r4.ebuild
@@ -21818,11 +21703,9 @@
 1912111540 ./net-dns/odsclient/odsclient-1.03-r1.ebuild
 2105292209 ./net-dns/opendnssec/opendnssec-2.0.3-r1.ebuild
 2104262239 ./net-dns/openresolv/openresolv-3.12.0.ebuild
-2105022239 ./net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
 2105122339 ./net-dns/pdns-recursor/pdns-recursor-4.4.3.ebuild
 2105122339 ./net-dns/pdns-recursor/pdns-recursor-4.5.1.ebuild
-2105022239 ./net-dns/pdns/pdns-4.4.0-r100.ebuild
-2105122339 ./net-dns/pdns/pdns-4.4.1.ebuild
+2106060039 ./net-dns/pdns/pdns-4.4.1.ebuild
 2103071509 ./net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
 2012311940 ./net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
 2105152109 ./net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
@@ -21864,7 +21747,7 @@
 2105090439 ./net-firewall/iptables/iptables-1.8.7.ebuild
 2011291139 ./net-firewall/itval/itval-1.2_p20121104-r1.ebuild
 2001260341 ./net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
-2012171509 ./net-firewall/nfacct/nfacct-1.0.2.ebuild
+2106070939 ./net-firewall/nfacct/nfacct-1.0.2.ebuild
 2105090909 ./net-firewall/nftables/nftables-0.9.8.ebuild
 2105272009 ./net-firewall/nftables/nftables-0.9.9.ebuild
 2105272009 ./net-firewall/nftables/nftables-9999.ebuild
@@ -21977,9 +21860,9 @@
 2101061839 ./net-im/mcabber/mcabber-9999.ebuild
 2104172239 ./net-im/minbif/minbif-1.0.5-r3.ebuild
 2104172309 ./net-im/openmittsu/openmittsu-0.9.15.0.ebuild
-2104031909 ./net-im/pidgin/pidgin-2.14.1.ebuild
 2104300939 ./net-im/pidgin/pidgin-2.14.4.ebuild
 2105070139 ./net-im/pidgin/pidgin-2.14.3-r1.ebuild
+2106041539 ./net-im/pidgin/pidgin-2.14.5.ebuild
 2011091539 ./net-im/poezio/poezio-9999.ebuild
 2101031239 ./net-im/poezio/poezio-0.13.1-r1.ebuild
 2010121339 ./net-im/profanity/profanity-0.9.5.ebuild
@@ -22016,8 +21899,7 @@
 2101310343 ./net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
 1702282250 ./net-im/ysm/ysm-2.9.9.1-r1.ebuild
 2105012139 ./net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
-2105091109 ./net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
-2106030539 ./net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
+2106042209 ./net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
 2104122209 ./net-im/teams/teams-1.4.00.4855-r1.ebuild
 2104122209 ./net-im/teams/teams-1.4.00.7556.ebuild
@@ -22047,7 +21929,7 @@
 2104030209 ./net-irc/eggdrop/eggdrop-1.9.0.ebuild
 2106020141 ./net-irc/eggdrop/eggdrop-1.9.1.ebuild
 2101071339 ./net-irc/emech/emech-3.0.99_p3.ebuild
-2004280809 ./net-irc/epic5/epic5-2.0.1.ebuild
+2106071139 ./net-irc/epic5/epic5-2.0.1.ebuild
 2104301309 ./net-irc/hexchat/hexchat-2.14.3-r100.ebuild
 2106011439 ./net-irc/hexchat/hexchat-9999.ebuild
 2105071609 ./net-irc/ii/ii-1.8.ebuild
@@ -22171,7 +22053,7 @@
 2001162209 ./net-libs/kdav2/kdav2-0.3.0.ebuild
 2001162209 ./net-libs/kimap2/kimap2-0.3.0.ebuild
 2105311239 ./net-libs/ldns/ldns-1.7.1-r1.ebuild
-2106031909 ./net-libs/ldns/ldns-1.7.1-r2.ebuild
+2106070939 ./net-libs/ldns/ldns-1.7.1-r2.ebuild
 2101312209 ./net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
 2102252109 ./net-libs/libad9361-iio/libad9361-iio-0.2.ebuild
 2102252109 ./net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -22201,7 +22083,7 @@
 2102270739 ./net-libs/libflowmanager/libflowmanager-3.0.0-r1.ebuild
 2102272039 ./net-libs/libgadu/libgadu-1.11.4.ebuild
 2102272039 ./net-libs/libgadu/libgadu-1.12.2-r1.ebuild
-2105291209 ./net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
+2106070939 ./net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
 2012231444 ./net-libs/libgrss/libgrss-0.7.0.ebuild
 2104161439 ./net-libs/libgrss/libgrss-0.5.0-r1.ebuild
 2104060140 ./net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -22223,6 +22105,7 @@
 2105161410 ./net-libs/libktorrent/libktorrent-21.04.1.ebuild
 2104060140 ./net-libs/liblockfile/liblockfile-1.16.ebuild
 2105291839 ./net-libs/libmbim/libmbim-1.24.6.ebuild
+2106070109 ./net-libs/libmbim/libmbim-1.24.8.ebuild
 2010301509 ./net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
 2004112339 ./net-libs/libmicrodns/libmicrodns-9999.ebuild
 2004141539 ./net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
@@ -22277,6 +22160,7 @@
 2105240739 ./net-libs/libpsl/libpsl-0.21.1.ebuild
 2104161439 ./net-libs/libqmi/libqmi-9999.ebuild
 2105291839 ./net-libs/libqmi/libqmi-1.28.4.ebuild
+2106070109 ./net-libs/libqmi/libqmi-1.28.6.ebuild
 2002092209 ./net-libs/librouteros/librouteros-1.1.2.ebuild
 2104060140 ./net-libs/librsync/librsync-2.3.1.ebuild
 2105311509 ./net-libs/librsync/librsync-2.3.2.ebuild
@@ -22316,7 +22200,7 @@
 2012271939 ./net-libs/libupnpp/libupnpp-0.20.1.ebuild
 2105021409 ./net-libs/libvncserver/libvncserver-0.9.13.ebuild
 2105042239 ./net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
-2105050039 ./net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
+2106070939 ./net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
 2105090839 ./net-libs/libzapojit/libzapojit-0.0.3.ebuild
 2104161439 ./net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
 2104161439 ./net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -22349,10 +22233,9 @@
 2104220609 ./net-libs/nodejs/nodejs-12.22.1.ebuild
 2104220609 ./net-libs/nodejs/nodejs-14.16.1.ebuild
 2105140109 ./net-libs/nodejs/nodejs-12.22.1-r1.ebuild
-2105140109 ./net-libs/nodejs/nodejs-16.1.0.ebuild
-2105140109 ./net-libs/nodejs/nodejs-99999999.ebuild
 2105192109 ./net-libs/nodejs/nodejs-14.17.0.ebuild
-2105192109 ./net-libs/nodejs/nodejs-16.2.0.ebuild
+2106041509 ./net-libs/nodejs/nodejs-16.3.0.ebuild
+2106041509 ./net-libs/nodejs/nodejs-99999999.ebuild
 2012281409 ./net-libs/ntirpc/ntirpc-3.4.ebuild
 1702282250 ./net-libs/obby/obby-0.4.8-r1.ebuild
 2106032239 ./net-libs/onion/onion-0.8.ebuild
@@ -22424,12 +22307,14 @@
 2012271939 ./net-libs/libnpupnp/libnpupnp-4.0.14-r1.ebuild
 2105271009 ./net-libs/libyang/libyang-1.0.236.ebuild
 2105280039 ./net-libs/libyang/libyang-2.0.7.ebuild
+2106051939 ./net-libs/libyang/libyang-1.0.240.ebuild
 2105150539 ./net-libs/rtrlib/rtrlib-0.7.0.ebuild
 2105210809 ./net-libs/libquotient/libquotient-0.6.6.ebuild
 2104040139 ./net-libs/libaxc/libaxc-0.3.4-r2.ebuild
 2104040139 ./net-libs/libomemo/libomemo-0.7.1-r2.ebuild
-2105280039 ./net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
 2105280039 ./net-libs/libnetconf2/libnetconf2-2.0.1.ebuild
+2106070239 ./net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
+2106051939 ./net-libs/libnetconf2/libnetconf2-1.1.46.ebuild
 2103052339 ./net-mail/altermime/altermime-0.3.11.ebuild
 1904081739 ./net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
 2105021609 ./net-mail/asmail/asmail-2.1-r1.ebuild
@@ -22460,7 +22345,8 @@
 2105021809 ./net-mail/fdm/fdm-2.0.ebuild
 2105021809 ./net-mail/fetchmail/fetchmail-6.4.16.ebuild
 2105021809 ./net-mail/fetchmail/fetchmail-6.4.8.ebuild
-2106011009 ./net-mail/fetchmail/fetchmail-6.4.19.ebuild
+2106070939 ./net-mail/fetchmail/fetchmail-6.4.19.ebuild
+2106041809 ./net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
 1905291309 ./net-mail/gnubiff/gnubiff-2.2.17-r2.ebuild
 1912110241 ./net-mail/grepmail/grepmail-5.30.33-r2.ebuild
 2102190239 ./net-mail/imapsync/imapsync-1.977.ebuild
@@ -22543,6 +22429,7 @@
 2103301239 ./net-mail/ytnef/ytnef-1.9.3.ebuild
 2104100009 ./net-mail/automx2/automx2-2021.3.1.ebuild
 2104121909 ./net-mail/automx2/automx2-2021.2.ebuild
+2106061939 ./net-mail/automx2/automx2-2021.4.ebuild
 2101310343 ./net-mail/b4/b4-0.6.1.ebuild
 2101310343 ./net-mail/django-mailman3/django-mailman3-1.3.4.ebuild
 2101310343 ./net-mail/mailmanclient/mailmanclient-3.3.1.ebuild
@@ -22640,7 +22527,7 @@
 1910051539 ./net-misc/dcetest/dcetest-2.0.ebuild
 2007081809 ./net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild
 2104292109 ./net-misc/dhcp/dhcp-4.4.2-r3.ebuild
-2106040309 ./net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+2106070939 ./net-misc/dhcp/dhcp-4.4.2_p1.ebuild
 2103081339 ./net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
 2006042139 ./net-misc/dhcpcd/dhcpcd-9999.ebuild
 2105142339 ./net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -22654,7 +22541,7 @@
 2105061339 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
 2105181739 ./net-misc/dropbox/dropbox-122.4.4867.ebuild
 2105262009 ./net-misc/dropbox/dropbox-123.4.4832.ebuild
-2102191139 ./net-misc/econnman/econnman-1.1-r2.ebuild
+2106060839 ./net-misc/econnman/econnman-1.1-r2.ebuild
 2009050409 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
 2012310209 ./net-misc/electron-cash/electron-cash-4.2.3.ebuild
 2101310343 ./net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
@@ -22681,10 +22568,10 @@
 2012311940 ./net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
 2104161439 ./net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
 2007081609 ./net-misc/geomyidae/geomyidae-0.34.ebuild
-2104161339 ./net-misc/gerbera/gerbera-1.8.0.ebuild
 2104161339 ./net-misc/gerbera/gerbera-9999.ebuild
+2106051539 ./net-misc/gerbera/gerbera-1.8.2.ebuild
 2006111139 ./net-misc/getdate/getdate-1.2-r2.ebuild
-2104281939 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
+2106070939 ./net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
 2105032239 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild
 2101161109 ./net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
 2103091509 ./net-misc/gns3-gui/gns3-gui-2.2.19.ebuild
@@ -22780,6 +22667,7 @@
 2105141139 ./net-misc/miniupnpd/miniupnpd-2.2.2.ebuild
 2104130239 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
 2105291839 ./net-misc/modemmanager/modemmanager-1.16.4.ebuild
+2106070109 ./net-misc/modemmanager/modemmanager-1.16.6.ebuild
 2002230040 ./net-misc/monmotha/monmotha-2.3.8-r1.ebuild
 2104292039 ./net-misc/mosh/mosh-1.3.2.ebuild
 2104292039 ./net-misc/mosh/mosh-9999.ebuild
@@ -22844,9 +22732,9 @@
 2105131709 ./net-misc/openssh/openssh-8.5_p1-r1.ebuild
 2105272239 ./net-misc/openssh/openssh-8.6_p1-r1.ebuild
 2104161439 ./net-misc/openvswitch/openvswitch-2.14.1.ebuild
-2101021739 ./net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild
-2102032209 ./net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild
+2106060009 ./net-misc/openvswitch/openvswitch-2.15.0.ebuild
 2102200009 ./net-misc/owncloud-client/owncloud-client-2.7.6.3261.ebuild
+2106041309 ./net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
 2011291139 ./net-misc/packETH/packETH-2.1.ebuild
 1904180709 ./net-misc/pcapfix/pcapfix-1.1.4.ebuild
 2105291739 ./net-misc/pedro/pedro-1.6-r1.ebuild
@@ -22869,6 +22757,7 @@
 2009092239 ./net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild
 2009092239 ./net-misc/proxytunnel/proxytunnel-9999.ebuild
 2101291809 ./net-misc/proxytunnel/proxytunnel-1.10.20210128.ebuild
+2106041809 ./net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild
 2104161439 ./net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
 1702282250 ./net-misc/ptpd/ptpd-2.3.1-r1.ebuild
 2105010309 ./net-misc/ptpd/ptpd-2.3.1-r2.ebuild
@@ -22876,7 +22765,7 @@
 2102230209 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
 2104200009 ./net-misc/putty/putty-0.74.ebuild
 2104200009 ./net-misc/putty/putty-9999.ebuild
-2105091139 ./net-misc/putty/putty-0.75.ebuild
+2106071639 ./net-misc/putty/putty-0.75.ebuild
 2102261739 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
 2102261739 ./net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
 2102230139 ./net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -23012,10 +22901,11 @@
 2104161439 ./net-misc/vrrpd/vrrpd-1.9.ebuild
 2101192239 ./net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
 2104301709 ./net-misc/wget/wget-1.20.3-r3.ebuild
-2106021739 ./net-misc/wget/wget-1.21.1.ebuild
+2106070139 ./net-misc/wget/wget-1.21.1.ebuild
 2012311940 ./net-misc/whatmask/whatmask-1.2-r1.ebuild
 2004201339 ./net-misc/whois/whois-9999.ebuild
 2105100109 ./net-misc/whois/whois-5.5.9.ebuild
+2106071139 ./net-misc/whois/whois-5.5.10.ebuild
 2010112339 ./net-misc/wol/wol-0.7.1-r2.ebuild
 2011041109 ./net-misc/wput/wput-0.6.2.ebuild
 2104151309 ./net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -23024,11 +22914,11 @@
 2104161439 ./net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
 2104161439 ./net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
 2104161439 ./net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild
-2105261009 ./net-misc/you-get/you-get-0.4.1520.ebuild
-2105261209 ./net-misc/you-get/you-get-0.4.1525.ebuild
-2101310343 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
-2105162209 ./net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
-2105162139 ./net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+2106052339 ./net-misc/you-get/you-get-0.4.1525.ebuild
+2106051109 ./net-misc/you-get/you-get-0.4.1527.ebuild
+2106061039 ./net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+2106060109 ./net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+2106071339 ./net-misc/youtube-dl/youtube-dl-9999.ebuild
 2105012139 ./net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
 2105012139 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
 2104122209 ./net-misc/zerotier/zerotier-1.6.3.ebuild
@@ -23061,10 +22951,12 @@
 2101111539 ./net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
 2104250839 ./net-misc/mstpd/mstpd-0.0.9.ebuild
 2103012009 ./net-misc/turbovnc/turbovnc-2.2.6.ebuild
-2105280039 ./net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
 2105280039 ./net-misc/netopeer2/netopeer2-2.0.0.ebuild
-2105280039 ./net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
+2106070239 ./net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
+2106051939 ./net-misc/netopeer2/netopeer2-1.1.76.ebuild
 2105280039 ./net-misc/sysrepo/sysrepo-2.0.1.ebuild
+2106070239 ./net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
+2106051939 ./net-misc/sysrepo/sysrepo-1.4.140.ebuild
 2106031309 ./net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
 2008291539 ./net-nds/adtool/adtool-1.3.3-r1.ebuild
 2105111309 ./net-nds/gssproxy/gssproxy-0.8.4.ebuild
@@ -23126,7 +23018,7 @@
 2105280639 ./net-p2p/bitcoind/bitcoind-0.21.0.ebuild
 2005211139 ./net-p2p/bitflu/bitflu-1.52.ebuild
 2102100609 ./net-p2p/bittornado/bittornado-0.4.1_p20160925-r2.ebuild
-2106011009 ./net-p2p/bittornado/bittornado-0.4.1_p20160925-r3.ebuild
+2106070939 ./net-p2p/bittornado/bittornado-0.4.1_p20160925-r3.ebuild
 2009201709 ./net-p2p/classified-ads/classified-ads-0.13.ebuild
 2104302009 ./net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
 2105062239 ./net-p2p/cpuminer-opt/cpuminer-opt-3.16.3.ebuild
@@ -23138,7 +23030,7 @@
 2103190739 ./net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
 2103190739 ./net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
 2104161439 ./net-p2p/fms/fms-0.3.82.ebuild
-2104180939 ./net-p2p/freenet/freenet-0.7.5_p1488.ebuild
+2106061139 ./net-p2p/freenet/freenet-0.7.5_p1488-r1.ebuild
 1907151840 ./net-p2p/gnut/gnut-0.4.28-r1.ebuild
 2104252339 ./net-p2p/go-ethereum/go-ethereum-1.10.2.ebuild
 2105071809 ./net-p2p/go-ethereum/go-ethereum-1.10.3.ebuild
@@ -23177,7 +23069,6 @@
 2105042209 ./net-p2p/transmission/transmission-9999.ebuild
 1806011708 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
 1911232009 ./net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
-2104130209 ./net-p2p/vuze/vuze-5.7.6.0.ebuild
 2105231239 ./net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
 2106031939 ./net-p2p/vuze/vuze-5.7.6.0-r1.ebuild
 2011181809 ./net-p2p/go-ipfs/go-ipfs-0.7.0.ebuild
@@ -23299,7 +23190,6 @@
 2104180939 ./net-vpn/badvpn/badvpn-1.999.130.ebuild
 2104161439 ./net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
 2101101639 ./net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
-2009130409 ./net-vpn/i2p/i2p-0.9.47.ebuild
 2012111109 ./net-vpn/i2p/i2p-0.9.48.ebuild
 2105280539 ./net-vpn/i2pd/i2pd-2.38.0.ebuild
 2104161439 ./net-vpn/iodine/iodine-0.7.0-r2.ebuild
@@ -23339,7 +23229,7 @@
 2008111439 ./net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
 2010071039 ./net-vpn/strongswan/strongswan-5.9.0.ebuild
 2102161539 ./net-vpn/strongswan/strongswan-5.9.1.ebuild
-2106031139 ./net-vpn/strongswan/strongswan-5.9.2.ebuild
+2106070939 ./net-vpn/strongswan/strongswan-5.9.2.ebuild
 2105021839 ./net-vpn/tinc/tinc-1.0.35-r2.ebuild
 2105021839 ./net-vpn/tinc/tinc-1.0.36.ebuild
 2105021839 ./net-vpn/tinc/tinc-1.1_pre17-r1.ebuild
@@ -23350,7 +23240,7 @@
 2009061309 ./net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
 2104161439 ./net-vpn/vpncwatch/vpncwatch-1.8.1.ebuild
 2101121409 ./net-vpn/vtun/vtun-3.0.3-r2.ebuild
-2104250009 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20210424.ebuild
+2106061309 ./net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild
 2104272139 ./net-vpn/wireguard-tools/wireguard-tools-1.0.20210424.ebuild
 2102181309 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
 2012212309 ./net-vpn/tailscale/tailscale-1.2.10-r1.ebuild
@@ -23389,7 +23279,8 @@
 2004101909 ./net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
 2101310343 ./net-wireless/bluez/bluez-5.55.ebuild
 2103241109 ./net-wireless/bluez/bluez-5.56-r1.ebuild
-2105240239 ./net-wireless/bluez/bluez-5.58.ebuild
+2106051410 ./net-wireless/bluez/bluez-5.58-r1.ebuild
+2106051410 ./net-wireless/bluez/bluez-5.58.ebuild
 2104271709 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
 2105050139 ./net-wireless/bss/bss-0.8-r2.ebuild
 2102150339 ./net-wireless/btcrack/btcrack-9999.ebuild
@@ -23545,7 +23436,6 @@
 1706160332 ./perl-core/CPAN-Meta-Requirements/CPAN-Meta-Requirements-2.125.0-r1.ebuild
 1912110241 ./perl-core/CPAN-Meta/CPAN-Meta-2.150.1.ebuild
 1706160332 ./perl-core/Data-Dumper/Data-Dumper-2.154.0.ebuild
-1706160332 ./perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
 1706160332 ./perl-core/Digest-MD5/Digest-MD5-2.530.0.ebuild
 1706160332 ./perl-core/Digest-SHA/Digest-SHA-5.880.0.ebuild
 1702282250 ./perl-core/Digest/Digest-1.170.0-r1.ebuild
@@ -23581,10 +23471,8 @@
 2101061839 ./perl-core/Text-Tabs+Wrap/Text-Tabs+Wrap-2013.52.300-r1.ebuild
 2002110109 ./perl-core/Thread-Semaphore/Thread-Semaphore-2.120.0-r1.ebuild
 1706160332 ./perl-core/Time-HiRes/Time-HiRes-1.972.600-r1.ebuild
-2002110109 ./perl-core/Time-Local/Time-Local-1.230.0-r1.ebuild
 2002110109 ./perl-core/Unicode-Collate/Unicode-Collate-1.250.0.ebuild
 2105281809 ./perl-core/Unicode-Collate/Unicode-Collate-1.290.0.ebuild
-1710112223 ./perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild
 2104180939 ./perl-core/libnet/libnet-1.270.0.ebuild
 1706160332 ./perl-core/parent/parent-0.228-r1.ebuild
 1706160332 ./perl-core/podlators/podlators-2.5.3.ebuild
@@ -23774,8 +23662,8 @@
 2010040239 ./sci-astronomy/skymaker/skymaker-3.10.5.ebuild
 1707070031 ./sci-astronomy/sofa_c/sofa_c-20170420.ebuild
 2009181139 ./sci-astronomy/stellarium/stellarium-0.20.2.ebuild
-2101310343 ./sci-astronomy/stellarium/stellarium-0.20.4.ebuild
 2103071009 ./sci-astronomy/stellarium/stellarium-0.20.3.ebuild
+2106071639 ./sci-astronomy/stellarium/stellarium-0.20.4.ebuild
 2105092239 ./sci-astronomy/stiff/stiff-2.4.0.ebuild
 2010040239 ./sci-astronomy/stuff/stuff-1.26.0.ebuild
 2102141539 ./sci-astronomy/swarp/swarp-2.41.5.ebuild
@@ -23793,7 +23681,7 @@
 1711161616 ./sci-biology/STAR/STAR-2.5.3a.ebuild
 1806091739 ./sci-biology/aaindex/aaindex-9.1-r1.ebuild
 2006212009 ./sci-biology/abyss/abyss-2.0.3-r2.ebuild
-1702282250 ./sci-biology/amap/amap-2.2-r3.ebuild
+2106062109 ./sci-biology/amap/amap-2.2-r4.ebuild
 1912110309 ./sci-biology/augustus/augustus-2.5.5.ebuild
 2001052109 ./sci-biology/bamtools/bamtools-2.5.1.ebuild
 2001052109 ./sci-biology/bamtools/bamtools-9999.ebuild
@@ -23934,7 +23822,7 @@
 2105161410 ./sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
 1702282250 ./sci-calculators/orpie/orpie-1.5.2-r1.ebuild
 2104060140 ./sci-calculators/pcalc/pcalc-3-r1.ebuild
-2106010209 ./sci-calculators/pcalc/pcalc-4.ebuild
+2106042139 ./sci-calculators/pcalc/pcalc-4.ebuild
 2105011109 ./sci-calculators/qalculate-gtk/qalculate-gtk-3.17.0.ebuild
 2105261609 ./sci-calculators/qalculate-gtk/qalculate-gtk-3.19.0.ebuild
 2105282309 ./sci-calculators/qalculate-gtk/qalculate-gtk-3.18.0.ebuild
@@ -24005,7 +23893,6 @@
 2008291539 ./sci-chemistry/psi/psi-3.4.0-r2.ebuild
 2105022239 ./sci-chemistry/pymol/pymol-2.4.0-r1.ebuild
 2105201839 ./sci-chemistry/pymol/pymol-2.5.0.ebuild
-2104180939 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
 2009170109 ./sci-chemistry/raster3d/raster3d-3.0.6.ebuild
 2009162339 ./sci-chemistry/suitename/suitename-0.3.070628.ebuild
 2101061839 ./sci-chemistry/surf/surf-1.0.ebuild
@@ -24057,13 +23944,13 @@
 2010111239 ./sci-electronics/iverilog/iverilog-9999.ebuild
 2102282109 ./sci-electronics/iverilog/iverilog-10.3.ebuild
 2103010109 ./sci-electronics/iverilog/iverilog-11.0.ebuild
-2102222209 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild
-2102222209 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild
-2102222209 ./sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild
-2102222209 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild
-2102222209 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild
-2102222209 ./sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild
-2101111339 ./sci-electronics/kicad/kicad-5.1.9.ebuild
+2106050239 ./sci-electronics/kicad-footprints/kicad-footprints-5.1.10.ebuild
+2106050239 ./sci-electronics/kicad-i18n/kicad-i18n-5.1.10.ebuild
+2106050239 ./sci-electronics/kicad-meta/kicad-meta-5.1.10.ebuild
+2106050239 ./sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
+2106050239 ./sci-electronics/kicad-symbols/kicad-symbols-5.1.10.ebuild
+2106050239 ./sci-electronics/kicad-templates/kicad-templates-5.1.10.ebuild
+2106050239 ./sci-electronics/kicad/kicad-5.1.10.ebuild
 2103130309 ./sci-electronics/klayout/klayout-9999.ebuild
 2105291639 ./sci-electronics/klayout/klayout-0.26.11.ebuild
 2105291639 ./sci-electronics/klayout/klayout-0.27.ebuild
@@ -24104,6 +23991,7 @@
 2002171539 ./sci-geosciences/gmt/gmt-4.5.18-r1.ebuild
 2103032109 ./sci-geosciences/gmt/gmt-5.4.4.ebuild
 2105291209 ./sci-geosciences/gnome-maps/gnome-maps-40.1.ebuild
+2106070109 ./sci-geosciences/gnome-maps/gnome-maps-40.2.ebuild
 2005210239 ./sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
 2105280439 ./sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
 2105280439 ./sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -24181,7 +24069,7 @@
 2106012239 ./sci-geosciences/qgis/qgis-3.18.3.ebuild
 2106012239 ./sci-geosciences/qgis/qgis-9999.ebuild
 2105080609 ./sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
-2105251739 ./sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
+2106040809 ./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
 2105271009 ./sci-geosciences/routino/routino-3.3.3.ebuild
@@ -24221,14 +24109,13 @@
 2101061839 ./sci-libs/camd/camd-2.4.6.ebuild
 2105042239 ./sci-libs/camd/camd-2.4.6-r1.ebuild
 2105241609 ./sci-libs/cantera/cantera-2.5.1-r1.ebuild
-2104180939 ./sci-libs/cbflib/cbflib-0.9.3.3.ebuild
 2102181209 ./sci-libs/ccfits/ccfits-2.5.ebuild
 2101061839 ./sci-libs/ccolamd/ccolamd-2.9.6.ebuild
 2104180939 ./sci-libs/cdd+/cdd+-077a.ebuild
 2105272239 ./sci-libs/cddlib/cddlib-094m-r1.ebuild
 2105291909 ./sci-libs/cdf/cdf-3.5.0.2.ebuild
 2105291909 ./sci-libs/cdf/cdf-3.8.0.ebuild
-2101310343 ./sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+2106051609 ./sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
 2101101739 ./sci-libs/cfitsio/cfitsio-3.490.ebuild
 2104180939 ./sci-libs/cgcode/cgcode-1.0-r2.ebuild
 2012272239 ./sci-libs/cgnslib/cgnslib-3.4.0.ebuild
@@ -24376,6 +24263,7 @@
 2101070839 ./sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
 2103061309 ./sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
 2101310343 ./sci-libs/libsvm/libsvm-3.24.ebuild
+2106062109 ./sci-libs/libsvm/libsvm-3.25.ebuild
 1702282250 ./sci-libs/libticables2/libticables2-1.3.5.ebuild
 1702282250 ./sci-libs/libticalcs2/libticalcs2-1.1.9.ebuild
 1702282250 ./sci-libs/libticonv/libticonv-1.1.5.ebuild
@@ -24422,8 +24310,7 @@
 2104181009 ./sci-libs/openblas/openblas-0.3.14.ebuild
 2105050039 ./sci-libs/openblas/openblas-0.3.15.ebuild
 2105050109 ./sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
-2105050109 ./sci-libs/opencascade/opencascade-7.5.1.ebuild
-2102050739 ./sci-libs/openlibm/openlibm-0.7.4.ebuild
+2106041109 ./sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
 2105280039 ./sci-libs/openlibm/openlibm-0.7.5.ebuild
 2006041239 ./sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
 2104050109 ./sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
@@ -24436,7 +24323,7 @@
 2102150339 ./sci-libs/pcl/pcl-1.11.1.ebuild
 2102150339 ./sci-libs/pcl/pcl-9999.ebuild
 2104161439 ./sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
-2103280309 ./sci-libs/plplot/plplot-5.15.0-r101.ebuild
+2106062009 ./sci-libs/plplot/plplot-5.15.0-r102.ebuild
 2105092239 ./sci-libs/primegen/primegen-0.97-r2.ebuild
 1702282250 ./sci-libs/profnet/profnet-1.0.22.ebuild
 1702282250 ./sci-libs/profphd-utils/profphd-utils-1.0.10-r1.ebuild
@@ -24508,10 +24395,11 @@
 2005151939 ./sci-libs/ignition-common/ignition-common-3.5.0.ebuild
 2009211709 ./sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild
 2102120039 ./sci-libs/volk/volk-2.4.1.ebuild
+2106060510 ./sci-libs/volk/volk-2.5.0.ebuild
 2105042239 ./sci-libs/libhomfly/libhomfly-1.02.6.ebuild
-2102141409 ./sci-libs/libecpint/libecpint-1.0.5.ebuild
 2105280039 ./sci-libs/libecpint/libecpint-1.0.6.ebuild
 2102080309 ./sci-libs/rtree/rtree-0.9.4-r1.ebuild
+2106051739 ./sci-libs/rtree/rtree-0.9.7.ebuild
 2011181009 ./sci-libs/shapely/shapely-1.7.1.ebuild
 2103061939 ./sci-libs/shapely/shapely-1.7.1-r1.ebuild
 2101310343 ./sci-libs/scikit-image/scikit-image-0.17.2.ebuild
@@ -24637,6 +24525,7 @@
 2001052109 ./sci-mathematics/yacas/yacas-1.7.0-r1.ebuild
 2103301239 ./sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
 2105170512 ./sci-mathematics/z3/z3-4.8.10.ebuild
+2106051139 ./sci-mathematics/z3/z3-4.8.11.ebuild
 2101051939 ./sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
 2101060739 ./sci-mathematics/gp2c/gp2c-0.0.12.ebuild
 2007231009 ./sci-mathematics/eclib/eclib-20190909.ebuild
@@ -24673,7 +24562,8 @@
 2105192139 ./sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
 2101022239 ./sci-misc/oww/oww-0.86.5.ebuild
 2007260509 ./sci-misc/tango/tango-9.2.5a.ebuild
-2101310343 ./sci-misc/vitables/vitables-3.0.0-r2.ebuild
+2106052109 ./sci-misc/vitables/vitables-3.0.0-r2.ebuild
+2106061739 ./sci-misc/vitables/vitables-3.0.2.ebuild
 2101070439 ./sci-physics/bullet/bullet-3.07.ebuild
 2102121839 ./sci-physics/bullet/bullet-3.08.ebuild
 2106021609 ./sci-physics/bullet/bullet-3.17.ebuild
@@ -24692,7 +24582,6 @@
 2007241439 ./sci-physics/hepmc/hepmc-2.06.09-r1.ebuild
 2105292209 ./sci-physics/heppdt/heppdt-3.04.01-r1.ebuild
 2105311239 ./sci-physics/herwig/herwig-6.5.21-r1.ebuild
-1912111540 ./sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild
 2104180509 ./sci-physics/lammps/lammps-20200303-r1.ebuild
 2105231639 ./sci-physics/lhapdf/lhapdf-6.3.0.ebuild
 2102140209 ./sci-physics/looptools/looptools-2.15.ebuild
@@ -24759,9 +24648,6 @@
 2105122309 ./sci-visualization/dash/dash-1.20.0.ebuild
 2105152009 ./sci-visualization/jupyter-dash/jupyter-dash-0.4.0.ebuild
 2106030210 ./sci-visualization/scidavis/scidavis-2.4.0-r1.ebuild
-2003191139 ./sec-policy/apparmor-profiles/apparmor-profiles-2.13.4.ebuild
-2010101309 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
-2011251039 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild
 2011251039 ./sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
 2012081009 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
 2011300739 ./sec-policy/selinux-abrt/selinux-abrt-9999.ebuild
@@ -25526,22 +25412,15 @@
 2010062239 ./sys-apps/accountsservice/accountsservice-0.6.55.ebuild
 2101061839 ./sys-apps/ack/ack-3.4.0.ebuild
 2106031839 ./sys-apps/ack/ack-3.5.0.ebuild
-2105131709 ./sys-apps/acl/acl-2.2.53-r1.ebuild
-2105131709 ./sys-apps/acl/acl-2.3.0.ebuild
 2105191839 ./sys-apps/acl/acl-2.3.1.ebuild
 2104161439 ./sys-apps/agedu/agedu-20200617.ebuild
 2104161439 ./sys-apps/agedu/agedu-20200705.ebuild
 2104180939 ./sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild
 2105271139 ./sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
-2003191139 ./sys-apps/apparmor/apparmor-2.13.4.ebuild
-2010110739 ./sys-apps/apparmor/apparmor-3.0.0.ebuild
 2102241939 ./sys-apps/apparmor/apparmor-3.0.1.ebuild
 2008051909 ./sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
 1712021939 ./sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
-2012201939 ./sys-apps/attr/attr-2.4.48-r5.ebuild
 2012201939 ./sys-apps/attr/attr-9999.ebuild
-2103120109 ./sys-apps/attr/attr-2.5.0.ebuild
-2104060140 ./sys-apps/attr/attr-2.4.48-r4.ebuild
 2105191839 ./sys-apps/attr/attr-2.5.1.ebuild
 2003241639 ./sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
 2106010539 ./sys-apps/baobab/baobab-40.0.ebuild
@@ -25559,6 +25438,7 @@
 2102241939 ./sys-apps/bleachbit/bleachbit-4.2.0.ebuild
 2101192109 ./sys-apps/bolt/bolt-0.9-r2.ebuild
 2104122109 ./sys-apps/bolt/bolt-0.9-r3.ebuild
+2106060709 ./sys-apps/bolt/bolt-0.9.1.ebuild
 2106020609 ./sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
 2105261209 ./sys-apps/busybox/busybox-1.32.1-r1.ebuild
 2105261209 ./sys-apps/busybox/busybox-1.33.1.ebuild
@@ -25592,8 +25472,8 @@
 2104180939 ./sys-apps/darwin-miscutils/darwin-miscutils-8.ebuild
 2104180939 ./sys-apps/darwin-miscutils/darwin-miscutils-9.ebuild
 2010220909 ./sys-apps/dbus-broker/dbus-broker-9999.ebuild
-2102162309 ./sys-apps/dbus-broker/dbus-broker-27.ebuild
 2103211809 ./sys-apps/dbus-broker/dbus-broker-28.ebuild
+2106062039 ./sys-apps/dbus-broker/dbus-broker-29.ebuild
 2101310343 ./sys-apps/dbus/dbus-1.12.20-r1.ebuild
 2103131509 ./sys-apps/dcfldd/dcfldd-1.7.ebuild
 1805290208 ./sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -25747,9 +25627,9 @@
 2009061539 ./sys-apps/kmscon/kmscon-8_p20180906-r1.ebuild
 2002112051 ./sys-apps/lcdsplash/lcdsplash-0.3.ebuild
 1912151809 ./sys-apps/lcdutils/lcdutils-0.2-r1.ebuild
-2105151639 ./sys-apps/less/less-586.ebuild
 2105172009 ./sys-apps/less/less-581.2.ebuild
 2105301439 ./sys-apps/less/less-589.ebuild
+2106041539 ./sys-apps/less/less-590.ebuild
 2012071539 ./sys-apps/likwid/likwid-4.3.4.ebuild
 2104070839 ./sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
 2010062139 ./sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -25818,6 +25698,7 @@
 2104060140 ./sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
 2104150839 ./sys-apps/osinfo-db-tools/osinfo-db-tools-1.9.0.ebuild
 2105291839 ./sys-apps/osinfo-db/osinfo-db-20210426.ebuild
+2106070109 ./sys-apps/osinfo-db/osinfo-db-20210531.ebuild
 2104180939 ./sys-apps/paxctl/paxctl-0.9.ebuild
 1911082039 ./sys-apps/paxctld/paxctld-1.2.3.ebuild
 2009042009 ./sys-apps/paxctld/paxctld-1.2.5.ebuild
@@ -25829,21 +25710,21 @@
 2007121939 ./sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
 2007121939 ./sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
 2104180939 ./sys-apps/pick/pick-4.0.0.ebuild
-2103271139 ./sys-apps/pkgcore/pkgcore-9999.ebuild
 2104290039 ./sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
 2105152239 ./sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
 2105231009 ./sys-apps/pkgcore/pkgcore-0.12.0.ebuild
-2105281109 ./sys-apps/pkgcore/pkgcore-0.12.1.ebuild
+2106041109 ./sys-apps/pkgcore/pkgcore-0.12.1.ebuild
+2106041109 ./sys-apps/pkgcore/pkgcore-9999.ebuild
 1702282250 ./sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
 2101060709 ./sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
 2102070739 ./sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
 2104030739 ./sys-apps/policycoreutils/policycoreutils-3.2.ebuild
 2104030739 ./sys-apps/policycoreutils/policycoreutils-9999.ebuild
-2103091939 ./sys-apps/portage/portage-9999.ebuild
 2104060140 ./sys-apps/portage/portage-3.0.13.ebuild
 2104060140 ./sys-apps/portage/portage-3.0.17-r2.ebuild
 2104251909 ./sys-apps/portage/portage-3.0.18.ebuild
-2105241209 ./sys-apps/portage/portage-3.0.19.ebuild
+2106041039 ./sys-apps/portage/portage-3.0.19.ebuild
+2106060039 ./sys-apps/portage/portage-9999.ebuild
 2010142339 ./sys-apps/powerpc-utils/powerpc-utils-1.1.3.18-r4.ebuild
 2104180939 ./sys-apps/prctl/prctl-1.6-r1.ebuild
 2009170039 ./sys-apps/preload/preload-0.6.4-r3.ebuild
@@ -25903,8 +25784,8 @@
 2005311339 ./sys-apps/salinfo/salinfo-1.2.ebuild
 2104252239 ./sys-apps/sandbox/sandbox-2.21.ebuild
 2105050139 ./sys-apps/sandbox/sandbox-2.22.ebuild
-2105111039 ./sys-apps/sandbox/sandbox-2.24.ebuild
 2105172009 ./sys-apps/sandbox/sandbox-2.23.ebuild
+2106070939 ./sys-apps/sandbox/sandbox-2.24.ebuild
 2105261139 ./sys-apps/sdparm/sdparm-1.12.ebuild
 2101031139 ./sys-apps/secilc/secilc-3.1.ebuild
 2104030739 ./sys-apps/secilc/secilc-3.2.ebuild
@@ -25917,7 +25798,7 @@
 2104030739 ./sys-apps/semodule-utils/semodule-utils-3.2.ebuild
 2104030739 ./sys-apps/semodule-utils/semodule-utils-9999.ebuild
 2002112051 ./sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
-2012162009 ./sys-apps/servicelog/servicelog-1.1.15.ebuild
+2106050239 ./sys-apps/servicelog/servicelog-1.1.15.ebuild
 2104060140 ./sys-apps/setserial/setserial-2.17-r5.ebuild
 2105141239 ./sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
 2105311239 ./sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -25977,7 +25858,7 @@
 2104060140 ./sys-apps/which/which-2.21.ebuild
 2101310343 ./sys-apps/x86info/x86info-1.30_p20190617.ebuild
 2104180939 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
-2104180939 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
+2106051410 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
 2105142339 ./sys-apps/xinetd/xinetd-2.3.15.4.ebuild
 2012231444 ./sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
 2006261839 ./sys-apps/yarn/yarn-1.22.4.ebuild
@@ -25998,22 +25879,25 @@
 2104031909 ./sys-apps/earlyoom/earlyoom-9999.ebuild
 2003261841 ./sys-apps/nosig/nosig-2.ebuild
 2104032109 ./sys-apps/lsvpd/lsvpd-1.7.11-r1.ebuild
+2106050239 ./sys-apps/lsvpd/lsvpd-1.7.12.ebuild
 2003042239 ./sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild
 2011151339 ./sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
 2104180939 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
 2101211109 ./sys-apps/flatpak/flatpak-1.10.0.ebuild
 2103111039 ./sys-apps/flatpak/flatpak-1.10.2.ebuild
+2106062039 ./sys-apps/flatpak/flatpak-1.11.1.ebuild
 2104080109 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
 2105310839 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
 2105230439 ./sys-apps/memtest86-bin/memtest86-bin-9.1.ebuild
 2104052009 ./sys-apps/radeontool/radeontool-1.6.3_p20181127.ebuild
 2106011309 ./sys-apps/plocate/plocate-1.1.7-r1.ebuild
 2104240909 ./sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
+2106050409 ./sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
 1912100909 ./sys-auth/docker_auth/docker_auth-1.3.1.ebuild
 1912100909 ./sys-auth/docker_auth/docker_auth-1.4.0.ebuild
 2008240239 ./sys-auth/docker_auth/docker_auth-1.5.0.ebuild
-2102191509 ./sys-auth/elogind/elogind-246.9.2.ebuild
-2106031939 ./sys-auth/elogind/elogind-246.10-r1.ebuild
+2106050109 ./sys-auth/elogind/elogind-246.10-r1.ebuild
+2106050109 ./sys-auth/elogind/elogind-246.9.2.ebuild
 2103152139 ./sys-auth/fprintd/fprintd-0.8.1-r3.ebuild
 2103261109 ./sys-auth/fprintd/fprintd-1.90.8.ebuild
 2104021239 ./sys-auth/fprintd/fprintd-1.90.9.ebuild
@@ -26080,7 +25964,7 @@
 2106040239 ./sys-auth/polkit/polkit-0.116-r1.ebuild
 2106040239 ./sys-auth/polkit/polkit-0.117.ebuild
 2106040239 ./sys-auth/polkit/polkit-0.118.ebuild
-2106040239 ./sys-auth/polkit/polkit-0.119.ebuild
+2106070939 ./sys-auth/polkit/polkit-0.119.ebuild
 2105070009 ./sys-auth/realtime-base/realtime-base-0.1-r1.ebuild
 2011172239 ./sys-auth/rtkit/rtkit-0.13-r1.ebuild
 2105251339 ./sys-auth/skey/skey-1.1.5-r11.ebuild
@@ -26113,6 +25997,7 @@
 2006262339 ./sys-block/f3/f3-7.2.ebuild
 2105082209 ./sys-block/f3/f3-8.0.ebuild
 2105021939 ./sys-block/fio/fio-3.20-r2.ebuild
+2106070739 ./sys-block/fio/fio-3.27.ebuild
 1702282250 ./sys-block/flashbench/flashbench-20120606.ebuild
 2009162339 ./sys-block/fwdl/fwdl-1.2.3.ebuild
 2012311940 ./sys-block/gpart/gpart-0.3.ebuild
@@ -26214,7 +26099,7 @@
 2006240339 ./sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild
 2104210709 ./sys-boot/grub/grub-2.06_rc1.ebuild
 2104222309 ./sys-boot/grub/grub-9999.ebuild
-2103071639 ./sys-boot/lilo/lilo-24.2.ebuild
+2106070009 ./sys-boot/lilo/lilo-24.2.ebuild
 1911100139 ./sys-boot/makebootfat/makebootfat-1.4.ebuild
 2105131709 ./sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
 1912110241 ./sys-boot/mbr/mbr-1.1.11-r1.ebuild
@@ -26453,7 +26338,7 @@
 2005081846 ./sys-cluster/ucx/ucx-1.5.2.ebuild
 2102281509 ./sys-cluster/ucx/ucx-1.10.0_rc5.ebuild
 2102281509 ./sys-cluster/ucx/ucx-1.9.0.ebuild
-2103310109 ./sys-cluster/vzctl/vzctl-4.9.4.ebuild
+2106071139 ./sys-cluster/vzctl/vzctl-4.9.4.ebuild
 2102202239 ./sys-cluster/wulfware/wulfware-2.6.0.ebuild
 1708241733 ./sys-cluster/zetcd/zetcd-0.0.4.ebuild
 2104180939 ./sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13-r1.ebuild
@@ -26567,11 +26452,11 @@
 2105141009 ./sys-devel/gcc/gcc-8.4.0-r2.ebuild
 2105161410 ./sys-devel/gcc/gcc-8.5.0.ebuild
 2106012039 ./sys-devel/gcc/gcc-9.4.0.ebuild
-2106021709 ./sys-devel/gcc/gcc-10.3.0.ebuild
+2106071639 ./sys-devel/gcc/gcc-10.3.0.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2105152139 ./sys-devel/gdb/gdb-10.1.ebuild
-2105152139 ./sys-devel/gdb/gdb-10.2.ebuild
 2105152139 ./sys-devel/gdb/gdb-9999.ebuild
+2106071639 ./sys-devel/gdb/gdb-10.2.ebuild
 2106011339 ./sys-devel/gettext/gettext-0.21.ebuild
 2106021739 ./sys-devel/gettext/gettext-0.21-r1.ebuild
 2101141639 ./sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -26584,12 +26469,12 @@
 2104060140 ./sys-devel/libtool/libtool-2.4.6-r6.ebuild
 2101310343 ./sys-devel/lld/lld-10.0.1.ebuild
 2103042109 ./sys-devel/lld/lld-13.0.0.9999.ebuild
-2105170512 ./sys-devel/lld/lld-10.0.1-r1.ebuild
-2105170512 ./sys-devel/lld/lld-11.1.0-r1.ebuild
 2105170439 ./sys-devel/lld/lld-11.1.0.ebuild
 2105170512 ./sys-devel/lld/lld-12.0.0.ebuild
 2105261539 ./sys-devel/lld/lld-12.0.1.9999.ebuild
 2105261539 ./sys-devel/lld/lld-12.0.1_rc1.ebuild
+2106041139 ./sys-devel/lld/lld-10.0.1-r1.ebuild
+2106041139 ./sys-devel/lld/lld-11.1.0-r1.ebuild
 2101061839 ./sys-devel/llvm-common/llvm-common-10.0.1.ebuild
 2101281209 ./sys-devel/llvm-common/llvm-common-13.0.0.9999.ebuild
 2105170439 ./sys-devel/llvm-common/llvm-common-11.1.0.ebuild
@@ -26677,8 +26562,8 @@
 2105162309 ./sys-fabric/qperf/qperf-0.4.9.ebuild
 2105162309 ./sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
 2105162309 ./sys-fabric/srptools/srptools-1.0.2.ebuild
-2002220039 ./sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
-2105272239 ./sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
+2106052339 ./sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
+2106052339 ./sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
 1702282250 ./sys-firmware/atmel-firmware/atmel-firmware-1.3-r1.ebuild
 2104242009 ./sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
 2104242009 ./sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild
@@ -26736,7 +26621,7 @@
 2104060140 ./sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
 2105131709 ./sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
 1907071039 ./sys-fs/aufs-headers/aufs-headers-4.14_p20190603.ebuild
-2104161439 ./sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
+2106071139 ./sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
 1805272138 ./sys-fs/autorun/autorun-3.17.ebuild
 1910022239 ./sys-fs/avfs/avfs-1.1.1.ebuild
 2102161539 ./sys-fs/avfs/avfs-1.1.3.ebuild
@@ -26781,7 +26666,7 @@
 2105090939 ./sys-fs/dislocker/dislocker-0.7.3.ebuild
 2105090939 ./sys-fs/dislocker/dislocker-9999.ebuild
 2105022109 ./sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
-2103121839 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+2106071139 ./sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
 2105131709 ./sys-fs/dosfstools/dosfstools-4.2.ebuild
 2012202239 ./sys-fs/duperemove/duperemove-0.11.2.ebuild
 2102101639 ./sys-fs/e2fsprogs/e2fsprogs-1.46.1.ebuild
@@ -26817,12 +26702,13 @@
 2003261841 ./sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
 2001031939 ./sys-fs/fuse-zip/fuse-zip-0.7.0.ebuild
 2104212209 ./sys-fs/fuse/fuse-2.9.9-r1.ebuild
-2106040440 ./sys-fs/fuse/fuse-3.10.3.ebuild
 2106040440 ./sys-fs/fuse/fuse-3.9.3.ebuild
+2106070939 ./sys-fs/fuse/fuse-3.10.3.ebuild
 2007202039 ./sys-fs/fuseiso/fuseiso-20070708-r3.ebuild
 2012311940 ./sys-fs/genext2fs/genext2fs-1.4.1.ebuild
 2008142339 ./sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild
 2008130609 ./sys-fs/growpart/growpart-0.0.30.ebuild
+2106070739 ./sys-fs/growpart/growpart-0.0.32.ebuild
 1911100409 ./sys-fs/gt5/gt5-1.4.0-r2.ebuild
 2002081539 ./sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
 2012040309 ./sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -26837,6 +26723,8 @@
 2101012139 ./sys-fs/lde/lde-2.6.1-r1.ebuild
 2102121709 ./sys-fs/lessfs/lessfs-1.7.0-r2.ebuild
 2104180939 ./sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
+2106060139 ./sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
+2106051410 ./sys-fs/libeatmydata/libeatmydata-129.ebuild
 1812240009 ./sys-fs/libfat/libfat-0.3a-r1.ebuild
 2011111109 ./sys-fs/loop-aes/loop-aes-3.7s.ebuild
 2103131039 ./sys-fs/loop-aes/loop-aes-3.7t.ebuild
@@ -26869,7 +26757,7 @@
 2101220739 ./sys-fs/rar2fs/rar2fs-1.29.4.ebuild
 2012271609 ./sys-fs/reiser4progs/reiser4progs-2.0.4.ebuild
 2104161439 ./sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
-2106040209 ./sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
+2106070939 ./sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
 2102171139 ./sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2.ebuild
 2105131709 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
 2003080109 ./sys-fs/safecopy/safecopy-1.7.ebuild
@@ -26997,6 +26885,7 @@
 2105170939 ./sys-kernel/git-sources/git-sources-5.13_rc2.ebuild
 2105240239 ./sys-kernel/git-sources/git-sources-5.13_rc3.ebuild
 2105310139 ./sys-kernel/git-sources/git-sources-5.13_rc4.ebuild
+2106070239 ./sys-kernel/git-sources/git-sources-5.13_rc5.ebuild
 2101310343 ./sys-kernel/kergen/kergen-0.1.5.ebuild
 1912110241 ./sys-kernel/kpatch/kpatch-9999.ebuild
 2008081539 ./sys-kernel/kpatch/kpatch-0.6.3-r1.ebuild
@@ -27017,9 +26906,9 @@
 2104060140 ./sys-kernel/linux-headers/linux-headers-5.10.ebuild
 2104060140 ./sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
 2105280109 ./sys-kernel/linux-headers/linux-headers-5.12.ebuild
-2105210809 ./sys-kernel/mips-sources/mips-sources-4.14.232.ebuild
-2105210809 ./sys-kernel/mips-sources/mips-sources-4.19.190.ebuild
-2105210809 ./sys-kernel/mips-sources/mips-sources-5.4.120.ebuild
+2106070709 ./sys-kernel/mips-sources/mips-sources-4.14.235.ebuild
+2106070709 ./sys-kernel/mips-sources/mips-sources-4.19.193.ebuild
+2106070709 ./sys-kernel/mips-sources/mips-sources-5.4.124.ebuild
 2104042209 ./sys-kernel/pf-sources/pf-sources-5.10_p12.ebuild
 2104042209 ./sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
 2104240939 ./sys-kernel/pf-sources/pf-sources-5.11_p8.ebuild
@@ -27176,10 +27065,9 @@
 1804301209 ./sys-libs/fortify-headers/fortify-headers-9999.ebuild
 2102151509 ./sys-libs/freeipmi/freeipmi-1.6.7.ebuild
 2104180939 ./sys-libs/freeipmi/freeipmi-1.5.7.ebuild
-2105211039 ./sys-libs/freeipmi/freeipmi-1.6.8.ebuild
+2106050439 ./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
-2104212209 ./sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
 2105272009 ./sys-libs/gdbm/gdbm-1.19.ebuild
 2104212209 ./sys-libs/glibc/glibc-2.19-r2.ebuild
 2104212209 ./sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -27188,8 +27076,8 @@
 2104212209 ./sys-libs/glibc/glibc-2.32-r6.ebuild
 2105152209 ./sys-libs/glibc/glibc-2.32-r7.ebuild
 2105152139 ./sys-libs/glibc/glibc-9999.ebuild
-2106021409 ./sys-libs/glibc/glibc-2.32-r8.ebuild
 2106021409 ./sys-libs/glibc/glibc-2.33.ebuild
+2106061209 ./sys-libs/glibc/glibc-2.32-r8.ebuild
 2105142339 ./sys-libs/gpm/gpm-1.20.7-r3.ebuild
 2105021609 ./sys-libs/gwenhywfar/gwenhywfar-5.4.1-r1.ebuild
 2105161410 ./sys-libs/kpmcore/kpmcore-20.12.3.ebuild
@@ -27197,19 +27085,12 @@
 2103251139 ./sys-libs/ldb/ldb-2.3.0.ebuild
 2105152109 ./sys-libs/ldb/ldb-2.2.1.ebuild
 2104192239 ./sys-libs/libaal/libaal-1.0.7-r2.ebuild
-2104120442 ./sys-libs/libapparmor/libapparmor-2.13.4.ebuild
-2104120442 ./sys-libs/libapparmor/libapparmor-3.0.0.ebuild
 2105272239 ./sys-libs/libapparmor/libapparmor-3.0.1.ebuild
 2006132027 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
 2101310343 ./sys-libs/libblockdev/libblockdev-2.24.ebuild
 2101310343 ./sys-libs/libblockdev/libblockdev-9999.ebuild
 2105271739 ./sys-libs/libblockdev/libblockdev-2.25.ebuild
-2101310343 ./sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild
-2101310343 ./sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
-2101310343 ./sys-libs/libcap-ng/libcap-ng-0.8.ebuild
 2105262139 ./sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
-2104212209 ./sys-libs/libcap/libcap-2.43.ebuild
-2104212209 ./sys-libs/libcap/libcap-2.48.ebuild
 2105262139 ./sys-libs/libcap/libcap-2.49.ebuild
 2105301409 ./sys-libs/libcap/libcap-2.50-r1.ebuild
 2008291639 ./sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
@@ -27245,8 +27126,8 @@
 2105240139 ./sys-libs/libseccomp/libseccomp-2.5.1-r1.ebuild
 2105240139 ./sys-libs/libseccomp/libseccomp-9999.ebuild
 2104180939 ./sys-libs/libselinux/libselinux-3.1-r1.ebuild
-2104180939 ./sys-libs/libselinux/libselinux-3.2.ebuild
 2104180939 ./sys-libs/libselinux/libselinux-9999.ebuild
+2106041039 ./sys-libs/libselinux/libselinux-3.2.ebuild
 2104180939 ./sys-libs/libsemanage/libsemanage-3.1-r1.ebuild
 2104180939 ./sys-libs/libsemanage/libsemanage-3.2.ebuild
 2104180939 ./sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -27254,6 +27135,7 @@
 2104180939 ./sys-libs/libsepol/libsepol-3.2.ebuild
 2104180939 ./sys-libs/libsepol/libsepol-9999.ebuild
 1908101709 ./sys-libs/libservicelog/libservicelog-1.1.18.ebuild
+2106050239 ./sys-libs/libservicelog/libservicelog-1.1.19.ebuild
 2102150539 ./sys-libs/libsmbios/libsmbios-2.4.3.ebuild
 2104180939 ./sys-libs/libstatgrab/libstatgrab-0.92.ebuild
 2105292209 ./sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r3.ebuild
@@ -27277,8 +27159,8 @@
 2104060140 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2103071509 ./sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
 2103071509 ./sys-libs/musl-nscd/musl-nscd-9999.ebuild
-2104212209 ./sys-libs/musl/musl-1.2.2-r2.ebuild
-2104212209 ./sys-libs/musl/musl-9999.ebuild
+2106061239 ./sys-libs/musl/musl-1.2.2-r2.ebuild
+2106061239 ./sys-libs/musl/musl-9999.ebuild
 2101061839 ./sys-libs/native-uuid/native-uuid-1.0.ebuild
 2105141239 ./sys-libs/ncurses-compat/ncurses-compat-6.2.ebuild
 2104212209 ./sys-libs/ncurses/ncurses-6.2-r1.ebuild
@@ -27293,8 +27175,6 @@
 2104060140 ./sys-libs/pam/pam-1.5.1.ebuild
 2105161809 ./sys-libs/pwdb/pwdb-0.62-r2.ebuild
 2001301109 ./sys-libs/queue-standalone/queue-standalone-0.1-r1.ebuild
-2105131709 ./sys-libs/readline/readline-8.0_p4.ebuild
-2105132209 ./sys-libs/readline/readline-8.1.ebuild
 2105141239 ./sys-libs/readline/readline-8.1_p1.ebuild
 1803291439 ./sys-libs/rpmatch-standalone/rpmatch-standalone-1.0.ebuild
 2104060140 ./sys-libs/slang/slang-2.3.2.ebuild
@@ -27353,9 +27233,8 @@
 2104120016 ./sys-power/sispmctl/sispmctl-4.1-r1.ebuild
 2002231739 ./sys-power/suspend/suspend-1.0_p20190605.ebuild
 2101060939 ./sys-power/suspend/suspend-1.0_p20200924.ebuild
-2102030309 ./sys-power/thermald/thermald-2.4.1-r1.ebuild
-2102111009 ./sys-power/thermald/thermald-2.4.2.ebuild
-2103100939 ./sys-power/thermald/thermald-2.4.3.ebuild
+2106061009 ./sys-power/thermald/thermald-2.4.3.ebuild
+2106051109 ./sys-power/thermald/thermald-2.4.5.ebuild
 2104272339 ./sys-power/uhubctl/uhubctl-2.4.0.ebuild
 2004032241 ./sys-power/upower/upower-0.99.9-r1.ebuild
 2105290309 ./sys-power/upower/upower-0.99.11.ebuild
@@ -27797,7 +27676,6 @@
 2010091839 ./www-apache/modsecurity-crs/modsecurity-crs-3.3.0.ebuild
 1702282250 ./www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
 2009181139 ./www-apache/passenger/passenger-6.0.6.ebuild
-2011201039 ./www-apache/passenger/passenger-6.0.7.ebuild
 2106030909 ./www-apache/passenger/passenger-6.0.9.ebuild
 2106031939 ./www-apache/passenger/passenger-6.0.8.ebuild
 2012171609 ./www-apache/pwauth/pwauth-2.3.10.ebuild
@@ -27896,8 +27774,7 @@
 2105190039 ./www-apps/nikola/nikola-8.1.3.ebuild
 2102230139 ./www-apps/novnc/novnc-9999.ebuild
 2103031609 ./www-apps/novnc/novnc-1.2.0.ebuild
-2008181309 ./www-apps/owncloud/owncloud-10.5.0.ebuild
-2101021409 ./www-apps/owncloud/owncloud-10.6.0.ebuild
+2106041239 ./www-apps/owncloud/owncloud-10.7.0.ebuild
 2105301109 ./www-apps/phpBB/phpBB-3.3.4.ebuild
 2012150539 ./www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
 2105191339 ./www-apps/piwigo/piwigo-11.5.0.ebuild
@@ -27925,12 +27802,14 @@
 2104131839 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.1.7.ebuild
 2106011409 ./www-client/chromium/chromium-91.0.4472.77.ebuild
 2106031009 ./www-client/chromium/chromium-92.0.4515.40.ebuild
+2106051139 ./www-client/chromium/chromium-93.0.4530.5.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
 2012030239 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2104302139 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2104302139 ./www-client/elinks/elinks-0.13.5-r100.ebuild
 2104302139 ./www-client/elinks/elinks-9999.ebuild
 2105291209 ./www-client/epiphany/epiphany-40.1.ebuild
+2106070109 ./www-client/epiphany/epiphany-40.2.ebuild
 2104302139 ./www-client/falkon/falkon-3.1.0-r1.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
 2104121139 ./www-client/fetch/fetch-1.0-r4.ebuild
@@ -27942,10 +27821,10 @@
 2106011139 ./www-client/firefox-bin/firefox-bin-78.11.0.ebuild
 2105082309 ./www-client/firefox/firefox-88.0.1.ebuild
 2105211939 ./www-client/firefox/firefox-78.10.1.ebuild
-2106012209 ./www-client/firefox/firefox-78.11.0.ebuild
 2106012209 ./www-client/firefox/firefox-89.0.ebuild
+2106041609 ./www-client/firefox/firefox-78.11.0.ebuild
 2106040009 ./www-client/google-chrome-beta/google-chrome-beta-92.0.4515.40.ebuild
-2106020009 ./www-client/google-chrome-unstable/google-chrome-unstable-92.0.4515.40.ebuild
+2106040909 ./www-client/google-chrome-unstable/google-chrome-unstable-93.0.4530.5.ebuild
 2105252239 ./www-client/google-chrome/google-chrome-91.0.4472.77.ebuild
 2104302139 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 2104180939 ./www-client/jd/jd-2.8.5_p120826.ebuild
@@ -27976,13 +27855,15 @@
 2105261109 ./www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild
 2106021639 ./www-client/seamonkey/seamonkey-2.53.8_beta1.ebuild
 1902071439 ./www-client/surf/surf-2.0.ebuild
-2103181439 ./www-client/surf/surf-9999.ebuild
+2106071409 ./www-client/surf/surf-2.1.ebuild
+2106071409 ./www-client/surf/surf-9999.ebuild
 2009241739 ./www-client/surfraw/surfraw-99999.ebuild
 2103060139 ./www-client/surfraw/surfraw-2.3.0-r3.ebuild
 2101131239 ./www-client/uget/uget-2.2.1.ebuild
 2105292209 ./www-client/uget/uget-9999.ebuild
 2105140009 ./www-client/vivaldi-snapshot/vivaldi-snapshot-3.9.2289.3.ebuild
-2106040039 ./www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.3.ebuild
+2106051809 ./www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.11.ebuild
+2106061409 ./www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.13.ebuild
 2105021339 ./www-client/vivaldi/vivaldi-3.7.2218.58.ebuild
 2105050109 ./www-client/vivaldi/vivaldi-3.8.2259.37.ebuild
 2105140009 ./www-client/vivaldi/vivaldi-3.8.2259.40.ebuild
@@ -28024,14 +27905,15 @@
 2106032239 ./www-misc/xxv/xxv-1.6.1-r2.ebuild
 2008250009 ./www-plugins/browserpass/browserpass-3.0.7.ebuild
 2105252239 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-91.0.4472.77.ebuild
-2106020009 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.40_alpha.ebuild
 2106040009 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.40_beta.ebuild
+2106040909 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4530.5_alpha.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
 2012261209 ./www-plugins/lightspark/lightspark-0.8.3.ebuild
 2102081839 ./www-plugins/lightspark/lightspark-0.8.4.ebuild
 2104210309 ./www-plugins/passff-host/passff-host-1.2.1-r1.ebuild
 2104180939 ./www-plugins/pdfjs/pdfjs-2.4.456.ebuild
 2104180939 ./www-plugins/pdfjs/pdfjs-2.5.207.ebuild
+2106041839 ./www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
 2009061009 ./www-servers/adsf/adsf-1.4.3.ebuild
 2103071109 ./www-servers/adsf/adsf-1.4.5.ebuild
 2105221039 ./www-servers/adsf/adsf-1.4.6.ebuild
@@ -28063,12 +27945,7 @@
 2105031009 ./www-servers/pound/pound-2.7f-r1.ebuild
 2105180010 ./www-servers/pound/pound-3.0.ebuild
 2105022339 ./www-servers/pshs/pshs-0.4.1.ebuild
-2008140239 ./www-servers/puma/puma-3.12.5-r1.ebuild
-2102041109 ./www-servers/puma/puma-5.1.1.ebuild
-2103041009 ./www-servers/puma/puma-5.2.2.ebuild
-2105100739 ./www-servers/puma/puma-5.3.0.ebuild
-2105120939 ./www-servers/puma/puma-5.3.1.ebuild
-2105221009 ./www-servers/puma/puma-5.3.2.ebuild
+2106061039 ./www-servers/puma/puma-5.3.2.ebuild
 2104180939 ./www-servers/resin/resin-4.0.48-r1.ebuild
 2101310343 ./www-servers/servefile/servefile-0.5.1.ebuild
 2011290239 ./www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
@@ -28281,6 +28158,7 @@
 2104060140 ./x11-libs/libSM/libSM-1.2.3-r1.ebuild
 2105021839 ./x11-libs/libX11/libX11-1.7.0.ebuild
 2105272239 ./x11-libs/libX11/libX11-1.7.1.ebuild
+2106070209 ./x11-libs/libX11/libX11-1.7.2.ebuild
 2105290309 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
 2104060140 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
 2105272239 ./x11-libs/libXaw/libXaw-1.0.14.ebuild
@@ -28392,6 +28270,7 @@
 2105251739 ./x11-libs/tslib/tslib-1.22.ebuild
 2103060139 ./x11-libs/vte/vte-0.28.2-r209.ebuild
 2106020609 ./x11-libs/vte/vte-0.64.1.ebuild
+2106070109 ./x11-libs/vte/vte-0.64.2.ebuild
 2101182239 ./x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
 2101182239 ./x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
 2105131709 ./x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild
@@ -28449,7 +28328,7 @@
 2104151009 ./x11-misc/dclock/dclock-2.2.2_p12.ebuild
 2103271939 ./x11-misc/devilspie/devilspie-0.23-r2.ebuild
 2104192239 ./x11-misc/devilspie2/devilspie2-0.43-r100.ebuild
-2101310343 ./x11-misc/dex/dex-0.8.0.ebuild
+2106060709 ./x11-misc/dex/dex-0.8.0.ebuild
 1908061139 ./x11-misc/dmenu/dmenu-9999.ebuild
 2104231939 ./x11-misc/dmenu/dmenu-5.0.ebuild
 2001231339 ./x11-misc/dunst/dunst-1.4.1.ebuild
@@ -28537,7 +28416,7 @@
 2104290509 ./x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
 2008070639 ./x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild
 2009252339 ./x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
-2101310343 ./x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
+2106071139 ./x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
 2106031009 ./x11-misc/menumaker/menumaker-0.99.12.ebuild
 1703221028 ./x11-misc/mgm/mgm-1.2-r1.ebuild
 1902221439 ./x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
@@ -28579,9 +28458,7 @@
 2006150109 ./x11-misc/qtfm/qtfm-99999.ebuild
 1907151840 ./x11-misc/quitcount/quitcount-3.1.3.ebuild
 2004142339 ./x11-misc/qxkb/qxkb-0.5.1_pre20190821.ebuild
-2002112051 ./x11-misc/read-edid/read-edid-1.4.2.ebuild
-2101050009 ./x11-misc/read-edid/read-edid-3.0.2.ebuild
-2105120009 ./x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+2106070939 ./x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
 2104161439 ./x11-misc/redshift/redshift-1.12-r3.ebuild
 2104161439 ./x11-misc/redshift/redshift-1.12-r4.ebuild
 2104202339 ./x11-misc/redshift/redshift-1.12-r5.ebuild
@@ -28743,8 +28620,8 @@
 2104200509 ./x11-misc/xrestop/xrestop-0.4.ebuild
 2104192239 ./x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
 2103160039 ./x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild
-2103040339 ./x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
-2104202039 ./x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+2106071139 ./x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+2106071139 ./x11-misc/xscreensaver/xscreensaver-5.45.ebuild
 2005091209 ./x11-misc/xsel/xsel-1.2.0-r1.ebuild
 2008170839 ./x11-misc/xsel/xsel-9999.ebuild
 2102072339 ./x11-misc/xsensors/xsensors-0.80.ebuild
@@ -28805,6 +28682,7 @@
 2101070439 ./x11-misc/clipnotify/clipnotify-1.0.2.ebuild
 2105021839 ./x11-misc/compose-tables/compose-tables-1.7.0.ebuild
 2105272239 ./x11-misc/compose-tables/compose-tables-1.7.1.ebuild
+2106070209 ./x11-misc/compose-tables/compose-tables-1.7.2.ebuild
 2012232339 ./x11-misc/prime-run/prime-run-1.0.ebuild
 2104042209 ./x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild
 2101300039 ./x11-misc/screenkey/screenkey-1.3.ebuild
@@ -29006,6 +28884,7 @@
 2102061109 ./x11-terms/aterm/aterm-1.0.1-r4.ebuild
 2002101039 ./x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
 2105291209 ./x11-terms/gnome-terminal/gnome-terminal-3.40.1.ebuild
+2106070109 ./x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
 2102211539 ./x11-terms/guake/guake-3.7.0.ebuild
 2102211539 ./x11-terms/guake/guake-9999.ebuild
 2101310343 ./x11-terms/kitty/kitty-0.19.3.ebuild
@@ -29028,12 +28907,12 @@
 2103101039 ./x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
 2105170309 ./x11-terms/rxvt-unicode/rxvt-unicode-9.26.ebuild
 2106032239 ./x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
-2101060009 ./x11-terms/sakura/sakura-3.7.1.ebuild
+2106071139 ./x11-terms/sakura/sakura-3.7.1.ebuild
 1903291509 ./x11-terms/st/st-9999.ebuild
 2012311940 ./x11-terms/st/st-0.8.4.ebuild
 2104042209 ./x11-terms/terminator/terminator-2.0.1.ebuild
 2104042209 ./x11-terms/terminator/terminator-2.1.0.ebuild
-2104101009 ./x11-terms/terminator/terminator-2.1.1.ebuild
+2106061039 ./x11-terms/terminator/terminator-2.1.1.ebuild
 2105111209 ./x11-terms/terminology/terminology-1.9.0.ebuild
 2102030309 ./x11-terms/tilda/tilda-1.5.2.ebuild
 2005081846 ./x11-terms/xfce4-terminal/xfce4-terminal-0.8.9.2.ebuild
@@ -29047,14 +28926,13 @@
 2106010309 ./x11-terms/kitty-terminfo/kitty-terminfo-0.20.3.ebuild
 2105181639 ./x11-terms/zutty/zutty-0.8.ebuild
 2106031009 ./x11-terms/zutty/zutty-0.9.ebuild
-2007142239 ./x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
 2105212309 ./x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild
+2106062139 ./x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
 2002230040 ./x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
 2105090839 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
 2105291839 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-40.1.1.ebuild
-2007142239 ./x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
 2105201939 ./x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild
-2105201639 ./x11-themes/adwaita-qt/adwaita-qt-1.3.0.ebuild
+2106062139 ./x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
 2003261841 ./x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
 2012170139 ./x11-themes/arc-theme/arc-theme-20201013.ebuild
 2101310139 ./x11-themes/arc-theme/arc-theme-20210127.ebuild
@@ -29166,9 +29044,9 @@
 2104262239 ./x11-themes/obsidian-xcursors/obsidian-xcursors-1.0-r1.ebuild
 1912291610 ./x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
 1912291610 ./x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
-2105050839 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild
-2105130739 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
-2106031839 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
+2106042309 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
+2106061039 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild
+2106042309 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
 2104262239 ./x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0-r1.ebuild
 1805212239 ./x11-themes/pidgin-penguins-smileys/pidgin-penguins-smileys-1.0.ebuild
 1804221708 ./x11-themes/pulse-glass/pulse-glass-20100616.ebuild
@@ -29219,7 +29097,7 @@
 2001141939 ./x11-wm/bspwm/bspwm-0.9.9.ebuild
 2101070409 ./x11-wm/bspwm/bspwm-0.9.10.ebuild
 2104161439 ./x11-wm/ctwm/ctwm-4.0.2.ebuild
-2105161609 ./x11-wm/ctwm/ctwm-4.0.3.ebuild
+2106070939 ./x11-wm/ctwm/ctwm-4.0.3.ebuild
 2006281409 ./x11-wm/cwm/cwm-9999.ebuild
 2102150339 ./x11-wm/cwm/cwm-6.6.ebuild
 2104160539 ./x11-wm/cwm/cwm-6.7.ebuild
@@ -29236,9 +29114,8 @@
 2010311439 ./x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
 2010311439 ./x11-wm/goomwwm/goomwwm-9999.ebuild
 2002061439 ./x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
-2101281109 ./x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
-2101281109 ./x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
-2104111109 ./x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
+2106060040 ./x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+2106060040 ./x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
 2105162309 ./x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
 2006040939 ./x11-wm/i3/i3-4.18.ebuild
 2010252239 ./x11-wm/i3/i3-4.18.3.ebuild
@@ -29246,8 +29123,8 @@
 2104042209 ./x11-wm/i3/i3-4.19.1.ebuild
 2104042209 ./x11-wm/i3/i3-9999.ebuild
 2104020139 ./x11-wm/icewm/icewm-2.2.1.ebuild
-2104280939 ./x11-wm/icewm/icewm-2.3.3.ebuild
 2105071709 ./x11-wm/icewm/icewm-2.3.4.ebuild
+2106071009 ./x11-wm/icewm/icewm-2.4.0.ebuild
 2104161439 ./x11-wm/jwm/jwm-2.3.7.ebuild
 2104151009 ./x11-wm/larswm/larswm-7.5.3-r2.ebuild
 2009300009 ./x11-wm/lumina/lumina-1.6.0.ebuild
@@ -29264,7 +29141,7 @@
 2104192239 ./x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
 2103040339 ./x11-wm/mutter/mutter-3.36.7-r1.ebuild
 2105310511 ./x11-wm/mutter/mutter-40.1.ebuild
-2106030309 ./x11-wm/mutter/mutter-40.1-r1.ebuild
+2106041139 ./x11-wm/mutter/mutter-40.1-r1.ebuild
 2012152209 ./x11-wm/notion/notion-3_p2015061300-r100.ebuild
 2012152209 ./x11-wm/notion/notion-9999.ebuild
 2103150209 ./x11-wm/openbox/openbox-9999.ebuild
@@ -30103,9 +29980,10 @@
 2106011113 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
 2106020609 metadata/md5-cache/app-accessibility/caribou-0.4.21-r3
 2106030240 metadata/md5-cache/app-accessibility/flite-2.2
-2106040440 metadata/md5-cache/app-accessibility/Manifest.gz
 2106040440 metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
 2106040440 metadata/md5-cache/app-accessibility/at-spi2-core-2.40.1
+2106070109 metadata/md5-cache/app-accessibility/Manifest.gz
+2106070109 metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
 1712092039 metadata/md5-cache/app-admin/eclean-kernel-1.99.4
 1705160038 metadata/md5-cache/app-admin/fifo-cronolog-1.1.1-r1
 1705150108 metadata/md5-cache/app-admin/filewatcher-2.4.6-r1
@@ -30200,7 +30078,6 @@
 2104060140 metadata/md5-cache/app-admin/killproc-2.13-r1
 2104060140 metadata/md5-cache/app-admin/makepasswd-1.10
 2104060140 metadata/md5-cache/app-admin/quickswitch-1.05
-2104071539 metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.25.1
 2104120442 metadata/md5-cache/app-admin/gnome-system-log-3.9.90
 2104120442 metadata/md5-cache/app-admin/haskell-updater-1.3.2
 2104121341 metadata/md5-cache/app-admin/apg-2.3.0b_p20150129
@@ -30258,8 +30135,6 @@
 2105010839 metadata/md5-cache/app-admin/mcollective-2.12.5
 2105081314 metadata/md5-cache/app-admin/authbind-2.1.2
 2105081314 metadata/md5-cache/app-admin/clog-1.3.0
-2105081314 metadata/md5-cache/app-admin/conky-1.11.6-r2
-2105081314 metadata/md5-cache/app-admin/conky-1.12.1
 2105081314 metadata/md5-cache/app-admin/conserver-8.2.6-r1
 2105080109 metadata/md5-cache/app-admin/dio-1.5.2-r2
 2105071809 metadata/md5-cache/app-admin/entr-4.9
@@ -30269,7 +30144,6 @@
 2105081009 metadata/md5-cache/app-admin/hcloud-1.22.1
 2105081314 metadata/md5-cache/app-admin/keepassxc-2.6.4-r2
 2105081314 metadata/md5-cache/app-admin/keepassxc-9999
-2105081314 metadata/md5-cache/app-admin/lsyncd-2.2.3
 2105081314 metadata/md5-cache/app-admin/monit-5.27.1
 2105081314 metadata/md5-cache/app-admin/monit-5.27.2
 2105081314 metadata/md5-cache/app-admin/monit-5.28.0
@@ -30285,13 +30159,11 @@
 2105081314 metadata/md5-cache/app-admin/tripwire-2.4.3.7
 2105081314 metadata/md5-cache/app-admin/ulogd-2.0.7-r2
 2105092239 metadata/md5-cache/app-admin/socklog-2.1.0
-2105101939 metadata/md5-cache/app-admin/conky-1.12.2
 2105111909 metadata/md5-cache/app-admin/logstash-bin-7.12.1
 2105121639 metadata/md5-cache/app-admin/sudo-1.9.7
 2105121039 metadata/md5-cache/app-admin/sysklogd-2.2.3
 2105131709 metadata/md5-cache/app-admin/apache-tools-2.4.46
 2105131709 metadata/md5-cache/app-admin/apache-tools-2.4.47
-2105141009 metadata/md5-cache/app-admin/conky-1.12.1-r1
 2105140339 metadata/md5-cache/app-admin/logsurfer+-1.8-r4
 2105122339 metadata/md5-cache/app-admin/selint-1.2.0
 2105140339 metadata/md5-cache/app-admin/tenshi-0.17-r1
@@ -30374,7 +30246,6 @@
 2105271139 metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.4
 2105271139 metadata/md5-cache/app-admin/keepass-2.48.1
 2105272039 metadata/md5-cache/app-admin/terraform-0.15.4
-2105281009 metadata/md5-cache/app-admin/exo-1.30.0
 2105281509 metadata/md5-cache/app-admin/logcheck-1.3.23
 2105282239 metadata/md5-cache/app-admin/graylog-3.3.13
 2105282239 metadata/md5-cache/app-admin/graylog-4.0.7
@@ -30391,11 +30262,6 @@
 2106011113 metadata/md5-cache/app-admin/github-backup-utils-3.0.0
 2106011113 metadata/md5-cache/app-admin/lib_users-0.14-r1
 2106011113 metadata/md5-cache/app-admin/lib_users-0.14-r2
-2106011113 metadata/md5-cache/app-admin/pydf-12-r1
-2106011113 metadata/md5-cache/app-admin/rsyslog-8.2008.0
-2106011113 metadata/md5-cache/app-admin/rsyslog-8.2010.0
-2106011113 metadata/md5-cache/app-admin/rsyslog-8.2012.0
-2106011113 metadata/md5-cache/app-admin/rsyslog-8.2012.0-r1
 2106011113 metadata/md5-cache/app-admin/rsyslog-8.2102.0
 2106011113 metadata/md5-cache/app-admin/rsyslog-8.2104.0
 2106011113 metadata/md5-cache/app-admin/syslog-ng-3.30.1
@@ -30406,8 +30272,6 @@
 2106011113 metadata/md5-cache/app-admin/undertaker-scripts-1
 2106011113 metadata/md5-cache/app-admin/yadm-2.4.0
 2106020141 metadata/md5-cache/app-admin/ansible-2.10.7
-2106020141 metadata/md5-cache/app-admin/ansible-9999
-2106020141 metadata/md5-cache/app-admin/ansible-base-2.10.4
 2106020141 metadata/md5-cache/app-admin/ansible-base-2.10.9
 2106020141 metadata/md5-cache/app-admin/ansible-cmdb-1.28
 2106020141 metadata/md5-cache/app-admin/ansible-cmdb-1.30
@@ -30457,12 +30321,24 @@
 2106021909 metadata/md5-cache/app-admin/puppet-7.7.0
 2106021909 metadata/md5-cache/app-admin/puppet-agent-7.7.0
 2106021909 metadata/md5-cache/app-admin/puppetserver-7.2.0
-2106040440 metadata/md5-cache/app-admin/Manifest.gz
-2106040109 metadata/md5-cache/app-admin/awscli-1.19.87
 2106040440 metadata/md5-cache/app-admin/gnome-abrt-1.3.6
-2106031139 metadata/md5-cache/app-admin/pydf-12-r2
 2106031139 metadata/md5-cache/app-admin/supervisor-4.2.2
 2106031139 metadata/md5-cache/app-admin/terraform-0.15.5
+2106071609 metadata/md5-cache/app-admin/Manifest.gz
+2106060639 metadata/md5-cache/app-admin/ansible-2.11.1
+2106060639 metadata/md5-cache/app-admin/ansible-9999
+2106060639 metadata/md5-cache/app-admin/ansible-base-2.10.10
+2106041939 metadata/md5-cache/app-admin/awscli-1.19.87
+2106051139 metadata/md5-cache/app-admin/awscli-1.19.88
+2106041039 metadata/md5-cache/app-admin/bitwarden-desktop-bin-1.26.5
+2106071609 metadata/md5-cache/app-admin/conky-1.11.6-r2
+2106071609 metadata/md5-cache/app-admin/conky-1.12.1
+2106071609 metadata/md5-cache/app-admin/conky-1.12.1-r1
+2106071609 metadata/md5-cache/app-admin/conky-1.12.2
+2106071009 metadata/md5-cache/app-admin/exo-1.31.0
+2106071009 metadata/md5-cache/app-admin/hcloud-1.23.0
+2106071609 metadata/md5-cache/app-admin/lsyncd-2.2.3
+2106070939 metadata/md5-cache/app-admin/pydf-12-r2
 2105081314 metadata/md5-cache/app-antivirus/clamav-0.103.2
 2106011113 metadata/md5-cache/app-antivirus/clamtk-6.11
 2106020141 metadata/md5-cache/app-antivirus/Manifest.gz
@@ -30582,8 +30458,6 @@
 2105311239 metadata/md5-cache/app-arch/dpkg-1.19.6
 2105311239 metadata/md5-cache/app-arch/dpkg-1.19.7
 2106011113 metadata/md5-cache/app-arch/rpm-4.14.2.1-r1
-2106011113 metadata/md5-cache/app-arch/rpm-4.16.0
-2106011113 metadata/md5-cache/app-arch/rpm-4.16.1.3
 2106020141 metadata/md5-cache/app-arch/bloscpack-0.16.0
 2106020609 metadata/md5-cache/app-arch/gnome-autoar-0.3.2
 2106020141 metadata/md5-cache/app-arch/patool-1.12
@@ -30596,7 +30470,6 @@
 2106030240 metadata/md5-cache/app-arch/brotli-1.0.9-r3
 2106030240 metadata/md5-cache/app-arch/brotli-9999
 2106030240 metadata/md5-cache/app-arch/bzip2-1.0.8-r1
-2106030309 metadata/md5-cache/app-arch/dpkg-1.20.7.1
 2106030240 metadata/md5-cache/app-arch/libarchive-3.5.1
 2106030240 metadata/md5-cache/app-arch/lz4-1.9.3
 2106030240 metadata/md5-cache/app-arch/snappy-1.1.8
@@ -30607,12 +30480,17 @@
 2106030240 metadata/md5-cache/app-arch/xz-utils-9999
 2106030240 metadata/md5-cache/app-arch/zstd-1.4.9
 2106030240 metadata/md5-cache/app-arch/zstd-1.5.0
-2106040440 metadata/md5-cache/app-arch/Manifest.gz
 2106040440 metadata/md5-cache/app-arch/bzip2-9999
 2106031139 metadata/md5-cache/app-arch/cksfv-1.3.15
 2106040440 metadata/md5-cache/app-arch/file-roller-3.40.0
 2106040440 metadata/md5-cache/app-arch/gcab-1.4
 2106031239 metadata/md5-cache/app-arch/snappy-1.1.9
+2106071609 metadata/md5-cache/app-arch/Manifest.gz
+2106041739 metadata/md5-cache/app-arch/dpkg-1.20.7.1
+2106070109 metadata/md5-cache/app-arch/gnome-autoar-0.3.3
+2106050739 metadata/md5-cache/app-arch/makeself-2.4.4
+2106071609 metadata/md5-cache/app-arch/rpm-4.16.0
+2106071609 metadata/md5-cache/app-arch/rpm-4.16.1.3
 1906012109 metadata/md5-cache/app-backup/consul-backinator-1.6.5
 1712281839 metadata/md5-cache/app-backup/dirvish-1.2.1
 1712281839 metadata/md5-cache/app-backup/hdup-2.0.14
@@ -30635,11 +30513,8 @@
 2103301639 metadata/md5-cache/app-backup/btrbk-0.31.2
 2103310849 metadata/md5-cache/app-backup/btrbk-9999
 2103310849 metadata/md5-cache/app-backup/mkstage4-9999
-2103301639 metadata/md5-cache/app-backup/snapper-0.5.6-r1
 2104031909 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
 2104120442 metadata/md5-cache/app-backup/pdumpfs-1.3-r2
-2104121341 metadata/md5-cache/app-backup/snapper-0.8.15-r1
-2104121341 metadata/md5-cache/app-backup/snapper-0.8.9-r1
 2104141939 metadata/md5-cache/app-backup/duply-2.3.1
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
@@ -30687,9 +30562,13 @@
 2106020141 metadata/md5-cache/app-backup/duplicity-0.8.19
 2106020141 metadata/md5-cache/app-backup/rdiff-backup-2.0.0
 2106020141 metadata/md5-cache/app-backup/untangle-https-backup-0.0.10-r1
-2106040440 metadata/md5-cache/app-backup/Manifest.gz
 2106040440 metadata/md5-cache/app-backup/deja-dup-42.7
-2106031139 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+2106071639 metadata/md5-cache/app-backup/Manifest.gz
+2106061209 metadata/md5-cache/app-backup/bacula-11.0.5
+2106071639 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
+2106060939 metadata/md5-cache/app-backup/snapper-0.8.15-r1
+2106060939 metadata/md5-cache/app-backup/snapper-0.8.16
+2106070409 metadata/md5-cache/app-backup/snapper-0.9.0
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 1910290939 metadata/md5-cache/app-benchmarks/geekbench-2.4.2
@@ -30720,7 +30599,6 @@
 2105012139 metadata/md5-cache/app-benchmarks/httperf-0.9.1_p20181111-r1
 2105011739 metadata/md5-cache/app-benchmarks/siege-4.0.7
 2105011739 metadata/md5-cache/app-benchmarks/siege-4.0.8
-2105011739 metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
 2105081314 metadata/md5-cache/app-benchmarks/acovea-gtk-1.0.1
 2105081314 metadata/md5-cache/app-benchmarks/libc-bench-20110206
 2105081314 metadata/md5-cache/app-benchmarks/pipebench-0.40-r2
@@ -30729,9 +30607,10 @@
 2105260410 metadata/md5-cache/app-benchmarks/hey-0.1.2
 2105260009 metadata/md5-cache/app-benchmarks/stress-ng-0.12.09
 2105300839 metadata/md5-cache/app-benchmarks/siege-4.0.9
-2106011113 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
-2106030139 metadata/md5-cache/app-benchmarks/Manifest.gz
 2106030139 metadata/md5-cache/app-benchmarks/geekbench-5.4.1
+2106071609 metadata/md5-cache/app-benchmarks/Manifest.gz
+2106071609 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r100
+2106071609 metadata/md5-cache/app-benchmarks/wrk-4.1.0-r100
 1910111840 metadata/md5-cache/app-cdr/ccd2iso-0.3
 1805212239 metadata/md5-cache/app-cdr/cdlabelgen-4.3.0
 1712122339 metadata/md5-cache/app-cdr/disc-cover-1.5.6-r1
@@ -30843,7 +30722,6 @@
 2103310849 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1-r1
 2103310849 metadata/md5-cache/app-crypt/debian-archive-keyring-2021.1
 2103310849 metadata/md5-cache/app-crypt/debian-archive-keyring-2021.1.1
-2103310520 metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
 2103310520 metadata/md5-cache/app-crypt/jitterentropy-rngd-1.1.0
 2103310520 metadata/md5-cache/app-crypt/kbfs-2.10.1
 2103310520 metadata/md5-cache/app-crypt/kbfs-2.11.0-r1
@@ -30915,7 +30793,6 @@
 2104261909 metadata/md5-cache/app-crypt/openpgp-keys-teemutoivola-20210426
 2104290509 metadata/md5-cache/app-crypt/kstart-4.2
 2104290509 metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
-2105011109 metadata/md5-cache/app-crypt/cardpeek-0.8.4
 2105010109 metadata/md5-cache/app-crypt/xca-2.1.2
 2105010109 metadata/md5-cache/app-crypt/xca-2.1.2-r1
 2105010109 metadata/md5-cache/app-crypt/xca-2.3.0
@@ -30986,22 +30863,14 @@
 2105311509 metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0
 2106011113 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.5
 2106011113 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
-2106020141 metadata/md5-cache/app-crypt/acme-1.13.0
 2106020141 metadata/md5-cache/app-crypt/acme-1.14.0
-2106020141 metadata/md5-cache/app-crypt/acme-1.15.0
 2106020141 metadata/md5-cache/app-crypt/acme-9999
 2106020141 metadata/md5-cache/app-crypt/acme-tiny-4.1.0
 2106020141 metadata/md5-cache/app-crypt/acme-tiny-9999
-2106020141 metadata/md5-cache/app-crypt/certbot-1.13.0
 2106020141 metadata/md5-cache/app-crypt/certbot-1.14.0
-2106020141 metadata/md5-cache/app-crypt/certbot-1.15.0
-2106020141 metadata/md5-cache/app-crypt/certbot-apache-1.13.0
 2106020141 metadata/md5-cache/app-crypt/certbot-apache-1.14.0
-2106020141 metadata/md5-cache/app-crypt/certbot-apache-1.15.0
 2106020141 metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
-2106020141 metadata/md5-cache/app-crypt/certbot-nginx-1.13.0
 2106020141 metadata/md5-cache/app-crypt/certbot-nginx-1.14.0
-2106020141 metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
 2106020141 metadata/md5-cache/app-crypt/glep63-check-9
 2106020141 metadata/md5-cache/app-crypt/gpgme-1.14.0
 2106020141 metadata/md5-cache/app-crypt/gpgme-1.15.0
@@ -31025,7 +30894,6 @@
 2106030240 metadata/md5-cache/app-crypt/hmaccalc-0.9.14
 2106030240 metadata/md5-cache/app-crypt/libb2-0.98.1-r2
 2106030240 metadata/md5-cache/app-crypt/libb2-0.98.1-r3
-2106030309 metadata/md5-cache/app-crypt/libmd-1.0.3
 2106030240 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 2106030240 metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r3
 2106030240 metadata/md5-cache/app-crypt/mit-krb5-1.18.3-r1
@@ -31036,10 +30904,17 @@
 2106030240 metadata/md5-cache/app-crypt/rhash-1.4.1
 2106030240 metadata/md5-cache/app-crypt/ssdeep-2.14.1
 2106030240 metadata/md5-cache/app-crypt/tc-play-2.0-r1
-2106040440 metadata/md5-cache/app-crypt/Manifest.gz
 2106040440 metadata/md5-cache/app-crypt/gcr-3.40.0
 2106040440 metadata/md5-cache/app-crypt/libsecret-0.20.4
 2106040440 metadata/md5-cache/app-crypt/seahorse-40.0-r1
+2106071609 metadata/md5-cache/app-crypt/Manifest.gz
+2106060709 metadata/md5-cache/app-crypt/acme-1.15.0
+2106071609 metadata/md5-cache/app-crypt/cardpeek-0.8.4
+2106060709 metadata/md5-cache/app-crypt/certbot-1.15.0
+2106060709 metadata/md5-cache/app-crypt/certbot-apache-1.15.0
+2106060709 metadata/md5-cache/app-crypt/certbot-nginx-1.15.0
+2106071609 metadata/md5-cache/app-crypt/ekeyd-1.1.5-r101
+2106041739 metadata/md5-cache/app-crypt/libmd-1.0.3
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1807201739 metadata/md5-cache/app-dicts/mecab-naist-jdic-0.6.3b_p20111013
 1908281339 metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
@@ -31606,7 +31481,6 @@
 2105311209 metadata/md5-cache/app-dicts/sword-Scofield-1.0
 2105311209 metadata/md5-cache/app-dicts/sword-StrongsGreek-1.2
 2106030139 metadata/md5-cache/app-dicts/verbiste-0.1.47
-2106040440 metadata/md5-cache/app-dicts/Manifest.gz
 2106040440 metadata/md5-cache/app-dicts/gnome-dictionary-40.0
 2106031739 metadata/md5-cache/app-dicts/myspell-af-20080701
 2106031739 metadata/md5-cache/app-dicts/myspell-bg-4.3
@@ -31648,7 +31522,6 @@
 2106031739 metadata/md5-cache/app-dicts/myspell-pt-20120420
 2106031739 metadata/md5-cache/app-dicts/myspell-pt-br-3.2.0
 2106031739 metadata/md5-cache/app-dicts/myspell-ro-3.3.10
-2106031739 metadata/md5-cache/app-dicts/myspell-ru-20180627
 2106031739 metadata/md5-cache/app-dicts/myspell-ru-20200606
 2106031739 metadata/md5-cache/app-dicts/myspell-sk-20200501
 2106031739 metadata/md5-cache/app-dicts/myspell-sl-20201231
@@ -31659,6 +31532,8 @@
 2106031739 metadata/md5-cache/app-dicts/myspell-tr-1.2
 2106031739 metadata/md5-cache/app-dicts/myspell-uk-5.3.1
 2106031739 metadata/md5-cache/app-dicts/myspell-zu-20100126
+2106070939 metadata/md5-cache/app-dicts/Manifest.gz
+2106070939 metadata/md5-cache/app-dicts/myspell-ru-20180627
 2002112051 metadata/md5-cache/app-doc/selfhtml-8.1.2
 2003261841 metadata/md5-cache/app-doc/devmanual-0_pre20200207
 2004032241 metadata/md5-cache/app-doc/jargon-4.4.7-r1
@@ -31670,7 +31545,6 @@
 2101061609 metadata/md5-cache/app-doc/vilearn-1.0
 2101061609 metadata/md5-cache/app-doc/zsh-lovers-0.9.1
 2101231224 metadata/md5-cache/app-doc/halibut-1.2
-2102241843 metadata/md5-cache/app-doc/cantera-docs-2.4.0
 2103011139 metadata/md5-cache/app-doc/cantera-docs-2.5.1
 2103050139 metadata/md5-cache/app-doc/selflinux-0.13.0
 2103050139 metadata/md5-cache/app-doc/selflinux-0.13.0-r1
@@ -31774,7 +31648,6 @@
 2104192309 metadata/md5-cache/app-doc/elisp-manual-26.3
 2104192239 metadata/md5-cache/app-doc/psmark-2.1
 2105051309 metadata/md5-cache/app-doc/gnucash-docs-4.5
-2105081314 metadata/md5-cache/app-doc/kicad-doc-5.1.9
 2105081314 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
 2105131709 metadata/md5-cache/app-doc/abs-guide-10
 2105131709 metadata/md5-cache/app-doc/tldp-howto-20120707
@@ -31791,8 +31664,9 @@
 2106011113 metadata/md5-cache/app-doc/doxygen-9999
 2106011113 metadata/md5-cache/app-doc/gimp-help-2.10.0-r1
 2106011113 metadata/md5-cache/app-doc/mathjax-docs-2.7.7
-2106020141 metadata/md5-cache/app-doc/Manifest.gz
 2106020141 metadata/md5-cache/app-doc/cppman-0.5.1
+2106051939 metadata/md5-cache/app-doc/Manifest.gz
+2106050239 metadata/md5-cache/app-doc/kicad-doc-5.1.10
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
 1905250139 metadata/md5-cache/app-editors/le-1.16.5
 1804130008 metadata/md5-cache/app-editors/yudit-2.9.6
@@ -31823,7 +31697,6 @@
 2101231224 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
 2101231224 metadata/md5-cache/app-editors/wily-1.0-r2
 2101231224 metadata/md5-cache/app-editors/zile-2.3.24-r2
-2101240709 metadata/md5-cache/app-editors/scite-4.4.4-r10
 2102150509 metadata/md5-cache/app-editors/mg-20200723
 2102150509 metadata/md5-cache/app-editors/zile-2.4.15
 2102241843 metadata/md5-cache/app-editors/qxmledit-0.9.12
@@ -31835,7 +31708,6 @@
 2104030309 metadata/md5-cache/app-editors/mousepad-0.5.4
 2104120442 metadata/md5-cache/app-editors/jext-5.0-r2
 2104111439 metadata/md5-cache/app-editors/mousepad-0.5.3-r1
-2104121341 metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
 2104130239 metadata/md5-cache/app-editors/dhex-0.69
 2104121341 metadata/md5-cache/app-editors/hexcurse-1.60.0
 2104121341 metadata/md5-cache/app-editors/joe-4.3-r1
@@ -31845,7 +31717,6 @@
 2104121341 metadata/md5-cache/app-editors/shed-1.15
 2104150839 metadata/md5-cache/app-editors/gnome-latex-3.38.0
 2104161439 metadata/md5-cache/app-editors/fte-20110708-r1
-2104170739 metadata/md5-cache/app-editors/vis-9999
 2104180939 metadata/md5-cache/app-editors/jedit-5.2.0-r1
 2104200209 metadata/md5-cache/app-editors/elvis-2.2.0-r8
 2104200439 metadata/md5-cache/app-editors/hexedit-1.2.13
@@ -31877,7 +31748,6 @@
 2105152239 metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r4
 2105161410 metadata/md5-cache/app-editors/kile-2.9.93-r1
 2105170639 metadata/md5-cache/app-editors/nano-5.6.1
-2105162209 metadata/md5-cache/app-editors/vis-0.7
 2105180040 metadata/md5-cache/app-editors/padre-1.0.0-r1
 2105180210 metadata/md5-cache/app-editors/vile-9.8u
 2105190309 metadata/md5-cache/app-editors/ne-3.3.1
@@ -31892,27 +31762,32 @@
 2105310909 metadata/md5-cache/app-editors/emacs-27.1-r4
 2105310909 metadata/md5-cache/app-editors/emacs-27.2.9999
 2105310909 metadata/md5-cache/app-editors/emacs-28.0.9999
-2105311509 metadata/md5-cache/app-editors/neovim-0.4.4-r100
-2105311509 metadata/md5-cache/app-editors/neovim-9999
 2106011113 metadata/md5-cache/app-editors/bluefish-2.2.12
-2106011113 metadata/md5-cache/app-editors/gvim-8.2.0814-r100
-2106011113 metadata/md5-cache/app-editors/gvim-9999
 2106011113 metadata/md5-cache/app-editors/pluma-1.24.1
-2106011113 metadata/md5-cache/app-editors/texworks-0.6.5-r100
-2106011113 metadata/md5-cache/app-editors/texworks-0.6.6
-2106011113 metadata/md5-cache/app-editors/vim-8.2.0814-r100
-2106011113 metadata/md5-cache/app-editors/vim-9999
 2106020141 metadata/md5-cache/app-editors/pyvim-3.0.2
 2106020141 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
 2106020141 metadata/md5-cache/app-editors/retext-7.1.0
 2106020141 metadata/md5-cache/app-editors/retext-7.2.1
 2106020141 metadata/md5-cache/app-editors/retext-9999
-2106040440 metadata/md5-cache/app-editors/Manifest.gz
-2106031939 metadata/md5-cache/app-editors/emacs-27.2
 2106040440 metadata/md5-cache/app-editors/gedit-40.1
 2106040440 metadata/md5-cache/app-editors/gedit-plugins-40.1
 2106040440 metadata/md5-cache/app-editors/ghex-3.18.4-r1
 2106031139 metadata/md5-cache/app-editors/mg-20210314
+2106071609 metadata/md5-cache/app-editors/Manifest.gz
+2106071139 metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
+2106070939 metadata/md5-cache/app-editors/emacs-27.2
+2106071609 metadata/md5-cache/app-editors/gvim-8.2.0814-r100
+2106071609 metadata/md5-cache/app-editors/gvim-9999
+2106071609 metadata/md5-cache/app-editors/neovim-0.4.4-r100
+2106071609 metadata/md5-cache/app-editors/neovim-9999
+2106071609 metadata/md5-cache/app-editors/scite-4.4.4-r10
+2106071609 metadata/md5-cache/app-editors/texworks-0.6.5-r100
+2106071609 metadata/md5-cache/app-editors/texworks-0.6.6
+2106071609 metadata/md5-cache/app-editors/vim-8.2.0814-r100
+2106071609 metadata/md5-cache/app-editors/vim-9999
+2106071609 metadata/md5-cache/app-editors/vis-0.7
+2106071609 metadata/md5-cache/app-editors/vis-9999
+2106041109 metadata/md5-cache/app-editors/vscodium-1.56.2
 2104192339 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2104192339 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2104192339 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -32173,8 +32048,10 @@
 2105311109 metadata/md5-cache/app-emacs/chess-2.0.5
 2105311109 metadata/md5-cache/app-emacs/evil-1.14.0
 2105311109 metadata/md5-cache/app-emacs/mic-paren-3.13
-2106020141 metadata/md5-cache/app-emacs/Manifest.gz
 2106020141 metadata/md5-cache/app-emacs/pymacs-0.26-r2
+2106051109 metadata/md5-cache/app-emacs/Manifest.gz
+2106051109 metadata/md5-cache/app-emacs/libegit2-0.0.20200515
+2106051109 metadata/md5-cache/app-emacs/magit-3.0.0
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
 1709080309 metadata/md5-cache/app-emulation/docker-bench-security-1.3.2
 1710122038 metadata/md5-cache/app-emulation/docker-bench-security-1.3.3
@@ -32184,26 +32061,12 @@
 1905112309 metadata/md5-cache/app-emulation/spice-html5-0.2.1
 1812071609 metadata/md5-cache/app-emulation/virt-what-1.19
 1910111840 metadata/md5-cache/app-emulation/wine-desktop-common-20150204-r1
-1808240739 metadata/md5-cache/app-emulation/wine-mono-4.6.4
-1808240739 metadata/md5-cache/app-emulation/wine-mono-4.7.0
-1808240739 metadata/md5-cache/app-emulation/wine-mono-4.7.1
-1808240739 metadata/md5-cache/app-emulation/wine-mono-4.7.3
-1906041809 metadata/md5-cache/app-emulation/wine-mono-4.7.5
-1903171739 metadata/md5-cache/app-emulation/wine-mono-4.8.0
-1904160509 metadata/md5-cache/app-emulation/wine-mono-4.8.1
-1905030139 metadata/md5-cache/app-emulation/wine-mono-4.8.3
-1906230109 metadata/md5-cache/app-emulation/wine-mono-4.9.0
-1908172039 metadata/md5-cache/app-emulation/wine-mono-4.9.2
-1909282039 metadata/md5-cache/app-emulation/wine-mono-4.9.3
 1911302339 metadata/md5-cache/app-emulation/virt-what-1.20
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2001291739 metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0-r1
 2002230040 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
 2003150109 metadata/md5-cache/app-emulation/spice-html5-0.2.2
 2004132009 metadata/md5-cache/app-emulation/wine-gecko-2.47.1
-2004132009 metadata/md5-cache/app-emulation/wine-mono-4.9.4
-2004260039 metadata/md5-cache/app-emulation/wine-mono-5.0.0
-2006200709 metadata/md5-cache/app-emulation/wine-mono-5.1.0
 2007110439 metadata/md5-cache/app-emulation/qemu-riscv64-bin-5.0.0
 2011070709 metadata/md5-cache/app-emulation/spice-protocol-0.14.1
 2011160239 metadata/md5-cache/app-emulation/libdsk-1.5.8
@@ -32220,7 +32083,6 @@
 2101231224 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.18.142142
 2101271639 metadata/md5-cache/app-emulation/libcacard-2.6.0
 2102080239 metadata/md5-cache/app-emulation/free42-2.5.25
-2102132309 metadata/md5-cache/app-emulation/wine-mono-6.0.0
 2102180309 metadata/md5-cache/app-emulation/free42-2.5.24
 2102260109 metadata/md5-cache/app-emulation/conmon-2.0.26
 2102281909 metadata/md5-cache/app-emulation/wine-mono-5.1.1
@@ -32265,10 +32127,8 @@
 2104121341 metadata/md5-cache/app-emulation/lxc-templates-3.0.4
 2104121341 metadata/md5-cache/app-emulation/punes-0.107
 2104121341 metadata/md5-cache/app-emulation/runv-0.7.0
-2104121341 metadata/md5-cache/app-emulation/ski-1.3.2-r4
 2104121341 metadata/md5-cache/app-emulation/slirp4netns-1.1.8
 2104121341 metadata/md5-cache/app-emulation/slirp4netns-1.1.9
-2104121341 metadata/md5-cache/app-emulation/snapd-2.47.1-r1
 2104121341 metadata/md5-cache/app-emulation/snapd-2.48
 2104121341 metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
 2104121341 metadata/md5-cache/app-emulation/spice-vdagent-0.19.0-r1
@@ -32346,13 +32206,11 @@
 2106011113 metadata/md5-cache/app-emulation/crossover-bin-20.0.4
 2106011113 metadata/md5-cache/app-emulation/crun-0.18
 2106011113 metadata/md5-cache/app-emulation/crun-0.19.1
-2106011113 metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
 2106011209 metadata/md5-cache/app-emulation/lxc-4.0.9-r1
 2106011209 metadata/md5-cache/app-emulation/lxd-4.0.6
 2106011113 metadata/md5-cache/app-emulation/qemu-5.2.0-r2
 2106011113 metadata/md5-cache/app-emulation/qemu-5.2.0-r3
 2106011113 metadata/md5-cache/app-emulation/qemu-5.2.0-r50
-2106011113 metadata/md5-cache/app-emulation/qemu-6.0.0
 2106011113 metadata/md5-cache/app-emulation/qemu-9999
 2106011113 metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1
 2106011113 metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
@@ -32394,7 +32252,6 @@
 2106020141 metadata/md5-cache/app-emulation/virt-manager-2.2.1-r3
 2106020141 metadata/md5-cache/app-emulation/virt-manager-3.1.0
 2106020141 metadata/md5-cache/app-emulation/virt-manager-3.2.0
-2106020141 metadata/md5-cache/app-emulation/virt-manager-9999
 2106030240 metadata/md5-cache/app-emulation/faudio-21.01
 2106030240 metadata/md5-cache/app-emulation/faudio-9999
 2106030240 metadata/md5-cache/app-emulation/vkd3d-1.0
@@ -32402,18 +32259,13 @@
 2106030240 metadata/md5-cache/app-emulation/vkd3d-1.1-r1
 2106030240 metadata/md5-cache/app-emulation/vkd3d-1.2
 2106030240 metadata/md5-cache/app-emulation/vkd3d-9999
-2106030240 metadata/md5-cache/app-emulation/wine-staging-6.6
 2106030240 metadata/md5-cache/app-emulation/wine-staging-6.7
 2106030240 metadata/md5-cache/app-emulation/wine-staging-6.8
 2106030240 metadata/md5-cache/app-emulation/wine-staging-6.9
-2106030240 metadata/md5-cache/app-emulation/wine-staging-9999
 2106030240 metadata/md5-cache/app-emulation/wine-vanilla-6.0
-2106030240 metadata/md5-cache/app-emulation/wine-vanilla-6.6
 2106030240 metadata/md5-cache/app-emulation/wine-vanilla-6.7
 2106030240 metadata/md5-cache/app-emulation/wine-vanilla-6.8
 2106030240 metadata/md5-cache/app-emulation/wine-vanilla-6.9
-2106030240 metadata/md5-cache/app-emulation/wine-vanilla-9999
-2106040440 metadata/md5-cache/app-emulation/Manifest.gz
 2106031739 metadata/md5-cache/app-emulation/cloud-init-21.2
 2106031739 metadata/md5-cache/app-emulation/cloud-init-9999
 2106032239 metadata/md5-cache/app-emulation/fuse-1.6.0
@@ -32424,12 +32276,24 @@
 2106040440 metadata/md5-cache/app-emulation/libvirt-7.1.0-r1
 2106040440 metadata/md5-cache/app-emulation/libvirt-7.2.0-r1
 2106040440 metadata/md5-cache/app-emulation/libvirt-7.3.0
-2106040440 metadata/md5-cache/app-emulation/libvirt-9999
 2106040440 metadata/md5-cache/app-emulation/libvirt-glib-4.0.0
 2106032309 metadata/md5-cache/app-emulation/nemu-2.5.0
 2106040440 metadata/md5-cache/app-emulation/spice-9999
 2106040440 metadata/md5-cache/app-emulation/spice-protocol-0.14.3
 2106040440 metadata/md5-cache/app-emulation/spice-protocol-9999
+2106071609 metadata/md5-cache/app-emulation/Manifest.gz
+2106071609 metadata/md5-cache/app-emulation/libguestfs-1.38.6-r103
+2106051440 metadata/md5-cache/app-emulation/libvirt-9999
+2106070939 metadata/md5-cache/app-emulation/qemu-6.0.0
+2106051410 metadata/md5-cache/app-emulation/ski-1.3.2-r4
+2106052309 metadata/md5-cache/app-emulation/snapd-2.51
+2106051440 metadata/md5-cache/app-emulation/virt-manager-9999
+2106070739 metadata/md5-cache/app-emulation/virt-what-1.21
+2106051909 metadata/md5-cache/app-emulation/wine-mono-6.2.0
+2106051909 metadata/md5-cache/app-emulation/wine-staging-6.10
+2106051909 metadata/md5-cache/app-emulation/wine-staging-9999
+2106051909 metadata/md5-cache/app-emulation/wine-vanilla-6.10
+2106051909 metadata/md5-cache/app-emulation/wine-vanilla-9999
 1708300239 metadata/md5-cache/app-eselect/eselect-renpy-0.7
 1912200109 metadata/md5-cache/app-eselect/eselect-vdr-0.0.3
 1912200109 metadata/md5-cache/app-eselect/eselect-vdr-0.0.4
@@ -32486,8 +32350,9 @@
 2105180939 metadata/md5-cache/app-eselect/eselect-QtPy-1.0
 2105190839 metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
 2105260410 metadata/md5-cache/app-eselect/eselect-notify-send-0.1
-2106011113 metadata/md5-cache/app-eselect/Manifest.gz
 2106011113 metadata/md5-cache/app-eselect/eselect-repository-10
+2106062039 metadata/md5-cache/app-eselect/Manifest.gz
+2106062039 metadata/md5-cache/app-eselect/eselect-repository-11
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
 2005211139 metadata/md5-cache/app-forensics/examiner-0.5-r3
 2006011108 metadata/md5-cache/app-forensics/zzuf-0.15-r1
@@ -32605,8 +32470,6 @@
 2105052209 metadata/md5-cache/app-i18n/xcin-2.5.3_pre3-r3
 2105081314 metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
 2105081314 metadata/md5-cache/app-i18n/dbskkd-cdb-3.00
-2105081314 metadata/md5-cache/app-i18n/fcitx-4.2.9.8
-2105081314 metadata/md5-cache/app-i18n/fcitx-4.9999
 2105081314 metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
 2105081314 metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
 2105081314 metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
@@ -32641,8 +32504,6 @@
 2105081314 metadata/md5-cache/app-i18n/kcm-fcitx-0.5.6
 2105081314 metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
 2105081314 metadata/md5-cache/app-i18n/librime-1.5.3-r1
-2105081314 metadata/md5-cache/app-i18n/librime-lua-20201011103348
-2105081314 metadata/md5-cache/app-i18n/librime-lua-99999999999999
 2105081314 metadata/md5-cache/app-i18n/poedit-2.2.4
 2105081314 metadata/md5-cache/app-i18n/poedit-2.3.1
 2105081314 metadata/md5-cache/app-i18n/scim-1.4.18
@@ -32666,8 +32527,6 @@
 2105311239 metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
 2105311239 metadata/md5-cache/app-i18n/scim-bridge-0.4.16-r3
 2105311239 metadata/md5-cache/app-i18n/scim-tomoe-0.6.0-r3
-2106011113 metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
-2106011113 metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
 2106011113 metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
 2106011113 metadata/md5-cache/app-i18n/ibus-table-1.12.1
 2106011113 metadata/md5-cache/app-i18n/ibus-table-1.12.4
@@ -32704,8 +32563,14 @@
 2106020141 metadata/md5-cache/app-i18n/nkf-2.1.5
 2106020141 metadata/md5-cache/app-i18n/transifex-client-0.14.2-r1
 2106020609 metadata/md5-cache/app-i18n/unicode-data-13.0.0
-2106031939 metadata/md5-cache/app-i18n/Manifest.gz
-2106031939 metadata/md5-cache/app-i18n/librime-1.7.3
+2106071609 metadata/md5-cache/app-i18n/Manifest.gz
+2106071609 metadata/md5-cache/app-i18n/fcitx-4.2.9.8
+2106071609 metadata/md5-cache/app-i18n/fcitx-4.9999
+2106071609 metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
+2106071609 metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
+2106042309 metadata/md5-cache/app-i18n/librime-1.7.3
+2106071609 metadata/md5-cache/app-i18n/librime-lua-20201011103348
+2106071609 metadata/md5-cache/app-i18n/librime-lua-99999999999999
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2101231224 metadata/md5-cache/app-laptop/msi-keyboard-1.0
 2101231224 metadata/md5-cache/app-laptop/spicctrl-1.9-r1
@@ -32731,7 +32596,6 @@
 2105081314 metadata/md5-cache/app-laptop/tp_smapi-0.43-r1
 2105142109 metadata/md5-cache/app-laptop/Manifest.gz
 2105142109 metadata/md5-cache/app-laptop/pommed-1.39-r2
-2101231224 metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
 2103310541 metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
 2103310541 metadata/md5-cache/app-metrics/burrow_exporter-0.0.6-r1
 2103310541 metadata/md5-cache/app-metrics/consul_exporter-0.4.0
@@ -32790,8 +32654,9 @@
 2105260410 metadata/md5-cache/app-metrics/redis_exporter-1.2.1
 2105260410 metadata/md5-cache/app-metrics/redis_exporter-1.20.0
 2105272109 metadata/md5-cache/app-metrics/alertmanager-0.22.1
-2106011113 metadata/md5-cache/app-metrics/Manifest.gz
-2106011113 metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+2106071609 metadata/md5-cache/app-metrics/Manifest.gz
+2106071609 metadata/md5-cache/app-metrics/collectd-5.12.0-r1
+2106071609 metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610-r100
 1806092239 metadata/md5-cache/app-misc/acdctl-1.1-r1
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
 1805222139 metadata/md5-cache/app-misc/cadubi-1.3
@@ -32881,7 +32746,6 @@
 2102211039 metadata/md5-cache/app-misc/when-1.1.40
 2102241843 metadata/md5-cache/app-misc/kryoflux-dtc-2.6-r1
 2102241843 metadata/md5-cache/app-misc/rbutil-1.4.1-r2
-2102241843 metadata/md5-cache/app-misc/socnetv-2.2
 2102241843 metadata/md5-cache/app-misc/zygrib-8.0.1-r1
 2102270209 metadata/md5-cache/app-misc/scrub-2.6.1
 2102272009 metadata/md5-cache/app-misc/dateutils-0.4.7
@@ -32947,7 +32811,6 @@
 2104060140 metadata/md5-cache/app-misc/dtach-0.9
 2104060140 metadata/md5-cache/app-misc/editor-wrapper-4-r1
 2104060140 metadata/md5-cache/app-misc/mime-types-9
-2104120442 metadata/md5-cache/app-misc/jitac-0.3.0
 2104112239 metadata/md5-cache/app-misc/notary-0.6.1-r2
 2104120442 metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.11
 2104121341 metadata/md5-cache/app-misc/abook-0.6.1-r2
@@ -32955,7 +32818,6 @@
 2104130339 metadata/md5-cache/app-misc/cdircmp-0.3-r2
 2104121341 metadata/md5-cache/app-misc/cstream-3.1.1-r1
 2104121341 metadata/md5-cache/app-misc/dateutils-9999
-2104121341 metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630
 2104121341 metadata/md5-cache/app-misc/delay-1.6-r2
 2104121341 metadata/md5-cache/app-misc/dfshow-0.9.1_beta-r1
 2104121341 metadata/md5-cache/app-misc/enum-1.1-r1
@@ -32988,7 +32850,6 @@
 2104121341 metadata/md5-cache/app-misc/vifm-9999
 2104121341 metadata/md5-cache/app-misc/vittk-1.3
 2104121341 metadata/md5-cache/app-misc/wipe-2.3.1
-2104121341 metadata/md5-cache/app-misc/worker-4.6.1-r100
 2104151009 metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
 2104161439 metadata/md5-cache/app-misc/bfr-1.6-r3
 2104161439 metadata/md5-cache/app-misc/ddccontrol-db-20190826_p20200613
@@ -33053,7 +32914,6 @@
 2105081314 metadata/md5-cache/app-misc/ckb-0.4.4
 2105081314 metadata/md5-cache/app-misc/ckb-0.4.4-r1
 2105081314 metadata/md5-cache/app-misc/ckermit-9.0.302
-2105081314 metadata/md5-cache/app-misc/cmatrix-2.0-r2
 2105081314 metadata/md5-cache/app-misc/ddate-0.2.2_p20160627
 2105081314 metadata/md5-cache/app-misc/ddcutil-0.9.1
 2105081314 metadata/md5-cache/app-misc/ddcutil-0.9.5
@@ -33061,11 +32921,9 @@
 2105081314 metadata/md5-cache/app-misc/devtodo-0.1.20-r3
 2105081314 metadata/md5-cache/app-misc/gcal-3.6.3
 2105081314 metadata/md5-cache/app-misc/gcal-4.1
-2105081314 metadata/md5-cache/app-misc/geekcode-1.7.3-r1
 2105081314 metadata/md5-cache/app-misc/glimpse-4.18.6-r1
 2105081314 metadata/md5-cache/app-misc/i2bits-0.1.0
 2105081314 metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
-2105081314 metadata/md5-cache/app-misc/jail-2.0-r4
 2105081314 metadata/md5-cache/app-misc/logiops-0.2.3
 2105081314 metadata/md5-cache/app-misc/lsx-0.1-r1
 2105081314 metadata/md5-cache/app-misc/mc-4.8.26-r2
@@ -33116,7 +32974,6 @@
 2105260410 metadata/md5-cache/app-misc/go-jira-1.0.23
 2105260410 metadata/md5-cache/app-misc/go-jira-1.0.26
 2105260410 metadata/md5-cache/app-misc/go-jira-1.0.27
-2105260410 metadata/md5-cache/app-misc/mkcert-1.4.1
 2105260410 metadata/md5-cache/app-misc/pet-0.3.6
 2105260410 metadata/md5-cache/app-misc/pet-0.3.6-r1
 2105260410 metadata/md5-cache/app-misc/spire-0.10.0
@@ -33141,7 +32998,6 @@
 2106011113 metadata/md5-cache/app-misc/mosquitto-1.6.8
 2106011113 metadata/md5-cache/app-misc/mosquitto-1.6.9
 2106011113 metadata/md5-cache/app-misc/mosquitto-2.0.10
-2106011113 metadata/md5-cache/app-misc/pax-utils-1.2.9
 2106011113 metadata/md5-cache/app-misc/pax-utils-1.3.1
 2106011113 metadata/md5-cache/app-misc/recoll-1.27.12
 2106011113 metadata/md5-cache/app-misc/recoll-1.28.5
@@ -33160,7 +33016,6 @@
 2106020141 metadata/md5-cache/app-misc/gramps-5.1.3
 2106011509 metadata/md5-cache/app-misc/grc-1.11.3
 2106011509 metadata/md5-cache/app-misc/grc-1.12
-2106012309 metadata/md5-cache/app-misc/hivex-1.3.18
 2106020141 metadata/md5-cache/app-misc/icdiff-1.9.5
 2106020141 metadata/md5-cache/app-misc/khal-0.10.1-r1
 2106020141 metadata/md5-cache/app-misc/khal-0.10.2
@@ -33179,7 +33034,6 @@
 2106020141 metadata/md5-cache/app-misc/tmuxp-1.5.4
 2106020141 metadata/md5-cache/app-misc/tmuxp-1.6.5
 2106020141 metadata/md5-cache/app-misc/tmuxp-1.7.2-r1
-2106020141 metadata/md5-cache/app-misc/trash-cli-0.20.11.23-r1
 2106020141 metadata/md5-cache/app-misc/trash-cli-0.20.12.26-r1
 2106020141 metadata/md5-cache/app-misc/wildq-1.1.10
 2106020141 metadata/md5-cache/app-misc/yq-2.11.1
@@ -33188,7 +33042,6 @@
 2106031039 metadata/md5-cache/app-misc/filebus-0.2.0
 2106022009 metadata/md5-cache/app-misc/remind-03.03.05
 2106030240 metadata/md5-cache/app-misc/rl-0.2.7-r1
-2106040440 metadata/md5-cache/app-misc/Manifest.gz
 2106040440 metadata/md5-cache/app-misc/bijiben-40.1
 2106032139 metadata/md5-cache/app-misc/gcstar-1.7.1-r2
 2106040440 metadata/md5-cache/app-misc/geoclue-2.5.7
@@ -33199,6 +33052,17 @@
 2106040440 metadata/md5-cache/app-misc/tracker-miners-2.3.5
 2106040440 metadata/md5-cache/app-misc/tracker-miners-2.3.5-r1
 2106040440 metadata/md5-cache/app-misc/tracker-miners-3.1.1
+2106071609 metadata/md5-cache/app-misc/Manifest.gz
+2106051039 metadata/md5-cache/app-misc/cmatrix-2.0-r3
+2106071139 metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630
+2106071039 metadata/md5-cache/app-misc/filebus-0.3.0
+2106071139 metadata/md5-cache/app-misc/geekcode-1.7.3-r1
+2106071139 metadata/md5-cache/app-misc/hivex-1.3.18
+2106071139 metadata/md5-cache/app-misc/jail-2.0-r4
+2106070939 metadata/md5-cache/app-misc/mkcert-1.4.1
+2106071139 metadata/md5-cache/app-misc/socnetv-2.2
+2106070839 metadata/md5-cache/app-misc/trash-cli-0.21.5.25
+2106071609 metadata/md5-cache/app-misc/worker-4.6.1-r100
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -33235,7 +33099,6 @@
 2104120442 metadata/md5-cache/app-office/abiword-docs-3.0.2
 2104120442 metadata/md5-cache/app-office/borg-1.7.4-r3
 2104120442 metadata/md5-cache/app-office/dia2code-1.0.0
-2104120442 metadata/md5-cache/app-office/hourglass-0.7.2-r1
 2104120442 metadata/md5-cache/app-office/pinpoint-0.1.8-r1
 2104120442 metadata/md5-cache/app-office/planner-0.14.6_p20130520-r2
 2104101709 metadata/md5-cache/app-office/upwork-5.4.5.1-r1
@@ -33280,11 +33143,11 @@
 2106011113 metadata/md5-cache/app-office/scribus-9999
 2106011113 metadata/md5-cache/app-office/unoconv-0.9.0
 2106030210 metadata/md5-cache/app-office/calligra-3.2.1-r2
-2106040440 metadata/md5-cache/app-office/Manifest.gz
 2106040440 metadata/md5-cache/app-office/gnome-todo-3.28.1-r1
 2106032239 metadata/md5-cache/app-office/gnucash-4.4
 2106032239 metadata/md5-cache/app-office/gnucash-4.5
 2106040440 metadata/md5-cache/app-office/gtg-0.4.0
+2106062039 metadata/md5-cache/app-office/Manifest.gz
 2103310520 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2103310520 metadata/md5-cache/app-officeext/languagetool-5.0
 2103310520 metadata/md5-cache/app-officeext/languagetool-5.1.3
@@ -33313,14 +33176,12 @@
 2106011113 metadata/md5-cache/app-pda/Manifest.gz
 2106011113 metadata/md5-cache/app-pda/libimobiledevice-1.3.0-r1
 2106011113 metadata/md5-cache/app-pda/libplist-2.2.0-r3
-2004032241 metadata/md5-cache/app-portage/demerge-0.047-r3
 2004032241 metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
 2008291939 metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
 2012031439 metadata/md5-cache/app-portage/mgorny-dev-scripts-6
 2012231444 metadata/md5-cache/app-portage/epkg-0.4-r1
 2012311940 metadata/md5-cache/app-portage/euses-2.5.9
 2012311940 metadata/md5-cache/app-portage/euses-2.6.0
-2012311940 metadata/md5-cache/app-portage/perl-info-0.16
 2101061639 metadata/md5-cache/app-portage/cpuid2cpuflags-11
 2101061639 metadata/md5-cache/app-portage/prefix-toolkit-8
 2101191539 metadata/md5-cache/app-portage/mgorny-dev-scripts-7
@@ -33386,8 +33247,6 @@
 2106020141 metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
 2106020141 metadata/md5-cache/app-portage/gentoolkit-0.5.1
 2106020141 metadata/md5-cache/app-portage/gentoolkit-9999
-2106020141 metadata/md5-cache/app-portage/gentoopm-0.3.3
-2106020141 metadata/md5-cache/app-portage/gentoopm-9999
 2106020141 metadata/md5-cache/app-portage/gpyutils-0.4.5
 2106020141 metadata/md5-cache/app-portage/gpyutils-0.5.1
 2106020141 metadata/md5-cache/app-portage/gpyutils-0.6
@@ -33409,18 +33268,21 @@
 2106020141 metadata/md5-cache/app-portage/pfl-3.1-r1
 2106020141 metadata/md5-cache/app-portage/repoman-2.3.23
 2106020141 metadata/md5-cache/app-portage/repoman-3.0.2
-2106020141 metadata/md5-cache/app-portage/repoman-3.0.3-r1
-2106020141 metadata/md5-cache/app-portage/repoman-9999
-2106020141 metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
-2106020141 metadata/md5-cache/app-portage/smart-live-rebuild-9999
-2106020141 metadata/md5-cache/app-portage/tatt-0.7-r1
 2106020141 metadata/md5-cache/app-portage/tatt-0.8
 2106020141 metadata/md5-cache/app-portage/tatt-9999
 2106022209 metadata/md5-cache/app-portage/prefix-toolkit-9
-2106040440 metadata/md5-cache/app-portage/Manifest.gz
 2106040139 metadata/md5-cache/app-portage/gemato-16.2
 2106040139 metadata/md5-cache/app-portage/gemato-9999
 2106040440 metadata/md5-cache/app-portage/pram-10
+2106062039 metadata/md5-cache/app-portage/Manifest.gz
+2106060909 metadata/md5-cache/app-portage/eix-0.35.0
+2106041309 metadata/md5-cache/app-portage/gentoopm-0.3.3
+2106041309 metadata/md5-cache/app-portage/gentoopm-9999
+2106061039 metadata/md5-cache/app-portage/kuroneko-0.1.0
+2106041209 metadata/md5-cache/app-portage/repoman-3.0.3-r1
+2106060939 metadata/md5-cache/app-portage/repoman-9999
+2106041309 metadata/md5-cache/app-portage/smart-live-rebuild-1.3.7
+2106041309 metadata/md5-cache/app-portage/smart-live-rebuild-9999
 1907092339 metadata/md5-cache/app-shells/rush-2.0
 1907130039 metadata/md5-cache/app-shells/rush-2.1
 1912110241 metadata/md5-cache/app-shells/pdsh-2.26-r1
@@ -33503,12 +33365,13 @@
 2106020141 metadata/md5-cache/app-shells/powerline-9999
 2106020141 metadata/md5-cache/app-shells/thefuck-3.28
 2106020141 metadata/md5-cache/app-shells/thefuck-3.30
-2106040440 metadata/md5-cache/app-shells/Manifest.gz
 2106040440 metadata/md5-cache/app-shells/ksh-2020.0.0-r1
 2106040440 metadata/md5-cache/app-shells/ksh-9999
 2106040440 metadata/md5-cache/app-shells/loksh-6.8
 2106040440 metadata/md5-cache/app-shells/loksh-6.8.1
 2106040440 metadata/md5-cache/app-shells/loksh-6.9
+2106051709 metadata/md5-cache/app-shells/Manifest.gz
+2106051709 metadata/md5-cache/app-shells/dash-0.5.11.4
 1803271139 metadata/md5-cache/app-text/convmv-2.05
 1910111840 metadata/md5-cache/app-text/dbacl-1.14.1
 1910111840 metadata/md5-cache/app-text/libwpd-0.10.3
@@ -33597,7 +33460,6 @@
 2101231224 metadata/md5-cache/app-text/xml2doc-20030510-r1
 2101251739 metadata/md5-cache/app-text/scdoc-1.11.1
 2102081239 metadata/md5-cache/app-text/ansifilter-2.18
-2102081839 metadata/md5-cache/app-text/highlight-3.57-r100
 2102141809 metadata/md5-cache/app-text/dos2unix-7.4.2
 2102150339 metadata/md5-cache/app-text/blogc-0.20.0
 2102181609 metadata/md5-cache/app-text/tessdata_best-4.1.0
@@ -33626,14 +33488,10 @@
 2103310849 metadata/md5-cache/app-text/rnv-1.7.11-r1
 2103310849 metadata/md5-cache/app-text/scdoc-9999
 2103310520 metadata/md5-cache/app-text/xmlformat-1.04
-2104020139 metadata/md5-cache/app-text/highlight-3.60
-2104021139 metadata/md5-cache/app-text/dvipsk-2021.1_p20210325
-2104021109 metadata/md5-cache/app-text/ps2pkm-1.8_p20210325
 2104031909 metadata/md5-cache/app-text/ding-1.8.1
 2104031909 metadata/md5-cache/app-text/htmlc-2.40.0
 2104031909 metadata/md5-cache/app-text/htmlc-2.60.0
 2104040939 metadata/md5-cache/app-text/cpdf-2.3.1
-2104041209 metadata/md5-cache/app-text/texlive-2021
 2104060140 metadata/md5-cache/app-text/build-docbook-catalog-1.21
 2104060140 metadata/md5-cache/app-text/dbacl-1.14
 2104060140 metadata/md5-cache/app-text/delta-20060803-r1
@@ -33730,7 +33588,6 @@
 2104192239 metadata/md5-cache/app-text/xmlto-0.0.28-r3
 2104250839 metadata/md5-cache/app-text/bibutils-6.10
 2105010239 metadata/md5-cache/app-text/ttf2pk2-2.0_p20200406
-2105010239 metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
 2105021839 metadata/md5-cache/app-text/qpdf-10.0.4
 2105021839 metadata/md5-cache/app-text/qpdf-10.1.0
 2105070239 metadata/md5-cache/app-text/gocr-0.52
@@ -33776,7 +33633,6 @@
 2105081314 metadata/md5-cache/app-text/pep-2.8-r2
 2105081314 metadata/md5-cache/app-text/pinfo-0.6.13
 2105081314 metadata/md5-cache/app-text/pinfo-99999
-2105081314 metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
 2105081314 metadata/md5-cache/app-text/poppler-21.02.0
 2105081314 metadata/md5-cache/app-text/poppler-9999
 2105090709 metadata/md5-cache/app-text/qpdf-10.3.2
@@ -33787,7 +33643,6 @@
 2105081314 metadata/md5-cache/app-text/stardict-4.0.0_pre20170304-r1
 2105081314 metadata/md5-cache/app-text/sword-1.9.0-r1
 2105081314 metadata/md5-cache/app-text/texlive-core-2020-r12
-2105081314 metadata/md5-cache/app-text/texlive-core-2021
 2105081314 metadata/md5-cache/app-text/tidy-html5-5.6.0
 2105081314 metadata/md5-cache/app-text/tidy-html5-5.7.28
 2105081314 metadata/md5-cache/app-text/tree-1.8.0
@@ -33804,7 +33659,6 @@
 2105101939 metadata/md5-cache/app-text/fblog-1.4.1
 2105120110 metadata/md5-cache/app-text/pandoc-2.13
 2105121209 metadata/md5-cache/app-text/dictd-1.13.0-r2
-2105131939 metadata/md5-cache/app-text/highlight-4.1
 2105141009 metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
 2105142339 metadata/md5-cache/app-text/lesspipe-1.85
 2105150609 metadata/md5-cache/app-text/qpdf-10.3.1
@@ -33823,7 +33677,6 @@
 2105182039 metadata/md5-cache/app-text/pdfgrep-2.1.2
 2105182039 metadata/md5-cache/app-text/unac-1.8.0
 2105181409 metadata/md5-cache/app-text/uudeview-0.5.20-r2
-2105190939 metadata/md5-cache/app-text/aiksaurus-1.2.1-r1
 2105202139 metadata/md5-cache/app-text/libetonyek-9999
 2105231139 metadata/md5-cache/app-text/cuneiform-1.1.0-r3
 2105221539 metadata/md5-cache/app-text/zotero-bin-5.0.96.2
@@ -33844,7 +33697,6 @@
 2105311239 metadata/md5-cache/app-text/rarian-0.8.1-r3
 2105311239 metadata/md5-cache/app-text/tesseract-3.05.02
 2105311239 metadata/md5-cache/app-text/wv-1.2.9-r2
-2105312109 metadata/md5-cache/app-text/xmlto-0.0.28-r6
 2106010409 metadata/md5-cache/app-text/htmldoc-1.9.11-r1
 2106010409 metadata/md5-cache/app-text/trang-20151127
 2106011113 metadata/md5-cache/app-text/asciidoc-9.0.2-r1
@@ -33914,7 +33766,6 @@
 2106030240 metadata/md5-cache/app-text/tesseract-4.1.1
 2106030240 metadata/md5-cache/app-text/tesseract-9999
 2106030909 metadata/md5-cache/app-text/wgetpaste-2.32
-2106040440 metadata/md5-cache/app-text/Manifest.gz
 2106040440 metadata/md5-cache/app-text/evince-40.1-r1
 2106040440 metadata/md5-cache/app-text/foliate-2.6.2
 2106040440 metadata/md5-cache/app-text/foliate-2.6.3
@@ -33940,6 +33791,19 @@
 2106040440 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2106040440 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2106040440 metadata/md5-cache/app-text/zathura-ps-9999
+2106071609 metadata/md5-cache/app-text/Manifest.gz
+2106061909 metadata/md5-cache/app-text/aiksaurus-1.2.1-r2
+2106051440 metadata/md5-cache/app-text/dvipsk-2021.1_p20210325
+2106071609 metadata/md5-cache/app-text/highlight-3.57-r100
+2106071609 metadata/md5-cache/app-text/highlight-3.60
+2106071609 metadata/md5-cache/app-text/highlight-4.1
+2106071609 metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
+2106051440 metadata/md5-cache/app-text/ps2pkm-1.8_p20210325
+2106051440 metadata/md5-cache/app-text/texlive-2021
+2106051440 metadata/md5-cache/app-text/texlive-core-2021
+2106042309 metadata/md5-cache/app-text/tidy-html5-5.7.28-r1
+2106051440 metadata/md5-cache/app-text/ttf2pk2-2.0_p20210325
+2106041139 metadata/md5-cache/app-text/xmlto-0.0.28-r6
 2105022339 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2105022339 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
 2105022339 metadata/md5-cache/app-vim/airline-themes-9999
@@ -34175,9 +34039,10 @@
 2106011113 metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
 2106011113 metadata/md5-cache/app-vim/vimpython-1.13-r3
 2106011113 metadata/md5-cache/app-vim/voom-5.3-r1
-2106020141 metadata/md5-cache/app-vim/Manifest.gz
 2106020141 metadata/md5-cache/app-vim/pyclewn-2.1-r2
 2106011509 metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+2106042109 metadata/md5-cache/app-vim/Manifest.gz
+2106042109 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
 2002112051 metadata/md5-cache/app-xemacs/xemacs-packages-all-2018.08.11
 2009181809 metadata/md5-cache/app-xemacs/ebuild-mode-1.51
 2103202139 metadata/md5-cache/app-xemacs/ebuild-mode-1.52
@@ -34514,43 +34379,42 @@
 2104101709 metadata/md5-cache/dev-ada/gnat-suite-bin-2016-r1
 2104101709 metadata/md5-cache/dev-ada/gnat-suite-bin-2017-r1
 2104101709 metadata/md5-cache/dev-ada/gnat-suite-bin-2018-r1
-2104101709 metadata/md5-cache/dev-ada/gnat-suite-bin-2019-r1
-2105301709 metadata/md5-cache/dev-ada/asis-2016-r1
 2105301709 metadata/md5-cache/dev-ada/asis-2019-r1
-2105301709 metadata/md5-cache/dev-ada/aws-2018-r2
 2105301709 metadata/md5-cache/dev-ada/aws-2019-r1
-2105301709 metadata/md5-cache/dev-ada/aws-2020
-2105301709 metadata/md5-cache/dev-ada/gnat_util-2017-r2
 2105301709 metadata/md5-cache/dev-ada/gnat_util-2018-r2
 2105301709 metadata/md5-cache/dev-ada/gnat_util-2019-r1
-2105301709 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
-2105301709 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
-2105301709 metadata/md5-cache/dev-ada/gnatcoll-core-2020
-2105301709 metadata/md5-cache/dev-ada/gnatmem-2019-r1
 2105301709 metadata/md5-cache/dev-ada/gnatsymbolize-2019-r1
-2105301709 metadata/md5-cache/dev-ada/gprbuild-2017-r2
 2105301709 metadata/md5-cache/dev-ada/gprbuild-2020
 2105301709 metadata/md5-cache/dev-ada/gprbuild-2020-r1
-2105301709 metadata/md5-cache/dev-ada/gtkada-2019-r1
-2105301709 metadata/md5-cache/dev-ada/gtkada-2019-r2
-2105301709 metadata/md5-cache/dev-ada/gtkada-2020
-2105301709 metadata/md5-cache/dev-ada/libgpr-2020
-2105301709 metadata/md5-cache/dev-ada/libgpr-2020-r1
-2105301709 metadata/md5-cache/dev-ada/xmlada-2020
-2105311239 metadata/md5-cache/dev-ada/xmlada-2020-r1
-2106011939 metadata/md5-cache/dev-ada/aunit-2020
-2106011939 metadata/md5-cache/dev-ada/aunit-2020-r1
-2106021509 metadata/md5-cache/dev-ada/aunit-2021
-2106021339 metadata/md5-cache/dev-ada/gnatmem-2020
-2106021339 metadata/md5-cache/dev-ada/gnatmem-2021
 2106021439 metadata/md5-cache/dev-ada/gnatsymbolize-2020
 2106021509 metadata/md5-cache/dev-ada/gnatsymbolize-2021
 2106021509 metadata/md5-cache/dev-ada/gprbuild-2021-r1
-2106021509 metadata/md5-cache/dev-ada/xmlada-2021
 2106021739 metadata/md5-cache/dev-ada/libgpr-2021
-2106032209 metadata/md5-cache/dev-ada/Manifest.gz
-2106032209 metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
 2106032209 metadata/md5-cache/dev-ada/gnatcoll-core-2021
+2106051739 metadata/md5-cache/dev-ada/Manifest.gz
+2106051639 metadata/md5-cache/dev-ada/aunit-2020
+2106051639 metadata/md5-cache/dev-ada/aunit-2021
+2106042239 metadata/md5-cache/dev-ada/aws-2018-r2
+2106051139 metadata/md5-cache/dev-ada/aws-2020
+2106051139 metadata/md5-cache/dev-ada/aws-2020-r1
+2106051139 metadata/md5-cache/dev-ada/aws-2021
+2106051639 metadata/md5-cache/dev-ada/gnat_util-2017-r2
+2106042239 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r1
+2106042239 metadata/md5-cache/dev-ada/gnatcoll-bindings-2020-r2
+2106042239 metadata/md5-cache/dev-ada/gnatcoll-bindings-2021
+2106042239 metadata/md5-cache/dev-ada/gnatcoll-core-2020
+2106042239 metadata/md5-cache/dev-ada/gnatcoll-core-2020-r1
+2106051639 metadata/md5-cache/dev-ada/gnatmem-2019-r1
+2106051639 metadata/md5-cache/dev-ada/gnatmem-2020
+2106051639 metadata/md5-cache/dev-ada/gnatmem-2021
+2106050039 metadata/md5-cache/dev-ada/gtkada-2019-r1
+2106050039 metadata/md5-cache/dev-ada/gtkada-2019-r2
+2106050039 metadata/md5-cache/dev-ada/gtkada-2020
+2106050039 metadata/md5-cache/dev-ada/gtkada-2021
+2106051639 metadata/md5-cache/dev-ada/libgpr-2020
+2106042239 metadata/md5-cache/dev-ada/libgpr-2020-r1
+2106051639 metadata/md5-cache/dev-ada/xmlada-2020
+2106051639 metadata/md5-cache/dev-ada/xmlada-2021
 1702282310 metadata/md5-cache/dev-cpp/pngpp-0.2.9
 2004032241 metadata/md5-cache/dev-cpp/asio-1.10.8
 2101231224 metadata/md5-cache/dev-cpp/libodb-2.5.0_beta19
@@ -34609,7 +34473,6 @@
 2105081314 metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
 2105121409 metadata/md5-cache/dev-cpp/prometheus-cpp-0.12.3
 2105240609 metadata/md5-cache/dev-cpp/eigen-3.3.9
-2105311739 metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
 2106011113 metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2-r1
 2106011113 metadata/md5-cache/dev-cpp/abseil-cpp-20200923.3
 2106011113 metadata/md5-cache/dev-cpp/abseil-cpp-20210324.1
@@ -34621,7 +34484,6 @@
 2106030240 metadata/md5-cache/dev-cpp/argparse-2.1
 2106030240 metadata/md5-cache/dev-cpp/gflags-2.2.1-r1
 2106030240 metadata/md5-cache/dev-cpp/gflags-9999
-2106030240 metadata/md5-cache/dev-cpp/glog-0.3.4-r1
 2106030240 metadata/md5-cache/dev-cpp/glog-0.4.0
 2106030240 metadata/md5-cache/dev-cpp/gtest-1.10.0_p20200702
 2106030240 metadata/md5-cache/dev-cpp/gtest-9999
@@ -34636,7 +34498,6 @@
 2106030240 metadata/md5-cache/dev-cpp/tbb-2020.2
 2106030240 metadata/md5-cache/dev-cpp/tbb-2020.3
 2106030240 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
-2106040440 metadata/md5-cache/dev-cpp/Manifest.gz
 2106040440 metadata/md5-cache/dev-cpp/atkmm-2.28.2
 2106040440 metadata/md5-cache/dev-cpp/atkmm-2.36.1
 2106040440 metadata/md5-cache/dev-cpp/cairomm-1.14.3
@@ -34647,6 +34508,10 @@
 2106040440 metadata/md5-cache/dev-cpp/mm-common-1.0.3
 2106040440 metadata/md5-cache/dev-cpp/pangomm-2.42.2
 2106040440 metadata/md5-cache/dev-cpp/pangomm-2.48.1
+2106070939 metadata/md5-cache/dev-cpp/Manifest.gz
+2106050239 metadata/md5-cache/dev-cpp/abseil-cpp-20210324.2
+2106042309 metadata/md5-cache/dev-cpp/glog-0.5.0
+2106070939 metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 1902091309 metadata/md5-cache/dev-db/ocp-0.3
 1902141809 metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.13
@@ -34768,9 +34633,6 @@
 2105081314 metadata/md5-cache/dev-db/pgrouting-3.1.3
 2105081314 metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11
 2105081314 metadata/md5-cache/dev-db/redis-5.0.12
-2105081314 metadata/md5-cache/dev-db/redis-6.0.12
-2105081314 metadata/md5-cache/dev-db/redis-6.2.1
-2105081314 metadata/md5-cache/dev-db/redis-6.2.3-r1
 2105081314 metadata/md5-cache/dev-db/spatialite-4.3.0a
 2105081314 metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
 2105081314 metadata/md5-cache/dev-db/sqlitebrowser-3.12.1
@@ -34784,7 +34646,6 @@
 2105081314 metadata/md5-cache/dev-db/tora-9999
 2105081314 metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1
 2105091709 metadata/md5-cache/dev-db/mariadb-10.2.35
-2105101639 metadata/md5-cache/dev-db/redis-6.0.13-r1
 2105131209 metadata/md5-cache/dev-db/phpmyadmin-5.1.0
 2105131709 metadata/md5-cache/dev-db/timescaledb-2.2.1
 2105152109 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.24
@@ -34857,7 +34718,6 @@
 2106020141 metadata/md5-cache/dev-db/pgcli-3.1.0
 2106020141 metadata/md5-cache/dev-db/pgxnclient-1.3-r2
 2106020141 metadata/md5-cache/dev-db/pgxnclient-1.3.1
-2106011839 metadata/md5-cache/dev-db/redis-6.2.4
 2106020141 metadata/md5-cache/dev-db/sadisplay-0.4.9
 2106021609 metadata/md5-cache/dev-db/sqlcl-bin-21.1.1.113.1704
 2106030240 metadata/md5-cache/dev-db/libiodbc-3.52.12-r1
@@ -34902,15 +34762,20 @@
 2106030240 metadata/md5-cache/dev-db/sqlite-3.35.3
 2106030240 metadata/md5-cache/dev-db/sqlite-3.35.4
 2106030240 metadata/md5-cache/dev-db/sqlite-3.35.5
-2106030240 metadata/md5-cache/dev-db/unixODBC-2.3.9
-2106032239 metadata/md5-cache/dev-db/Manifest.gz
 2106031909 metadata/md5-cache/dev-db/mycli-1.24.1
 2106031909 metadata/md5-cache/dev-db/mycli-9999
 2106032239 metadata/md5-cache/dev-db/pgbouncer-1.15.0
 2106032239 metadata/md5-cache/dev-db/postgresql-9.5.25
 2106032239 metadata/md5-cache/dev-db/postgresql-9.6.21
 2106032239 metadata/md5-cache/dev-db/postgresql-9.6.22
-2106031139 metadata/md5-cache/dev-db/redis-6.0.14
+2106071609 metadata/md5-cache/dev-db/Manifest.gz
+2106071609 metadata/md5-cache/dev-db/redis-6.0.12
+2106071609 metadata/md5-cache/dev-db/redis-6.0.13-r1
+2106071609 metadata/md5-cache/dev-db/redis-6.0.14
+2106071609 metadata/md5-cache/dev-db/redis-6.2.1
+2106071609 metadata/md5-cache/dev-db/redis-6.2.3-r1
+2106071609 metadata/md5-cache/dev-db/redis-6.2.4
+2106071139 metadata/md5-cache/dev-db/unixODBC-2.3.9
 2103301639 metadata/md5-cache/dev-dotnet/pe-format-2.1.2-r1
 2104121341 metadata/md5-cache/dev-dotnet/pe-format-9999
 2105121409 metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2
@@ -35119,23 +34984,23 @@
 2105081314 metadata/md5-cache/dev-games/ogre-1.9.0-r2
 2105081314 metadata/md5-cache/dev-games/ogre-2.1
 2105081314 metadata/md5-cache/dev-games/ois-1.5
-2105081314 metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
-2105081314 metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
 2105081314 metadata/md5-cache/dev-games/openscenegraph-qt-3.5.7-r1
 2105081314 metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511
 2105081314 metadata/md5-cache/dev-games/simgear-9999
 2105140039 metadata/md5-cache/dev-games/ois-1.5.1
 2105150209 metadata/md5-cache/dev-games/simgear-2020.3.8
 2105232009 metadata/md5-cache/dev-games/aseprite-1.1.9
-2106011339 metadata/md5-cache/dev-games/cegui-0.8.7-r100
 2106011113 metadata/md5-cache/dev-games/freecell-solver-6.2.0-r1
 2106011113 metadata/md5-cache/dev-games/tiled-1.4.3-r1
 2106011113 metadata/md5-cache/dev-games/tiled-1.5.0
 2106030240 metadata/md5-cache/dev-games/physfs-3.0.2
 2106030240 metadata/md5-cache/dev-games/physfs-9999
-2106032239 metadata/md5-cache/dev-games/Manifest.gz
 2106032239 metadata/md5-cache/dev-games/mygui-3.2.2
 2106032239 metadata/md5-cache/dev-games/mygui-3.4.0
+2106071609 metadata/md5-cache/dev-games/Manifest.gz
+2106071609 metadata/md5-cache/dev-games/cegui-0.8.7-r100
+2106071609 metadata/md5-cache/dev-games/openscenegraph-3.6.5-r100
+2106071609 metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425-r100
 2103310541 metadata/md5-cache/dev-go/blackfriday-1.2_p20150720
 2103310541 metadata/md5-cache/dev-go/blackfriday-1.4
 2103310541 metadata/md5-cache/dev-go/coveraggregator-0_pre20170216-r1
@@ -35491,7 +35356,6 @@
 2103310849 metadata/md5-cache/dev-haskell/keys-3.12.3
 2103310849 metadata/md5-cache/dev-haskell/language-bash-0.9.0
 2103310849 metadata/md5-cache/dev-haskell/language-c-0.4.7
-2103310849 metadata/md5-cache/dev-haskell/language-c-0.8.3
 2103310849 metadata/md5-cache/dev-haskell/language-css-0.0.3
 2103310849 metadata/md5-cache/dev-haskell/language-dot-0.1.1
 2103310849 metadata/md5-cache/dev-haskell/language-ecmascript-0.19.1.0
@@ -35753,7 +35617,6 @@
 2103310849 metadata/md5-cache/dev-haskell/type-equality-1
 2103310849 metadata/md5-cache/dev-haskell/typed-process-0.2.6.0
 2103310849 metadata/md5-cache/dev-haskell/unexceptionalio-0.5.1
-2103310849 metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7
 2103310849 metadata/md5-cache/dev-haskell/uniplate-1.6.12
 2103310849 metadata/md5-cache/dev-haskell/unix-compat-0.5.2
 2103310849 metadata/md5-cache/dev-haskell/unix-time-0.4.7
@@ -36008,11 +35871,12 @@
 2105171009 metadata/md5-cache/dev-haskell/cpu-0.1.2
 2105221209 metadata/md5-cache/dev-haskell/unicode-transforms-0.3.7.1
 2105240809 metadata/md5-cache/dev-haskell/hexpat-0.20.13
-2105292209 metadata/md5-cache/dev-haskell/Manifest.gz
 2105292209 metadata/md5-cache/dev-haskell/skylighting-0.10.5-r1
 2105292209 metadata/md5-cache/dev-haskell/skylighting-0.8.5-r1
 2105292209 metadata/md5-cache/dev-haskell/skylighting-core-0.10.5-r1
 2105292209 metadata/md5-cache/dev-haskell/skylighting-core-0.8.5-r1
+2106070939 metadata/md5-cache/dev-haskell/Manifest.gz
+2106070939 metadata/md5-cache/dev-haskell/integer-logarithms-1.0.3.1
 1702282312 metadata/md5-cache/dev-java/java-apicheck-0_p20150907
 2010200709 metadata/md5-cache/dev-java/offo-hyphenation-2.0
 2101062239 metadata/md5-cache/dev-java/ant-1.10.9
@@ -36041,8 +35905,6 @@
 2103310849 metadata/md5-cache/dev-java/ant-testutil-1.10.9
 2103310849 metadata/md5-cache/dev-java/ant-xz-1.10.9
 2103310849 metadata/md5-cache/dev-java/asm-5.1-r1
-2103310849 metadata/md5-cache/dev-java/bcprov-1.66
-2103310849 metadata/md5-cache/dev-java/bcprov-1.68
 2103310849 metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
 2103310849 metadata/md5-cache/dev-java/commons-httpclient-3.1-r2
 2103310849 metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
@@ -36072,7 +35934,6 @@
 2103310849 metadata/md5-cache/dev-java/junit-3.8.2-r2
 2103310849 metadata/md5-cache/dev-java/myfaces-api-2.2.14
 2103310849 metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
-2103310849 metadata/md5-cache/dev-java/protobuf-java-3.13.0
 2103310849 metadata/md5-cache/dev-java/qdox-1.6.3-r2
 2103310541 metadata/md5-cache/dev-java/sbt-bin-1.3.10
 2103310541 metadata/md5-cache/dev-java/sbt-bin-1.3.2
@@ -36081,7 +35942,6 @@
 2103310849 metadata/md5-cache/dev-java/spec-alpha-0.2.194
 2103310541 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
 2103310849 metadata/md5-cache/dev-java/swt-3.7.2-r3
-2103310849 metadata/md5-cache/dev-java/tagsoup-1.2.1
 2103310849 metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
 2103310849 metadata/md5-cache/dev-java/validation-api-1.1.0-r1
 2103310849 metadata/md5-cache/dev-java/xalan-2.7.2-r1
@@ -36092,7 +35952,6 @@
 2104021309 metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
 2104051409 metadata/md5-cache/dev-java/hamcrest-core-1.3-r2
 2104051409 metadata/md5-cache/dev-java/hamcrest-library-1.3-r2
-2104060309 metadata/md5-cache/dev-java/protobuf-java-3.14.0
 2104070939 metadata/md5-cache/dev-java/cglib-3.3.0
 2104120442 metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
 2104120442 metadata/md5-cache/dev-java/airline-0.7-r1
@@ -36110,24 +35969,11 @@
 2104120442 metadata/md5-cache/dev-java/args4j-2.32
 2104120442 metadata/md5-cache/dev-java/args4j-2.33
 2104120442 metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
-2104120442 metadata/md5-cache/dev-java/bcmail-1.38-r6
 2104120442 metadata/md5-cache/dev-java/bcmail-1.45-r5
 2104120442 metadata/md5-cache/dev-java/bcmail-1.50-r3
-2104120442 metadata/md5-cache/dev-java/bcmail-1.52-r3
 2104120442 metadata/md5-cache/dev-java/bcpg-1.50-r1
 2104120442 metadata/md5-cache/dev-java/bcpg-1.50-r2
-2104120442 metadata/md5-cache/dev-java/bcpg-1.52-r1
-2104120442 metadata/md5-cache/dev-java/bcpg-1.52-r2
 2104120442 metadata/md5-cache/dev-java/bcpkix-1.50-r2
-2104120442 metadata/md5-cache/dev-java/bcpkix-1.52-r1
-2104120442 metadata/md5-cache/dev-java/bcprov-1.38-r4
-2104120442 metadata/md5-cache/dev-java/bcprov-1.45-r2
-2104120442 metadata/md5-cache/dev-java/bcprov-1.50-r2
-2104120442 metadata/md5-cache/dev-java/bcprov-1.50-r4
-2104120442 metadata/md5-cache/dev-java/bcprov-1.52-r1
-2104120442 metadata/md5-cache/dev-java/bcprov-1.52-r2
-2104120442 metadata/md5-cache/dev-java/bcprov-1.52-r3
-2104120442 metadata/md5-cache/dev-java/bcprov-1.54
 2104120442 metadata/md5-cache/dev-java/bctsp-1.45-r1
 2104120442 metadata/md5-cache/dev-java/beansbinding-1.2.1-r3
 2104120442 metadata/md5-cache/dev-java/blowfishj-2.14-r3
@@ -36139,7 +35985,6 @@
 2104120442 metadata/md5-cache/dev-java/btf-1.2
 2104120442 metadata/md5-cache/dev-java/c3p0-0.9.5.1
 2104120442 metadata/md5-cache/dev-java/cdi-api-1.2-r1
-2104120442 metadata/md5-cache/dev-java/cldc-api-1.1-r1
 2104120442 metadata/md5-cache/dev-java/cofoja-1.2
 2104120442 metadata/md5-cache/dev-java/cofoja-1.3
 2104120442 metadata/md5-cache/dev-java/commons-chain-1.2
@@ -36379,14 +36224,6 @@
 2104120442 metadata/md5-cache/dev-java/piccolo2d-3.0-r1
 2104120442 metadata/md5-cache/dev-java/portletapi-1.0-r1
 2104120442 metadata/md5-cache/dev-java/portletapi-2.0-r1
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.0
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.1
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.2
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.3
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.4
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.5
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.6
-2104100139 metadata/md5-cache/dev-java/protobuf-java-3.15.7
 2104120442 metadata/md5-cache/dev-java/rat-0.11
 2104120442 metadata/md5-cache/dev-java/reflectasm-1.11.0
 2104120442 metadata/md5-cache/dev-java/reflectasm-1.11.1
@@ -36612,7 +36449,6 @@
 2105192039 metadata/md5-cache/dev-java/commons-lang-3.12.0
 2105192039 metadata/md5-cache/dev-java/commons-text-1.9
 2105201309 metadata/md5-cache/dev-java/libreadline-java-0.8.0-r5
-2105211009 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
 2105201339 metadata/md5-cache/dev-java/sun-jms-1.1-r3
 2105220609 metadata/md5-cache/dev-java/commons-cli-1.4
 2105231239 metadata/md5-cache/dev-java/miglayout-4.0-r2
@@ -36633,8 +36469,6 @@
 2105310939 metadata/md5-cache/dev-java/brotli-dec-0.1.2
 2105310939 metadata/md5-cache/dev-java/commons-compress-1.20
 2105310939 metadata/md5-cache/dev-java/zstd-jni-1.4.9.1
-2106010209 metadata/md5-cache/dev-java/protobuf-java-3.16.0
-2106010209 metadata/md5-cache/dev-java/protobuf-java-9999
 2106010409 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.109
 2106011113 metadata/md5-cache/dev-java/jython-2.7.0-r2
 2106020141 metadata/md5-cache/dev-java/java-config-2.3.1
@@ -36642,9 +36476,20 @@
 2106020141 metadata/md5-cache/dev-java/javatoolkit-0.6.5
 2106030240 metadata/md5-cache/dev-java/icedtea-bin-3.16.0
 2106031039 metadata/md5-cache/dev-java/openjdk-8.292_p10
-2106031009 metadata/md5-cache/dev-java/protobuf-java-3.15.8
-2106031939 metadata/md5-cache/dev-java/Manifest.gz
 2106031939 metadata/md5-cache/dev-java/jdbc-mysql-8.0.25
+2106071209 metadata/md5-cache/dev-java/Manifest.gz
+2106051009 metadata/md5-cache/dev-java/bcprov-1.45-r2
+2106051009 metadata/md5-cache/dev-java/bcprov-1.50-r2
+2106051009 metadata/md5-cache/dev-java/bcprov-1.50-r4
+2106051009 metadata/md5-cache/dev-java/bcprov-1.52-r2
+2106061139 metadata/md5-cache/dev-java/bcprov-1.68-r2
+2106062009 metadata/md5-cache/dev-java/protobuf-java-3.15.8
+2106062009 metadata/md5-cache/dev-java/protobuf-java-3.16.0
+2106062009 metadata/md5-cache/dev-java/protobuf-java-3.17.0
+2106062009 metadata/md5-cache/dev-java/protobuf-java-3.17.1
+2106062009 metadata/md5-cache/dev-java/protobuf-java-3.17.2
+2106062009 metadata/md5-cache/dev-java/protobuf-java-9999
+2106070939 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r2
 1910152339 metadata/md5-cache/dev-lang/duktape-2.4.0
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
 1810090339 metadata/md5-cache/dev-lang/execline-2.5.0.1
@@ -36710,7 +36555,6 @@
 2104161439 metadata/md5-cache/dev-lang/parrot-8.1.0-r2
 2104161439 metadata/md5-cache/dev-lang/scala-2.12.10
 2104161439 metadata/md5-cache/dev-lang/scala-2.12.4
-2104162239 metadata/md5-cache/dev-lang/nim-1.4.6
 2104180939 metadata/md5-cache/dev-lang/cfortran-4.4-r3
 2104180939 metadata/md5-cache/dev-lang/smlnj-110.82
 2104192339 metadata/md5-cache/dev-lang/gforth-0.7.3-r1
@@ -36729,7 +36573,6 @@
 2105022139 metadata/md5-cache/dev-lang/tuprolog-3.1.0-r1
 2105022139 metadata/md5-cache/dev-lang/tuprolog-3.2.0
 2105081314 metadata/md5-cache/dev-lang/R-4.0.4
-2105081314 metadata/md5-cache/dev-lang/R-4.0.5
 2105081314 metadata/md5-cache/dev-lang/c-intercal-31.0
 2105081314 metadata/md5-cache/dev-lang/erlang-23.3.1
 2105081314 metadata/md5-cache/dev-lang/gprolog-1.4.5
@@ -36804,7 +36647,6 @@
 2105310009 metadata/md5-cache/dev-lang/perl-5.34.0
 2105311509 metadata/md5-cache/dev-lang/mujs-1.1.2
 2106011113 metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
-2106011113 metadata/md5-cache/dev-lang/ghc-8.10.4
 2106011113 metadata/md5-cache/dev-lang/ghc-8.8.4
 2106011113 metadata/md5-cache/dev-lang/ghc-9.0.1
 2106011113 metadata/md5-cache/dev-lang/ispc-1.14.1
@@ -36865,13 +36707,23 @@
 2106030240 metadata/md5-cache/dev-lang/tk-8.6.8
 2106030240 metadata/md5-cache/dev-lang/tk-8.6.9
 2106030240 metadata/md5-cache/dev-lang/tk-8.6.9.1
-2106040440 metadata/md5-cache/dev-lang/Manifest.gz
 2106040440 metadata/md5-cache/dev-lang/orc-0.4.31
-2106031909 metadata/md5-cache/dev-lang/python-2.7.18_p10
-2106031909 metadata/md5-cache/dev-lang/python-3.6.13_p5
-2106031909 metadata/md5-cache/dev-lang/python-3.7.10_p6
-2106031909 metadata/md5-cache/dev-lang/python-3.8.10_p2
-2106031909 metadata/md5-cache/dev-lang/python-3.9.5_p2
+2106070109 metadata/md5-cache/dev-lang/Manifest.gz
+2106062109 metadata/md5-cache/dev-lang/R-4.0.5-r1
+2106051410 metadata/md5-cache/dev-lang/erlang-24.0.2
+2106061309 metadata/md5-cache/dev-lang/ghc-8.10.4
+2106061709 metadata/md5-cache/dev-lang/ghc-8.10.5
+2106062309 metadata/md5-cache/dev-lang/go-1.15.13
+2106062309 metadata/md5-cache/dev-lang/go-1.16.5
+2106041039 metadata/md5-cache/dev-lang/php-7.4.20
+2106041039 metadata/md5-cache/dev-lang/php-8.0.7
+2106051309 metadata/md5-cache/dev-lang/python-2.7.18_p10
+2106051309 metadata/md5-cache/dev-lang/python-3.6.13_p5
+2106051309 metadata/md5-cache/dev-lang/python-3.7.10_p6
+2106051309 metadata/md5-cache/dev-lang/python-3.8.10_p2
+2106051309 metadata/md5-cache/dev-lang/python-3.9.5_p2
+2106041039 metadata/md5-cache/dev-lang/typescript-4.3.2
+2106070109 metadata/md5-cache/dev-lang/vala-0.52.4
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1908180639 metadata/md5-cache/dev-libs/darts-0.32
 1702282313 metadata/md5-cache/dev-libs/libb64-1.2.1
@@ -36886,7 +36738,6 @@
 1911180139 metadata/md5-cache/dev-libs/rremove-1.0.5
 1911290109 metadata/md5-cache/dev-libs/skalibs-2.9.1.0
 1912150039 metadata/md5-cache/dev-libs/libe-0.11.0
-2002261639 metadata/md5-cache/dev-libs/editline-1.17.1
 2003031839 metadata/md5-cache/dev-libs/libmodbus-3.1.6
 2003091939 metadata/md5-cache/dev-libs/pthreads4w-3.0.0
 2004032241 metadata/md5-cache/dev-libs/libmaa-1.3.2
@@ -36970,9 +36821,7 @@
 2103310849 metadata/md5-cache/dev-libs/nsgenbind-0.8-r1
 2103311110 metadata/md5-cache/dev-libs/redland-1.0.17-r2
 2103310849 metadata/md5-cache/dev-libs/tree-sitter-9999
-2104021039 metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
 2104021209 metadata/md5-cache/dev-libs/libpfm-4.11.0
-2104021139 metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
 2104031909 metadata/md5-cache/dev-libs/liblist-2.4-r1
 2104031909 metadata/md5-cache/dev-libs/libnl-1.1.9999
 2104031909 metadata/md5-cache/dev-libs/libserialport-0.1.1
@@ -37001,7 +36850,6 @@
 2104060140 metadata/md5-cache/dev-libs/ptexenc-1.3.8_p20200406
 2104060140 metadata/md5-cache/dev-libs/xxhash-0.7.3
 2104060140 metadata/md5-cache/dev-libs/xxhash-0.8.0
-2104070639 metadata/md5-cache/dev-libs/tree-sitter-0.19.4-r1
 2104071009 metadata/md5-cache/dev-libs/libksba-1.5.1
 2104071209 metadata/md5-cache/dev-libs/zlog-1.2.15
 2104121341 metadata/md5-cache/dev-libs/9libs-1.0-r4
@@ -37020,7 +36868,6 @@
 2104121341 metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
 2104121341 metadata/md5-cache/dev-libs/geoip-1.6.12
 2104121341 metadata/md5-cache/dev-libs/gf-complete-2.0.0-r1
-2104121341 metadata/md5-cache/dev-libs/gf2x-1.3.0
 2104121341 metadata/md5-cache/dev-libs/gtx-0.2.2-r1
 2104121341 metadata/md5-cache/dev-libs/gumbo-0.10.1
 2104121341 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
@@ -37052,8 +36899,6 @@
 2104121341 metadata/md5-cache/dev-libs/libtar-1.2.20-r4
 2104121341 metadata/md5-cache/dev-libs/libtimezonemap-0.4.6
 2104121341 metadata/md5-cache/dev-libs/libtommath-1.2.0
-2104121341 metadata/md5-cache/dev-libs/libucl-0.8.1-r100
-2104121341 metadata/md5-cache/dev-libs/libucl-9999
 2104121341 metadata/md5-cache/dev-libs/libvformat-1.13-r2
 2104121341 metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
 2104121341 metadata/md5-cache/dev-libs/libxdiff-0.23-r2
@@ -37246,7 +37091,6 @@
 2105081314 metadata/md5-cache/dev-libs/openobex-1.7.2-r2
 2105081314 metadata/md5-cache/dev-libs/pegtl-3.2.0
 2105081314 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
-2105081314 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.3.0
 2105081314 metadata/md5-cache/dev-libs/pmdk-1.9.2
 2105081314 metadata/md5-cache/dev-libs/poco-1.9.0-r2
 2105081314 metadata/md5-cache/dev-libs/processor-trace-2.0
@@ -37364,7 +37208,6 @@
 2105291839 metadata/md5-cache/dev-libs/libmirage-3.2.5
 2105292109 metadata/md5-cache/dev-libs/libzia-4.29
 2105300339 metadata/md5-cache/dev-libs/libzia-4.28
-2105301309 metadata/md5-cache/dev-libs/libofx-0.10.2
 2105300839 metadata/md5-cache/dev-libs/libsigsegv-2.13
 2105300839 metadata/md5-cache/dev-libs/xmlsec-1.2.32
 2105311239 metadata/md5-cache/dev-libs/ffcall-2.1
@@ -37377,8 +37220,6 @@
 2105311239 metadata/md5-cache/dev-libs/qqwing-1.3.4
 2105311239 metadata/md5-cache/dev-libs/starpu-1.2.6-r1
 2105312109 metadata/md5-cache/dev-libs/vala-common-0.52.3
-2106011113 metadata/md5-cache/dev-libs/Ice-3.6.5
-2106011113 metadata/md5-cache/dev-libs/Ice-3.6.5-r1
 2106011113 metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.105
 2106011113 metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.160
 2106011113 metadata/md5-cache/dev-libs/botan-2.17.3
@@ -37417,9 +37258,6 @@
 2106011113 metadata/md5-cache/dev-libs/librdkafka-1.6.0
 2106011113 metadata/md5-cache/dev-libs/librdkafka-1.6.1
 2106011113 metadata/md5-cache/dev-libs/librdkafka-1.7.0
-2106011113 metadata/md5-cache/dev-libs/librelp-1.7.0
-2106011113 metadata/md5-cache/dev-libs/librelp-1.8.0
-2106011113 metadata/md5-cache/dev-libs/librelp-1.9.0
 2106011113 metadata/md5-cache/dev-libs/libreport-2.13.1
 2106011113 metadata/md5-cache/dev-libs/libreport-2.15.0
 2106011113 metadata/md5-cache/dev-libs/libreport-2.15.1
@@ -37428,13 +37266,11 @@
 2106011113 metadata/md5-cache/dev-libs/link-grammar-5.8.1
 2106011113 metadata/md5-cache/dev-libs/newt-0.52.21-r1
 2106011209 metadata/md5-cache/dev-libs/raft-0.10.1
-2106011113 metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
 2106011113 metadata/md5-cache/dev-libs/satyr-0.31
 2106011113 metadata/md5-cache/dev-libs/satyr-0.37
 2106011113 metadata/md5-cache/dev-libs/stfl-0.24-r3
 2106011113 metadata/md5-cache/dev-libs/voikko-fi-2.4
 2106011113 metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
-2106011113 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
 2106011113 metadata/md5-cache/dev-libs/zziplib-0.13.72
 2106020141 metadata/md5-cache/dev-libs/capstone-4.0.2-r2
 2106020141 metadata/md5-cache/dev-libs/distorm3-3.5.2
@@ -37452,7 +37288,6 @@
 2106020141 metadata/md5-cache/dev-libs/liblouis-3.13.0
 2106020141 metadata/md5-cache/dev-libs/liblouis-3.17.0
 2106021409 metadata/md5-cache/dev-libs/libmaxminddb-1.6.0
-2106020141 metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
 2106020141 metadata/md5-cache/dev-libs/libpreludedb-5.2.0
 2106020141 metadata/md5-cache/dev-libs/libpy-0.2.5-r1
 2106012139 metadata/md5-cache/dev-libs/libsavitar-4.8.0
@@ -37478,7 +37313,6 @@
 2106030240 metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
 2106030240 metadata/md5-cache/dev-libs/elfutils-0.183
 2106030240 metadata/md5-cache/dev-libs/elfutils-0.184
-2106030240 metadata/md5-cache/dev-libs/elfutils-0.185
 2106030240 metadata/md5-cache/dev-libs/ell-0.39
 2106030240 metadata/md5-cache/dev-libs/ell-0.40
 2106030240 metadata/md5-cache/dev-libs/ell-9999
@@ -37495,7 +37329,6 @@
 2106030240 metadata/md5-cache/dev-libs/icu-le-hb-1.0.3-r1
 2106030240 metadata/md5-cache/dev-libs/iniparser-3.1-r2
 2106030240 metadata/md5-cache/dev-libs/isl-0.23-r1
-2106030240 metadata/md5-cache/dev-libs/isl-0.24
 2106030240 metadata/md5-cache/dev-libs/jansson-2.13.1-r1
 2106030240 metadata/md5-cache/dev-libs/jemalloc-5.2.1
 2106030240 metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
@@ -37621,23 +37454,10 @@
 2106030240 metadata/md5-cache/dev-libs/openssl-compat-1.0.2u-r1
 2106030240 metadata/md5-cache/dev-libs/pakchois-0.4-r2
 2106030240 metadata/md5-cache/dev-libs/popt-1.18
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.13.0
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.14.0
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.0
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.1
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.2
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.3
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.4
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.5
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.6
-2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.7
 2106030240 metadata/md5-cache/dev-libs/protobuf-3.15.8
 2106030240 metadata/md5-cache/dev-libs/protobuf-3.16.0
-2106030240 metadata/md5-cache/dev-libs/protobuf-9999
 2106030240 metadata/md5-cache/dev-libs/protobuf-c-1.3.3
 2106030809 metadata/md5-cache/dev-libs/raft-0.11.0
-2106030240 metadata/md5-cache/dev-libs/re2-0.2020.11.01
-2106030240 metadata/md5-cache/dev-libs/re2-0.2021.02.02
 2106030240 metadata/md5-cache/dev-libs/re2-0.2021.04.01
 2106030240 metadata/md5-cache/dev-libs/serd-0.30.10
 2106030240 metadata/md5-cache/dev-libs/sord-0.16.8-r1
@@ -37650,17 +37470,14 @@
 2106030240 metadata/md5-cache/dev-libs/xapian-1.4.17
 2106030240 metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r2
 2106030240 metadata/md5-cache/dev-libs/yajl-2.1.0-r3
-2106040639 metadata/md5-cache/dev-libs/Manifest.gz
 2106040440 metadata/md5-cache/dev-libs/aml-0.2.0
 2106040440 metadata/md5-cache/dev-libs/aml-9999
 2106040440 metadata/md5-cache/dev-libs/appstream-0.12.11-r1
-2106040440 metadata/md5-cache/dev-libs/appstream-0.14.3
 2106040440 metadata/md5-cache/dev-libs/appstream-glib-0.7.18
 2106040440 metadata/md5-cache/dev-libs/atk-2.36.0
 2106040440 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902
 2106040109 metadata/md5-cache/dev-libs/concurrencykit-0.7.1
 2106040440 metadata/md5-cache/dev-libs/criterion-2.4_pre20200110
-2106040440 metadata/md5-cache/dev-libs/efl-1.25.1-r11
 2106040440 metadata/md5-cache/dev-libs/folks-0.15.2
 2106040440 metadata/md5-cache/dev-libs/girara-0.3.5
 2106040440 metadata/md5-cache/dev-libs/girara-9999
@@ -37694,12 +37511,10 @@
 2106040440 metadata/md5-cache/dev-libs/libjcat-0.1.7
 2106040440 metadata/md5-cache/dev-libs/libjcat-0.1.8
 2106040440 metadata/md5-cache/dev-libs/libmanette-0.2.6
-2106040440 metadata/md5-cache/dev-libs/libpeas-1.30.0
 2106040440 metadata/md5-cache/dev-libs/libratbag-0.15
 2106031939 metadata/md5-cache/dev-libs/librelp-1.10.0
 2106040440 metadata/md5-cache/dev-libs/libsigc++-2.10.7
 2106040440 metadata/md5-cache/dev-libs/libsigc++-3.0.7
-2106032309 metadata/md5-cache/dev-libs/libuv-1.41.0
 2106040440 metadata/md5-cache/dev-libs/libvarlink-16
 2106040440 metadata/md5-cache/dev-libs/libvarlink-18
 2106040440 metadata/md5-cache/dev-libs/libvarlink-19
@@ -37719,6 +37534,33 @@
 2106040440 metadata/md5-cache/dev-libs/weston-9.0.0
 2106040440 metadata/md5-cache/dev-libs/weston-9999
 2106040209 metadata/md5-cache/dev-libs/xapian-1.4.18
+2106061039 metadata/md5-cache/dev-libs/Ice-3.6.5-r1
+2106071609 metadata/md5-cache/dev-libs/Manifest.gz
+2106051410 metadata/md5-cache/dev-libs/appstream-0.14.3
+2106051410 metadata/md5-cache/dev-libs/editline-1.17.1
+2106071609 metadata/md5-cache/dev-libs/efl-1.25.1-r11
+2106070009 metadata/md5-cache/dev-libs/elfutils-0.185
+2106060039 metadata/md5-cache/dev-libs/gf2x-1.3.0
+2106070939 metadata/md5-cache/dev-libs/isl-0.24
+2106051440 metadata/md5-cache/dev-libs/kpathsea-6.3.3_p20210325
+2106070939 metadata/md5-cache/dev-libs/libofx-0.10.2
+2106071609 metadata/md5-cache/dev-libs/libpeas-1.30.0
+2106071609 metadata/md5-cache/dev-libs/libprelude-5.2.0-r10
+2106071609 metadata/md5-cache/dev-libs/libucl-0.8.1-r100
+2106071609 metadata/md5-cache/dev-libs/libucl-9999
+2106070939 metadata/md5-cache/dev-libs/libuv-1.41.0
+2106071539 metadata/md5-cache/dev-libs/nettle-3.7.3
+2106051410 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.3.0
+2106062009 metadata/md5-cache/dev-libs/protobuf-3.17.0
+2106062009 metadata/md5-cache/dev-libs/protobuf-3.17.1
+2106062009 metadata/md5-cache/dev-libs/protobuf-3.17.2
+2106062009 metadata/md5-cache/dev-libs/protobuf-9999
+2106051440 metadata/md5-cache/dev-libs/ptexenc-1.3.9_p20210325
+2106042309 metadata/md5-cache/dev-libs/re2-0.2021.06.01
+2106071609 metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1-r100
+2106042209 metadata/md5-cache/dev-libs/tree-sitter-0.19.5
+2106070109 metadata/md5-cache/dev-libs/vala-common-0.52.4
+2106071609 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
 2012231444 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2104120442 metadata/md5-cache/dev-lisp/uiop-3.1.5
 2104121341 metadata/md5-cache/dev-lisp/roswell-20.05.14.106
@@ -37764,49 +37606,48 @@
 2106021109 metadata/md5-cache/dev-lisp/sbcl-2.1.5
 2106032239 metadata/md5-cache/dev-lisp/Manifest.gz
 2106032239 metadata/md5-cache/dev-lisp/clisp-2.49.92
-2101231224 metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
-2101240709 metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
-2101240709 metadata/md5-cache/dev-lua/luajson-1.3.4-r100
-2102081839 metadata/md5-cache/dev-lua/lutok-0.4-r10
-2104210039 metadata/md5-cache/dev-lua/dkjson-2.5-r100
-2104210039 metadata/md5-cache/dev-lua/inifile-1.0-r100
-2104210039 metadata/md5-cache/dev-lua/lua-term-0.7-r101
-2104210039 metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
-2104210039 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
-2104210039 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r103
-2104210039 metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
-2104210039 metadata/md5-cache/dev-lua/lualdap-1.2.6
-2104212339 metadata/md5-cache/dev-lua/lanes-3.13.0-r100
-2104212339 metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
-2104212339 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
-2104212339 metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
-2104212339 metadata/md5-cache/dev-lua/luaossl-20200709-r100
-2104222239 metadata/md5-cache/dev-lua/busted-2.0.0-r101
-2104222239 metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
-2104222239 metadata/md5-cache/dev-lua/lua-argparse-0.7.1
-2104222239 metadata/md5-cache/dev-lua/luacheck-0.24.0
-2104222239 metadata/md5-cache/dev-lua/luacov-0.14.0-r100
-2104222239 metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
-2104222239 metadata/md5-cache/dev-lua/luassert-1.8.0-r101
-2104222239 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
-2104222239 metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
-2104222239 metadata/md5-cache/dev-lua/say-1.3_p1-r101
-2104292109 metadata/md5-cache/dev-lua/lgi-0.9.2-r100
-2104291739 metadata/md5-cache/dev-lua/luaposix-35.0-r102
-2104302109 metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
-2104302109 metadata/md5-cache/dev-lua/luasec-1.0
-2105081314 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
-2105081314 metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
-2105081314 metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
-2105081314 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
-2105081314 metadata/md5-cache/dev-lua/luv-1.36.0.0
-2105081314 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
-2105100009 metadata/md5-cache/dev-lua/md5-1.3
-2105290110 metadata/md5-cache/dev-lua/penlight-1.10.0
-2106030139 metadata/md5-cache/dev-lua/mpack-1.0.8-r100
-2106040109 metadata/md5-cache/dev-lua/Manifest.gz
-2106032309 metadata/md5-cache/dev-lua/luarocks-3.7.0
-2106032309 metadata/md5-cache/dev-lua/luasec-1.0.1
+2106071609 metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
+2106071609 metadata/md5-cache/dev-lua/Manifest.gz
+2106071609 metadata/md5-cache/dev-lua/busted-2.0.0-r101
+2106071609 metadata/md5-cache/dev-lua/busted-htest-1.0.0-r100
+2106071609 metadata/md5-cache/dev-lua/dkjson-2.5-r100
+2106071609 metadata/md5-cache/dev-lua/inifile-1.0-r100
+2106071609 metadata/md5-cache/dev-lua/lanes-3.13.0-r100
+2106071609 metadata/md5-cache/dev-lua/ldoc-1.4.6-r100
+2106071609 metadata/md5-cache/dev-lua/lgi-0.9.2-r100
+2106071609 metadata/md5-cache/dev-lua/lpeg-1.0.2-r101
+2106071609 metadata/md5-cache/dev-lua/lua-argparse-0.7.1
+2106071609 metadata/md5-cache/dev-lua/lua-bit32-5.3.5.1
+2106071609 metadata/md5-cache/dev-lua/lua-cjson-2.1.0.8-r100
+2106071609 metadata/md5-cache/dev-lua/lua-openssl-0.8.0_p6
+2106071609 metadata/md5-cache/dev-lua/lua-term-0.7-r101
+2106071609 metadata/md5-cache/dev-lua/lua-utf8-0.1.3-r100
+2106071609 metadata/md5-cache/dev-lua/lua-zlib-1.2-r100
+2106071609 metadata/md5-cache/dev-lua/lua_cliargs-3.0_p2-r100
+2106071609 metadata/md5-cache/dev-lua/luacheck-0.24.0
+2106071609 metadata/md5-cache/dev-lua/luacov-0.14.0-r100
+2106071609 metadata/md5-cache/dev-lua/luadbi-0.7.2-r102
+2106071609 metadata/md5-cache/dev-lua/luaevent-0.4.6-r100
+2106071609 metadata/md5-cache/dev-lua/luaexpat-1.3.0-r103
+2106071609 metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
+2106071609 metadata/md5-cache/dev-lua/luajson-1.3.4-r100
+2106071609 metadata/md5-cache/dev-lua/lualdap-1.2.6
+2106071609 metadata/md5-cache/dev-lua/luaossl-20200709-r100
+2106071609 metadata/md5-cache/dev-lua/luaposix-35.0-r102
+2106071609 metadata/md5-cache/dev-lua/luarocks-3.7.0
+2106071609 metadata/md5-cache/dev-lua/luasec-1.0.1
+2106071609 metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
+2106071609 metadata/md5-cache/dev-lua/luassert-1.8.0-r101
+2106071609 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r102
+2106071609 metadata/md5-cache/dev-lua/lutok-0.4-r10
+2106071609 metadata/md5-cache/dev-lua/luv-1.36.0.0
+2106071609 metadata/md5-cache/dev-lua/md5-1.3
+2106071609 metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r101
+2106071609 metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
+2106071609 metadata/md5-cache/dev-lua/mpack-1.0.8-r100
+2106071609 metadata/md5-cache/dev-lua/penlight-1.10.0
+2106071609 metadata/md5-cache/dev-lua/say-1.3_p1-r101
+2106071609 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
 2010031709 metadata/md5-cache/dev-ml/facile-1.1.3
 2010141439 metadata/md5-cache/dev-ml/camlp4-4.10_p1
 2010280709 metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1
@@ -38011,7 +37852,6 @@
 2106011113 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1.9999
 2106011113 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1_rc1
 2106011113 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0.9999
-2106030409 metadata/md5-cache/dev-ml/Manifest.gz
 2106030409 metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
 2106030409 metadata/md5-cache/dev-ml/astring-0.8.5
 2106030409 metadata/md5-cache/dev-ml/async_kernel-0.14.0
@@ -38023,6 +37863,15 @@
 2106030409 metadata/md5-cache/dev-ml/mtime-1.1.0
 2106030409 metadata/md5-cache/dev-ml/opam-file-format-2.1.2
 2106030409 metadata/md5-cache/dev-ml/uuidm-0.9.7
+2106070309 metadata/md5-cache/dev-ml/Manifest.gz
+2106070309 metadata/md5-cache/dev-ml/dose3-6.0.1_p2
+2106070309 metadata/md5-cache/dev-ml/opam-2.0.8-r2
+2106070309 metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
+2106070309 metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
+2106070309 metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
+2106070309 metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
+2106070309 metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
+2106070309 metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
 2105180040 metadata/md5-cache/dev-perl/Ace-1.920.0-r6
 2105180040 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2105180040 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
@@ -38621,7 +38470,6 @@
 2105180040 metadata/md5-cache/dev-perl/File-ShareDir-Install-0.110.0
 2105180040 metadata/md5-cache/dev-perl/File-ShareDir-ProjectDistDir-1.0.9
 2105180040 metadata/md5-cache/dev-perl/File-Slurp-9999.270.0
-2105180040 metadata/md5-cache/dev-perl/File-Slurper-0.10.0
 2105180040 metadata/md5-cache/dev-perl/File-Sort-1.10.0-r2
 2105180040 metadata/md5-cache/dev-perl/File-Spec-Native-1.4.0
 2105180040 metadata/md5-cache/dev-perl/File-Tail-1.300.0
@@ -38647,17 +38495,12 @@
 2105180040 metadata/md5-cache/dev-perl/Gearman-Server-1.130.1-r1
 2105180040 metadata/md5-cache/dev-perl/Gentoo-App-Pram-0.200.0
 2105180040 metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.8.1
-2105180040 metadata/md5-cache/dev-perl/Geo-IP-1.510.0
 2105180040 metadata/md5-cache/dev-perl/GeoIP2-2.6.2
-2105180040 metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r1
-2105180040 metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r1
 2105180040 metadata/md5-cache/dev-perl/Getopt-GUI-Long-0.930.0-r2
 2105180040 metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.103.0
-2105180040 metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0
 2105180040 metadata/md5-cache/dev-perl/Getopt-Tabular-0.300.0-r1
 2105180040 metadata/md5-cache/dev-perl/Git-Wrapper-0.47.0-r1
 2105180040 metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.43.0
-2105180040 metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r2
 2105180040 metadata/md5-cache/dev-perl/GnuPG-Interface-0.520.0-r3
 2105180040 metadata/md5-cache/dev-perl/Goo-Canvas-0.60.0-r2
 2105180040 metadata/md5-cache/dev-perl/GooCanvas2-0.60.0-r1
@@ -38760,7 +38603,6 @@
 2105180040 metadata/md5-cache/dev-perl/IO-Event-0.813.0-r1
 2105180040 metadata/md5-cache/dev-perl/IO-HTML-1.1.0
 2105180040 metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
-2105180040 metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
 2105180040 metadata/md5-cache/dev-perl/IO-Interface-1.90.0
 2105180040 metadata/md5-cache/dev-perl/IO-LockedFile-0.230.0-r1
 2105180040 metadata/md5-cache/dev-perl/IO-Multiplex-1.160.0-r1
@@ -39263,9 +39105,6 @@
 2105180040 metadata/md5-cache/dev-perl/Pod-Strip-1.20.0-r1
 2105180040 metadata/md5-cache/dev-perl/Pod-Tests-1.190.0-r1
 2105180040 metadata/md5-cache/dev-perl/Pod-Weaver-4.15.0
-2105180040 metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
-2105180040 metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
-2105180040 metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
 2105180040 metadata/md5-cache/dev-perl/PostScript-0.60.0-r1
 2105180040 metadata/md5-cache/dev-perl/PostScript-Simple-0.90.0
 2105180040 metadata/md5-cache/dev-perl/Probe-Perl-0.30.0
@@ -39322,7 +39161,6 @@
 2105180040 metadata/md5-cache/dev-perl/SVG-Graph-0.20.0-r1
 2105180040 metadata/md5-cache/dev-perl/Safe-Hole-0.130.0-r1
 2105180040 metadata/md5-cache/dev-perl/Safe-Isa-1.0.8
-2105180040 metadata/md5-cache/dev-perl/Sane-0.50.0-r1
 2105180040 metadata/md5-cache/dev-perl/Scalar-Properties-1.100.860-r1
 2105180040 metadata/md5-cache/dev-perl/Schedule-At-1.150.0-r2
 2105180040 metadata/md5-cache/dev-perl/Schedule-Cron-Events-1.950.0
@@ -39614,7 +39452,6 @@
 2105180040 metadata/md5-cache/dev-perl/UNIVERSAL-can-1.201.403.280
 2105180040 metadata/md5-cache/dev-perl/UNIVERSAL-isa-1.201.710.120
 2105180040 metadata/md5-cache/dev-perl/UNIVERSAL-moniker-0.80.0-r1
-2105180040 metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
 2105180040 metadata/md5-cache/dev-perl/URI-1.710.0
 2105180040 metadata/md5-cache/dev-perl/URI-1.730.0
 2105180040 metadata/md5-cache/dev-perl/URI-Encode-1.1.1
@@ -39879,7 +39716,6 @@
 2105250339 metadata/md5-cache/dev-perl/strictures-2.0.3
 2105252239 metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r2
 2105252309 metadata/md5-cache/dev-perl/Cache-Memcached-Fast-0.270.0
-2105261139 metadata/md5-cache/dev-perl/DBI-Shell-11.970.0
 2105261139 metadata/md5-cache/dev-perl/Devel-OverloadInfo-0.5.0
 2105261139 metadata/md5-cache/dev-perl/Digest-CRC-0.220.0_p2-r1
 2105252209 metadata/md5-cache/dev-perl/Digest-MD2-2.40.0-r1
@@ -39953,21 +39789,15 @@
 2106010009 metadata/md5-cache/dev-perl/File-ReadBackwards-1.60.0
 2106010009 metadata/md5-cache/dev-perl/File-Remove-1.600.0
 2106010039 metadata/md5-cache/dev-perl/File-ShareDir-1.118.0
-2106011113 metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
 2106011009 metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
-2106011113 metadata/md5-cache/dev-perl/Test-Fork-0.20.0
 2106020609 metadata/md5-cache/dev-perl/Font-TTF-1.60.0-r1
 2106020609 metadata/md5-cache/dev-perl/IO-String-1.80.0-r1
-2106021609 metadata/md5-cache/dev-perl/Tk-804.36.0
 2106021839 metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
-2106021739 metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
 2106021839 metadata/md5-cache/dev-perl/Exporter-Tiny-1.2.2
 2106022009 metadata/md5-cache/dev-perl/FFI-CheckLib-0.270.0
 2106022209 metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.10.0-r1
 2106022009 metadata/md5-cache/dev-perl/File-BaseDir-0.80.0
 2106022009 metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
-2106021739 metadata/md5-cache/dev-perl/File-LibMagic-1.230.0
-2106021839 metadata/md5-cache/dev-perl/File-ShareDir-1.116.0
 2106022209 metadata/md5-cache/dev-perl/File-Slurp-Tiny-0.4.0-r1
 2106022209 metadata/md5-cache/dev-perl/File-Stat-Bits-1.10.0-r2
 2106022209 metadata/md5-cache/dev-perl/File-Sync-0.110.0-r1
@@ -39980,7 +39810,6 @@
 2106022209 metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r2
 2106022209 metadata/md5-cache/dev-perl/Frontier-RPC-0.07_beta4-r3
 2106022209 metadata/md5-cache/dev-perl/Fuse-0.16.1-r2
-2106021839 metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
 2106021839 metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.428.0
 2106022309 metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.360.0-r1
 2106022309 metadata/md5-cache/dev-perl/Term-ReadLine-Gnu-1.420.0-r1
@@ -39990,28 +39819,51 @@
 2106032139 metadata/md5-cache/dev-perl/Bio-Graphics-2.400.0-r1
 2106032139 metadata/md5-cache/dev-perl/Business-ISBN-3.6.0-r1
 2106032139 metadata/md5-cache/dev-perl/Chart-2.4.10-r2
-2106031139 metadata/md5-cache/dev-perl/Devel-CheckOS-1.860.0
-2106031939 metadata/md5-cache/dev-perl/File-HomeDir-1.6.0
 2106031939 metadata/md5-cache/dev-perl/File-Listing-6.70.0
 2106031939 metadata/md5-cache/dev-perl/File-MimeInfo-0.290.0
-2106031939 metadata/md5-cache/dev-perl/File-Remove-1.580.0
 2106031139 metadata/md5-cache/dev-perl/File-RsyncP-0.760.0
-2106031939 metadata/md5-cache/dev-perl/File-ShareDir-Install-0.130.0
-2106031939 metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
-2106031139 metadata/md5-cache/dev-perl/File-Slurper-0.12.0
-2106032309 metadata/md5-cache/dev-perl/File-Which-1.230.0
-2106031939 metadata/md5-cache/dev-perl/File-pushd-1.16.0
-2106031139 metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400
-2106031939 metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.140.0
-2106032309 metadata/md5-cache/dev-perl/Filter-1.600.0
-2106031939 metadata/md5-cache/dev-perl/Finance-YahooQuote-0.260.0
-2106032239 metadata/md5-cache/dev-perl/GD-2.730.0-r1
 2106032239 metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r2
 2106032239 metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r2
-2106040209 metadata/md5-cache/dev-perl/Manifest.gz
 2106040209 metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.4
 2106032239 metadata/md5-cache/dev-perl/Template-GD-2.660.0-r2
-2106031139 metadata/md5-cache/dev-perl/Test-Compile-2.4.1
+2106070939 metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
+2106070939 metadata/md5-cache/dev-perl/DBI-Shell-11.970.0
+2106070939 metadata/md5-cache/dev-perl/Devel-CheckOS-1.860.0
+2106070939 metadata/md5-cache/dev-perl/File-HomeDir-1.6.0
+2106070939 metadata/md5-cache/dev-perl/File-LibMagic-1.230.0
+2106070939 metadata/md5-cache/dev-perl/File-Remove-1.580.0
+2106070939 metadata/md5-cache/dev-perl/File-ShareDir-1.116.0
+2106070939 metadata/md5-cache/dev-perl/File-ShareDir-Install-0.130.0
+2106070939 metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
+2106070939 metadata/md5-cache/dev-perl/File-Slurper-0.12.0
+2106070939 metadata/md5-cache/dev-perl/File-Which-1.230.0
+2106070939 metadata/md5-cache/dev-perl/File-pushd-1.16.0
+2106070939 metadata/md5-cache/dev-perl/FileHandle-Unget-0.163.400
+2106070939 metadata/md5-cache/dev-perl/Filesys-Notify-Simple-0.140.0
+2106070939 metadata/md5-cache/dev-perl/Filter-1.600.0
+2106070939 metadata/md5-cache/dev-perl/Finance-YahooQuote-0.260.0
+2106070939 metadata/md5-cache/dev-perl/GD-2.730.0-r1
+2106042139 metadata/md5-cache/dev-perl/Gearman-2.4.15
+2106042139 metadata/md5-cache/dev-perl/Geo-IP-1.510.0-r1
+2106042139 metadata/md5-cache/dev-perl/Geography-Countries-2009041301.0.0-r2
+2106042139 metadata/md5-cache/dev-perl/Getopt-ArgvFile-1.110.0-r2
+2106051839 metadata/md5-cache/dev-perl/Getopt-Long-Descriptive-0.109.0
+2106051839 metadata/md5-cache/dev-perl/Getopt-Mixed-1.120.0-r1
+2106051839 metadata/md5-cache/dev-perl/Git-Wrapper-0.48.0
+2106051839 metadata/md5-cache/dev-perl/Glib-Object-Introspection-0.49.0
+2106051839 metadata/md5-cache/dev-perl/GnuPG-Interface-1.20.0
+2106061639 metadata/md5-cache/dev-perl/Google-Ads-AdWords-Client-5.8.2
+2106061639 metadata/md5-cache/dev-perl/Graph-0.972.100
+2106061709 metadata/md5-cache/dev-perl/Graphics-ColorNames-3.5.0
+2106070939 metadata/md5-cache/dev-perl/IO-Interactive-1.22.0
+2106070309 metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
+2106070939 metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
+2106071039 metadata/md5-cache/dev-perl/Manifest.gz
+2106061639 metadata/md5-cache/dev-perl/Set-Object-1.410.0
+2106070939 metadata/md5-cache/dev-perl/Test-Compile-2.4.1
+2106070939 metadata/md5-cache/dev-perl/Test-Fork-0.20.0
+2106041739 metadata/md5-cache/dev-perl/Tk-804.36.0
+2106070939 metadata/md5-cache/dev-perl/UNIVERSAL-require-0.180.0
 1903202339 metadata/md5-cache/dev-php/PEAR-HTTP_Header-1.2.1-r2
 1702282315 metadata/md5-cache/dev-php/cli-prompt-1.0.0
 1812180409 metadata/md5-cache/dev-php/cli-prompt-1.0.3
@@ -40403,8 +40255,9 @@
 2105281909 metadata/md5-cache/dev-php/libvirt-php-0.5.4-r1
 2105281909 metadata/md5-cache/dev-php/libvirt-php-0.5.5-r1
 2105281909 metadata/md5-cache/dev-php/libvirt-php-9999
-2106022239 metadata/md5-cache/dev-php/Manifest.gz
 2106022239 metadata/md5-cache/dev-php/zetacomponents-ConsoleTools-1.7.2-r1
+2106041039 metadata/md5-cache/dev-php/Manifest.gz
+2106041039 metadata/md5-cache/dev-php/composer-2.1.1
 2103310520 metadata/md5-cache/dev-python/nltk-data-20200312-r1
 2103310520 metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.3_p37_p1
 2104060140 metadata/md5-cache/dev-python/python-docs-2.7.18
@@ -40458,21 +40311,17 @@
 2106020141 metadata/md5-cache/dev-python/Babel-2.9.1
 2106020141 metadata/md5-cache/dev-python/BitVector-3.4.9-r1
 2106020141 metadata/md5-cache/dev-python/BitVector-3.5.0
-2106020141 metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
 2106020141 metadata/md5-cache/dev-python/Faker-8.2.0
 2106020141 metadata/md5-cache/dev-python/Faker-8.2.1
 2106020141 metadata/md5-cache/dev-python/Faker-8.3.0
 2106020141 metadata/md5-cache/dev-python/Faker-8.4.0
 2106020141 metadata/md5-cache/dev-python/GitPython-3.1.15
-2106020141 metadata/md5-cache/dev-python/GitPython-3.1.17
 2106020141 metadata/md5-cache/dev-python/GridDataFormats-0.5.0
 2106020141 metadata/md5-cache/dev-python/MechanicalSoup-0.12.0
 2106020141 metadata/md5-cache/dev-python/MechanicalSoup-1.0.0
 2106020141 metadata/md5-cache/dev-python/MechanicalSoup-1.1.0
 2106020141 metadata/md5-cache/dev-python/PyContracts-1.8.14-r1
 2106020141 metadata/md5-cache/dev-python/PyECLib-1.6.0
-2106020141 metadata/md5-cache/dev-python/PyGithub-1.54.1
-2106020141 metadata/md5-cache/dev-python/PyGithub-1.55
 2106020141 metadata/md5-cache/dev-python/PyPDF2-1.26.0-r1
 2106020509 metadata/md5-cache/dev-python/PyQt5-sip-12.9.0
 2106020509 metadata/md5-cache/dev-python/PyQt5-sip-4.19.25
@@ -40500,7 +40349,6 @@
 2106020141 metadata/md5-cache/dev-python/aiodns-3.0.0
 2106020141 metadata/md5-cache/dev-python/aiofiles-0.5.0
 2106020141 metadata/md5-cache/dev-python/aiofiles-0.6.0
-2106020141 metadata/md5-cache/dev-python/aiofiles-0.7.0
 2106020141 metadata/md5-cache/dev-python/aiohttp-3.7.4
 2106020141 metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
 2106020141 metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
@@ -40509,26 +40357,14 @@
 2106020141 metadata/md5-cache/dev-python/aiorpcX-0.18.5
 2106020141 metadata/md5-cache/dev-python/aiorpcX-0.19.1
 2106020141 metadata/md5-cache/dev-python/aiorpcX-0.21.1
-2106020141 metadata/md5-cache/dev-python/aiorpcX-0.22.0
 2106020141 metadata/md5-cache/dev-python/aiorpcX-0.22.1
 2106020141 metadata/md5-cache/dev-python/aiosmtpd-1.4.2
 2106020141 metadata/md5-cache/dev-python/alabaster-0.7.12
 2106020141 metadata/md5-cache/dev-python/alagitpull-0.0.23-r1
-2106020141 metadata/md5-cache/dev-python/alembic-1.5.8
-2106020141 metadata/md5-cache/dev-python/alembic-1.6.0
-2106020141 metadata/md5-cache/dev-python/alembic-1.6.2
-2106020141 metadata/md5-cache/dev-python/alembic-1.6.3
-2106020141 metadata/md5-cache/dev-python/alembic-1.6.4
-2106020141 metadata/md5-cache/dev-python/alembic-1.6.5
 2106020141 metadata/md5-cache/dev-python/ament_package-0.9.2
 2106020141 metadata/md5-cache/dev-python/amodem-1.15.1-r1
 2106020141 metadata/md5-cache/dev-python/aniso8601-9.0.1
-2106020141 metadata/md5-cache/dev-python/ansi-0.2.0
-2106020141 metadata/md5-cache/dev-python/ansi2html-1.6.0
 2106020141 metadata/md5-cache/dev-python/ansible-runner-1.4.7-r1
-2106020141 metadata/md5-cache/dev-python/ansicolor-0.2.6-r1
-2106020141 metadata/md5-cache/dev-python/ansicolor-0.3.2
-2106020141 metadata/md5-cache/dev-python/ansicolor-9999
 2106020141 metadata/md5-cache/dev-python/anyqt-0.0.12
 2106020141 metadata/md5-cache/dev-python/anyqt-0.0.13
 2106020141 metadata/md5-cache/dev-python/anyqt-0.0.8-r1
@@ -40540,25 +40376,16 @@
 2106020141 metadata/md5-cache/dev-python/appdirs-1.4.4-r1
 2106020141 metadata/md5-cache/dev-python/apsw-3.32.2_p1
 2106020141 metadata/md5-cache/dev-python/apsw-3.35.4_p1
-2106020141 metadata/md5-cache/dev-python/argcomplete-1.12.2-r1
-2106020141 metadata/md5-cache/dev-python/argcomplete-1.12.3
 2106020141 metadata/md5-cache/dev-python/argh-0.26.2-r2
 2106020141 metadata/md5-cache/dev-python/argon2-cffi-20.1.0
 2106020141 metadata/md5-cache/dev-python/argparse-manpage-1.4
 2106020141 metadata/md5-cache/dev-python/argparse-manpage-1.5
-2106020141 metadata/md5-cache/dev-python/arpeggio-1.10.0
-2106020141 metadata/md5-cache/dev-python/arpeggio-1.10.2
 2106020141 metadata/md5-cache/dev-python/arrow-1.0.3
-2106020141 metadata/md5-cache/dev-python/arrow-1.1.0
 2106020141 metadata/md5-cache/dev-python/asgiref-3.3.4
-2106020141 metadata/md5-cache/dev-python/asn1crypto-1.4.0
 2106020141 metadata/md5-cache/dev-python/asteval-0.9.21
 2106020141 metadata/md5-cache/dev-python/asteval-0.9.22
 2106020141 metadata/md5-cache/dev-python/asteval-0.9.23
 2106020141 metadata/md5-cache/dev-python/astor-0.8.1
-2106020141 metadata/md5-cache/dev-python/astroid-2.5
-2106020141 metadata/md5-cache/dev-python/astroid-2.5.3
-2106020141 metadata/md5-cache/dev-python/astroid-2.5.6
 2106020141 metadata/md5-cache/dev-python/astroid-2.5.7
 2106020141 metadata/md5-cache/dev-python/asttokens-2.0.5
 2106020141 metadata/md5-cache/dev-python/astunparse-1.6.3
@@ -40567,25 +40394,16 @@
 2106020141 metadata/md5-cache/dev-python/async_timeout-3.0.1
 2106020141 metadata/md5-cache/dev-python/asyncstdlib-3.9.1
 2106020141 metadata/md5-cache/dev-python/asyncstdlib-3.9.2
-2106020141 metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
 2106020141 metadata/md5-cache/dev-python/atpublic-1.0
 2106020141 metadata/md5-cache/dev-python/atpublic-2.1.2
 2106020141 metadata/md5-cache/dev-python/atpublic-2.1.3
 2106020141 metadata/md5-cache/dev-python/atpublic-2.3
-2106020141 metadata/md5-cache/dev-python/attrs-20.3.0
-2106020141 metadata/md5-cache/dev-python/attrs-20.3.0_p20210222
-2106020141 metadata/md5-cache/dev-python/attrs-21.1.0
-2106020141 metadata/md5-cache/dev-python/attrs-21.2.0
 2106020141 metadata/md5-cache/dev-python/audioread-2.1.8-r2
 2106020141 metadata/md5-cache/dev-python/audioread-2.1.9
 2106020141 metadata/md5-cache/dev-python/authheaders-0.13.0
-2106020141 metadata/md5-cache/dev-python/authres-1.2.0
 2106020141 metadata/md5-cache/dev-python/autobahn-21.3.1
 2106020141 metadata/md5-cache/dev-python/automat-20.2.0
 2106020141 metadata/md5-cache/dev-python/automaton-2.2.0
-2106020141 metadata/md5-cache/dev-python/autopep8-1.5.5
-2106020141 metadata/md5-cache/dev-python/autopep8-1.5.6
-2106020141 metadata/md5-cache/dev-python/autopep8-1.5.7
 2106020141 metadata/md5-cache/dev-python/autopep8-9999
 2106020141 metadata/md5-cache/dev-python/autoprop-1.0.2
 2106020141 metadata/md5-cache/dev-python/autoprop-2.0.0
@@ -40594,14 +40412,9 @@
 2106020141 metadata/md5-cache/dev-python/autoprop-2.2.0
 2106020141 metadata/md5-cache/dev-python/autoprop-3.0.0
 2106020141 metadata/md5-cache/dev-python/aws-sam-translator-1.35.0
-2106020141 metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
-2106020141 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.7.0
-2106020141 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
 2106020141 metadata/md5-cache/dev-python/awxkit-19.0.0-r1
 2106020141 metadata/md5-cache/dev-python/awxkit-19.1.0
 2106020141 metadata/md5-cache/dev-python/awxkit-19.2.0
-2106020141 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
-2106020141 metadata/md5-cache/dev-python/babelfish-9999
 2106020141 metadata/md5-cache/dev-python/backcall-0.2.0
 2106020141 metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
 2106020141 metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
@@ -40619,20 +40432,13 @@
 2106020141 metadata/md5-cache/dev-python/beautifulsoup-4.9.3
 2106020141 metadata/md5-cache/dev-python/bert-2.2.0
 2106020141 metadata/md5-cache/dev-python/betamax-matchers-0.4.0
-2106020141 metadata/md5-cache/dev-python/bibtexparser-1.1.0
-2106020141 metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
-2106020141 metadata/md5-cache/dev-python/bitarray-2.0.1
-2106020141 metadata/md5-cache/dev-python/bitarray-2.1.0
-2106020141 metadata/md5-cache/dev-python/bitstring-3.1.7
 2106020141 metadata/md5-cache/dev-python/black-20.8_beta1
 2106020141 metadata/md5-cache/dev-python/black-21.4_beta1
 2106020141 metadata/md5-cache/dev-python/black-21.4_beta2
-2106020141 metadata/md5-cache/dev-python/black-21.5_beta1
 2106020141 metadata/md5-cache/dev-python/black-21.5_beta2
 2106020141 metadata/md5-cache/dev-python/blessed-1.17.11
 2106020141 metadata/md5-cache/dev-python/blessed-1.17.12
 2106020141 metadata/md5-cache/dev-python/blessed-1.18.0
-2106020141 metadata/md5-cache/dev-python/blessings-1.7-r1
 2106020141 metadata/md5-cache/dev-python/blinker-1.4-r2
 2106020141 metadata/md5-cache/dev-python/blockdiag-2.0.1
 2106020141 metadata/md5-cache/dev-python/blosc-1.10.2
@@ -40665,17 +40471,10 @@
 2106020141 metadata/md5-cache/dev-python/bpython-0.21
 2106020141 metadata/md5-cache/dev-python/bracex-2.1.1
 2106020141 metadata/md5-cache/dev-python/braintree-4.9.0
-2106020141 metadata/md5-cache/dev-python/breathe-4.28.0
-2106020141 metadata/md5-cache/dev-python/breathe-4.29.2
-2106020141 metadata/md5-cache/dev-python/breathe-4.30.0
 2106020141 metadata/md5-cache/dev-python/brotlicffi-1.0.9.1
-2106020141 metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
 2106020141 metadata/md5-cache/dev-python/brotlipy-0.7.0-r3
 2106020141 metadata/md5-cache/dev-python/bsddb3-6.2.9
-2106020141 metadata/md5-cache/dev-python/cached-property-1.5.2
 2106020141 metadata/md5-cache/dev-python/cachelib-0.1.1
-2106020141 metadata/md5-cache/dev-python/cachetools-4.2.1
-2106020141 metadata/md5-cache/dev-python/cachetools-4.2.2
 2106020141 metadata/md5-cache/dev-python/cairocffi-1.2.0
 2106011509 metadata/md5-cache/dev-python/cangjie-1.3-r1
 2106020141 metadata/md5-cache/dev-python/capturer-3.0
@@ -40686,7 +40485,6 @@
 2106020141 metadata/md5-cache/dev-python/casttube-0.2.0
 2106020141 metadata/md5-cache/dev-python/catkin_pkg-0.4.23-r1
 2106020141 metadata/md5-cache/dev-python/catkin_pkg-9999
-2106020141 metadata/md5-cache/dev-python/cbor-1.0.0-r1
 2106020141 metadata/md5-cache/dev-python/cbor2-5.2.0
 2106020141 metadata/md5-cache/dev-python/cbor2-5.3.0
 2106020141 metadata/md5-cache/dev-python/certifi-10001-r1
@@ -40698,7 +40496,6 @@
 2106020141 metadata/md5-cache/dev-python/cfn-python-lint-0.49.1
 2106020141 metadata/md5-cache/dev-python/cfn-python-lint-0.49.2
 2106020141 metadata/md5-cache/dev-python/cftime-1.4.1
-2106020141 metadata/md5-cache/dev-python/cftime-1.5.0
 2106020141 metadata/md5-cache/dev-python/cgroup-utils-0.8
 2106020141 metadata/md5-cache/dev-python/chai-1.1.2
 2106020141 metadata/md5-cache/dev-python/chainmap-1.0.3
@@ -40723,7 +40520,6 @@
 2106020141 metadata/md5-cache/dev-python/click-default-group-1.2.2
 2106020141 metadata/md5-cache/dev-python/click-log-0.3.2
 2106020141 metadata/md5-cache/dev-python/click-plugins-1.0.3
-2106020141 metadata/md5-cache/dev-python/click-plugins-1.1.1
 2106020141 metadata/md5-cache/dev-python/click-threading-0.4.4
 2106020141 metadata/md5-cache/dev-python/click-threading-0.5.0
 2106020141 metadata/md5-cache/dev-python/cliff-3.7.0
@@ -40744,7 +40540,6 @@
 2106020141 metadata/md5-cache/dev-python/commonmark-0.9.1
 2106020141 metadata/md5-cache/dev-python/configargparse-1.4
 2106020141 metadata/md5-cache/dev-python/configargparse-1.4.1
-2106020141 metadata/md5-cache/dev-python/configclass-0.2.0
 2106020141 metadata/md5-cache/dev-python/configobj-5.0.6-r1
 2106020141 metadata/md5-cache/dev-python/configshell-fb-1.1.28
 2106020141 metadata/md5-cache/dev-python/confuse-1.0.0
@@ -40759,27 +40554,18 @@
 2106020141 metadata/md5-cache/dev-python/cov-core-1.15.0-r2
 2106020141 metadata/md5-cache/dev-python/coverage-4.5.4
 2106020141 metadata/md5-cache/dev-python/coverage-5.5
-2106020141 metadata/md5-cache/dev-python/cppy-1.1.0
 2106020141 metadata/md5-cache/dev-python/crashtest-0.3.1
-2106020141 metadata/md5-cache/dev-python/crcmod-1.7-r4
 2106020141 metadata/md5-cache/dev-python/croniter-1.0.12
-2106020141 metadata/md5-cache/dev-python/croniter-1.0.13
 2106020141 metadata/md5-cache/dev-python/cryptography-3.4.7-r1
 2106020141 metadata/md5-cache/dev-python/css-parser-1.0.4-r1
 2106020141 metadata/md5-cache/dev-python/css-parser-1.0.6
 2106020141 metadata/md5-cache/dev-python/cssselect-1.1.0-r1
-2106020141 metadata/md5-cache/dev-python/cssselect2-0.4.1
 2106020141 metadata/md5-cache/dev-python/cssutils-2.2.0
 2106020141 metadata/md5-cache/dev-python/csv23-0.3.2-r1
-2106020141 metadata/md5-cache/dev-python/ctypescrypto-0.5
-2106020141 metadata/md5-cache/dev-python/ctypescrypto-9999
 2106020141 metadata/md5-cache/dev-python/cursive-0.2.2-r1
 2106020141 metadata/md5-cache/dev-python/curtsies-0.3.5
 2106020141 metadata/md5-cache/dev-python/cvxopt-1.2.5-r1
 2106020141 metadata/md5-cache/dev-python/cvxopt-1.2.6
-2106020141 metadata/md5-cache/dev-python/cwcwidth-0.1.1
-2106020141 metadata/md5-cache/dev-python/cwcwidth-0.1.2
-2106020141 metadata/md5-cache/dev-python/cwcwidth-0.1.4
 2106020141 metadata/md5-cache/dev-python/cx_Freeze-6.6
 2106020141 metadata/md5-cache/dev-python/cycler-0.10.0-r1
 2106020141 metadata/md5-cache/dev-python/cython-0.29.21
@@ -40795,7 +40581,6 @@
 2106020141 metadata/md5-cache/dev-python/dbusmock-0.23.0
 2106020141 metadata/md5-cache/dev-python/dbutils-1.3
 2106020141 metadata/md5-cache/dev-python/dbutils-2.0
-2106020141 metadata/md5-cache/dev-python/dbutils-2.0.1
 2106020141 metadata/md5-cache/dev-python/ddt-1.4.2
 2106020141 metadata/md5-cache/dev-python/debtcollector-2.2.0
 2106020141 metadata/md5-cache/dev-python/decorator-4.4.2-r1
@@ -40812,7 +40597,6 @@
 2106020141 metadata/md5-cache/dev-python/dictdiffer-0.8.1
 2106020141 metadata/md5-cache/dev-python/dicttoxml-1.7.4-r1
 2106020141 metadata/md5-cache/dev-python/diff-match-patch-20181111
-2106020141 metadata/md5-cache/dev-python/diff-match-patch-20200713
 2106020141 metadata/md5-cache/dev-python/dill-0.3.3
 2106020141 metadata/md5-cache/dev-python/discogs-client-2.3.12
 2106020141 metadata/md5-cache/dev-python/discogs-client-9999
@@ -40820,8 +40604,6 @@
 2106020141 metadata/md5-cache/dev-python/dissononce-0.34.3-r1
 2106020141 metadata/md5-cache/dev-python/distlib-0.3.1-r1
 2106020141 metadata/md5-cache/dev-python/distlib-0.3.2
-2106020141 metadata/md5-cache/dev-python/distro-1.5.0-r1
-2106020141 metadata/md5-cache/dev-python/dj-database-url-0.5.0
 2106020141 metadata/md5-cache/dev-python/dj-email-url-1.0.2
 2106020141 metadata/md5-cache/dev-python/django-allauth-0.42.0
 2106020141 metadata/md5-cache/dev-python/django-appconf-1.0.4
@@ -40839,11 +40621,6 @@
 2106020141 metadata/md5-cache/dev-python/django-haystack-3.0
 2106020141 metadata/md5-cache/dev-python/django-js-asset-1.2.2
 2106020141 metadata/md5-cache/dev-python/django-mptt-0.11.0
-2106020141 metadata/md5-cache/dev-python/django-otp-1.0.2
-2106020141 metadata/md5-cache/dev-python/django-otp-1.0.3
-2106020141 metadata/md5-cache/dev-python/django-otp-1.0.4
-2106020141 metadata/md5-cache/dev-python/django-otp-1.0.5
-2106020141 metadata/md5-cache/dev-python/django-otp-1.0.6
 2106020141 metadata/md5-cache/dev-python/django-pglocks-1.0.4
 2106020141 metadata/md5-cache/dev-python/django-picklefield-3.0.1
 2106020141 metadata/md5-cache/dev-python/django-prometheus-2.1.0
@@ -40864,16 +40641,11 @@
 2106020141 metadata/md5-cache/dev-python/dkimpy-1.0.5
 2106020141 metadata/md5-cache/dev-python/dns-lexicon-3.3.4
 2106020141 metadata/md5-cache/dev-python/dnspython-1.16.0-r2
-2106020141 metadata/md5-cache/dev-python/dnspython-2.1.0
 2106020141 metadata/md5-cache/dev-python/doc8-0.6.0
-2106020141 metadata/md5-cache/dev-python/docker-py-5.0.0
 2106020141 metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
 2106020141 metadata/md5-cache/dev-python/docopt-0.6.2-r3
-2106020141 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
-2106020141 metadata/md5-cache/dev-python/docutils-0.16-r1
 2106020141 metadata/md5-cache/dev-python/docutils-0.17
 2106020141 metadata/md5-cache/dev-python/docutils-0.17.1
-2106020141 metadata/md5-cache/dev-python/docutils-glep-1.2
 2106020141 metadata/md5-cache/dev-python/dogpile-cache-1.1.2
 2106020141 metadata/md5-cache/dev-python/dogpile-cache-1.1.3
 2106020141 metadata/md5-cache/dev-python/doit-0.33.1
@@ -40895,7 +40667,6 @@
 2106020141 metadata/md5-cache/dev-python/ecdsa-0.17.0
 2106020141 metadata/md5-cache/dev-python/editdistance-s-1.0.0
 2106020141 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
-2106020141 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
 2106020141 metadata/md5-cache/dev-python/elasticsearch-py-7.7.0-r1
 2106020141 metadata/md5-cache/dev-python/elementpath-2.2.2
 2106020141 metadata/md5-cache/dev-python/emcee-3.0.2
@@ -40910,12 +40681,8 @@
 2106020141 metadata/md5-cache/dev-python/enzyme-0.4.1-r2
 2106020141 metadata/md5-cache/dev-python/enzyme-9999
 2106020141 metadata/md5-cache/dev-python/eradicate-2.0.0
-2106020141 metadata/md5-cache/dev-python/errorhandler-2.0.1
-2106020141 metadata/md5-cache/dev-python/et_xmlfile-1.0.1
-2106020141 metadata/md5-cache/dev-python/et_xmlfile-1.1.0
 2106020141 metadata/md5-cache/dev-python/eventlet-0.30.0-r1
 2106020141 metadata/md5-cache/dev-python/eventlet-0.30.2-r1
-2106020141 metadata/md5-cache/dev-python/eventlet-0.31.0
 2106020141 metadata/md5-cache/dev-python/exam-0.10.6
 2106020141 metadata/md5-cache/dev-python/exdown-0.8.6
 2106020141 metadata/md5-cache/dev-python/exdown-0.8.8
@@ -40933,10 +40700,7 @@
 2106020141 metadata/md5-cache/dev-python/fasteners-0.16-r1
 2106020141 metadata/md5-cache/dev-python/fastimport-0.9.11
 2106020141 metadata/md5-cache/dev-python/fastimport-0.9.12
-2106020141 metadata/md5-cache/dev-python/fastjsonschema-2.15.0
-2106020141 metadata/md5-cache/dev-python/fastjsonschema-2.15.1
 2106020141 metadata/md5-cache/dev-python/fcl-0.0.12-r1
-2106020141 metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
 2106020141 metadata/md5-cache/dev-python/feedparser-5.2.1-r1
 2106020141 metadata/md5-cache/dev-python/feedparser-6.0.2
 2106020141 metadata/md5-cache/dev-python/fido2-0.8.1
@@ -40947,13 +40711,11 @@
 2106020141 metadata/md5-cache/dev-python/findimports-1.5.2
 2106020141 metadata/md5-cache/dev-python/findimports-2.0.0
 2106020141 metadata/md5-cache/dev-python/findimports-2.1.0
-2106020141 metadata/md5-cache/dev-python/fitsio-0.9.11
 2106020141 metadata/md5-cache/dev-python/fixtures-3.0.0-r1
 2106020141 metadata/md5-cache/dev-python/flake8-3.8.4
 2106020141 metadata/md5-cache/dev-python/flake8-3.9.1
 2106020141 metadata/md5-cache/dev-python/flake8-3.9.2
 2106020141 metadata/md5-cache/dev-python/flake8-import-order-0.18
-2106020141 metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
 2106020141 metadata/md5-cache/dev-python/flaky-3.7.0-r1
 2106020141 metadata/md5-cache/dev-python/flask-1.1.2-r1
 2106020141 metadata/md5-cache/dev-python/flask-1.1.4
@@ -40962,12 +40724,8 @@
 2106020141 metadata/md5-cache/dev-python/flask-9999
 2106020141 metadata/md5-cache/dev-python/flask-api-2.0
 2106020141 metadata/md5-cache/dev-python/flask-assets-0.12
-2106020141 metadata/md5-cache/dev-python/flask-babel-2.0.0
 2106020141 metadata/md5-cache/dev-python/flask-babelex-0.9.4
 2106020141 metadata/md5-cache/dev-python/flask-compress-1.9.0
-2106020141 metadata/md5-cache/dev-python/flask-cors-3.0.10
-2106020141 metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
-2106020141 metadata/md5-cache/dev-python/flask-gravatar-0.5.0
 2106020141 metadata/md5-cache/dev-python/flask-htmlmin-2.1.0
 2106020141 metadata/md5-cache/dev-python/flask-login-0.5.0
 2106020141 metadata/md5-cache/dev-python/flask-mail-0.9.1-r1
@@ -40976,7 +40734,6 @@
 2106020141 metadata/md5-cache/dev-python/flask-migrate-3.0.1
 2106020141 metadata/md5-cache/dev-python/flask-mongoengine-1.0.0
 2106020141 metadata/md5-cache/dev-python/flask-nav-0.6-r2
-2106020141 metadata/md5-cache/dev-python/flask-paginate-0.8.1
 2106020141 metadata/md5-cache/dev-python/flask-paranoid-0.2.0-r1
 2106020141 metadata/md5-cache/dev-python/flask-principal-0.4.0-r1
 2106020141 metadata/md5-cache/dev-python/flask-restful-0.3.8
@@ -40984,14 +40741,11 @@
 2106020141 metadata/md5-cache/dev-python/flask-script-2.0.6
 2106020141 metadata/md5-cache/dev-python/flask-security-3.4.5
 2106020141 metadata/md5-cache/dev-python/flask-security-4.0.1
-2106020141 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
 2106020141 metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
 2106020141 metadata/md5-cache/dev-python/flask-wtf-0.14.3
-2106020141 metadata/md5-cache/dev-python/flask-wtf-0.15.1
 2106020141 metadata/md5-cache/dev-python/flatbuffers-1.12
 2106020141 metadata/md5-cache/dev-python/fleep-1.0.1
 2106020141 metadata/md5-cache/dev-python/fleep-9999
-2106020141 metadata/md5-cache/dev-python/flexmock-0.10.4
 2106020141 metadata/md5-cache/dev-python/flit-2.1.0
 2106020141 metadata/md5-cache/dev-python/flit-3.2.0
 2106020141 metadata/md5-cache/dev-python/flit_core-2.1.0
@@ -41005,14 +40759,7 @@
 2106020141 metadata/md5-cache/dev-python/flufl-lock-5.0.4
 2106020141 metadata/md5-cache/dev-python/flufl-lock-5.0.5
 2106020141 metadata/md5-cache/dev-python/flufl-lock-5.1
-2106020141 metadata/md5-cache/dev-python/fonttools-4.22.0
-2106020141 metadata/md5-cache/dev-python/fonttools-4.22.1
-2106020141 metadata/md5-cache/dev-python/fonttools-4.23.1
-2106020141 metadata/md5-cache/dev-python/fonttools-4.24.0
-2106020141 metadata/md5-cache/dev-python/fonttools-4.24.3
 2106020141 metadata/md5-cache/dev-python/fonttools-4.24.4
-2106020141 metadata/md5-cache/dev-python/fqdn-1.5.0-r1
-2106020141 metadata/md5-cache/dev-python/fqdn-1.5.1
 2106020141 metadata/md5-cache/dev-python/freezegun-1.1.0
 2106020141 metadata/md5-cache/dev-python/freezegun-1.1.0-r1
 2106020141 metadata/md5-cache/dev-python/frozen-flask-0.15
@@ -41020,7 +40767,6 @@
 2106020141 metadata/md5-cache/dev-python/fs-2.4.13
 2106020141 metadata/md5-cache/dev-python/fsspec-2021.04.0
 2106020141 metadata/md5-cache/dev-python/fsspec-2021.05.0
-2106020141 metadata/md5-cache/dev-python/fudge-1.1.1
 2106020141 metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
 2106020141 metadata/md5-cache/dev-python/funcy-1.15
 2106020141 metadata/md5-cache/dev-python/funcy-1.16
@@ -41034,10 +40780,7 @@
 2106020141 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5-r1
 2106020141 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
 2106020141 metadata/md5-cache/dev-python/genshi-0.7.5
-2106020141 metadata/md5-cache/dev-python/genson-1.1.0
 2106020141 metadata/md5-cache/dev-python/genty-1.3.2-r1
-2106020141 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
-2106020141 metadata/md5-cache/dev-python/gevent-21.1.2
 2106020141 metadata/md5-cache/dev-python/gevent-websocket-0.10.1
 2106020141 metadata/md5-cache/dev-python/geventhttpclient-1.4.5
 2106020141 metadata/md5-cache/dev-python/git-review-1.28.0
@@ -41051,16 +40794,9 @@
 2106020141 metadata/md5-cache/dev-python/google-api-core-1.26.3
 2106020141 metadata/md5-cache/dev-python/google-api-core-1.27.0
 2106020141 metadata/md5-cache/dev-python/google-api-core-1.28.0
-2106020141 metadata/md5-cache/dev-python/google-api-python-client-2.2.0
-2106020141 metadata/md5-cache/dev-python/google-api-python-client-2.3.0
-2106020141 metadata/md5-cache/dev-python/google-api-python-client-2.4.0
-2106020141 metadata/md5-cache/dev-python/google-api-python-client-2.5.0
-2106020141 metadata/md5-cache/dev-python/google-api-python-client-2.6.0
 2106020141 metadata/md5-cache/dev-python/google-api-python-client-2.7.0
 2106020141 metadata/md5-cache/dev-python/google-apitools-0.5.31
 2106020141 metadata/md5-cache/dev-python/google-apitools-0.5.32
-2106020141 metadata/md5-cache/dev-python/google-auth-1.29.0
-2106020141 metadata/md5-cache/dev-python/google-auth-1.30.0
 2106020141 metadata/md5-cache/dev-python/google-auth-1.30.1
 2106020141 metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0
 2106020141 metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
@@ -41070,23 +40806,17 @@
 2106020141 metadata/md5-cache/dev-python/google-reauth-python-0.1.0-r1
 2106020141 metadata/md5-cache/dev-python/google-reauth-python-0.1.1
 2106020141 metadata/md5-cache/dev-python/googleapis-common-protos-1.53.0
-2106020141 metadata/md5-cache/dev-python/graphviz-0.16
 2106020141 metadata/md5-cache/dev-python/greenlet-1.0.0
 2106020141 metadata/md5-cache/dev-python/greenlet-1.1.0
 2106020141 metadata/md5-cache/dev-python/greenstalk-1.0.1
-2106020141 metadata/md5-cache/dev-python/grpcio-1.32.0-r1
-2106020141 metadata/md5-cache/dev-python/grpcio-1.37.1
 2106020141 metadata/md5-cache/dev-python/grpcio-1.38.0
-2106020141 metadata/md5-cache/dev-python/grpcio-testing-1.32.0
 2106020141 metadata/md5-cache/dev-python/grpcio-testing-1.37.1
 2106020141 metadata/md5-cache/dev-python/grpcio-testing-1.38.0
-2106020141 metadata/md5-cache/dev-python/grpcio-tools-1.32.0
 2106020141 metadata/md5-cache/dev-python/grpcio-tools-1.37.1
 2106020141 metadata/md5-cache/dev-python/grpcio-tools-1.38.0
 2106020141 metadata/md5-cache/dev-python/gsd-2.4.1
 2106020141 metadata/md5-cache/dev-python/gsd-2.4.2
 2106020141 metadata/md5-cache/dev-python/gssapi-1.6.12
-2106020141 metadata/md5-cache/dev-python/guessit-3.3.1
 2106020141 metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
 2106020141 metadata/md5-cache/dev-python/h11-0.12.0
 2106020141 metadata/md5-cache/dev-python/h5py-2.10.0-r1
@@ -41094,14 +40824,10 @@
 2106020141 metadata/md5-cache/dev-python/hacking-4.1.0
 2106020141 metadata/md5-cache/dev-python/hcloud-python-1.12.0
 2106020141 metadata/md5-cache/dev-python/helpdev-0.7.1
-2106020141 metadata/md5-cache/dev-python/hiredis-1.1.0
 2106020141 metadata/md5-cache/dev-python/hpack-3.0.0
 2106020141 metadata/md5-cache/dev-python/hpack-4.0.0
 2106020141 metadata/md5-cache/dev-python/html2text-2020.1.16-r1
-2106020141 metadata/md5-cache/dev-python/html5-parser-0.4.9
 2106020141 metadata/md5-cache/dev-python/html5lib-1.1
-2106020141 metadata/md5-cache/dev-python/httmock-1.4.0
-2106020141 metadata/md5-cache/dev-python/http-parser-0.9.0
 2106020141 metadata/md5-cache/dev-python/httpauth-0.3
 2106020141 metadata/md5-cache/dev-python/httpbin-0.7.0-r2
 2106020141 metadata/md5-cache/dev-python/httpcore-0.12.3
@@ -41124,9 +40850,6 @@
 2106020141 metadata/md5-cache/dev-python/huawei-lte-api-1.4.18
 2106020141 metadata/md5-cache/dev-python/humanfriendly-8.2
 2106020141 metadata/md5-cache/dev-python/humanfriendly-9.1
-2106020141 metadata/md5-cache/dev-python/humanize-3.4.1
-2106020141 metadata/md5-cache/dev-python/humanize-3.5.0
-2106020141 metadata/md5-cache/dev-python/humanize-3.6.0
 2106020141 metadata/md5-cache/dev-python/hvac-0.10.11
 2106020141 metadata/md5-cache/dev-python/hvac-0.10.12
 2106020141 metadata/md5-cache/dev-python/hvac-0.10.13
@@ -41149,7 +40872,6 @@
 2106020141 metadata/md5-cache/dev-python/hypothesis-6.13.7
 2106020141 metadata/md5-cache/dev-python/hypothesis-6.13.8
 2106020141 metadata/md5-cache/dev-python/hypothesis-6.13.9
-2106020141 metadata/md5-cache/dev-python/icalendar-4.0.7
 2106020141 metadata/md5-cache/dev-python/identify-2.2.4
 2106020141 metadata/md5-cache/dev-python/identify-2.2.6
 2106020141 metadata/md5-cache/dev-python/identify-2.2.7
@@ -41166,7 +40888,6 @@
 2106020141 metadata/md5-cache/dev-python/iminuit-2.5.0
 2106020141 metadata/md5-cache/dev-python/iminuit-2.6.0
 2106020141 metadata/md5-cache/dev-python/iminuit-2.6.1
-2106020141 metadata/md5-cache/dev-python/immutables-0.15
 2106020141 metadata/md5-cache/dev-python/importlib_metadata-3.10.1
 2106020141 metadata/md5-cache/dev-python/importlib_metadata-4.0.0
 2106020141 metadata/md5-cache/dev-python/importlib_metadata-4.3.0
@@ -41184,24 +40905,16 @@
 2106020141 metadata/md5-cache/dev-python/influxdb-5.3.0-r1
 2106020141 metadata/md5-cache/dev-python/iniconfig-1.1.1
 2106020141 metadata/md5-cache/dev-python/iniparse-0.4-r2
-2106020141 metadata/md5-cache/dev-python/iniparse-0.5
 2106020141 metadata/md5-cache/dev-python/intelhex-2.3.0
-2106020141 metadata/md5-cache/dev-python/intervaltree-3.0.2
-2106020141 metadata/md5-cache/dev-python/intervaltree-3.1.0
 2106020141 metadata/md5-cache/dev-python/intreehooks-1.0
 2106020141 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
 2106020141 metadata/md5-cache/dev-python/ioflo-2.0.0
 2106020141 metadata/md5-cache/dev-python/ioflo-2.0.2
-2106020141 metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
 2106020141 metadata/md5-cache/dev-python/ipdb-0.13.7
 2106020141 metadata/md5-cache/dev-python/ipdb-0.13.8
-2106020141 metadata/md5-cache/dev-python/ipy-1.01
-2106020439 metadata/md5-cache/dev-python/ipykernel-5.5.3-r1
-2106020141 metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
 2106020141 metadata/md5-cache/dev-python/ipykernel-5.5.5
 2106020141 metadata/md5-cache/dev-python/ipyparallel-6.3.0-r1
 2106020141 metadata/md5-cache/dev-python/ipython-7.22.0-r1
-2106020141 metadata/md5-cache/dev-python/ipython-7.23.1
 2106020141 metadata/md5-cache/dev-python/ipython-7.24.0
 2106020141 metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r2
 2106020141 metadata/md5-cache/dev-python/ipywidgets-7.5.1-r1
@@ -41237,27 +40950,13 @@
 2106020141 metadata/md5-cache/dev-python/jinja-2.11.3
 2106020141 metadata/md5-cache/dev-python/jinja-3.0.0
 2106020141 metadata/md5-cache/dev-python/jinja-3.0.1
-2106020141 metadata/md5-cache/dev-python/jinja2-time-0.2.0
-2106020141 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
-2106020141 metadata/md5-cache/dev-python/jmespath-0.10.0
 2106020141 metadata/md5-cache/dev-python/joblib-1.0.1
-2106020141 metadata/md5-cache/dev-python/josepy-1.8.0
 2106020141 metadata/md5-cache/dev-python/jq-1.1.2
 2106020141 metadata/md5-cache/dev-python/js2py-0.70_p20210218
-2106020141 metadata/md5-cache/dev-python/jsmin-2.2.2
-2106020141 metadata/md5-cache/dev-python/json-rpc-1.13.0
 2106020141 metadata/md5-cache/dev-python/jsondiff-1.3.0
-2106020141 metadata/md5-cache/dev-python/jsonext-0.4.2
-2106020141 metadata/md5-cache/dev-python/jsonmerge-1.6.0
-2106020141 metadata/md5-cache/dev-python/jsonmerge-1.8.0
 2106020141 metadata/md5-cache/dev-python/jsonpatch-1.32
 2106020141 metadata/md5-cache/dev-python/jsonpickle-2.0.0
 2106020141 metadata/md5-cache/dev-python/jsonpointer-2.1
-2106020141 metadata/md5-cache/dev-python/jsonref-0.1
-2106020141 metadata/md5-cache/dev-python/jsonrpclib-0.4.2
-2106020141 metadata/md5-cache/dev-python/jsonrpclib-9999
-2106020141 metadata/md5-cache/dev-python/jsonschema-3.2.0
-2106020141 metadata/md5-cache/dev-python/jsonxs-0.6
 2106020141 metadata/md5-cache/dev-python/junit-xml-1.9
 2106020141 metadata/md5-cache/dev-python/jupyter-1.0.0-r3
 2106020141 metadata/md5-cache/dev-python/jupyter_client-6.1.12
@@ -41274,15 +40973,11 @@
 2106020141 metadata/md5-cache/dev-python/keep-2.10.1
 2106020141 metadata/md5-cache/dev-python/keystoneauth-4.2.1
 2106020141 metadata/md5-cache/dev-python/keystonemiddleware-9.1.0
-2106020141 metadata/md5-cache/dev-python/kiwisolver-1.3.1
 2106020141 metadata/md5-cache/dev-python/klein-20.6.0
 2106020141 metadata/md5-cache/dev-python/kombu-5.0.1
 2106020141 metadata/md5-cache/dev-python/lark-parser-0.11.2
 2106020141 metadata/md5-cache/dev-python/lark-parser-0.11.3
 2106020141 metadata/md5-cache/dev-python/lark-parser-0.7.8
-2106020141 metadata/md5-cache/dev-python/latexcodec-2.0.1
-2106020141 metadata/md5-cache/dev-python/lazr-config-2.2.2
-2106020141 metadata/md5-cache/dev-python/lazr-delegates-2.0.4
 2106020141 metadata/md5-cache/dev-python/lazy-object-proxy-1.5.0
 2106020141 metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
 2106020141 metadata/md5-cache/dev-python/ldap3-2.8.1
@@ -41290,8 +40985,6 @@
 2106020141 metadata/md5-cache/dev-python/lesscpy-0.14.0
 2106020141 metadata/md5-cache/dev-python/libarchive-c-2.9
 2106020141 metadata/md5-cache/dev-python/libcloud-3.3.0
-2106020141 metadata/md5-cache/dev-python/liblarch-3.0.1
-2106020141 metadata/md5-cache/dev-python/libnacl-1.7.2-r1
 2106020141 metadata/md5-cache/dev-python/libpillowfight-0.3.0
 2106020141 metadata/md5-cache/dev-python/libpy_simdjson-0.4.0
 2106020141 metadata/md5-cache/dev-python/libtmux-0.8.5
@@ -41307,23 +41000,16 @@
 2106020141 metadata/md5-cache/dev-python/linecache2-1.0.0-r1
 2106020141 metadata/md5-cache/dev-python/lit-10.0.1
 2106020141 metadata/md5-cache/dev-python/lit-11.1.0
-2106020141 metadata/md5-cache/dev-python/lit-12.0.0
-2106020141 metadata/md5-cache/dev-python/lit-12.0.1.9999
-2106020141 metadata/md5-cache/dev-python/lit-12.0.1_rc1
-2106020141 metadata/md5-cache/dev-python/lit-13.0.0.9999
 2106020141 metadata/md5-cache/dev-python/livereload-2.6.3
 2106020141 metadata/md5-cache/dev-python/llfuse-1.4.1
 2106020141 metadata/md5-cache/dev-python/llvmlite-0.36.0
 2106020141 metadata/md5-cache/dev-python/lmdb-1.2.0-r1
-2106020141 metadata/md5-cache/dev-python/lmdb-1.2.1
 2106020141 metadata/md5-cache/dev-python/lmfit-1.0.1-r1
 2106020141 metadata/md5-cache/dev-python/lmfit-1.0.2
-2106020141 metadata/md5-cache/dev-python/locket-0.2.1
 2106020141 metadata/md5-cache/dev-python/lockfile-0.12.2-r2
 2106020141 metadata/md5-cache/dev-python/logbook-1.5.3
 2106020141 metadata/md5-cache/dev-python/logfury-0.1.2-r1
 2106020141 metadata/md5-cache/dev-python/loguru-0.5.3
-2106020141 metadata/md5-cache/dev-python/logutils-0.3.5
 2106020141 metadata/md5-cache/dev-python/loky-2.9.0
 2106020141 metadata/md5-cache/dev-python/lunr-0.5.8
 2106020141 metadata/md5-cache/dev-python/lunr-0.5.9
@@ -41336,8 +41022,6 @@
 2106020141 metadata/md5-cache/dev-python/mando-0.6.4
 2106020141 metadata/md5-cache/dev-python/manuel-1.10.1
 2106020141 metadata/md5-cache/dev-python/markdown-2.6.11
-2106020141 metadata/md5-cache/dev-python/markdown-3.3.4
-2106020141 metadata/md5-cache/dev-python/markdown2-2.4.0
 2106020141 metadata/md5-cache/dev-python/markuppy-1.14
 2106020141 metadata/md5-cache/dev-python/markups-3.1.0
 2106020141 metadata/md5-cache/dev-python/markups-3.1.1
@@ -41350,27 +41034,20 @@
 2106020141 metadata/md5-cache/dev-python/matplotlib-3.3.4
 2106020141 metadata/md5-cache/dev-python/matplotlib-3.4.0
 2106020141 metadata/md5-cache/dev-python/matplotlib-3.4.1
-2106020141 metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
 2106020141 metadata/md5-cache/dev-python/matterhook-0.2-r1
 2106020141 metadata/md5-cache/dev-python/mccabe-0.6.1-r1
 2106020141 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
-2106020141 metadata/md5-cache/dev-python/mdx_gh_links-0.2
 2106020141 metadata/md5-cache/dev-python/mecab-python-0.996
 2106020141 metadata/md5-cache/dev-python/mechanize-0.4.5
 2106020141 metadata/md5-cache/dev-python/mediafile-0.6.0
-2106020141 metadata/md5-cache/dev-python/memory_profiler-0.57
-2106020141 metadata/md5-cache/dev-python/mergedict-1.0.0
 2106020141 metadata/md5-cache/dev-python/metakernel-0.25.0-r1
-2106020141 metadata/md5-cache/dev-python/micawber-0.5.3
 2106020141 metadata/md5-cache/dev-python/microversion-parse-1.0.1
-2106020141 metadata/md5-cache/dev-python/mimerender-0.6.0
 2106020141 metadata/md5-cache/dev-python/minidb-2.0.4
 2106020141 metadata/md5-cache/dev-python/minimock-1.3.0
 2106020141 metadata/md5-cache/dev-python/miniupnpc-2.2.1
 2106020141 metadata/md5-cache/dev-python/miniupnpc-2.2.2
 2106020141 metadata/md5-cache/dev-python/misaka-2.1.1
 2106020141 metadata/md5-cache/dev-python/mistune-0.8.4-r1
-2106020141 metadata/md5-cache/dev-python/mkautodoc-0.1.0
 2106020141 metadata/md5-cache/dev-python/mkdocs-1.1.2
 2106020141 metadata/md5-cache/dev-python/mkdocs-1.1.2-r1
 2106020141 metadata/md5-cache/dev-python/mkdocs-1.1.2-r2
@@ -41391,8 +41068,6 @@
 2106020141 metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.2.2
 2106020141 metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
 2106020141 metadata/md5-cache/dev-python/mock-4.0.3
-2106020141 metadata/md5-cache/dev-python/mongoengine-0.23.0
-2106020141 metadata/md5-cache/dev-python/mongoengine-0.23.1
 2106020141 metadata/md5-cache/dev-python/mongomock-3.22.1
 2106020141 metadata/md5-cache/dev-python/more-itertools-8.7.0
 2106020141 metadata/md5-cache/dev-python/more-itertools-8.8.0
@@ -41410,7 +41085,6 @@
 2106020141 metadata/md5-cache/dev-python/mpmath-1.2.1
 2106020141 metadata/md5-cache/dev-python/msgpack-0.6.2
 2106020141 metadata/md5-cache/dev-python/msgpack-1.0.2
-2106020141 metadata/md5-cache/dev-python/mss-6.1.0
 2106020141 metadata/md5-cache/dev-python/multidict-5.1.0
 2106020141 metadata/md5-cache/dev-python/munkres-1.1.2
 2106020141 metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -41430,7 +41104,6 @@
 2106020141 metadata/md5-cache/dev-python/nbsphinx-0.8.4
 2106020141 metadata/md5-cache/dev-python/nbsphinx-0.8.5
 2106020141 metadata/md5-cache/dev-python/nbval-0.9.6
-2106020141 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
 2106020141 metadata/md5-cache/dev-python/neovim-remote-2.4.0
 2106020141 metadata/md5-cache/dev-python/neovim-remote-9999
 2106020141 metadata/md5-cache/dev-python/nest_asyncio-1.5.1
@@ -41445,10 +41118,6 @@
 2106020141 metadata/md5-cache/dev-python/nltk-3.6.2-r1
 2106020141 metadata/md5-cache/dev-python/nnpy-1.4.2
 2106020141 metadata/md5-cache/dev-python/node-semver-0.8.0
-2106020141 metadata/md5-cache/dev-python/nodeenv-1.3.5
-2106020141 metadata/md5-cache/dev-python/nodeenv-1.6.0
-2106020141 metadata/md5-cache/dev-python/nose-1.3.7-r7
-2106020141 metadata/md5-cache/dev-python/nose-1.3.7-r8
 2106020141 metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
 2106020141 metadata/md5-cache/dev-python/nose-random-1.0.0
 2106020141 metadata/md5-cache/dev-python/nose2-0.10.0
@@ -41463,7 +41132,6 @@
 2106020141 metadata/md5-cache/dev-python/ntplib-0.4.0
 2106020141 metadata/md5-cache/dev-python/nuitka-0.6.11
 2106020141 metadata/md5-cache/dev-python/nuitka-0.6.15
-2106020141 metadata/md5-cache/dev-python/numexpr-2.7.2_p1
 2106020141 metadata/md5-cache/dev-python/numpy-1.20.2-r1
 2106020141 metadata/md5-cache/dev-python/numpy-1.20.3-r1
 2106020141 metadata/md5-cache/dev-python/numpydoc-1.1.0
@@ -41471,10 +41139,8 @@
 2106020141 metadata/md5-cache/dev-python/oauth2client-4.1.3-r1
 2106020141 metadata/md5-cache/dev-python/oauthlib-3.1.0
 2106020141 metadata/md5-cache/dev-python/oauthlib-3.1.1
-2106020141 metadata/md5-cache/dev-python/objgraph-3.5.0
 2106020141 metadata/md5-cache/dev-python/oct2py-5.2.0-r1
 2106020141 metadata/md5-cache/dev-python/octave_kernel-0.32.0-r1
-2106020141 metadata/md5-cache/dev-python/odfpy-1.3.6
 2106020141 metadata/md5-cache/dev-python/olefile-0.46-r1
 2106020141 metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
 2106020141 metadata/md5-cache/dev-python/openpyxl-3.0.7-r1
@@ -41528,11 +41194,8 @@
 2106020141 metadata/md5-cache/dev-python/pandas-1.2.3-r1
 2106020141 metadata/md5-cache/dev-python/pandas-1.2.4
 2106020141 metadata/md5-cache/dev-python/pandas-datareader-0.9.0
-2106020141 metadata/md5-cache/dev-python/pandocfilters-1.4.3
 2106020141 metadata/md5-cache/dev-python/parallax-1.0.6
 2106020141 metadata/md5-cache/dev-python/parameterized-0.8.1
-2106020141 metadata/md5-cache/dev-python/paramiko-2.7.2
-2106020141 metadata/md5-cache/dev-python/parsedatetime-2.6
 2106020141 metadata/md5-cache/dev-python/parso-0.7.0-r1
 2106020141 metadata/md5-cache/dev-python/parso-0.7.1-r1
 2106020141 metadata/md5-cache/dev-python/parso-0.8.2
@@ -41548,13 +41211,8 @@
 2106020141 metadata/md5-cache/dev-python/pathspec-0.8.1
 2106020141 metadata/md5-cache/dev-python/pathtools-0.1.2-r3
 2106020141 metadata/md5-cache/dev-python/patsy-0.5.1
-2106020141 metadata/md5-cache/dev-python/pbkdf2-1.3-r1
-2106020141 metadata/md5-cache/dev-python/pbr-5.5.1
-2106020141 metadata/md5-cache/dev-python/pbr-5.6.0
 2106020141 metadata/md5-cache/dev-python/pdfrw-0.4_p1
-2106020141 metadata/md5-cache/dev-python/pebble-4.6.1
 2106020141 metadata/md5-cache/dev-python/pecan-1.4.0
-2106020141 metadata/md5-cache/dev-python/peewee-3.14.4
 2106020141 metadata/md5-cache/dev-python/pelican-minify-0.9
 2106020141 metadata/md5-cache/dev-python/pendulum-2.1.2-r1
 2106020141 metadata/md5-cache/dev-python/pexpect-4.8.0-r1
@@ -41567,12 +41225,9 @@
 2106020141 metadata/md5-cache/dev-python/phply-1.2.5
 2106020141 metadata/md5-cache/dev-python/pickleshare-0.7.5
 2106020141 metadata/md5-cache/dev-python/pid-3.0.4
-2106020141 metadata/md5-cache/dev-python/piexif-1.1.3-r1
 2106020141 metadata/md5-cache/dev-python/pika-1.1.0
 2106020141 metadata/md5-cache/dev-python/pikepdf-2.11.4
 2106020141 metadata/md5-cache/dev-python/pikepdf-2.12.0
-2106020141 metadata/md5-cache/dev-python/pikepdf-2.12.1
-2106020141 metadata/md5-cache/dev-python/pilkit-2.0
 2106020141 metadata/md5-cache/dev-python/pillow-8.2.0
 2106020141 metadata/md5-cache/dev-python/pipenv-2020.11.15
 2106020141 metadata/md5-cache/dev-python/pipenv-2021.5.29
@@ -41581,7 +41236,6 @@
 2106020141 metadata/md5-cache/dev-python/pkgconfig-1.5.2
 2106020141 metadata/md5-cache/dev-python/pkginfo-1.7.0
 2106020141 metadata/md5-cache/dev-python/plotly-4.14.1
-2106020141 metadata/md5-cache/dev-python/plotly-4.14.3
 2106020141 metadata/md5-cache/dev-python/plotly-geo-1.0.0
 2106020141 metadata/md5-cache/dev-python/pluggy-0.13.1-r1
 2106020141 metadata/md5-cache/dev-python/pluginbase-1.0.0
@@ -41603,10 +41257,7 @@
 2106020141 metadata/md5-cache/dev-python/pretend-1.0.9-r1
 2106020141 metadata/md5-cache/dev-python/pretty-yaml-20.4.0
 2106020141 metadata/md5-cache/dev-python/prettytable-0.7.2-r1
-2106020141 metadata/md5-cache/dev-python/prettytable-2.1.0
 2106020141 metadata/md5-cache/dev-python/priority-1.3.0
-2106020141 metadata/md5-cache/dev-python/process-tests-2.1.1
-2106020141 metadata/md5-cache/dev-python/process-tests-2.1.2
 2106020141 metadata/md5-cache/dev-python/progress-1.5
 2106020141 metadata/md5-cache/dev-python/progressbar-2.5
 2106020141 metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -41614,18 +41265,6 @@
 2106020141 metadata/md5-cache/dev-python/prometheus_client-0.10.1
 2106020141 metadata/md5-cache/dev-python/prometheus_client-0.11.0
 2106020141 metadata/md5-cache/dev-python/prompt_toolkit-3.0.18
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.14.0
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.0
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.1
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.2
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.3
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.4
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.5
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.6
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.15.7
-2106020141 metadata/md5-cache/dev-python/protobuf-python-3.16.0
-2106020141 metadata/md5-cache/dev-python/protobuf-python-9999
 2106020141 metadata/md5-cache/dev-python/prov-1.5.3
 2106020141 metadata/md5-cache/dev-python/pslab-python-1.0.1-r1
 2106020141 metadata/md5-cache/dev-python/psutil-5.7.0-r1
@@ -41637,7 +41276,6 @@
 2106020141 metadata/md5-cache/dev-python/publicsuffix-2.20191221
 2106020141 metadata/md5-cache/dev-python/pudb-2020.1
 2106020141 metadata/md5-cache/dev-python/pudb-2021.1
-2106020141 metadata/md5-cache/dev-python/pulsectl-21.5.14
 2106020141 metadata/md5-cache/dev-python/pulsectl-21.5.17
 2106020141 metadata/md5-cache/dev-python/pushbullet-py-0.12.0
 2106020141 metadata/md5-cache/dev-python/pweave-0.30.3-r1
@@ -41646,7 +41284,6 @@
 2106020141 metadata/md5-cache/dev-python/py-amqp-5.0.6
 2106020141 metadata/md5-cache/dev-python/py-cpuinfo-6.0.0
 2106020141 metadata/md5-cache/dev-python/py-cpuinfo-7.0.0
-2106020141 metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
 2106020141 metadata/md5-cache/dev-python/py-gfm-0.1.4
 2106020141 metadata/md5-cache/dev-python/py-gfm-1.0.2
 2106020141 metadata/md5-cache/dev-python/py-ubjson-0.16.1
@@ -41656,8 +41293,6 @@
 2106020141 metadata/md5-cache/dev-python/pyGPG-0.2
 2106020141 metadata/md5-cache/dev-python/pyGPG-9999
 2106020141 metadata/md5-cache/dev-python/pyacoustid-1.2.0
-2106020141 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
-2106020141 metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
 2106020141 metadata/md5-cache/dev-python/pyamg-4.0.0
 2106020141 metadata/md5-cache/dev-python/pyasn1-0.4.8-r1
 2106020141 metadata/md5-cache/dev-python/pyasn1-modules-0.2.8-r1
@@ -41666,9 +41301,6 @@
 2106020141 metadata/md5-cache/dev-python/pybind11-2.6.2
 2106020141 metadata/md5-cache/dev-python/pybluez-0.23
 2106020141 metadata/md5-cache/dev-python/pybtex-0.23.0
-2106020141 metadata/md5-cache/dev-python/pybtex-0.24.0
-2106020141 metadata/md5-cache/dev-python/pybtex-docutils-0.2.2
-2106020141 metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
 2106020141 metadata/md5-cache/dev-python/pycadf-3.1.1
 2106020141 metadata/md5-cache/dev-python/pycairo-1.20.0
 2106020141 metadata/md5-cache/dev-python/pycapnp-0.6.4
@@ -41682,7 +41314,6 @@
 2106020141 metadata/md5-cache/dev-python/pychroot-9999
 2106020141 metadata/md5-cache/dev-python/pyclipper-1.2.1
 2106020141 metadata/md5-cache/dev-python/pycodestyle-2.6.0
-2106020141 metadata/md5-cache/dev-python/pycodestyle-2.7.0
 2106020141 metadata/md5-cache/dev-python/pycollada-0.7.1
 2106020141 metadata/md5-cache/dev-python/pycountry-20.7.3
 2106020141 metadata/md5-cache/dev-python/pycparser-2.20-r1
@@ -41695,8 +41326,6 @@
 2106020141 metadata/md5-cache/dev-python/pycxx-7.1.2-r2
 2106020141 metadata/md5-cache/dev-python/pycxx-7.1.5
 2106020141 metadata/md5-cache/dev-python/pydantic-1.8.2
-2106020141 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.5.2
-2106020141 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
 2106020141 metadata/md5-cache/dev-python/pydbus-0.6.0
 2106020141 metadata/md5-cache/dev-python/pydecomp-0.3-r1
 2106020141 metadata/md5-cache/dev-python/pydecomp-9999
@@ -41705,10 +41334,6 @@
 2106020141 metadata/md5-cache/dev-python/pydns-3.2.1
 2106020141 metadata/md5-cache/dev-python/pydocstyle-6.0.0
 2106020141 metadata/md5-cache/dev-python/pydocstyle-6.1.1
-2106020141 metadata/md5-cache/dev-python/pydot-1.4.2
-2106020141 metadata/md5-cache/dev-python/pydotplus-2.0.2
-2106020141 metadata/md5-cache/dev-python/pyelftools-0.27
-2106020141 metadata/md5-cache/dev-python/pyenchant-3.2.0
 2106020141 metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
 2106020141 metadata/md5-cache/dev-python/pyflakes-2.2.0
 2106020141 metadata/md5-cache/dev-python/pyformance-0.4-r1
@@ -41724,39 +41349,27 @@
 2106020141 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
 2106020141 metadata/md5-cache/dev-python/pyghmi-1.5.22
 2106020141 metadata/md5-cache/dev-python/pygit2-1.5.0
-2106020141 metadata/md5-cache/dev-python/pygit2-1.6.0
 2106020141 metadata/md5-cache/dev-python/pyglet-1.5.16
 2106020141 metadata/md5-cache/dev-python/pyglet-1.5.17
-2106020141 metadata/md5-cache/dev-python/pygments-2.8.1
-2106020141 metadata/md5-cache/dev-python/pygments-2.9.0
 2106020141 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
 2106020141 metadata/md5-cache/dev-python/pygpgme-0.3-r3
 2106020141 metadata/md5-cache/dev-python/pygraphviz-1.6
 2106020141 metadata/md5-cache/dev-python/pygresql-5.2.2
-2106020141 metadata/md5-cache/dev-python/pyh2o-1
 2106020141 metadata/md5-cache/dev-python/pyhamcrest-2.0.2
 2106020141 metadata/md5-cache/dev-python/pyhcl-0.4.4
 2106020141 metadata/md5-cache/dev-python/pyicu-2.7.3
 2106020141 metadata/md5-cache/dev-python/pyinotify-0.9.6
 2106020141 metadata/md5-cache/dev-python/pyjsparser-2.7.1_p20190421
 2106020141 metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
-2106020141 metadata/md5-cache/dev-python/pyjwt-2.0.1
-2106020141 metadata/md5-cache/dev-python/pyjwt-2.1.0
 2106020141 metadata/md5-cache/dev-python/pykerberos-1.3.1
 2106020141 metadata/md5-cache/dev-python/pykka-2.0.2
 2106020141 metadata/md5-cache/dev-python/pykka-2.0.3
-2106020141 metadata/md5-cache/dev-python/pykka-3.0.1
 2106020141 metadata/md5-cache/dev-python/pykwalify-1.8.0
 2106020141 metadata/md5-cache/dev-python/pylama-7.7.1-r1
-2106020141 metadata/md5-cache/dev-python/pylast-4.2.0
-2106020141 metadata/md5-cache/dev-python/pylast-4.2.1
 2106020141 metadata/md5-cache/dev-python/pylatex-1.4.1
 2106020141 metadata/md5-cache/dev-python/pylev-1.2.0
 2106020141 metadata/md5-cache/dev-python/pylev-1.4.0
 2106020141 metadata/md5-cache/dev-python/pylibacl-0.6.0
-2106020141 metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
-2106020141 metadata/md5-cache/dev-python/pylint-2.7.4
-2106020141 metadata/md5-cache/dev-python/pylint-2.8.2
 2106020141 metadata/md5-cache/dev-python/pylru-1.2.0
 2106020141 metadata/md5-cache/dev-python/pyls-black-0.4.6-r1
 2106020141 metadata/md5-cache/dev-python/pyls-spyder-0.3.2-r1
@@ -41765,7 +41378,6 @@
 2106020141 metadata/md5-cache/dev-python/pymdown-extensions-8.0.1
 2106020141 metadata/md5-cache/dev-python/pymdown-extensions-8.1.1
 2106020141 metadata/md5-cache/dev-python/pymdown-extensions-8.2
-2106020141 metadata/md5-cache/dev-python/pymdown-lexers-0_pre20180905
 2106020141 metadata/md5-cache/dev-python/pymdown-lexers-0_pre20210308
 2106020141 metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
 2106020141 metadata/md5-cache/dev-python/pymediainfo-5.0.4
@@ -41778,20 +41390,15 @@
 2106020141 metadata/md5-cache/dev-python/pymongo-3.11.1
 2106020141 metadata/md5-cache/dev-python/pymongo-3.11.2
 2106020141 metadata/md5-cache/dev-python/pymongo-3.11.3
-2106020141 metadata/md5-cache/dev-python/pymongo-3.11.4
 2106020141 metadata/md5-cache/dev-python/pymountboot-0.2.3
 2106020141 metadata/md5-cache/dev-python/pymountboot-9999
 2106020141 metadata/md5-cache/dev-python/pymssql-2.2.1
-2106020141 metadata/md5-cache/dev-python/pymysql-1.0.2
-2106020141 metadata/md5-cache/dev-python/pynacl-1.4.0
 2106012139 metadata/md5-cache/dev-python/pynest2d-4.8.0-r1
 2106020141 metadata/md5-cache/dev-python/pynput-1.6.8
 2106020141 metadata/md5-cache/dev-python/pynput-9999
 2106020141 metadata/md5-cache/dev-python/pynvim-0.4.3
 2106020141 metadata/md5-cache/dev-python/pyocr-0.7.2
 2106020141 metadata/md5-cache/dev-python/pyocr-0.8
-2106020141 metadata/md5-cache/dev-python/pyopencl-2021.1.3
-2106020141 metadata/md5-cache/dev-python/pyopencl-2021.2.2
 2106020141 metadata/md5-cache/dev-python/pyopengl-3.1.5
 2106020141 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.5
 2106020141 metadata/md5-cache/dev-python/pyopenssl-20.0.1
@@ -41803,8 +41410,6 @@
 2106020141 metadata/md5-cache/dev-python/pypax-9999
 2106020141 metadata/md5-cache/dev-python/pypcap-1.2.3-r1
 2106020141 metadata/md5-cache/dev-python/pypeg2-2.15.2-r1
-2106020141 metadata/md5-cache/dev-python/pyperclip-1.8.2
-2106020141 metadata/md5-cache/dev-python/pyphen-0.10.0
 2106020141 metadata/md5-cache/dev-python/pypiserver-1.4.2
 2106020141 metadata/md5-cache/dev-python/pypng-0.0.20
 2106020141 metadata/md5-cache/dev-python/pypowervm-1.1.24
@@ -41823,7 +41428,6 @@
 2106020141 metadata/md5-cache/dev-python/pyqtgraph-0.12.1
 2106020141 metadata/md5-cache/dev-python/pyquery-1.4.3
 2106020141 metadata/md5-cache/dev-python/pyre2-1.0.7
-2106020141 metadata/md5-cache/dev-python/pyrfc3339-1.1
 2106020141 metadata/md5-cache/dev-python/pyro-4.80
 2106020141 metadata/md5-cache/dev-python/pyroute2-0.5.14
 2106020141 metadata/md5-cache/dev-python/pyrqlite-2.1
@@ -41885,13 +41489,9 @@
 2106020141 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
 2106020141 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
 2106020141 metadata/md5-cache/dev-python/pytest-metadata-1.8.0
-2106020141 metadata/md5-cache/dev-python/pytest-mock-3.5.1
-2106020141 metadata/md5-cache/dev-python/pytest-mock-3.6.0
-2106020141 metadata/md5-cache/dev-python/pytest-mock-3.6.1
 2106020141 metadata/md5-cache/dev-python/pytest-ordering-0.6
 2106020141 metadata/md5-cache/dev-python/pytest-pylint-0.17.0
 2106020141 metadata/md5-cache/dev-python/pytest-pylint-0.18.0
-2106020141 metadata/md5-cache/dev-python/pytest-qt-3.3.0
 2106020141 metadata/md5-cache/dev-python/pytest-regressions-2.2.0
 2106020141 metadata/md5-cache/dev-python/pytest-rerunfailures-10.0
 2106020141 metadata/md5-cache/dev-python/pytest-rerunfailures-9.1.1
@@ -41904,7 +41504,6 @@
 2106020141 metadata/md5-cache/dev-python/pytest-subtests-0.4.0
 2106020141 metadata/md5-cache/dev-python/pytest-subtests-0.5.0
 2106020141 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
-2106020141 metadata/md5-cache/dev-python/pytest-testmon-1.0.3
 2106020141 metadata/md5-cache/dev-python/pytest-timeout-1.4.2-r1
 2106020141 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
 2106020141 metadata/md5-cache/dev-python/pytest-xdist-2.2.1
@@ -41929,8 +41528,6 @@
 2106020141 metadata/md5-cache/dev-python/python-distutils-extra-2.45
 2106020141 metadata/md5-cache/dev-python/python-dotenv-0.17.1
 2106020141 metadata/md5-cache/dev-python/python-editor-1.0.4-r1
-2106020141 metadata/md5-cache/dev-python/python-efl-1.25.0
-2106020141 metadata/md5-cache/dev-python/python-email-validator-1.1.2
 2106020141 metadata/md5-cache/dev-python/python-engineio-3.12.1
 2106020141 metadata/md5-cache/dev-python/python-engineio-4.0.1
 2106020141 metadata/md5-cache/dev-python/python-engineio-4.1.0
@@ -41945,7 +41542,6 @@
 2106020141 metadata/md5-cache/dev-python/python-iptables-1.0.0-r1
 2106020141 metadata/md5-cache/dev-python/python-ironicclient-4.4.0
 2106020141 metadata/md5-cache/dev-python/python-jose-3.2.0-r1
-2106020141 metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
 2106020141 metadata/md5-cache/dev-python/python-jwt-1.2.0
 2106020141 metadata/md5-cache/dev-python/python-keystoneclient-4.1.1
 2106020141 metadata/md5-cache/dev-python/python-language-server-0.36.2-r1
@@ -41956,7 +41552,6 @@
 2106020141 metadata/md5-cache/dev-python/python-lhafile-0.3.0
 2106020141 metadata/md5-cache/dev-python/python-libevdev-0.9
 2106020141 metadata/md5-cache/dev-python/python-linux-procfs-0.6.3
-2106020141 metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
 2106020141 metadata/md5-cache/dev-python/python-lsp-server-1.0.1
 2106020141 metadata/md5-cache/dev-python/python-ly-0.9.6
 2106020141 metadata/md5-cache/dev-python/python-lzo-1.12-r1
@@ -41965,11 +41560,9 @@
 2106020141 metadata/md5-cache/dev-python/python-magnumclient-3.2.1
 2106020141 metadata/md5-cache/dev-python/python-manilaclient-2.3.0
 2106020141 metadata/md5-cache/dev-python/python-markdown-math-0.8
-2106020141 metadata/md5-cache/dev-python/python-memcached-1.59-r1
 2106020141 metadata/md5-cache/dev-python/python-mimeparse-1.6.0-r3
 2106020141 metadata/md5-cache/dev-python/python-mistralclient-4.1.1
 2106020141 metadata/md5-cache/dev-python/python-monascaclient-2.2.1
-2106020141 metadata/md5-cache/dev-python/python-mpd-3.0.4
 2106020141 metadata/md5-cache/dev-python/python-mpv-0.5.2
 2106020141 metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.7.1
 2106020141 metadata/md5-cache/dev-python/python-nbxmpp-2.0.2-r1
@@ -41985,17 +41578,13 @@
 2106020141 metadata/md5-cache/dev-python/python-senlinclient-2.1.1
 2106020141 metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r2
 2106020141 metadata/md5-cache/dev-python/python-slip-0.6.5-r1
-2106020141 metadata/md5-cache/dev-python/python-slugify-1.2.6
 2106020141 metadata/md5-cache/dev-python/python-slugify-4.0.1
-2106020141 metadata/md5-cache/dev-python/python-slugify-5.0.0
 2106020141 metadata/md5-cache/dev-python/python-slugify-5.0.1
 2106020141 metadata/md5-cache/dev-python/python-socks-1.2.4
-2106020141 metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
 2106020141 metadata/md5-cache/dev-python/python-stdnum-1.16
 2106020141 metadata/md5-cache/dev-python/python-swiftclient-3.10.1
 2106020141 metadata/md5-cache/dev-python/python-systemd-234
 2106020141 metadata/md5-cache/dev-python/python-troveclient-5.1.1
-2106020141 metadata/md5-cache/dev-python/python-utils-2.5.6
 2106020141 metadata/md5-cache/dev-python/python-varlink-30.3.0
 2106020141 metadata/md5-cache/dev-python/python-vitrageclient-4.1.1
 2106020141 metadata/md5-cache/dev-python/python-vlc-3.0.12118
@@ -42003,9 +41592,7 @@
 2106020141 metadata/md5-cache/dev-python/python-xlib-0.30
 2106020141 metadata/md5-cache/dev-python/python-xmlsec-1.3.11
 2106020141 metadata/md5-cache/dev-python/python-xmlsec-1.3.9
-2106020141 metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
 2106020141 metadata/md5-cache/dev-python/python-zaqarclient-2.0.1
-2106020141 metadata/md5-cache/dev-python/python-zipstream-1.1.4
 2106020141 metadata/md5-cache/dev-python/python-zunclient-4.1.1
 2106020141 metadata/md5-cache/dev-python/python3-lxc-3.0.4
 2106020141 metadata/md5-cache/dev-python/python3-openid-3.2.0
@@ -42015,7 +41602,6 @@
 2106012139 metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
 2106012139 metadata/md5-cache/dev-python/python_orocos_kdl-9999
 2106020141 metadata/md5-cache/dev-python/pythondialog-3.5.1
-2106020141 metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
 2106020141 metadata/md5-cache/dev-python/pytools-2021.2.6
 2106020141 metadata/md5-cache/dev-python/pytools-2021.2.7
 2106020141 metadata/md5-cache/dev-python/pytools-9999
@@ -42030,42 +41616,27 @@
 2106020141 metadata/md5-cache/dev-python/pyx-0.15
 2106020141 metadata/md5-cache/dev-python/pyxDamerauLevenshtein-1.7.0
 2106020141 metadata/md5-cache/dev-python/pyxattr-0.7.2
-2106020141 metadata/md5-cache/dev-python/pyxdg-0.27
 2106020141 metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
 2106020141 metadata/md5-cache/dev-python/pyyaml-5.4.1
-2106020141 metadata/md5-cache/dev-python/pyzbar-0.1.8
 2106020141 metadata/md5-cache/dev-python/pyzmq-20.0.0
 2106020141 metadata/md5-cache/dev-python/pyzotero-1.4.22
 2106020141 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
 2106020141 metadata/md5-cache/dev-python/qdarkstyle-3.0.2
-2106020141 metadata/md5-cache/dev-python/qrcode-6.1
 2106020141 metadata/md5-cache/dev-python/qstylizer-0.1.10
-2106020141 metadata/md5-cache/dev-python/qtawesome-1.0.2
-2106020141 metadata/md5-cache/dev-python/qtconsole-5.0.3
-2106020141 metadata/md5-cache/dev-python/qtconsole-5.1.0
 2106020141 metadata/md5-cache/dev-python/qtsass-0.3.0
-2106020141 metadata/md5-cache/dev-python/quantities-0.12.4
-2106020141 metadata/md5-cache/dev-python/radon-4.1.0
-2106020141 metadata/md5-cache/dev-python/radon-4.5.1
-2106020141 metadata/md5-cache/dev-python/radon-4.5.2
 2106020141 metadata/md5-cache/dev-python/raet-0.6.8-r1
 2106020141 metadata/md5-cache/dev-python/raet-0.6.8-r2
 2106020141 metadata/md5-cache/dev-python/random2-1.0.1-r1
-2106020141 metadata/md5-cache/dev-python/rarfile-3.1
 2106020141 metadata/md5-cache/dev-python/ratelimit-1.4.1
 2106020141 metadata/md5-cache/dev-python/rcssmin-1.0.6
 2106020141 metadata/md5-cache/dev-python/rdflib-5.0.0
 2106020141 metadata/md5-cache/dev-python/re-assert-1.1.0
-2106020141 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
-2106020141 metadata/md5-cache/dev-python/rebulk-3.0.1
-2106020141 metadata/md5-cache/dev-python/recommonmark-0.7.1
 2106020141 metadata/md5-cache/dev-python/redis-py-3.5.3
 2106020141 metadata/md5-cache/dev-python/reedsolomon-1.5.4
 2106020141 metadata/md5-cache/dev-python/reflink-0.2.1-r1
 2106020141 metadata/md5-cache/dev-python/regex-2021.4.4
 2106020141 metadata/md5-cache/dev-python/rencode-1.0.6
 2106020141 metadata/md5-cache/dev-python/reno-3.3.0
-2106020141 metadata/md5-cache/dev-python/reportlab-3.5.67
 2106020141 metadata/md5-cache/dev-python/repoze-lru-0.7-r1
 2106020141 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
 2106020141 metadata/md5-cache/dev-python/requests-2.25.1-r2
@@ -42073,15 +41644,10 @@
 2106020141 metadata/md5-cache/dev-python/requests-cache-0.6.0
 2106020141 metadata/md5-cache/dev-python/requests-cache-0.6.1
 2106020141 metadata/md5-cache/dev-python/requests-cache-0.6.2
-2106020141 metadata/md5-cache/dev-python/requests-cache-0.6.3
 2106020141 metadata/md5-cache/dev-python/requests-credssp-1.2.0
 2106020141 metadata/md5-cache/dev-python/requests-file-1.4.3
 2106020141 metadata/md5-cache/dev-python/requests-futures-1.0.0
 2106020141 metadata/md5-cache/dev-python/requests-kerberos-0.12.0-r1
-2106020141 metadata/md5-cache/dev-python/requests-mock-1.8.0
-2106020141 metadata/md5-cache/dev-python/requests-mock-1.9.0
-2106020141 metadata/md5-cache/dev-python/requests-mock-1.9.1
-2106020141 metadata/md5-cache/dev-python/requests-mock-1.9.2
 2106020141 metadata/md5-cache/dev-python/requests-mock-1.9.3
 2106020141 metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
 2106020141 metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
@@ -42098,9 +41664,6 @@
 2106020141 metadata/md5-cache/dev-python/rfc3339-validator-0.1.3
 2106020141 metadata/md5-cache/dev-python/rfc3339-validator-0.1.4
 2106020141 metadata/md5-cache/dev-python/rfc3986-1.4.0
-2106020141 metadata/md5-cache/dev-python/rfc3986-1.5.0
-2106020141 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
-2106020141 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
 2106020141 metadata/md5-cache/dev-python/rich-10.0.0
 2106020141 metadata/md5-cache/dev-python/rich-10.0.1
 2106020141 metadata/md5-cache/dev-python/rich-10.1.0
@@ -42136,28 +41699,22 @@
 2106020141 metadata/md5-cache/dev-python/ruamel-yaml-0.17.7
 2106020141 metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
 2106020141 metadata/md5-cache/dev-python/ryu-4.34
-2106020141 metadata/md5-cache/dev-python/s3transfer-0.4.2
 2106020141 metadata/md5-cache/dev-python/sabyenc-4.0.2
 2106020141 metadata/md5-cache/dev-python/sarge-0.1.5
-2106020141 metadata/md5-cache/dev-python/scandir-1.10.0-r2
 2106020141 metadata/md5-cache/dev-python/scikit-build-0.11.1
 2106020141 metadata/md5-cache/dev-python/scipy-1.6.2
-2106020141 metadata/md5-cache/dev-python/scipy-1.6.3
 2106020141 metadata/md5-cache/dev-python/scripttest-1.3.0-r1
 2106020141 metadata/md5-cache/dev-python/scrypt-0.8.16
 2106020141 metadata/md5-cache/dev-python/scrypt-0.8.18
 2106020141 metadata/md5-cache/dev-python/seaborn-0.11.1
 2106020141 metadata/md5-cache/dev-python/selenium-3.141.0-r1
 2106020141 metadata/md5-cache/dev-python/semantic_version-2.8.5
-2106020141 metadata/md5-cache/dev-python/semver-2.13.0
 2106020141 metadata/md5-cache/dev-python/send2trash-1.5.0-r1
-2106020141 metadata/md5-cache/dev-python/sentinels-1.0.0
 2106020141 metadata/md5-cache/dev-python/sentry-sdk-1.0.0
 2106020141 metadata/md5-cache/dev-python/sentry-sdk-1.1.0
 2106020141 metadata/md5-cache/dev-python/serpent-1.30.2
 2106020141 metadata/md5-cache/dev-python/serpent-1.40
 2106020141 metadata/md5-cache/dev-python/serverfiles-0.2.1
-2106020141 metadata/md5-cache/dev-python/serverfiles-0.3.1
 2106020141 metadata/md5-cache/dev-python/service_identity-18.1.0-r1
 2106020141 metadata/md5-cache/dev-python/service_identity-21.1.0
 2106020141 metadata/md5-cache/dev-python/setproctitle-1.2.2
@@ -42167,7 +41724,6 @@
 2106020141 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
 2106020141 metadata/md5-cache/dev-python/setuptools_rust-0.12.1
 2106020141 metadata/md5-cache/dev-python/setuptools_scm-6.0.1-r1
-2106020141 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
 2106020141 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
 2106020141 metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
 2106020141 metadata/md5-cache/dev-python/sgmllib3k-1.0.0
@@ -42177,8 +41733,6 @@
 2106020141 metadata/md5-cache/dev-python/signature_dispatch-0.1.0
 2106020141 metadata/md5-cache/dev-python/simplebayes-1.5.7
 2106020141 metadata/md5-cache/dev-python/simplebayes-1.5.8
-2106020141 metadata/md5-cache/dev-python/simpleeval-0.9.10
-2106020141 metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
 2106020141 metadata/md5-cache/dev-python/simplejson-3.17.2-r1
 2106020141 metadata/md5-cache/dev-python/simplekml-1.3.5
 2106020141 metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
@@ -42188,19 +41742,14 @@
 2106020141 metadata/md5-cache/dev-python/simpy-3.0.13
 2106020509 metadata/md5-cache/dev-python/sip-4.19.25
 2106020509 metadata/md5-cache/dev-python/sip-5.5.0
-2106020141 metadata/md5-cache/dev-python/six-1.15.0-r1
-2106020141 metadata/md5-cache/dev-python/six-1.16.0
 2106020141 metadata/md5-cache/dev-python/slackclient-2.5.0
 2106020141 metadata/md5-cache/dev-python/slimit-0.8.1-r1
 2106020141 metadata/md5-cache/dev-python/slixmpp-1.7.0
-2106020141 metadata/md5-cache/dev-python/slixmpp-1.7.1
 2106020141 metadata/md5-cache/dev-python/slixmpp-9999
 2106020141 metadata/md5-cache/dev-python/smartypants-9999
 2106020141 metadata/md5-cache/dev-python/smmap-4.0.0
 2106020141 metadata/md5-cache/dev-python/snakeoil-0.9.4
-2106020141 metadata/md5-cache/dev-python/snakeoil-0.9.5
 2106020141 metadata/md5-cache/dev-python/snaketrace-0.3.1
-2106020141 metadata/md5-cache/dev-python/snappy-0.6.0
 2106020141 metadata/md5-cache/dev-python/snapshottest-0.5.1
 2106020141 metadata/md5-cache/dev-python/sniffio-1.2.0
 2106020141 metadata/md5-cache/dev-python/snowballstemmer-2.1.0
@@ -42211,10 +41760,8 @@
 2106020141 metadata/md5-cache/dev-python/sortedcontainers-2.4.0
 2106020141 metadata/md5-cache/dev-python/soupsieve-2.2.1
 2106020141 metadata/md5-cache/dev-python/sparql-wrapper-1.8.5
-2106020141 metadata/md5-cache/dev-python/speaklater-1.3-r1
 2106020141 metadata/md5-cache/dev-python/speg-0.3-r2
 2106020141 metadata/md5-cache/dev-python/sphinx-3.5.4
-2106020141 metadata/md5-cache/dev-python/sphinx-4.0.2
 2106020141 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
 2106020141 metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.12.0
 2106020141 metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.8.0
@@ -42222,7 +41769,6 @@
 2106020141 metadata/md5-cache/dev-python/sphinx-gallery-0.9.0
 2106020141 metadata/md5-cache/dev-python/sphinx-issues-1.2.0
 2106020141 metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
-2106020141 metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
 2106020141 metadata/md5-cache/dev-python/sphinx-notfound-page-0.5
 2106020141 metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
 2106020141 metadata/md5-cache/dev-python/sphinx-panels-0.5.2
@@ -42231,36 +41777,21 @@
 2106020141 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
 2106020141 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
 2106020141 metadata/md5-cache/dev-python/sphinx_lv2_theme-1.0.0-r1
-2106020141 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
 2106020141 metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.2.0-r2
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.0.0
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.2.0
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.2.1
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.3.0
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1-r2
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.7.0
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
 2106020141 metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.4
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.1.0
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
-2106020141 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
 2106020141 metadata/md5-cache/dev-python/sphobjinv-2.1
-2106020141 metadata/md5-cache/dev-python/spur-0.3.22
 2106020141 metadata/md5-cache/dev-python/spyder-4.2.5
-2106020141 metadata/md5-cache/dev-python/spyder-5.0.3-r1
 2106020141 metadata/md5-cache/dev-python/spyder-kernels-1.10.2
 2106020141 metadata/md5-cache/dev-python/spyder-kernels-2.0.3
 2106020141 metadata/md5-cache/dev-python/spyder-line-profiler-0.2.1
@@ -42274,7 +41805,6 @@
 2106020141 metadata/md5-cache/dev-python/sqlalchemy-1.4.12
 2106020141 metadata/md5-cache/dev-python/sqlalchemy-1.4.13
 2106020141 metadata/md5-cache/dev-python/sqlalchemy-1.4.14
-2106020141 metadata/md5-cache/dev-python/sqlalchemy-1.4.15
 2106020141 metadata/md5-cache/dev-python/sqlalchemy-1.4.16
 2106020141 metadata/md5-cache/dev-python/sqlalchemy-1.4.17
 2106020141 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
@@ -42302,7 +41832,6 @@
 2106020141 metadata/md5-cache/dev-python/svg-path-4.0.2
 2106020141 metadata/md5-cache/dev-python/svg-path-4.1
 2106020141 metadata/md5-cache/dev-python/svgwrite-1.4
-2106020141 metadata/md5-cache/dev-python/svgwrite-1.4.1
 2106020141 metadata/md5-cache/dev-python/swagger-spec-validator-2.7.3
 2106020141 metadata/md5-cache/dev-python/sybil-2.0.1
 2106020141 metadata/md5-cache/dev-python/symengine-0.7.2-r2
@@ -42318,7 +41847,6 @@
 2106020141 metadata/md5-cache/dev-python/tempora-4.0.2
 2106020141 metadata/md5-cache/dev-python/tenacity-7.0.0
 2106020141 metadata/md5-cache/dev-python/termcolor-1.1.0-r2
-2106020141 metadata/md5-cache/dev-python/terminado-0.10.0
 2106020141 metadata/md5-cache/dev-python/terminado-0.9.4
 2106020141 metadata/md5-cache/dev-python/terminaltables-3.1.0
 2106020141 metadata/md5-cache/dev-python/terminaltables-9999
@@ -42337,13 +41865,9 @@
 2106020141 metadata/md5-cache/dev-python/theano-1.0.5-r1
 2106020141 metadata/md5-cache/dev-python/theano-pymc-1.1.2-r1
 2106020141 metadata/md5-cache/dev-python/threadpoolctl-2.1.0
-2106020141 metadata/md5-cache/dev-python/three-merge-0.1.1
 2106020141 metadata/md5-cache/dev-python/thrift-0.13.0
 2106020141 metadata/md5-cache/dev-python/thrift-0.14.1
 2106020141 metadata/md5-cache/dev-python/tikzplotlib-0.9.8
-2106020141 metadata/md5-cache/dev-python/timeout-decorator-0.5.0
-2106020141 metadata/md5-cache/dev-python/tinycss-0.4
-2106020141 metadata/md5-cache/dev-python/tinycss2-1.1.0
 2106020141 metadata/md5-cache/dev-python/tinyrpc-1.0.1
 2106020141 metadata/md5-cache/dev-python/tld-0.12.2
 2106020141 metadata/md5-cache/dev-python/tld-0.12.3
@@ -42352,17 +41876,12 @@
 2106020141 metadata/md5-cache/dev-python/toml-0.10.2
 2106020141 metadata/md5-cache/dev-python/toolz-0.11.1
 2106020141 metadata/md5-cache/dev-python/tooz-2.7.1
-2106020141 metadata/md5-cache/dev-python/towncrier-21.3.0
-2106020141 metadata/md5-cache/dev-python/tox-3.23.0
-2106020141 metadata/md5-cache/dev-python/tox-3.23.1
 2106020141 metadata/md5-cache/dev-python/tqdm-4.60.0
 2106020141 metadata/md5-cache/dev-python/tqdm-4.61.0
 2106020141 metadata/md5-cache/dev-python/traceback2-1.4.0-r1
 2106020141 metadata/md5-cache/dev-python/traitlets-4.3.3
 2106020141 metadata/md5-cache/dev-python/traitlets-5.0.5
 2106020141 metadata/md5-cache/dev-python/transitions-0.8.8
-2106020141 metadata/md5-cache/dev-python/translate-toolkit-3.3.4
-2106020141 metadata/md5-cache/dev-python/translate-toolkit-3.3.6
 2106020141 metadata/md5-cache/dev-python/tree-sitter-0.19.0
 2106020141 metadata/md5-cache/dev-python/tree-sitter-0.2.1
 2106020141 metadata/md5-cache/dev-python/tree-sitter-0.2.2
@@ -42381,23 +41900,16 @@
 2106020141 metadata/md5-cache/dev-python/txgithub-15.0.0-r1
 2106020141 metadata/md5-cache/dev-python/txrequests-0.9.6
 2106020141 metadata/md5-cache/dev-python/typed-ast-1.4.3
-2106020141 metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
-2106020141 metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
 2106020141 metadata/md5-cache/dev-python/tzlocal-2.1
 2106020141 metadata/md5-cache/dev-python/u-msgpack-2.7.1
 2106020141 metadata/md5-cache/dev-python/ubelt-0.9.5
-2106020141 metadata/md5-cache/dev-python/ujson-4.0.2
 2106020141 metadata/md5-cache/dev-python/uncertainties-3.1.4-r1
 2106020141 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
-2106020141 metadata/md5-cache/dev-python/unidecode-1.2.0
 2106020141 metadata/md5-cache/dev-python/unidiff-0.6.0
-2106020141 metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
 2106020141 metadata/md5-cache/dev-python/unittest-or-fail-1
 2106020141 metadata/md5-cache/dev-python/unittest2-1.1.0-r1
 2106020141 metadata/md5-cache/dev-python/uranium-4.8.0-r1
 2106020141 metadata/md5-cache/dev-python/urdf_parser_py-0.4.5
-2106020141 metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
-2106020141 metadata/md5-cache/dev-python/url-normalize-1.4.3
 2106020141 metadata/md5-cache/dev-python/urlgrabber-4.1.0
 2106020141 metadata/md5-cache/dev-python/urllib3-1.26.4
 2106020141 metadata/md5-cache/dev-python/urllib3-1.26.5
@@ -42424,13 +41936,10 @@
 2106020141 metadata/md5-cache/dev-python/visitor-0.1.3-r1
 2106020141 metadata/md5-cache/dev-python/vncdotool-0.13.0
 2106020141 metadata/md5-cache/dev-python/vncdotool-1.0.0
-2106020141 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
-2106020141 metadata/md5-cache/dev-python/voluptuous-0.12.1
 2106020141 metadata/md5-cache/dev-python/vpython-7.6.1-r3
 2106020141 metadata/md5-cache/dev-python/waitress-2.0.0
 2106020141 metadata/md5-cache/dev-python/wand-0.6.5
 2106020141 metadata/md5-cache/dev-python/wand-0.6.6
-2106020141 metadata/md5-cache/dev-python/warlock-1.3.3
 2106020141 metadata/md5-cache/dev-python/watchdog-1.0.2
 2106020141 metadata/md5-cache/dev-python/watchdog-2.0.3
 2106020141 metadata/md5-cache/dev-python/watchdog-2.1.1
@@ -42443,12 +41952,8 @@
 2106020141 metadata/md5-cache/dev-python/weasyprint-52.4
 2106020141 metadata/md5-cache/dev-python/weasyprint-52.5
 2106020141 metadata/md5-cache/dev-python/webassets-2.0
-2106020141 metadata/md5-cache/dev-python/webcolors-1.11.1
 2106020141 metadata/md5-cache/dev-python/webencodings-0.5.1-r1
 2106020141 metadata/md5-cache/dev-python/webob-1.8.7
-2106020141 metadata/md5-cache/dev-python/websocket-client-0.58.0-r1
-2106020141 metadata/md5-cache/dev-python/websocket-client-0.59.0
-2106020141 metadata/md5-cache/dev-python/websocket-client-1.0.0
 2106020141 metadata/md5-cache/dev-python/websocket-client-1.0.1
 2106020141 metadata/md5-cache/dev-python/websockets-9.1
 2106020141 metadata/md5-cache/dev-python/websockify-0.9.0-r1
@@ -42459,32 +41964,24 @@
 2106020141 metadata/md5-cache/dev-python/werkzeug-2.0.1-r1
 2106020141 metadata/md5-cache/dev-python/whatever-0.6
 2106020141 metadata/md5-cache/dev-python/wheel-0.36.2
-2106020141 metadata/md5-cache/dev-python/whichcraft-0.6.1
 2106020141 metadata/md5-cache/dev-python/whisper-1.1.5
 2106020141 metadata/md5-cache/dev-python/whisper-1.1.7
-2106020141 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
 2106020141 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
 2106020141 metadata/md5-cache/dev-python/wrapt-1.12.1
 2106020141 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
 2106020141 metadata/md5-cache/dev-python/ws4py-9999
-2106020141 metadata/md5-cache/dev-python/wsaccel-0.6.3
 2106020141 metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
 2106020141 metadata/md5-cache/dev-python/wsproto-0.15.0
 2106020141 metadata/md5-cache/dev-python/wsproto-1.0.0
 2106020141 metadata/md5-cache/dev-python/wstools-0.4.8
-2106020141 metadata/md5-cache/dev-python/wtforms-2.3.3
 2106020141 metadata/md5-cache/dev-python/wurlitzer-2.1.0
-2106020141 metadata/md5-cache/dev-python/www-authenticate-0.9.2
 2106020141 metadata/md5-cache/dev-python/wxpython-4.0.7
 2106020141 metadata/md5-cache/dev-python/wxpython-4.0.7-r1
 2106020141 metadata/md5-cache/dev-python/xapp-2.0.2
 2106020141 metadata/md5-cache/dev-python/xarray-0.17.0
 2106020141 metadata/md5-cache/dev-python/xarray-0.18.1
 2106020141 metadata/md5-cache/dev-python/xarray-0.18.2
-2106020141 metadata/md5-cache/dev-python/xcffib-0.11.1
 2106020141 metadata/md5-cache/dev-python/xdg-5.0.1-r2
-2106020141 metadata/md5-cache/dev-python/xdg-5.0.2
-2106020141 metadata/md5-cache/dev-python/xdoctest-0.15.4
 2106020141 metadata/md5-cache/dev-python/xlrd-2.0.1
 2106020141 metadata/md5-cache/dev-python/xlsxwriter-1.3.9
 2106020141 metadata/md5-cache/dev-python/xlsxwriter-1.4.2
@@ -42493,20 +41990,13 @@
 2106020141 metadata/md5-cache/dev-python/xmlschema-1.6.2
 2106020141 metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
 2106020141 metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
-2106020141 metadata/md5-cache/dev-python/xxhash-2.0.0
-2106020141 metadata/md5-cache/dev-python/xxhash-2.0.2
-2106020141 metadata/md5-cache/dev-python/yapf-0.31.0
 2106020141 metadata/md5-cache/dev-python/yappi-1.3.2
-2106020141 metadata/md5-cache/dev-python/yapsy-1.12.2
 2106020141 metadata/md5-cache/dev-python/yaql-1.1.3
 2106020141 metadata/md5-cache/dev-python/yarl-1.6.3
 2106020141 metadata/md5-cache/dev-python/yaswfp-0.9.3-r1
 2106020141 metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
-2106020141 metadata/md5-cache/dev-python/zc-lockfile-2.0
 2106020141 metadata/md5-cache/dev-python/zconfig-3.5.0
 2106020141 metadata/md5-cache/dev-python/zconfig-3.6.0
-2106020141 metadata/md5-cache/dev-python/zeroconf-0.29.0
-2106020141 metadata/md5-cache/dev-python/zeroconf-0.30.0
 2106020141 metadata/md5-cache/dev-python/zipp-3.4.1
 2106020141 metadata/md5-cache/dev-python/zope-component-4.4.1
 2106020141 metadata/md5-cache/dev-python/zope-configuration-4.4.0
@@ -42515,7 +42005,6 @@
 2106020141 metadata/md5-cache/dev-python/zope-exceptions-4.4
 2106020141 metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.1
 2106020141 metadata/md5-cache/dev-python/zope-interface-5.3.0
-2106020141 metadata/md5-cache/dev-python/zope-interface-5.4.0
 2106020141 metadata/md5-cache/dev-python/zope-schema-6.1.0
 2106020141 metadata/md5-cache/dev-python/zope-testing-4.9
 2106020141 metadata/md5-cache/dev-python/zope-testrunner-5.2
@@ -42523,7 +42012,6 @@
 2106020141 metadata/md5-cache/dev-python/zstandard-0.15.2-r1
 2106020141 metadata/md5-cache/dev-python/zstd-1.4.9.1
 2106020141 metadata/md5-cache/dev-python/zstd-1.5.0.2
-2106020141 metadata/md5-cache/dev-python/zxcvbn-4.4.28
 2106022339 metadata/md5-cache/dev-python/PyQt5-5.15.4-r1
 2106021939 metadata/md5-cache/dev-python/betamax-0.8.1
 2106021939 metadata/md5-cache/dev-python/bleach-3.3.0
@@ -42544,7 +42032,6 @@
 2106030240 metadata/md5-cache/dev-python/nuitka-0.6.15.1
 2106021739 metadata/md5-cache/dev-python/passlib-1.7.4
 2106021939 metadata/md5-cache/dev-python/portend-2.7.1
-2106022009 metadata/md5-cache/dev-python/protobuf-python-3.15.8
 2106021939 metadata/md5-cache/dev-python/pyfakefs-4.4.0
 2106031039 metadata/md5-cache/dev-python/pyflakes-2.3.1
 2106022209 metadata/md5-cache/dev-python/pyilmbase-2.5.6
@@ -42560,12 +42047,7 @@
 2106030210 metadata/md5-cache/dev-python/vdirsyncer-0.16.8-r1
 2106040109 metadata/md5-cache/dev-python/Faker-8.5.0
 2106040109 metadata/md5-cache/dev-python/Faker-8.5.1
-2106040440 metadata/md5-cache/dev-python/Manifest.gz
 2106031139 metadata/md5-cache/dev-python/QtPy-1.9.0-r5
-2106040109 metadata/md5-cache/dev-python/boto3-1.17.87
-2106040109 metadata/md5-cache/dev-python/boto3-9999
-2106040109 metadata/md5-cache/dev-python/botocore-1.20.87
-2106040109 metadata/md5-cache/dev-python/botocore-9999
 2106040109 metadata/md5-cache/dev-python/cfn-python-lint-0.50.0
 2106031309 metadata/md5-cache/dev-python/exdown-0.9.0
 2106040139 metadata/md5-cache/dev-python/google-api-core-1.29.0
@@ -42573,7 +42055,6 @@
 2106040139 metadata/md5-cache/dev-python/hypothesis-6.13.12
 2106040109 metadata/md5-cache/dev-python/identify-2.2.8
 2106032239 metadata/md5-cache/dev-python/imapclient-2.2.0
-2106031309 metadata/md5-cache/dev-python/libsass-0.21.0
 2106031939 metadata/md5-cache/dev-python/lxml-4.6.3-r1
 2106031339 metadata/md5-cache/dev-python/nbsphinx-0.8.6
 2106032239 metadata/md5-cache/dev-python/pip-21.1.1
@@ -42590,6 +42071,323 @@
 2106040109 metadata/md5-cache/dev-python/sphinx-panels-0.6.0
 2106031939 metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.8
 2106032239 metadata/md5-cache/dev-python/zeep-3.4.0
+2106051839 metadata/md5-cache/dev-python/CppHeaderParser-2.7.4
+2106042139 metadata/md5-cache/dev-python/GitPython-3.1.17
+2106071639 metadata/md5-cache/dev-python/Manifest.gz
+2106052339 metadata/md5-cache/dev-python/PyGithub-1.55
+2106051609 metadata/md5-cache/dev-python/aiofiles-0.7.0
+2106052339 metadata/md5-cache/dev-python/aiorpcX-0.22.0
+2106052339 metadata/md5-cache/dev-python/alembic-1.6.2
+2106051609 metadata/md5-cache/dev-python/alembic-1.6.5
+2106051609 metadata/md5-cache/dev-python/ansi-0.2.0
+2106051609 metadata/md5-cache/dev-python/ansi2html-1.6.0
+2106052339 metadata/md5-cache/dev-python/ansicolor-0.3.2
+2106051609 metadata/md5-cache/dev-python/ansicolor-9999
+2106051139 metadata/md5-cache/dev-python/apispec-4.5.0
+2106052339 metadata/md5-cache/dev-python/argcomplete-1.12.3
+2106052339 metadata/md5-cache/dev-python/arpeggio-1.10.2
+2106052339 metadata/md5-cache/dev-python/arrow-1.1.0
+2106051609 metadata/md5-cache/dev-python/asn1crypto-1.4.0
+2106052339 metadata/md5-cache/dev-python/astroid-2.5.6
+2106051609 metadata/md5-cache/dev-python/atomicwrites-1.4.0-r1
+2106052339 metadata/md5-cache/dev-python/attrs-21.2.0
+2106051609 metadata/md5-cache/dev-python/authres-1.2.0
+2106052339 metadata/md5-cache/dev-python/autopep8-1.5.7
+2106051609 metadata/md5-cache/dev-python/aws-sam-translator-1.36.0
+2106052339 metadata/md5-cache/dev-python/aws-xray-sdk-python-2.8.0
+2106051609 metadata/md5-cache/dev-python/babelfish-0.5.5-r1
+2106051609 metadata/md5-cache/dev-python/babelfish-9999
+2106051609 metadata/md5-cache/dev-python/bibtexparser-1.1.0
+2106051609 metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
+2106060009 metadata/md5-cache/dev-python/bitarray-2.1.0
+2106051609 metadata/md5-cache/dev-python/bitstring-3.1.7
+2106071639 metadata/md5-cache/dev-python/black-21.5_beta1
+2106051609 metadata/md5-cache/dev-python/blessings-1.7-r1
+2106041939 metadata/md5-cache/dev-python/boto3-1.17.87
+2106051139 metadata/md5-cache/dev-python/boto3-1.17.88
+2106041939 metadata/md5-cache/dev-python/boto3-9999
+2106041939 metadata/md5-cache/dev-python/botocore-1.20.87
+2106051139 metadata/md5-cache/dev-python/botocore-1.20.88
+2106041939 metadata/md5-cache/dev-python/botocore-9999
+2106052339 metadata/md5-cache/dev-python/breathe-4.30.0
+2106071639 metadata/md5-cache/dev-python/brotlicffi-1.0.9.2
+2106051609 metadata/md5-cache/dev-python/cached-property-1.5.2
+2106052339 metadata/md5-cache/dev-python/cachetools-4.2.2
+2106051639 metadata/md5-cache/dev-python/cbor-1.0.0-r1
+2106051139 metadata/md5-cache/dev-python/cbor2-5.4.0
+2106051639 metadata/md5-cache/dev-python/cftime-1.5.0
+2106051639 metadata/md5-cache/dev-python/click-plugins-1.1.1
+2106071009 metadata/md5-cache/dev-python/cmd2-2.0.1
+2106052209 metadata/md5-cache/dev-python/configclass-0.2.0
+2106051639 metadata/md5-cache/dev-python/cppy-1.1.0
+2106051639 metadata/md5-cache/dev-python/crcmod-1.7-r4
+2106051639 metadata/md5-cache/dev-python/croniter-1.0.13
+2106052209 metadata/md5-cache/dev-python/cssselect2-0.4.1
+2106051639 metadata/md5-cache/dev-python/ctypescrypto-0.5
+2106051639 metadata/md5-cache/dev-python/ctypescrypto-9999
+2106051639 metadata/md5-cache/dev-python/cwcwidth-0.1.4
+2106051139 metadata/md5-cache/dev-python/dask-2021.6.0
+2106051639 metadata/md5-cache/dev-python/dbutils-2.0.1
+2106051639 metadata/md5-cache/dev-python/diff-match-patch-20200713
+2106051639 metadata/md5-cache/dev-python/distro-1.5.0-r1
+2106051639 metadata/md5-cache/dev-python/dj-database-url-0.5.0
+2106052209 metadata/md5-cache/dev-python/django-otp-1.0.6
+2106051410 metadata/md5-cache/dev-python/dnspython-2.1.0
+2106052209 metadata/md5-cache/dev-python/docker-py-5.0.0
+2106051639 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
+2106041539 metadata/md5-cache/dev-python/docutils-0.16-r1
+2106041309 metadata/md5-cache/dev-python/docutils-glep-1.2
+2106051639 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
+2106051639 metadata/md5-cache/dev-python/errorhandler-2.0.1
+2106052339 metadata/md5-cache/dev-python/et_xmlfile-1.1.0
+2106071639 metadata/md5-cache/dev-python/eventlet-0.31.0
+2106041209 metadata/md5-cache/dev-python/fasteners-0.16.1
+2106052339 metadata/md5-cache/dev-python/fastjsonschema-2.15.1
+2106051639 metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
+2106051639 metadata/md5-cache/dev-python/fitsio-0.9.11
+2106070309 metadata/md5-cache/dev-python/flake8-polyfill-1.0.2
+2106041809 metadata/md5-cache/dev-python/flask-babel-2.0.0
+2106051709 metadata/md5-cache/dev-python/flask-cors-3.0.10
+2106051709 metadata/md5-cache/dev-python/flask-debug-0.4.3-r1
+2106051709 metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+2106051709 metadata/md5-cache/dev-python/flask-paginate-0.8.1
+2106051709 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+2106041809 metadata/md5-cache/dev-python/flask-wtf-0.15.1
+2106051709 metadata/md5-cache/dev-python/flexmock-0.10.4
+2106052339 metadata/md5-cache/dev-python/fonttools-4.23.1
+2106052209 metadata/md5-cache/dev-python/fqdn-1.5.1
+2106051709 metadata/md5-cache/dev-python/fudge-1.1.1
+2106051709 metadata/md5-cache/dev-python/genson-1.1.0
+2106051709 metadata/md5-cache/dev-python/geoip-python-1.3.2-r1
+2106042209 metadata/md5-cache/dev-python/gevent-21.1.2
+2106052339 metadata/md5-cache/dev-python/google-api-python-client-2.4.0
+2106052339 metadata/md5-cache/dev-python/google-auth-1.30.0
+2106051709 metadata/md5-cache/dev-python/graphviz-0.16
+2106060009 metadata/md5-cache/dev-python/grpcio-1.37.1
+2106052209 metadata/md5-cache/dev-python/guessit-3.3.1
+2106051709 metadata/md5-cache/dev-python/hiredis-1.1.0
+2106051709 metadata/md5-cache/dev-python/html5-parser-0.4.9
+2106051709 metadata/md5-cache/dev-python/httmock-1.4.0
+2106051709 metadata/md5-cache/dev-python/http-parser-0.9.0
+2106052339 metadata/md5-cache/dev-python/humanize-3.5.0
+2106061639 metadata/md5-cache/dev-python/humanize-3.7.1
+2106041039 metadata/md5-cache/dev-python/hypothesis-6.13.13
+2106051139 metadata/md5-cache/dev-python/hypothesis-6.13.14
+2106051709 metadata/md5-cache/dev-python/icalendar-4.0.7
+2106051139 metadata/md5-cache/dev-python/identify-2.2.9
+2106051739 metadata/md5-cache/dev-python/immutables-0.15
+2106041039 metadata/md5-cache/dev-python/importlib_metadata-4.5.0
+2106051739 metadata/md5-cache/dev-python/iniparse-0.5
+2106052339 metadata/md5-cache/dev-python/intervaltree-3.1.0
+2106051739 metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
+2106051739 metadata/md5-cache/dev-python/ipy-1.01
+2106052339 metadata/md5-cache/dev-python/ipykernel-5.5.4-r1
+2106071639 metadata/md5-cache/dev-python/ipython-7.23.1
+2106052209 metadata/md5-cache/dev-python/jinja2-time-0.2.0
+2106051739 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+2106041809 metadata/md5-cache/dev-python/jmespath-0.10.0
+2106051739 metadata/md5-cache/dev-python/josepy-1.8.0
+2106051739 metadata/md5-cache/dev-python/jsmin-2.2.2
+2106051739 metadata/md5-cache/dev-python/json-rpc-1.13.0
+2106070309 metadata/md5-cache/dev-python/jsonext-0.4.2
+2106051739 metadata/md5-cache/dev-python/jsonmerge-1.8.0
+2106051739 metadata/md5-cache/dev-python/jsonref-0.1
+2106051739 metadata/md5-cache/dev-python/jsonrpclib-0.4.2
+2106051739 metadata/md5-cache/dev-python/jsonrpclib-9999
+2106041839 metadata/md5-cache/dev-python/jsonschema-3.2.0
+2106051739 metadata/md5-cache/dev-python/jsonxs-0.6
+2106051639 metadata/md5-cache/dev-python/kiwisolver-1.3.1
+2106051739 metadata/md5-cache/dev-python/latexcodec-2.0.1
+2106070309 metadata/md5-cache/dev-python/lazr-config-2.2.2
+2106070309 metadata/md5-cache/dev-python/lazr-config-2.2.3
+2106070309 metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+2106051739 metadata/md5-cache/dev-python/liblarch-3.0.1
+2106051739 metadata/md5-cache/dev-python/libnacl-1.7.2-r1
+2106041409 metadata/md5-cache/dev-python/libsass-0.21.0
+2106051139 metadata/md5-cache/dev-python/line_profiler-3.3.0
+2106051739 metadata/md5-cache/dev-python/lit-12.0.0
+2106051739 metadata/md5-cache/dev-python/lit-12.0.1.9999
+2106051739 metadata/md5-cache/dev-python/lit-12.0.1_rc1
+2106051739 metadata/md5-cache/dev-python/lit-13.0.0.9999
+2106051739 metadata/md5-cache/dev-python/lmdb-1.2.1
+2106052209 metadata/md5-cache/dev-python/locket-0.2.1
+2106051739 metadata/md5-cache/dev-python/logutils-0.3.5
+2106052209 metadata/md5-cache/dev-python/markdown-3.3.4
+2106051739 metadata/md5-cache/dev-python/markdown2-2.4.0
+2106071639 metadata/md5-cache/dev-python/matplotlib-inline-0.1.2
+2106060009 metadata/md5-cache/dev-python/mdx_gh_links-0.2
+2106051739 metadata/md5-cache/dev-python/memory_profiler-0.57
+2106051739 metadata/md5-cache/dev-python/mergedict-1.0.0
+2106051739 metadata/md5-cache/dev-python/micawber-0.5.3
+2106051739 metadata/md5-cache/dev-python/mimerender-0.6.0
+2106061639 metadata/md5-cache/dev-python/minidb-2.0.5
+2106060009 metadata/md5-cache/dev-python/mkautodoc-0.1.0
+2106061609 metadata/md5-cache/dev-python/mongoengine-0.23.1
+2106071539 metadata/md5-cache/dev-python/mongomock-3.23.0
+2106051509 metadata/md5-cache/dev-python/mss-6.1.0
+2106052209 metadata/md5-cache/dev-python/ndg-httpsclient-0.5.1
+2106061609 metadata/md5-cache/dev-python/nodeenv-1.6.0
+2106052339 metadata/md5-cache/dev-python/nose-1.3.7-r8
+2106071539 metadata/md5-cache/dev-python/nuitka-0.6.15.3
+2106051809 metadata/md5-cache/dev-python/numexpr-2.7.2_p1
+2106051839 metadata/md5-cache/dev-python/numexpr-2.7.3
+2106051809 metadata/md5-cache/dev-python/objgraph-3.5.0
+2106051809 metadata/md5-cache/dev-python/odfpy-1.3.6
+2106060009 metadata/md5-cache/dev-python/ovs-2.13.3
+2106051839 metadata/md5-cache/dev-python/pandocfilters-1.4.3
+2106042109 metadata/md5-cache/dev-python/paramiko-2.7.2
+2106051809 metadata/md5-cache/dev-python/parsedatetime-2.6
+2106051809 metadata/md5-cache/dev-python/pbkdf2-1.3-r1
+2106052339 metadata/md5-cache/dev-python/pbr-5.6.0
+2106051809 metadata/md5-cache/dev-python/pebble-4.6.1
+2106041809 metadata/md5-cache/dev-python/peewee-3.14.4
+2106051809 metadata/md5-cache/dev-python/piexif-1.1.3-r1
+2106041809 metadata/md5-cache/dev-python/pikepdf-2.12.1
+2106071539 metadata/md5-cache/dev-python/pikepdf-2.12.2
+2106052109 metadata/md5-cache/dev-python/pilkit-2.0
+2106051839 metadata/md5-cache/dev-python/plotly-4.14.3
+2106052109 metadata/md5-cache/dev-python/prettytable-2.1.0
+2106052339 metadata/md5-cache/dev-python/process-tests-2.1.2
+2106062009 metadata/md5-cache/dev-python/protobuf-python-3.15.8
+2106062009 metadata/md5-cache/dev-python/protobuf-python-3.16.0
+2106062009 metadata/md5-cache/dev-python/protobuf-python-3.17.0
+2106062009 metadata/md5-cache/dev-python/protobuf-python-3.17.1
+2106062009 metadata/md5-cache/dev-python/protobuf-python-3.17.2
+2106062009 metadata/md5-cache/dev-python/protobuf-python-9999
+2106051709 metadata/md5-cache/dev-python/pulsectl-21.5.18
+2106052109 metadata/md5-cache/dev-python/py-cpuinfo-8.0.0
+2106052109 metadata/md5-cache/dev-python/pyaes-1.6.1-r2
+2106052339 metadata/md5-cache/dev-python/pyalsa-1.1.6-r1
+2106052109 metadata/md5-cache/dev-python/pybtex-0.24.0
+2106060009 metadata/md5-cache/dev-python/pybtex-docutils-1.0.0
+2106052109 metadata/md5-cache/dev-python/pycodestyle-2.7.0
+2106052339 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.6.3
+2106052109 metadata/md5-cache/dev-python/pydot-1.4.2
+2106052109 metadata/md5-cache/dev-python/pydotplus-2.0.2
+2106052109 metadata/md5-cache/dev-python/pyelftools-0.27
+2106052109 metadata/md5-cache/dev-python/pyenchant-3.2.0
+2106042209 metadata/md5-cache/dev-python/pyfakefs-4.5.0
+2106052109 metadata/md5-cache/dev-python/pygit2-1.6.0
+2106052339 metadata/md5-cache/dev-python/pygments-2.9.0
+2106052109 metadata/md5-cache/dev-python/pyh2o-1
+2106052339 metadata/md5-cache/dev-python/pyjwt-2.1.0
+2106052109 metadata/md5-cache/dev-python/pykka-3.0.1
+2106052339 metadata/md5-cache/dev-python/pylast-4.2.1
+2106052109 metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+2106061609 metadata/md5-cache/dev-python/pylint-2.8.2
+2106051139 metadata/md5-cache/dev-python/pyls-black-0.4.7
+2106071639 metadata/md5-cache/dev-python/pymongo-3.11.4
+2106052109 metadata/md5-cache/dev-python/pymysql-1.0.2
+2106042109 metadata/md5-cache/dev-python/pynacl-1.4.0
+2106051639 metadata/md5-cache/dev-python/pyopencl-2021.1.3
+2106051639 metadata/md5-cache/dev-python/pyopencl-2021.2.2
+2106052109 metadata/md5-cache/dev-python/pyperclip-1.8.2
+2106052109 metadata/md5-cache/dev-python/pyphen-0.10.0
+2106052109 metadata/md5-cache/dev-python/pyrfc3339-1.1
+2106052339 metadata/md5-cache/dev-python/pytest-mock-3.6.1
+2106051539 metadata/md5-cache/dev-python/pytest-qt-3.3.0
+2106051410 metadata/md5-cache/dev-python/pytest-qt-4.0.0
+2106060839 metadata/md5-cache/dev-python/python-efl-1.25.0
+2106041809 metadata/md5-cache/dev-python/python-email-validator-1.1.2
+2106051139 metadata/md5-cache/dev-python/python-jose-3.3.0
+2106060009 metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0-r1
+2106060009 metadata/md5-cache/dev-python/python-lsp-jsonrpc-1.0.0
+2106052109 metadata/md5-cache/dev-python/python-memcached-1.59-r1
+2106052109 metadata/md5-cache/dev-python/python-mpd-3.0.4
+2106052339 metadata/md5-cache/dev-python/python-slugify-5.0.0
+2106052109 metadata/md5-cache/dev-python/python-sshpubkeys-3.3.1
+2106052139 metadata/md5-cache/dev-python/python-utils-2.5.6
+2106041809 metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1-r1
+2106052139 metadata/md5-cache/dev-python/python-zipstream-1.1.4
+2106052139 metadata/md5-cache/dev-python/pytidylib-0.3.2-r1
+2106052139 metadata/md5-cache/dev-python/pyxdg-0.27
+2106052139 metadata/md5-cache/dev-python/pyzbar-0.1.8
+2106052139 metadata/md5-cache/dev-python/qrcode-6.1
+2106051509 metadata/md5-cache/dev-python/qtawesome-1.0.2
+2106052339 metadata/md5-cache/dev-python/qtconsole-5.1.0
+2106052139 metadata/md5-cache/dev-python/quantities-0.12.4
+2106070309 metadata/md5-cache/dev-python/radon-4.5.2
+2106052139 metadata/md5-cache/dev-python/rarfile-3.1
+2106041539 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
+2106052139 metadata/md5-cache/dev-python/rebulk-3.0.1
+2106052139 metadata/md5-cache/dev-python/recommonmark-0.7.1
+2106052139 metadata/md5-cache/dev-python/reportlab-3.5.67
+2106070239 metadata/md5-cache/dev-python/requests-cache-0.6.3
+2106051139 metadata/md5-cache/dev-python/requests-cache-0.6.4
+2106052339 metadata/md5-cache/dev-python/requests-mock-1.9.2
+2106052139 metadata/md5-cache/dev-python/rfc3986-1.5.0
+2106041839 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+2106041839 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+2106041939 metadata/md5-cache/dev-python/s3transfer-0.4.2
+2106052139 metadata/md5-cache/dev-python/scandir-1.10.0-r2
+2106061039 metadata/md5-cache/dev-python/scipy-1.6.3
+2106052139 metadata/md5-cache/dev-python/semver-2.13.0
+2106052139 metadata/md5-cache/dev-python/sentinels-1.0.0
+2106052139 metadata/md5-cache/dev-python/serverfiles-0.3.1
+2106041809 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
+2106052139 metadata/md5-cache/dev-python/simpleeval-0.9.10
+2106052139 metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+2106060009 metadata/md5-cache/dev-python/simpy-4.0.1
+2106052339 metadata/md5-cache/dev-python/six-1.16.0
+2106061039 metadata/md5-cache/dev-python/slixmpp-1.7.1
+2106070939 metadata/md5-cache/dev-python/snakeoil-0.9.5
+2106052139 metadata/md5-cache/dev-python/snappy-0.6.0
+2106052139 metadata/md5-cache/dev-python/speaklater-1.3-r1
+2106041509 metadata/md5-cache/dev-python/sphinx-4.0.2
+2106051539 metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
+2106041539 metadata/md5-cache/dev-python/sphinx_rtd_theme-0.5.2
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.2
+2106051539 metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.7
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2
+2106060009 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5
+2106052339 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.2.1
+2106041509 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4
+2106052139 metadata/md5-cache/dev-python/spur-0.3.22
+2106051410 metadata/md5-cache/dev-python/spyder-5.0.3-r2
+2106071639 metadata/md5-cache/dev-python/sqlalchemy-1.4.15
+2106051139 metadata/md5-cache/dev-python/stripe-2.58.0
+2106052139 metadata/md5-cache/dev-python/svgwrite-1.4.1
+2106052139 metadata/md5-cache/dev-python/terminado-0.10.0
+2106051839 metadata/md5-cache/dev-python/three-merge-0.1.1
+2106070239 metadata/md5-cache/dev-python/timeout-decorator-0.5.0
+2106052139 metadata/md5-cache/dev-python/tinycss-0.4
+2106052139 metadata/md5-cache/dev-python/tinycss2-1.1.0
+2106071009 metadata/md5-cache/dev-python/tld-0.12.6
+2106052139 metadata/md5-cache/dev-python/towncrier-21.3.0
+2106052339 metadata/md5-cache/dev-python/tox-3.23.1
+2106052339 metadata/md5-cache/dev-python/translate-toolkit-3.3.6
+2106041109 metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506
+2106041609 metadata/md5-cache/dev-python/tree-sitter-0.19.0_p20210506-r1
+2106052339 metadata/md5-cache/dev-python/typing-extensions-3.10.0.0
+2106052139 metadata/md5-cache/dev-python/ujson-4.0.2
+2106052139 metadata/md5-cache/dev-python/unidecode-1.2.0
+2106052139 metadata/md5-cache/dev-python/unittest-mixins-1.6-r1
+2106052139 metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
+2106070239 metadata/md5-cache/dev-python/url-normalize-1.4.3
+2106052209 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
+2106052209 metadata/md5-cache/dev-python/voluptuous-0.12.1
+2106052209 metadata/md5-cache/dev-python/warlock-1.3.3
+2106041839 metadata/md5-cache/dev-python/webcolors-1.11.1
+2106052339 metadata/md5-cache/dev-python/websocket-client-0.59.0
+2106052209 metadata/md5-cache/dev-python/whichcraft-0.6.1
+2106041509 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
+2106052209 metadata/md5-cache/dev-python/wsaccel-0.6.3
+2106041809 metadata/md5-cache/dev-python/wtforms-2.3.3
+2106052209 metadata/md5-cache/dev-python/www-authenticate-0.9.2
+2106052209 metadata/md5-cache/dev-python/xcffib-0.11.1
+2106052209 metadata/md5-cache/dev-python/xdg-5.0.2
+2106060009 metadata/md5-cache/dev-python/xdoctest-0.15.4
+2106052209 metadata/md5-cache/dev-python/xxhash-2.0.2
+2106052209 metadata/md5-cache/dev-python/yapf-0.31.0
+2106052209 metadata/md5-cache/dev-python/yapsy-1.12.2
+2106052209 metadata/md5-cache/dev-python/zc-lockfile-2.0
+2106052339 metadata/md5-cache/dev-python/zeroconf-0.30.0
+2106071639 metadata/md5-cache/dev-python/zope-interface-5.4.0
+2106052209 metadata/md5-cache/dev-python/zxcvbn-4.4.28
 2101101239 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2101231224 metadata/md5-cache/dev-qt/qtchooser-66
 2101231224 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
@@ -43824,96 +43622,39 @@
 2105151010 metadata/md5-cache/dev-ruby/acme-client-2.0.6
 2105151010 metadata/md5-cache/dev-ruby/acme-client-2.0.7
 2105151010 metadata/md5-cache/dev-ruby/acme-client-2.0.8
-2105151010 metadata/md5-cache/dev-ruby/actioncable-5.2.4.5
 2105151010 metadata/md5-cache/dev-ruby/actioncable-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/actioncable-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/actioncable-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/actioncable-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/actioncable-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/actioncable-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/actioncable-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/actionmailbox-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/actionmailbox-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/actionmailbox-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/actionmailbox-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/actionmailer-5.2.4.5
 2105151010 metadata/md5-cache/dev-ruby/actionmailer-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/actionmailer-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/actionmailer-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/actionmailer-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/actionmailer-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/actionmailer-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/actionmailer-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/actionpack-5.2.4.5
-2105151010 metadata/md5-cache/dev-ruby/actionpack-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/actionpack-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/actionpack-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/actionpack-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/actionpack-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/actionpack-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/actionpack-6.1.3.2
 2105151010 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.1
 2105151010 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1
-2105151010 metadata/md5-cache/dev-ruby/actiontext-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/actiontext-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/actiontext-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/actiontext-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/actiontext-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/actiontext-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/actionview-5.2.4.5
-2105151010 metadata/md5-cache/dev-ruby/actionview-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/actionview-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/actionview-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/actionview-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/actionview-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/actionview-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/actionview-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/activejob-5.2.4.5
 2105151010 metadata/md5-cache/dev-ruby/activejob-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/activejob-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/activejob-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/activejob-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/activejob-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/activejob-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/activejob-6.1.3.2
 2105151010 metadata/md5-cache/dev-ruby/activeldap-5.2.4
 2105151010 metadata/md5-cache/dev-ruby/activeldap-6.0.4
 2105151010 metadata/md5-cache/dev-ruby/activeldap-6.1.0
-2105151010 metadata/md5-cache/dev-ruby/activemodel-5.2.4.5
-2105151010 metadata/md5-cache/dev-ruby/activemodel-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/activemodel-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/activemodel-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/activemodel-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/activemodel-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/activemodel-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/activemodel-6.1.3.2
 2105151010 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2
-2105151010 metadata/md5-cache/dev-ruby/activerecord-5.2.4.5
 2105151010 metadata/md5-cache/dev-ruby/activerecord-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/activerecord-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/activerecord-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/activerecord-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/activerecord-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/activerecord-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/activerecord-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/activestorage-5.2.4.5
 2105151010 metadata/md5-cache/dev-ruby/activestorage-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/activestorage-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/activestorage-6.0.3.7
 2105151010 metadata/md5-cache/dev-ruby/activestorage-6.0.3.7-r1
-2105151010 metadata/md5-cache/dev-ruby/activestorage-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/activestorage-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/activestorage-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/activestorage-6.1.3.2
-2105151010 metadata/md5-cache/dev-ruby/activesupport-5.2.4.5
-2105151010 metadata/md5-cache/dev-ruby/activesupport-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/activesupport-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/activesupport-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/activesupport-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/activesupport-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/activesupport-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/activesupport-6.1.3.2
 2105151010 metadata/md5-cache/dev-ruby/acts_as_list-1.0.1
 2105151010 metadata/md5-cache/dev-ruby/acts_as_list-1.0.3
@@ -44357,8 +44098,6 @@
 2105151010 metadata/md5-cache/dev-ruby/log_buddy-0.7.0
 2105151010 metadata/md5-cache/dev-ruby/logue-1.0.18
 2105151010 metadata/md5-cache/dev-ruby/loofah-2.7.0
-2105151010 metadata/md5-cache/dev-ruby/loofah-2.8.0
-2105151010 metadata/md5-cache/dev-ruby/loofah-2.9.0
 2105151010 metadata/md5-cache/dev-ruby/loofah-2.9.1
 2105151010 metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
 2105151010 metadata/md5-cache/dev-ruby/lumberjack-1.0.13
@@ -44580,25 +44319,13 @@
 2105151010 metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
 2105151010 metadata/md5-cache/dev-ruby/rack-test-1.1.0
 2105151010 metadata/md5-cache/dev-ruby/radius-0.7.5
-2105151010 metadata/md5-cache/dev-ruby/rails-5.2.4.5
 2105151010 metadata/md5-cache/dev-ruby/rails-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/rails-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/rails-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/rails-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/rails-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/rails-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/rails-6.1.3.2
 2105151010 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
 2105151010 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
 2105151010 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
-2105151010 metadata/md5-cache/dev-ruby/railties-5.2.4.5
-2105151010 metadata/md5-cache/dev-ruby/railties-5.2.6
-2105151010 metadata/md5-cache/dev-ruby/railties-6.0.3.5
 2105151010 metadata/md5-cache/dev-ruby/railties-6.0.3.7
-2105151010 metadata/md5-cache/dev-ruby/railties-6.1.2.1
-2105151010 metadata/md5-cache/dev-ruby/railties-6.1.2.1-r1
-2105151010 metadata/md5-cache/dev-ruby/railties-6.1.3
-2105151010 metadata/md5-cache/dev-ruby/railties-6.1.3.1
 2105151010 metadata/md5-cache/dev-ruby/railties-6.1.3.2
 2105151010 metadata/md5-cache/dev-ruby/rainbow-3.0.0
 2105151010 metadata/md5-cache/dev-ruby/rake-12.3.3
@@ -44646,11 +44373,7 @@
 2105151010 metadata/md5-cache/dev-ruby/redis-4.1.4
 2105151010 metadata/md5-cache/dev-ruby/ref-2.0.0
 2105151010 metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
-2105151010 metadata/md5-cache/dev-ruby/regexp_parser-1.7.1
 2105151010 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
-2105151010 metadata/md5-cache/dev-ruby/regexp_parser-2.0.0
-2105151010 metadata/md5-cache/dev-ruby/regexp_parser-2.0.3
-2105151010 metadata/md5-cache/dev-ruby/regexp_parser-2.1.0
 2105151010 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
 2105151010 metadata/md5-cache/dev-ruby/request_store-1.5.0
 2105151010 metadata/md5-cache/dev-ruby/rest-client-2.1.0
@@ -44769,7 +44492,6 @@
 2105151010 metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
 2105151010 metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
 2105151010 metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
-2105151010 metadata/md5-cache/dev-ruby/ruby-prof-1.4.1
 2105151010 metadata/md5-cache/dev-ruby/ruby-prof-1.4.2
 2105151010 metadata/md5-cache/dev-ruby/ruby-progressbar-1.10.1-r1
 2105151010 metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
@@ -45083,22 +44805,35 @@
 2105231109 metadata/md5-cache/dev-ruby/rcairo-1.17.5
 2105232009 metadata/md5-cache/dev-ruby/twitter-text-3.1.0-r1
 2105250839 metadata/md5-cache/dev-ruby/websocket-driver-0.7.4
-2105252109 metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
-2105252109 metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
 2105280839 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
 2105280839 metadata/md5-cache/dev-ruby/rbs-1.2.1
-2105291109 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
 2105291109 metadata/md5-cache/dev-ruby/parser-3.0.1.1
 2105281909 metadata/md5-cache/dev-ruby/puppetdb-termini-7.3.1
-2105281909 metadata/md5-cache/dev-ruby/ruby-prof-0.18.0
 2105292209 metadata/md5-cache/dev-ruby/nokogiri-1.11.4
 2105292209 metadata/md5-cache/dev-ruby/nokogiri-1.11.6
 2105310909 metadata/md5-cache/dev-ruby/autoprefixer-rails-10.2.5.1
 2105310909 metadata/md5-cache/dev-ruby/bundler-2.2.18
 2105310909 metadata/md5-cache/dev-ruby/test-unit-3.4.2
 2106011113 metadata/md5-cache/dev-ruby/rbst-0.6.5
-2106030909 metadata/md5-cache/dev-ruby/Manifest.gz
 2106030909 metadata/md5-cache/dev-ruby/mixlib-shellout-3.0.9
+2106070939 metadata/md5-cache/dev-ruby/Manifest.gz
+2106041139 metadata/md5-cache/dev-ruby/actionpack-5.2.6
+2106041139 metadata/md5-cache/dev-ruby/actionview-5.2.6
+2106041139 metadata/md5-cache/dev-ruby/activemodel-5.2.6
+2106041139 metadata/md5-cache/dev-ruby/activesupport-5.2.6
+2106040909 metadata/md5-cache/dev-ruby/bundler-2.2.19
+2106041139 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+2106070939 metadata/md5-cache/dev-ruby/ice_nine-0.11.2-r1
+2106070809 metadata/md5-cache/dev-ruby/loofah-2.10.0
+2106070809 metadata/md5-cache/dev-ruby/loofah-2.8.0
+2106040909 metadata/md5-cache/dev-ruby/nokogiri-1.11.7
+2106041139 metadata/md5-cache/dev-ruby/railties-5.2.6
+2106070939 metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
+2106041239 metadata/md5-cache/dev-ruby/ruby-prof-1.4.3
+2106070809 metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
+2106050909 metadata/md5-cache/dev-ruby/sassc-2.4.0
+2106050909 metadata/md5-cache/dev-ruby/test-unit-3.4.4
+2106050909 metadata/md5-cache/dev-ruby/tins-1.29.1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -45231,10 +44966,8 @@
 2104290909 metadata/md5-cache/dev-tex/latex2rtf-2.3.15
 2104301839 metadata/md5-cache/dev-tex/latex-beamer-3.62
 2105010239 metadata/md5-cache/dev-tex/bibtexu-3.71_p20200406
-2105010239 metadata/md5-cache/dev-tex/bibtexu-3.71_p20210325
 2105050139 metadata/md5-cache/dev-tex/biblatex-3.16
 2105081314 metadata/md5-cache/dev-tex/catdvi-0.14-r2
-2105081314 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210428
 2105131939 metadata/md5-cache/dev-tex/hevea-2.35-r1
 2105180040 metadata/md5-cache/dev-tex/biber-2.14
 2105180040 metadata/md5-cache/dev-tex/biber-2.16
@@ -45242,45 +44975,12 @@
 2105221709 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r11
 2105252109 metadata/md5-cache/dev-tex/dvi2gr-0.4-r1
 2106011113 metadata/md5-cache/dev-tex/pythontex-0.17
-2106020141 metadata/md5-cache/dev-tex/Manifest.gz
 2106020141 metadata/md5-cache/dev-tex/dot2tex-2.11.3
 2106020141 metadata/md5-cache/dev-tex/rubber-1.5.1
 2106020141 metadata/md5-cache/dev-tex/rubber-1.6.0_alpha1
-2104041110 metadata/md5-cache/dev-texlive/texlive-basic-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-fontutils-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-formatsextra-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-games-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-humanities-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langarabic-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langchinese-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langcjk-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langenglish-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langfrench-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langgerman-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langgreek-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langitalian-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langkorean-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langother-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langpolish-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-langspanish-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-latex-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-latexextra-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-luatex-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-mathscience-2021
-2104041609 metadata/md5-cache/dev-texlive/texlive-metapost-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-music-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-pictures-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-pstricks-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-publishers-2021
-2104041110 metadata/md5-cache/dev-texlive/texlive-xetex-2021
+2106051839 metadata/md5-cache/dev-tex/Manifest.gz
+2106051440 metadata/md5-cache/dev-tex/bibtexu-3.71_p20210325
+2106051440 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
 2104060140 metadata/md5-cache/dev-texlive/texlive-basic-2020-r1
 2104060140 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-context-2020
@@ -45295,7 +44995,6 @@
 2104060140 metadata/md5-cache/dev-texlive/texlive-langcjk-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2020
-2104060140 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
 2104060140 metadata/md5-cache/dev-texlive/texlive-langenglish-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-langeuropean-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-langfrench-2020
@@ -45320,9 +45019,45 @@
 2104060140 metadata/md5-cache/dev-texlive/texlive-pstricks-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-publishers-2020
 2104060140 metadata/md5-cache/dev-texlive/texlive-xetex-2020
-2104152239 metadata/md5-cache/dev-texlive/texlive-context-2021
-2104180009 metadata/md5-cache/dev-texlive/Manifest.gz
-2104180009 metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
+2106051440 metadata/md5-cache/dev-texlive/Manifest.gz
+2106051440 metadata/md5-cache/dev-texlive/texlive-basic-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-context-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-fontsextra-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-fontutils-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-formatsextra-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-games-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-humanities-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langarabic-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langchinese-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langcjk-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langcyrillic-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langczechslovak-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langenglish-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langeuropean-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langfrench-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langgerman-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langgreek-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langitalian-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langjapanese-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langkorean-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langother-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langpolish-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langportuguese-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-langspanish-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-latex-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-latexextra-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-latexrecommended-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-luatex-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-mathscience-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-metapost-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-music-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-pictures-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-plaingeneric-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-pstricks-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-publishers-2021
+2106051440 metadata/md5-cache/dev-texlive/texlive-xetex-2021
 1805161038 metadata/md5-cache/dev-util/abi-compliance-checker-2.3
 1709052039 metadata/md5-cache/dev-util/abi-dumper-1.1
 1910181539 metadata/md5-cache/dev-util/autoproject-0.20_p5
@@ -45411,7 +45146,6 @@
 2102281209 metadata/md5-cache/dev-util/cloc-1.88
 2103011139 metadata/md5-cache/dev-util/distro-info-data-0.46
 2103111109 metadata/md5-cache/dev-util/shards-0.14.1
-2103150409 metadata/md5-cache/dev-util/geany-plugins-1.37-r101
 2103152309 metadata/md5-cache/dev-util/memprof-0.6.2-r1
 2103310849 metadata/md5-cache/dev-util/abi-compliance-checker-9999
 2103310520 metadata/md5-cache/dev-util/android-ndk-11c
@@ -45447,9 +45181,7 @@
 2103310541 metadata/md5-cache/dev-util/drone-cli-0.8.6
 2103310541 metadata/md5-cache/dev-util/drone-cli-1.1.4
 2103310520 metadata/md5-cache/dev-util/envman-2.1.1
-2103310849 metadata/md5-cache/dev-util/hermes-9999
 2103310849 metadata/md5-cache/dev-util/japi-compliance-checker-9999
-2103310849 metadata/md5-cache/dev-util/jarwizard-2.50
 2103310849 metadata/md5-cache/dev-util/lttng-modules-2.10.12-r1
 2103310849 metadata/md5-cache/dev-util/lttng-modules-2.11.0-r1
 2103310849 metadata/md5-cache/dev-util/lttng-modules-2.11.8
@@ -45599,7 +45331,6 @@
 2104261339 metadata/md5-cache/dev-util/wiggle-1.2
 2104282139 metadata/md5-cache/dev-util/samurai-9999
 2104280109 metadata/md5-cache/dev-util/xdelta-1.1.4-r3
-2104291739 metadata/md5-cache/dev-util/hermes-2.8_p20180315
 2104292309 metadata/md5-cache/dev-util/samurai-1.2-r1
 2105020009 metadata/md5-cache/dev-util/radare2-4.5.1-r1
 2105020009 metadata/md5-cache/dev-util/radare2-5.2.1
@@ -45706,7 +45437,6 @@
 2105081314 metadata/md5-cache/dev-util/stressapptest-1.0.9
 2105081314 metadata/md5-cache/dev-util/sysdig-0.27.0
 2105081314 metadata/md5-cache/dev-util/sysdig-0.27.1
-2105081314 metadata/md5-cache/dev-util/sysdig-0.27.1-r100
 2105081314 metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
 2105081314 metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
 2105082209 metadata/md5-cache/dev-util/unifdef-2.12
@@ -45715,7 +45445,6 @@
 2105081314 metadata/md5-cache/dev-util/vulkan-headers-1.2.162
 2105081314 metadata/md5-cache/dev-util/vulkan-headers-1.2.170
 2105081314 metadata/md5-cache/dev-util/vulkan-headers-9999
-2105091609 metadata/md5-cache/dev-util/byacc-20210328
 2105091409 metadata/md5-cache/dev-util/visualvm-2.0.6
 2105101939 metadata/md5-cache/dev-util/bingrep-0.8.5
 2105101939 metadata/md5-cache/dev-util/cargo-audit-0.14.1
@@ -45775,7 +45504,6 @@
 2105180040 metadata/md5-cache/dev-util/App-SVN-Bisect-1.1-r1
 2105180040 metadata/md5-cache/dev-util/autodia-2.140.0-r2
 2105180339 metadata/md5-cache/dev-util/cbindgen-0.19.0
-2105180210 metadata/md5-cache/dev-util/dialog-1.3.20210509
 2105180040 metadata/md5-cache/dev-util/egypt-1.10
 2105180040 metadata/md5-cache/dev-util/ninka-2.0_pre1_p20170402
 2105190909 metadata/md5-cache/dev-util/stripe-mock-0.105.0
@@ -45804,7 +45532,6 @@
 2105260410 metadata/md5-cache/dev-util/promu-0.11.1
 2105260410 metadata/md5-cache/dev-util/promu-0.5.0
 2105260410 metadata/md5-cache/dev-util/promu-0.7.0
-2105270139 metadata/md5-cache/dev-util/schroot-1.6.10_p12
 2105270539 metadata/md5-cache/dev-util/spirv-headers-1.5.4.2_pre20210526
 2105260410 metadata/md5-cache/dev-util/src-cli-3.26.2
 2105260410 metadata/md5-cache/dev-util/src-cli-3.26.3
@@ -45821,13 +45548,9 @@
 2105291839 metadata/md5-cache/dev-util/colm-0.14.7
 2105291839 metadata/md5-cache/dev-util/ragel-7.0.4
 2105312109 metadata/md5-cache/dev-util/gtk-doc-am-1.33.2
-2105311839 metadata/md5-cache/dev-util/uftrace-0.10
 2106011113 metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
 2106011113 metadata/md5-cache/dev-util/bcc-0.16.0-r1
 2106011113 metadata/md5-cache/dev-util/bcc-0.17.0
-2106011113 metadata/md5-cache/dev-util/bcc-0.17.0-r100
-2106011113 metadata/md5-cache/dev-util/bcc-0.18.0-r1
-2106011113 metadata/md5-cache/dev-util/bcc-0.19.0
 2106011113 metadata/md5-cache/dev-util/bear-2.4.4
 2106011113 metadata/md5-cache/dev-util/bear-3.0.11-r1
 2106011409 metadata/md5-cache/dev-util/boost-build-1.76.0-r2
@@ -45965,10 +45688,8 @@
 2106020141 metadata/md5-cache/dev-util/cppcheck-2.4.1
 2106020141 metadata/md5-cache/dev-util/cram-0.7-r1
 2106020141 metadata/md5-cache/dev-util/diff-cover-5.0.1
-2106020141 metadata/md5-cache/dev-util/diffoscope-175
 2106020141 metadata/md5-cache/dev-util/diffoscope-176
 2106020141 metadata/md5-cache/dev-util/distro-info-1.0
-2106020141 metadata/md5-cache/dev-util/dogtail-0.9.11
 2106020141 metadata/md5-cache/dev-util/dput-ng-1.32
 2106020141 metadata/md5-cache/dev-util/ebuildtester-0.1.27
 2106020141 metadata/md5-cache/dev-util/ebuildtester-0.1.29
@@ -45984,7 +45705,6 @@
 2106020141 metadata/md5-cache/dev-util/gyp-20200512145953
 2106020141 metadata/md5-cache/dev-util/gyp-99999999999999
 2106020141 metadata/md5-cache/dev-util/howdoi-2.0.15
-2106020141 metadata/md5-cache/dev-util/howdoi-2.0.7
 2106020141 metadata/md5-cache/dev-util/meld-3.20.3
 2106020141 metadata/md5-cache/dev-util/meson-0.56.2
 2106020141 metadata/md5-cache/dev-util/meson-0.57.2
@@ -45992,10 +45712,8 @@
 2106011709 metadata/md5-cache/dev-util/pahole-1.20
 2106021139 metadata/md5-cache/dev-util/pahole-1.21
 2106020141 metadata/md5-cache/dev-util/pkgcheck-0.10.0
-2106020141 metadata/md5-cache/dev-util/pkgcheck-0.10.1
 2106020141 metadata/md5-cache/dev-util/pkgcheck-0.9.7-r2
 2106020141 metadata/md5-cache/dev-util/pkgcheck-0.9.7-r3
-2106020141 metadata/md5-cache/dev-util/pkgcheck-9999
 2106020141 metadata/md5-cache/dev-util/pkgdev-0.1.2
 2106020141 metadata/md5-cache/dev-util/pkgdev-0.1.3
 2106020141 metadata/md5-cache/dev-util/pkgdev-0.1.4-r1
@@ -46015,7 +45733,6 @@
 2106020141 metadata/md5-cache/dev-util/wstool-9999
 2106020141 metadata/md5-cache/dev-util/ydiff-1.2
 2106030240 metadata/md5-cache/dev-util/apitrace-9.0-r2
-2106030409 metadata/md5-cache/dev-util/bcc-0.20.0-r1
 2106030240 metadata/md5-cache/dev-util/cgdb-0.7.1
 2106030240 metadata/md5-cache/dev-util/cgdb-9999
 2106030240 metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -46053,9 +45770,7 @@
 2106030240 metadata/md5-cache/dev-util/umockdev-0.12.1
 2106030240 metadata/md5-cache/dev-util/vulkan-tools-1.2.162
 2106030240 metadata/md5-cache/dev-util/vulkan-tools-1.2.170
-2106030240 metadata/md5-cache/dev-util/vulkan-tools-1.2.179
 2106030240 metadata/md5-cache/dev-util/vulkan-tools-9999
-2106040639 metadata/md5-cache/dev-util/Manifest.gz
 2106031139 metadata/md5-cache/dev-util/cppcheck-2.2
 2106040440 metadata/md5-cache/dev-util/d-feet-0.3.16
 2106040440 metadata/md5-cache/dev-util/desktop-file-utils-0.26-r1
@@ -46068,14 +45783,39 @@
 2106040440 metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.26
 2106032209 metadata/md5-cache/dev-util/idea-community-2021.1.2.211.7442.40
 2106032009 metadata/md5-cache/dev-util/pkgdev-0.1.5
-2106040440 metadata/md5-cache/dev-util/rizin-0.2.1
 2106040109 metadata/md5-cache/dev-util/stripe-mock-0.106.0
 2106040440 metadata/md5-cache/dev-util/sysprof-3.38.1
 2106040440 metadata/md5-cache/dev-util/sysprof-capture-3.36.0-r1
 2106040440 metadata/md5-cache/dev-util/sysprof-capture-3.38.1-r1
-2106031939 metadata/md5-cache/dev-util/valgrind-3.17.0
 2106040440 metadata/md5-cache/dev-util/wayland-scanner-1.19.0
 2106040440 metadata/md5-cache/dev-util/wayland-scanner-9999
+2106071639 metadata/md5-cache/dev-util/Manifest.gz
+2106071609 metadata/md5-cache/dev-util/bcc-0.17.0-r100
+2106071609 metadata/md5-cache/dev-util/bcc-0.18.0-r1
+2106071609 metadata/md5-cache/dev-util/bcc-0.19.0
+2106071609 metadata/md5-cache/dev-util/bcc-0.20.0-r1
+2106050239 metadata/md5-cache/dev-util/bear-3.0.12
+2106070209 metadata/md5-cache/dev-util/catalyst-3.0.18
+2106051410 metadata/md5-cache/dev-util/cookiecutter-1.7.3
+2106051410 metadata/md5-cache/dev-util/diffoscope-177
+2106070939 metadata/md5-cache/dev-util/dogtail-0.9.11
+2106051809 metadata/md5-cache/dev-util/flawfinder-2.0.17
+2106071609 metadata/md5-cache/dev-util/geany-plugins-1.37-r101
+2106071609 metadata/md5-cache/dev-util/hermes-2.8_p20180315
+2106071609 metadata/md5-cache/dev-util/hermes-9999
+2106041109 metadata/md5-cache/dev-util/pkgcheck-0.10.1
+2106041109 metadata/md5-cache/dev-util/pkgcheck-9999
+2106061239 metadata/md5-cache/dev-util/poke-1.3
+2106051410 metadata/md5-cache/dev-util/radare2-5.3.0
+2106041239 metadata/md5-cache/dev-util/rizin-0.2.1
+2106050239 metadata/md5-cache/dev-util/schroot-1.6.10_p12-r1
+2106071609 metadata/md5-cache/dev-util/sysdig-0.27.1-r100
+2106070439 metadata/md5-cache/dev-util/sysprof-3.40.1
+2106070439 metadata/md5-cache/dev-util/sysprof-capture-3.40.1
+2106070439 metadata/md5-cache/dev-util/sysprof-common-3.40.1
+2106071609 metadata/md5-cache/dev-util/uftrace-0.10
+2106071639 metadata/md5-cache/dev-util/valgrind-3.17.0
+2106070939 metadata/md5-cache/dev-util/vulkan-tools-1.2.179
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1807302309 metadata/md5-cache/dev-vcs/easygit-1.7.5.2
 1702282322 metadata/md5-cache/dev-vcs/git-merge-changelog-20170131
@@ -46108,8 +45848,6 @@
 2103310849 metadata/md5-cache/dev-vcs/mr-1.99999999
 2103310849 metadata/md5-cache/dev-vcs/svn2git-9999
 2103311110 metadata/md5-cache/dev-vcs/tig-2.5.1
-2103311110 metadata/md5-cache/dev-vcs/tig-2.5.2
-2103311110 metadata/md5-cache/dev-vcs/tig-2.5.3
 2103311110 metadata/md5-cache/dev-vcs/topgit-0.19.12
 2103311110 metadata/md5-cache/dev-vcs/topgit-0.9-r1
 2104031909 metadata/md5-cache/dev-vcs/notify-webhook-0.1.0
@@ -46166,7 +45904,6 @@
 2106011439 metadata/md5-cache/dev-vcs/git-tools-2020.09
 2106020141 metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
 2106020141 metadata/md5-cache/dev-vcs/hg-evolve-10.3.2
-2106020141 metadata/md5-cache/dev-vcs/hg-git-0.9.0
 2106020141 metadata/md5-cache/dev-vcs/hg-git-0.9.0_rc1-r1
 2106020141 metadata/md5-cache/dev-vcs/mercurial-5.5.2
 2106020141 metadata/md5-cache/dev-vcs/mercurial-5.6.1-r1
@@ -46174,21 +45911,25 @@
 2106020141 metadata/md5-cache/dev-vcs/pre-commit-2.12.1
 2106020141 metadata/md5-cache/dev-vcs/pre-commit-2.13.0
 2106020141 metadata/md5-cache/dev-vcs/python-gitlab-2.5.0
-2106020141 metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
 2106020039 metadata/md5-cache/dev-vcs/reposurgeon-4.27
 2106020141 metadata/md5-cache/dev-vcs/stgit-1.0
 2106020141 metadata/md5-cache/dev-vcs/stgit-1.1
 2106020141 metadata/md5-cache/dev-vcs/svneverever-1.5.0
 2106020141 metadata/md5-cache/dev-vcs/tortoisehg-5.8
 2106020141 metadata/md5-cache/dev-vcs/tortoisehg-9999
-2106021709 metadata/md5-cache/dev-vcs/git-2.32.0_rc3
 2106022009 metadata/md5-cache/dev-vcs/mercurial-5.8
-2106040440 metadata/md5-cache/dev-vcs/Manifest.gz
 2106032239 metadata/md5-cache/dev-vcs/fossil-2.12.1
 2106032239 metadata/md5-cache/dev-vcs/fossil-2.13
 2106032239 metadata/md5-cache/dev-vcs/fossil-2.14
 2106040440 metadata/md5-cache/dev-vcs/gitg-3.32.1-r1
 2106040009 metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
+2106071639 metadata/md5-cache/dev-vcs/Manifest.gz
+2106062139 metadata/md5-cache/dev-vcs/git-2.32.0
+2106051009 metadata/md5-cache/dev-vcs/hg-git-0.10.1
+2106071639 metadata/md5-cache/dev-vcs/hg-git-0.9.0
+2106050339 metadata/md5-cache/dev-vcs/python-gitlab-2.6.0
+2106040839 metadata/md5-cache/dev-vcs/tig-2.5.3-r1
+2106062039 metadata/md5-cache/dev-vcs/tig-2.5.4
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 2009060239 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 2102241843 metadata/md5-cache/games-action/atanks-6.5
@@ -46271,12 +46012,12 @@
 2105201839 metadata/md5-cache/games-action/multimc-0.6.12
 2105221539 metadata/md5-cache/games-action/minecraft-launcher-1.6.93
 2105221539 metadata/md5-cache/games-action/minecraft-launcher-928
-2105251309 metadata/md5-cache/games-action/minetest-5.4.1-r1
 2106011113 metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20200615
 2106011113 metadata/md5-cache/games-action/dxx-rebirth-9999
 2106011113 metadata/md5-cache/games-action/teeworlds-0.7.5-r1
-2106021609 metadata/md5-cache/games-action/Manifest.gz
 2106021609 metadata/md5-cache/games-action/gltron-0.70-r2
+2106071609 metadata/md5-cache/games-action/Manifest.gz
+2106071609 metadata/md5-cache/games-action/minetest-5.4.1-r1
 1804221238 metadata/md5-cache/games-arcade/lbreakout-010315-r1
 2003271309 metadata/md5-cache/games-arcade/jazz2-data-0-r20200327
 2101231224 metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
@@ -46342,7 +46083,6 @@
 2104121341 metadata/md5-cache/games-arcade/cosmosmash-1.4.7-r1
 2104121341 metadata/md5-cache/games-arcade/crack-attack-1.1.14-r2
 2104121341 metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r2
-2104121341 metadata/md5-cache/games-arcade/epiar-0.5.1
 2104121341 metadata/md5-cache/games-arcade/fishsupper-0.1.6-r1
 2104130339 metadata/md5-cache/games-arcade/gnake-0.94b-r1
 2104121341 metadata/md5-cache/games-arcade/grande-KXL-0.6-r1
@@ -46379,7 +46119,6 @@
 2105081314 metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1
 2105081314 metadata/md5-cache/games-arcade/epiar-0.5-r1
 2105081314 metadata/md5-cache/games-arcade/gnujump-1.0.8-r1
-2105081314 metadata/md5-cache/games-arcade/jvgs-0.5-r100
 2105081314 metadata/md5-cache/games-arcade/lbreakout2-2.6.5-r1
 2105081314 metadata/md5-cache/games-arcade/ninvaders-0.1.2
 2105081314 metadata/md5-cache/games-arcade/njam-1.25-r1
@@ -46405,10 +46144,12 @@
 2106011113 metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r3
 2106020309 metadata/md5-cache/games-arcade/rockdodger-1.1.4
 2106021609 metadata/md5-cache/games-arcade/sdlsasteroids-3.0.1-r1
-2106040440 metadata/md5-cache/games-arcade/Manifest.gz
 2106040339 metadata/md5-cache/games-arcade/excido-0.1.5c-r4
 2106040440 metadata/md5-cache/games-arcade/gnome-nibbles-3.38.2
 2106040440 metadata/md5-cache/games-arcade/gnome-robots-40.0
+2106071609 metadata/md5-cache/games-arcade/Manifest.gz
+2106071609 metadata/md5-cache/games-arcade/epiar-0.5.1
+2106071609 metadata/md5-cache/games-arcade/jvgs-0.5-r100
 2003311339 metadata/md5-cache/games-board/polyglot-1.4.70b-r3
 2006220109 metadata/md5-cache/games-board/gnuchess-6.2.7
 2012281255 metadata/md5-cache/games-board/camato-0.7.4-r1
@@ -46469,17 +46210,17 @@
 2105311139 metadata/md5-cache/games-board/cockatrice-20210126
 2106011113 metadata/md5-cache/games-board/gnubg-1.06.002-r1
 2106011113 metadata/md5-cache/games-board/scid-4.6.2-r1
-2106021439 metadata/md5-cache/games-board/gnuchess-6.2.8-r1
 2106020141 metadata/md5-cache/games-board/pychess-1.0.2
 2106020141 metadata/md5-cache/games-board/pychess-1.0.3
 2106020141 metadata/md5-cache/games-board/pysolfc-2.6.4-r1
-2106040440 metadata/md5-cache/games-board/Manifest.gz
 2106040440 metadata/md5-cache/games-board/four-in-a-row-3.38.1
 2106040440 metadata/md5-cache/games-board/gnome-chess-40.1
 2106040440 metadata/md5-cache/games-board/gnome-mahjongg-3.38.3
 2106040440 metadata/md5-cache/games-board/gnome-mines-40.0
 2106040440 metadata/md5-cache/games-board/iagno-3.38.1
 2106040440 metadata/md5-cache/games-board/tali-40.1
+2106070939 metadata/md5-cache/games-board/Manifest.gz
+2106070939 metadata/md5-cache/games-board/gnuchess-6.2.8-r1
 1911021809 metadata/md5-cache/games-emulation/desmume-0.9.11-r2
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
 1909151309 metadata/md5-cache/games-emulation/mupen64plus-2.5.9
@@ -46559,24 +46300,21 @@
 2106011113 metadata/md5-cache/games-emulation/openmsx-16.0-r1
 2106020609 metadata/md5-cache/games-emulation/emutos-1.0.1
 2106020309 metadata/md5-cache/games-emulation/fbzx-4.6.0
-2106020609 metadata/md5-cache/games-emulation/fceux-2.3.0
 2106020609 metadata/md5-cache/games-emulation/hatari-2.3.1
 2106020141 metadata/md5-cache/games-emulation/m64py-0.2.5
 2106020309 metadata/md5-cache/games-emulation/mastergear-bin-4.9
 2106030240 metadata/md5-cache/games-emulation/gens-2.15.5-r2
-2106040440 metadata/md5-cache/games-emulation/Manifest.gz
 2106040440 metadata/md5-cache/games-emulation/desmume-0.9.11_p20210409
 2106040440 metadata/md5-cache/games-emulation/snes9x-1.60
+2106071609 metadata/md5-cache/games-emulation/Manifest.gz
+2106071609 metadata/md5-cache/games-emulation/fceux-2.3.0
+2106060709 metadata/md5-cache/games-emulation/openmsx-17.0
 1707090139 metadata/md5-cache/games-engines/xzip-1.8.2-r3
 2004101409 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2011050809 metadata/md5-cache/games-engines/exult-1.6
 2101231224 metadata/md5-cache/games-engines/frotz-2.52
-2101231224 metadata/md5-cache/games-engines/love-0.7.2-r100
-2101231224 metadata/md5-cache/games-engines/love-0.8.0-r100
-2101231224 metadata/md5-cache/games-engines/love-11.3-r100
 2102010239 metadata/md5-cache/games-engines/dMagnetic-0.30
 2102241843 metadata/md5-cache/games-engines/residualvm-0.3.1-r2
-2103310849 metadata/md5-cache/games-engines/love-9999
 2103310849 metadata/md5-cache/games-engines/residualvm-9999
 2104041339 metadata/md5-cache/games-engines/nazghul-0.7.1-r1
 2104180939 metadata/md5-cache/games-engines/residualvm-0.2.1-r1
@@ -46587,22 +46325,26 @@
 2105081314 metadata/md5-cache/games-engines/devilutionx-9999
 2105081314 metadata/md5-cache/games-engines/gargoyle-2019.1.1
 2105081314 metadata/md5-cache/games-engines/odamex-0.9.0
-2105081314 metadata/md5-cache/games-engines/openmw-0.46.0
 2105081314 metadata/md5-cache/games-engines/openmw-9999
 2105081314 metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317-r1
 2105081314 metadata/md5-cache/games-engines/openxcom-9999
 2105081314 metadata/md5-cache/games-engines/scummvm-tools-2.1.0
 2105081314 metadata/md5-cache/games-engines/scummvm-tools-2.2.0
-2105081314 metadata/md5-cache/games-engines/solarus-1.3.1-r100
-2105081314 metadata/md5-cache/games-engines/stratagus-2.4.3-r100
-2105081314 metadata/md5-cache/games-engines/stratagus-3.0.0-r100
 2105291809 metadata/md5-cache/games-engines/odamex-0.9.2
 2105301839 metadata/md5-cache/games-engines/scummvm-2.2.0-r1
 2105301839 metadata/md5-cache/games-engines/scummvm-9999
 2105311109 metadata/md5-cache/games-engines/frobtads-2.0
 2105311109 metadata/md5-cache/games-engines/qtads-3.0.0
-2106011209 metadata/md5-cache/games-engines/Manifest.gz
 2106011209 metadata/md5-cache/games-engines/box2d-2.4.1
+2106071609 metadata/md5-cache/games-engines/Manifest.gz
+2106071609 metadata/md5-cache/games-engines/love-0.7.2-r100
+2106071609 metadata/md5-cache/games-engines/love-0.8.0-r100
+2106071609 metadata/md5-cache/games-engines/love-11.3-r100
+2106071609 metadata/md5-cache/games-engines/love-9999
+2106060309 metadata/md5-cache/games-engines/openmw-0.46.0-r1
+2106071609 metadata/md5-cache/games-engines/solarus-1.3.1-r100
+2106071609 metadata/md5-cache/games-engines/stratagus-2.4.3-r100
+2106071609 metadata/md5-cache/games-engines/stratagus-3.0.0-r100
 2005172009 metadata/md5-cache/games-fps/doom-data-1.9
 2011090239 metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r3
 2011090239 metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r3
@@ -46659,19 +46401,19 @@
 2105081314 metadata/md5-cache/games-fps/darkplaces-20140513-r1
 2105081314 metadata/md5-cache/games-fps/gzdoom-4.5.0
 2105081314 metadata/md5-cache/games-fps/prboom-plus-2.6
-2105081314 metadata/md5-cache/games-fps/quakeforge-0.7.2-r1
 2105081314 metadata/md5-cache/games-fps/qudos-0.40.1
 2105081314 metadata/md5-cache/games-fps/sauerbraten-2013.02.03-r2
 2105081314 metadata/md5-cache/games-fps/sauerbraten-2020.12.27
 2105081314 metadata/md5-cache/games-fps/urbanterror-4.3.4_p20210304
 2105162139 metadata/md5-cache/games-fps/avp-20150214-r1
 2105230209 metadata/md5-cache/games-fps/gzdoom-4.6.0
-2106011113 metadata/md5-cache/games-fps/Manifest.gz
 2106011113 metadata/md5-cache/games-fps/chocolate-doom-3.0.1
 2106011113 metadata/md5-cache/games-fps/doomsday-2.1.1-r1
 2106011113 metadata/md5-cache/games-fps/doomsday-2.3.0
 2106011113 metadata/md5-cache/games-fps/freedm-data-0.12.1
 2106011113 metadata/md5-cache/games-fps/freedoom-data-0.12.1
+2106071139 metadata/md5-cache/games-fps/Manifest.gz
+2106071139 metadata/md5-cache/games-fps/quakeforge-0.7.2_p20210601
 2102241843 metadata/md5-cache/games-kids/lletters-0.1.95-r4
 2104120442 metadata/md5-cache/games-kids/tuxmath-2.0.3-r1
 2104121341 metadata/md5-cache/games-kids/tuxtype-1.8.3-r1
@@ -46726,14 +46468,14 @@
 2105081314 metadata/md5-cache/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
 2105151010 metadata/md5-cache/games-misc/lolcat-100.0.1-r1
 2105290209 metadata/md5-cache/games-misc/bsd-games-3.1-r1
-2105291209 metadata/md5-cache/games-misc/wtf-20210130
 2106011113 metadata/md5-cache/games-misc/opengfx-0.6.0
 2106011113 metadata/md5-cache/games-misc/openmsx-0.3.1-r5
 2106011113 metadata/md5-cache/games-misc/ponysay-3.0.3
-2106020309 metadata/md5-cache/games-misc/Manifest.gz
 2106020141 metadata/md5-cache/games-misc/doge-3.6.0
 2106020309 metadata/md5-cache/games-misc/nyancat-1.5.2
 2106020141 metadata/md5-cache/games-misc/usolitaire-0.2.1
+2106051839 metadata/md5-cache/games-misc/Manifest.gz
+2106051839 metadata/md5-cache/games-misc/wtf-20210416
 1807151809 metadata/md5-cache/games-mud/trebuchet-1.075-r1
 2002230040 metadata/md5-cache/games-mud/tintin-2.01.8
 2103311309 metadata/md5-cache/games-mud/circlemud-3.1-r1
@@ -46796,7 +46538,6 @@
 2104120442 metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
 2104120442 metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
 2104100939 metadata/md5-cache/games-puzzle/nightsky-20111222-r1
-2104120442 metadata/md5-cache/games-puzzle/pauker-1.8-r1
 2104100939 metadata/md5-cache/games-puzzle/splice-20121120-r1
 2104100939 metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r1
 2104120539 metadata/md5-cache/games-puzzle/triptych-1.16
@@ -46805,7 +46546,6 @@
 2104121341 metadata/md5-cache/games-puzzle/construo-0.2.2-r1
 2104121341 metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
 2104121341 metadata/md5-cache/games-puzzle/enigma-1.21-r3
-2104121341 metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
 2104130239 metadata/md5-cache/games-puzzle/gnurobbo-0.68
 2104121341 metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
 2104121341 metadata/md5-cache/games-puzzle/mures-0.5-r1
@@ -46826,7 +46566,6 @@
 2105081314 metadata/md5-cache/games-puzzle/ksokoban-9999
 2105081314 metadata/md5-cache/games-puzzle/ltris-1.0.19-r1
 2105081314 metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
-2105081314 metadata/md5-cache/games-puzzle/nudoku-2.1.0
 2105081314 metadata/md5-cache/games-puzzle/pingus-9999
 2105081314 metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r1
 2105081314 metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
@@ -46840,9 +46579,6 @@
 2106011113 metadata/md5-cache/games-puzzle/monsterz-0.7.1_p11
 2106011113 metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
 2106021209 metadata/md5-cache/games-puzzle/brainworkshop-5.0.2
-2106020309 metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
-2106020839 metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r2
-2106040440 metadata/md5-cache/games-puzzle/Manifest.gz
 2106040440 metadata/md5-cache/games-puzzle/atomix-3.34.0-r1
 2106040440 metadata/md5-cache/games-puzzle/five-or-more-3.32.2
 2106040440 metadata/md5-cache/games-puzzle/gnome-klotski-3.38.2
@@ -46854,6 +46590,13 @@
 2106040440 metadata/md5-cache/games-puzzle/lightsoff-40.0.1
 2106040440 metadata/md5-cache/games-puzzle/quadrapassel-40.1
 2106040440 metadata/md5-cache/games-puzzle/swell-foop-40.1
+2106071609 metadata/md5-cache/games-puzzle/Manifest.gz
+2106071609 metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
+2106070109 metadata/md5-cache/games-puzzle/hitori-3.38.2
+2106071609 metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
+2106071139 metadata/md5-cache/games-puzzle/nudoku-2.1.0
+2106050839 metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
+2106062109 metadata/md5-cache/games-puzzle/pauker-1.8-r2
 2101231224 metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.12
 2102241843 metadata/md5-cache/games-roguelike/tomenet-4.7.3
 2102241843 metadata/md5-cache/games-roguelike/wrogue-0.8.0b-r1
@@ -46864,7 +46607,6 @@
 2104101609 metadata/md5-cache/games-roguelike/adom-3.3.3-r1
 2104121341 metadata/md5-cache/games-roguelike/angband-4.2.1
 2104121341 metadata/md5-cache/games-roguelike/angband-4.2.1-r1
-2104121341 metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
 2104121341 metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
 2104121341 metadata/md5-cache/games-roguelike/zangband-2.7.4c
 2104250109 metadata/md5-cache/games-roguelike/neon-chrome-1.1.12
@@ -46872,10 +46614,11 @@
 2105081314 metadata/md5-cache/games-roguelike/nethack-3.6.6
 2105081314 metadata/md5-cache/games-roguelike/powder-117-r1
 2105240309 metadata/md5-cache/games-roguelike/moria-5.7.14
-2106011113 metadata/md5-cache/games-roguelike/Manifest.gz
-2106011113 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
-2106011113 metadata/md5-cache/games-roguelike/stone-soup-0.26.0
-2106011113 metadata/md5-cache/games-roguelike/stone-soup-0.26.1
+2106071609 metadata/md5-cache/games-roguelike/Manifest.gz
+2106071609 metadata/md5-cache/games-roguelike/crossfire-client-1.71.0-r100
+2106071609 metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
+2106071609 metadata/md5-cache/games-roguelike/stone-soup-0.26.0
+2106071609 metadata/md5-cache/games-roguelike/stone-soup-0.26.1
 2102241843 metadata/md5-cache/games-rpg/deponia-doomsday-1.2.0267
 2102241843 metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
 2102241843 metadata/md5-cache/games-rpg/eternal-lands-1.9.5.8
@@ -46892,7 +46635,6 @@
 2104120442 metadata/md5-cache/games-rpg/drascula-1.0-r3
 2104120442 metadata/md5-cache/games-rpg/dreamweb-1.1-r1
 2104120442 metadata/md5-cache/games-rpg/eschalon-book-1-demo-106-r1
-2104120442 metadata/md5-cache/games-rpg/freedroid-1.0.2-r1
 2104120442 metadata/md5-cache/games-rpg/grimrock-20150707
 2104120442 metadata/md5-cache/games-rpg/lure-1.1-r1
 2104120442 metadata/md5-cache/games-rpg/openglad-0.98-r1
@@ -46901,7 +46643,6 @@
 2104100939 metadata/md5-cache/games-rpg/to-the-moon-0-r1
 2104100939 metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r1
 2104121341 metadata/md5-cache/games-rpg/daimonin-client-0.10.8
-2104121341 metadata/md5-cache/games-rpg/kqlives-0.99-r100
 2104121341 metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1
 2104121341 metadata/md5-cache/games-rpg/manaplus-9999
 2104161439 metadata/md5-cache/games-rpg/xu4-0.9-r1
@@ -46915,7 +46656,6 @@
 2105050139 metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
 2105081314 metadata/md5-cache/games-rpg/freedink-108.4-r1
 2105081314 metadata/md5-cache/games-rpg/gwiz-0.8-r1
-2105081314 metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
 2105081314 metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
 2105081314 metadata/md5-cache/games-rpg/zsxd-1.9.0-r1
 2105200039 metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1
@@ -46923,8 +46663,11 @@
 2106011113 metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2
 2106021409 metadata/md5-cache/games-rpg/adonthell-0.3.8
 2106021409 metadata/md5-cache/games-rpg/wastesedge-0.3.8
-2106030939 metadata/md5-cache/games-rpg/Manifest.gz
-2106030939 metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1
+2106071609 metadata/md5-cache/games-rpg/Manifest.gz
+2106060539 metadata/md5-cache/games-rpg/freedroid-1.2.1
+2106071609 metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1
+2106071609 metadata/md5-cache/games-rpg/kqlives-0.99-r100
+2106071609 metadata/md5-cache/games-rpg/sumwars-0.5.8-r100
 1805012309 metadata/md5-cache/games-server/crossfire-server-1.71.0-r1
 1702282323 metadata/md5-cache/games-server/mednafen-server-0.5.2-r1
 2010091139 metadata/md5-cache/games-server/steamcmd-1.0-r3
@@ -46951,7 +46694,6 @@
 2104161439 metadata/md5-cache/games-simulation/train-valley-1.3.31403
 2104180939 metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
 2104250109 metadata/md5-cache/games-simulation/micropolis-1.0_p20180313
-2105081314 metadata/md5-cache/games-simulation/corsix-th-0.64-r100
 2105081314 metadata/md5-cache/games-simulation/crashtest-1.1-r1
 2105081314 metadata/md5-cache/games-simulation/flightgear-9999
 2105081314 metadata/md5-cache/games-simulation/lincity-1.13.1-r1
@@ -46962,8 +46704,9 @@
 2105150209 metadata/md5-cache/games-simulation/flightgear-2020.3.8
 2105150209 metadata/md5-cache/games-simulation/flightgear-data-2020.3.8
 2106011113 metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r2
-2106020141 metadata/md5-cache/games-simulation/Manifest.gz
 2106020141 metadata/md5-cache/games-simulation/singularity-1.00
+2106071609 metadata/md5-cache/games-simulation/Manifest.gz
+2106071609 metadata/md5-cache/games-simulation/corsix-th-0.64-r100
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2102241843 metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
 2104062139 metadata/md5-cache/games-sports/billardgl-1.75-r2
@@ -46974,9 +46717,9 @@
 2105081314 metadata/md5-cache/games-sports/dustrac-1.13.0
 2105081314 metadata/md5-cache/games-sports/foobillard-3.0a-r1
 2105081314 metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
-2105081314 metadata/md5-cache/games-sports/xmoto-0.6.1-r100
-2105200039 metadata/md5-cache/games-sports/Manifest.gz
 2105200039 metadata/md5-cache/games-sports/torcs-1.3.6-r2
+2106071609 metadata/md5-cache/games-sports/Manifest.gz
+2106071609 metadata/md5-cache/games-sports/xmoto-0.6.1-r100
 2102241843 metadata/md5-cache/games-strategy/crimson-0.5.3-r1
 2102241843 metadata/md5-cache/games-strategy/dunelegacy-0.96.4
 2102241843 metadata/md5-cache/games-strategy/lgeneral-1.4.3
@@ -47006,11 +46749,8 @@
 2105081314 metadata/md5-cache/games-strategy/colobot-0.1.12
 2105081314 metadata/md5-cache/games-strategy/colobot-9999
 2105081314 metadata/md5-cache/games-strategy/freesynd-0.7.5
-2105081314 metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
 2105081314 metadata/md5-cache/games-strategy/julius-1.4.1
 2105081314 metadata/md5-cache/games-strategy/maxr-0.2.9
-2105081314 metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
-2105081314 metadata/md5-cache/games-strategy/megaglest-3.13.0
 2105081314 metadata/md5-cache/games-strategy/megaglest-data-3.11.1-r1
 2105081314 metadata/md5-cache/games-strategy/megaglest-data-3.13.0
 2105081314 metadata/md5-cache/games-strategy/scorched3d-44-r2
@@ -47024,19 +46764,22 @@
 2105081314 metadata/md5-cache/games-strategy/wesnoth-1.14.14
 2105081314 metadata/md5-cache/games-strategy/wesnoth-1.15.12
 2105101939 metadata/md5-cache/games-strategy/ja2-stracciatella-0.17.0
-2105112109 metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
-2105121409 metadata/md5-cache/games-strategy/openra-20190314-r100
-2105151939 metadata/md5-cache/games-strategy/freeciv-2.6.4
 2106011113 metadata/md5-cache/games-strategy/0ad-0.0.24_alpha_pre20210116040036-r2
 2106011113 metadata/md5-cache/games-strategy/0ad-0.0.24b_alpha
 2106011113 metadata/md5-cache/games-strategy/colobot-data-0.1.12
 2106011113 metadata/md5-cache/games-strategy/freeorion-0.4.10.1-r1
 2106011113 metadata/md5-cache/games-strategy/freeorion-9999
 2106011113 metadata/md5-cache/games-strategy/widelands-0.20-r1
-2106040440 metadata/md5-cache/games-strategy/Manifest.gz
-2106040440 metadata/md5-cache/games-strategy/naev-0.8.2
 2106031939 metadata/md5-cache/games-strategy/widelands-0.21
 2106031939 metadata/md5-cache/games-strategy/widelands-9999
+2106071609 metadata/md5-cache/games-strategy/Manifest.gz
+2106071609 metadata/md5-cache/games-strategy/freeciv-2.6.4
+2106071609 metadata/md5-cache/games-strategy/hedgewars-1.0.0-r100
+2106071609 metadata/md5-cache/games-strategy/megaglest-3.11.1-r100
+2106071609 metadata/md5-cache/games-strategy/megaglest-3.13.0
+2106071609 metadata/md5-cache/games-strategy/naev-0.8.2
+2106071609 metadata/md5-cache/games-strategy/openra-20190314-r100
+2106071609 metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723-r100
 1909100139 metadata/md5-cache/games-util/deutex-5.2.0
 1707090139 metadata/md5-cache/games-util/xgame-gtk2-2.0.2-r1
 2011222009 metadata/md5-cache/games-util/etswitch-0.1.14-r1
@@ -47075,7 +46818,6 @@
 2105081314 metadata/md5-cache/games-util/lgogdownloader-3.7-r1
 2105081314 metadata/md5-cache/games-util/lgogdownloader-9999
 2105081314 metadata/md5-cache/games-util/qjoypad-4.3.1
-2105081314 metadata/md5-cache/games-util/slade-3.2.0_beta2
 2105081314 metadata/md5-cache/games-util/springlobby-0.269
 2105081314 metadata/md5-cache/games-util/wxchtdecoder-1.5a-r1
 2105090809 metadata/md5-cache/games-util/xpadneo-0.9.1
@@ -47094,9 +46836,10 @@
 2106020141 metadata/md5-cache/games-util/sc-controller-0.4.8.1
 2106020141 metadata/md5-cache/games-util/sc-controller-0.4.8.2
 2106030339 metadata/md5-cache/games-util/glbsp-2.24
-2106040440 metadata/md5-cache/games-util/Manifest.gz
 2106040440 metadata/md5-cache/games-util/gamemode-1.6.1
 2106040440 metadata/md5-cache/games-util/gamemode-9999
+2106071609 metadata/md5-cache/games-util/Manifest.gz
+2106071609 metadata/md5-cache/games-util/slade-3.2.0_beta2
 2103311110 metadata/md5-cache/gnome-base/libgnomekbd-3.26.1
 2104120442 metadata/md5-cache/gnome-base/gnome-applets-3.36.4
 2104120442 metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
@@ -47122,7 +46865,6 @@
 2106030240 metadata/md5-cache/gnome-base/librsvg-2.40.21
 2106030240 metadata/md5-cache/gnome-base/librsvg-2.50.5
 2106030240 metadata/md5-cache/gnome-base/librsvg-2.50.6
-2106040440 metadata/md5-cache/gnome-base/Manifest.gz
 2106040440 metadata/md5-cache/gnome-base/dconf-0.40.0
 2106040440 metadata/md5-cache/gnome-base/dconf-editor-3.38.3
 2106040440 metadata/md5-cache/gnome-base/gdm-40.0
@@ -47132,11 +46874,14 @@
 2106040440 metadata/md5-cache/gnome-base/gnome-settings-daemon-40.0.1
 2106040440 metadata/md5-cache/gnome-base/gnome-shell-3.36.7
 2106040440 metadata/md5-cache/gnome-base/gnome-shell-40.1
-2106040440 metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
 2106040440 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.38.0
 2106040440 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-40.0
 2106040440 metadata/md5-cache/gnome-base/gvfs-1.48.1
 2106040440 metadata/md5-cache/gnome-base/nautilus-40.1
+2106070109 metadata/md5-cache/gnome-base/Manifest.gz
+2106041139 metadata/md5-cache/gnome-base/gnome-shell-40.1-r1
+2106070109 metadata/md5-cache/gnome-base/librsvg-2.50.7
+2106070109 metadata/md5-cache/gnome-base/nautilus-40.2
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2006291909 metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-27
 2101060409 metadata/md5-cache/gnome-extra/cinnamon-translations-4.6.2
@@ -47180,14 +46925,12 @@
 2105310009 metadata/md5-cache/gnome-extra/pch-session-40.0
 2106011113 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
 2106011113 metadata/md5-cache/gnome-extra/cinnamon-4.6.7
-2106011113 metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
 2106011113 metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
 2106011113 metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
 2106011939 metadata/md5-cache/gnome-extra/cinnamon-translations-4.8.3
 2106020609 metadata/md5-cache/gnome-extra/evolution-data-server-3.40.1
 2106020609 metadata/md5-cache/gnome-extra/libgda-5.2.9
 2106020609 metadata/md5-cache/gnome-extra/synapse-0.2.99.4
-2106040639 metadata/md5-cache/gnome-extra/Manifest.gz
 2106040440 metadata/md5-cache/gnome-extra/cinnamon-4.8.6
 2106040440 metadata/md5-cache/gnome-extra/cinnamon-control-center-4.8.2
 2106040440 metadata/md5-cache/gnome-extra/cinnamon-desktop-4.6.4
@@ -47202,8 +46945,6 @@
 2106040440 metadata/md5-cache/gnome-extra/cjs-4.8.2
 2106040440 metadata/md5-cache/gnome-extra/gnome-boxes-40.1
 2106040440 metadata/md5-cache/gnome-extra/gnome-calculator-40.1
-2106040440 metadata/md5-cache/gnome-extra/gnome-calendar-40.1
-2106040440 metadata/md5-cache/gnome-extra/gnome-characters-40.0
 2106040440 metadata/md5-cache/gnome-extra/gnome-clocks-40.0
 2106040440 metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
 2106040440 metadata/md5-cache/gnome-extra/gnome-contacts-40.0
@@ -47214,20 +46955,30 @@
 2106040440 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.17.0
 2106040440 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-46
 2106040440 metadata/md5-cache/gnome-extra/gnome-shell-extensions-40.1
-2106040440 metadata/md5-cache/gnome-extra/gnome-software-3.34.2
-2106040440 metadata/md5-cache/gnome-extra/gnome-software-3.36.1
-2106040440 metadata/md5-cache/gnome-extra/gnome-software-40.0
-2106040440 metadata/md5-cache/gnome-extra/gnome-software-40.1
 2106040440 metadata/md5-cache/gnome-extra/gnome-system-monitor-40.1
 2106040639 metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
 2106040440 metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
-2106040440 metadata/md5-cache/gnome-extra/gnome-weather-40.0
 2106040440 metadata/md5-cache/gnome-extra/gucharmap-13.0.7
 2106040440 metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
 2106040440 metadata/md5-cache/gnome-extra/nemo-4.6.5-r1
 2106040440 metadata/md5-cache/gnome-extra/nemo-4.8.4-r1
 2106040440 metadata/md5-cache/gnome-extra/nm-applet-1.22.0
 2106040440 metadata/md5-cache/gnome-extra/sushi-3.38.0
+2106070939 metadata/md5-cache/gnome-extra/Manifest.gz
+2106070109 metadata/md5-cache/gnome-extra/evolution-data-server-3.40.2
+2106070109 metadata/md5-cache/gnome-extra/evolution-ews-3.40.2
+2106070109 metadata/md5-cache/gnome-extra/gnome-boxes-40.2
+2106070939 metadata/md5-cache/gnome-extra/gnome-calendar-40.1
+2106070939 metadata/md5-cache/gnome-extra/gnome-calendar-40.2
+2106070939 metadata/md5-cache/gnome-extra/gnome-characters-40.0
+2106070739 metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
+2106062139 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-33
+2106040939 metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
+2106070109 metadata/md5-cache/gnome-extra/gnome-software-40.2
+2106070939 metadata/md5-cache/gnome-extra/gnome-weather-40.0
+2106070109 metadata/md5-cache/gnome-extra/sushi-3.38.1
+2106070109 metadata/md5-cache/gnome-extra/yelp-40.2
+2106070109 metadata/md5-cache/gnome-extra/yelp-xsl-40.2
 2105081314 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2105081314 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2105081314 metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
@@ -47307,7 +47058,6 @@
 2105081314 metadata/md5-cache/gui-apps/nm-tray-0.4.3-r1
 2105101939 metadata/md5-cache/gui-apps/tuigreet-0.1.1
 2105101939 metadata/md5-cache/gui-apps/tuigreet-0.2.0
-2106040440 metadata/md5-cache/gui-apps/Manifest.gz
 2106040440 metadata/md5-cache/gui-apps/grim-1.3.1
 2106040440 metadata/md5-cache/gui-apps/grim-9999
 2106040440 metadata/md5-cache/gui-apps/gtkgreet-0.6-r1
@@ -47320,7 +47070,6 @@
 2106040440 metadata/md5-cache/gui-apps/lavalauncher-2.1.0
 2106040440 metadata/md5-cache/gui-apps/lavalauncher-9999
 2106040440 metadata/md5-cache/gui-apps/mako-1.4.1
-2106040440 metadata/md5-cache/gui-apps/mako-1.5
 2106040440 metadata/md5-cache/gui-apps/mako-9999
 2106040440 metadata/md5-cache/gui-apps/slurp-1.2.0
 2106040440 metadata/md5-cache/gui-apps/slurp-9999
@@ -47354,6 +47103,8 @@
 2106040440 metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
 2106040440 metadata/md5-cache/gui-apps/wl-clipboard-2.0.0
 2106040440 metadata/md5-cache/gui-apps/wl-clipboard-9999
+2106060709 metadata/md5-cache/gui-apps/Manifest.gz
+2106060709 metadata/md5-cache/gui-apps/mako-1.5
 2104012009 metadata/md5-cache/gui-libs/amtk-5.2.0
 2104130139 metadata/md5-cache/gui-libs/display-manager-init-1.0-r3
 2104171809 metadata/md5-cache/gui-libs/eglexternalplatform-1.1
@@ -47361,7 +47112,6 @@
 2105101939 metadata/md5-cache/gui-libs/greetd-0.7.0
 2106020609 metadata/md5-cache/gui-libs/libwpe-1.10.0
 2106020609 metadata/md5-cache/gui-libs/wpebackend-fdo-1.8.4
-2106040440 metadata/md5-cache/gui-libs/Manifest.gz
 2106040440 metadata/md5-cache/gui-libs/egl-wayland-1.1.6
 2106040440 metadata/md5-cache/gui-libs/egl-wayland-1.1.7
 2106040440 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.2
@@ -47385,7 +47135,9 @@
 2106040440 metadata/md5-cache/gui-libs/wlroots-9999
 2106040440 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.2.0
 2106040440 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.3.0
-2106040440 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
+2106060609 metadata/md5-cache/gui-libs/Manifest.gz
+2106060609 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
+2106060609 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
 2103252009 metadata/md5-cache/gui-wm/hikari-2.2.2-r1
 2106040440 metadata/md5-cache/gui-wm/Manifest.gz
 2106040440 metadata/md5-cache/gui-wm/sway-1.5.1-r1
@@ -47440,7 +47192,6 @@
 2105081314 metadata/md5-cache/kde-apps/kaccounts-integration-20.12.3
 2105081314 metadata/md5-cache/kde-apps/kaccounts-providers-20.12.3-r1
 2105081314 metadata/md5-cache/kde-apps/kalarmcal-20.12.3
-2105081314 metadata/md5-cache/kde-apps/kate-20.12.3-r1
 2105081314 metadata/md5-cache/kde-apps/kcalutils-20.12.3
 2105081314 metadata/md5-cache/kde-apps/kde-dev-scripts-20.12.3
 2105081314 metadata/md5-cache/kde-apps/kde-dev-utils-20.12.3
@@ -47503,7 +47254,6 @@
 2105081314 metadata/md5-cache/kde-apps/poxml-20.12.3
 2105081314 metadata/md5-cache/kde-apps/print-manager-20.12.3
 2105081314 metadata/md5-cache/kde-apps/signon-kwallet-extension-20.12.3
-2105081314 metadata/md5-cache/kde-apps/spectacle-20.12.3-r1
 2105081314 metadata/md5-cache/kde-apps/svgpart-20.12.3
 2105081314 metadata/md5-cache/kde-apps/thumbnailers-20.12.3
 2105081314 metadata/md5-cache/kde-apps/zeroconf-ioslave-20.12.3
@@ -47858,18 +47608,21 @@
 2105161410 metadata/md5-cache/kde-apps/yakuake-20.12.3
 2105161410 metadata/md5-cache/kde-apps/yakuake-21.04.1
 2105211739 metadata/md5-cache/kde-apps/kwave-21.04.1
-2105301509 metadata/md5-cache/kde-apps/kio-extras-20.12.3-r1
 2105301509 metadata/md5-cache/kde-apps/kio-extras-21.04.1-r1
-2106011113 metadata/md5-cache/kde-apps/cantor-20.12.3
-2106011113 metadata/md5-cache/kde-apps/cantor-21.04.1
 2106011113 metadata/md5-cache/kde-apps/kajongg-20.12.3
 2106011113 metadata/md5-cache/kde-apps/kajongg-21.04.1
 2106011113 metadata/md5-cache/kde-apps/kig-20.12.3
 2106011113 metadata/md5-cache/kde-apps/kig-21.04.1
 2106011113 metadata/md5-cache/kde-apps/lokalize-20.12.3
 2106011113 metadata/md5-cache/kde-apps/lokalize-21.04.1
-2106031439 metadata/md5-cache/kde-apps/Manifest.gz
-2106031439 metadata/md5-cache/kde-apps/konqueror-21.04.1-r1
+2106071609 metadata/md5-cache/kde-apps/Manifest.gz
+2106071609 metadata/md5-cache/kde-apps/cantor-20.12.3
+2106071609 metadata/md5-cache/kde-apps/cantor-21.04.1
+2106051410 metadata/md5-cache/kde-apps/kate-20.12.3-r1
+2106051410 metadata/md5-cache/kde-apps/kio-extras-20.12.3-r1
+2106051410 metadata/md5-cache/kde-apps/konqueror-20.12.3-r1
+2106051339 metadata/md5-cache/kde-apps/konqueror-21.04.1-r1
+2106051410 metadata/md5-cache/kde-apps/spectacle-20.12.3-r1
 1905280009 metadata/md5-cache/kde-frameworks/kf-env-5
 2105081314 metadata/md5-cache/kde-frameworks/attica-5.80.0
 2105081314 metadata/md5-cache/kde-frameworks/baloo-5.80.0-r1
@@ -47946,97 +47699,96 @@
 2105081314 metadata/md5-cache/kde-frameworks/syndication-5.80.0
 2105081314 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.80.0-r1
 2105081314 metadata/md5-cache/kde-frameworks/threadweaver-5.80.0
-2105091539 metadata/md5-cache/kde-frameworks/attica-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/baloo-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/bluez-qt-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/frameworkintegration-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kactivities-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kactivities-stats-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/karchive-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kauth-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kbookmarks-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcalendarcore-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcmutils-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcodecs-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcompletion-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kconfig-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcontacts-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcoreaddons-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kcrash-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdav-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdbusaddons-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdeclarative-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kded-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdelibs4support-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdesu-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdnssd-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kdoctools-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kemoticons-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kguiaddons-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kholidays-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/khtml-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kiconthemes-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kidletime-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kimageformats-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kinit-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kirigami-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kitemmodels-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kitemviews-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kjobwidgets-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kjs-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/knewstuff-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/knotifications-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/knotifyconfig-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kpackage-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kparts-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kpeople-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kplotting-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kpty-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kquickcharts-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kross-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kservice-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/ktexteditor-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/ktextwidgets-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kunitconversion-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kwallet-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kwayland-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kwindowsystem-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/kxmlgui-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/oxygen-icons-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/plasma-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/prison-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/purpose-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/solid-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/sonnet-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/syndication-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.82.0
-2105091539 metadata/md5-cache/kde-frameworks/threadweaver-5.82.0
-2105202309 metadata/md5-cache/kde-frameworks/krunner-5.82.0
-2105300039 metadata/md5-cache/kde-frameworks/kglobalaccel-5.82.0-r1
-2105301909 metadata/md5-cache/kde-frameworks/kio-5.82.0-r2
-2106011113 metadata/md5-cache/kde-frameworks/breeze-icons-5.82.0
-2106011113 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.82.0
 2106011113 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.80.0
-2106011113 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.82.0
 2106011113 metadata/md5-cache/kde-frameworks/kfilemetadata-5.80.0
-2106011113 metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
 2106011113 metadata/md5-cache/kde-frameworks/ki18n-5.80.0
-2106011113 metadata/md5-cache/kde-frameworks/ki18n-5.82.0
-2106020141 metadata/md5-cache/kde-frameworks/Manifest.gz
 2106020141 metadata/md5-cache/kde-frameworks/kapidox-5.80.0
-2106020141 metadata/md5-cache/kde-frameworks/kapidox-5.82.0
+2106070939 metadata/md5-cache/kde-frameworks/Manifest.gz
+2106051410 metadata/md5-cache/kde-frameworks/attica-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/baloo-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/bluez-qt-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/breeze-icons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.82.0
+2106070939 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/frameworkintegration-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kactivities-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kactivities-stats-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kapidox-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/karchive-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kauth-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kbookmarks-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcalendarcore-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcmutils-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcodecs-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcompletion-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kconfig-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kconfigwidgets-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcontacts-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcoreaddons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kcrash-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdav-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdbusaddons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdeclarative-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kded-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdelibs4support-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdesu-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdnssd-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kdoctools-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kemoticons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kfilemetadata-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kglobalaccel-5.82.0-r1
+2106051410 metadata/md5-cache/kde-frameworks/kguiaddons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kholidays-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/khtml-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/ki18n-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kiconthemes-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kidletime-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kimageformats-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kinit-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kio-5.82.0-r2
+2106051410 metadata/md5-cache/kde-frameworks/kirigami-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kitemmodels-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kitemviews-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kjobwidgets-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kjs-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/knewstuff-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/knotifications-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/knotifyconfig-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kpackage-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kparts-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kpeople-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kplotting-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kpty-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kquickcharts-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kross-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/krunner-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kservice-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/ktexteditor-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/ktextwidgets-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kunitconversion-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kwallet-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kwayland-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kwindowsystem-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/kxmlgui-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/networkmanager-qt-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/oxygen-icons-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/plasma-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/prison-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/purpose-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/solid-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/sonnet-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/syndication-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.82.0
+2106051410 metadata/md5-cache/kde-frameworks/threadweaver-5.82.0
 2105081314 metadata/md5-cache/kde-misc/basket-2.49b
 2105081314 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
 2105081314 metadata/md5-cache/kde-misc/kdiff3-1.8.5
 2105081314 metadata/md5-cache/kde-misc/kdirstat-3.2.1
 2105081314 metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
 2105081314 metadata/md5-cache/kde-misc/kio-fuse-5.0.0-r1
-2105081314 metadata/md5-cache/kde-misc/kio-fuse-5.0.1
 2105081314 metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
 2105081314 metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3
 2105081314 metadata/md5-cache/kde-misc/kio-stash-1.0-r1
@@ -48063,9 +47815,10 @@
 2105161410 metadata/md5-cache/kde-misc/rsibreak-0.12.13
 2105161410 metadata/md5-cache/kde-misc/skanlite-2.2.0
 2105161410 metadata/md5-cache/kde-misc/wacomtablet-3.2.0
-2105202139 metadata/md5-cache/kde-misc/Manifest.gz
 2105202139 metadata/md5-cache/kde-misc/kdiff3-1.9.2
-2105202139 metadata/md5-cache/kde-misc/latte-dock-0.9.12
+2106051410 metadata/md5-cache/kde-misc/Manifest.gz
+2106051410 metadata/md5-cache/kde-misc/kio-fuse-5.0.1
+2106051410 metadata/md5-cache/kde-misc/latte-dock-0.9.12
 2101242239 metadata/md5-cache/kde-plasma/plasma-meta-5.20.5
 2104241709 metadata/md5-cache/kde-plasma/breeze-grub-5.20.5
 2105081314 metadata/md5-cache/kde-plasma/bluedevil-5.20.5
@@ -48115,59 +47868,59 @@
 2105081314 metadata/md5-cache/kde-plasma/systemsettings-5.20.5
 2105081314 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.5
 2105081314 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.5
-2105091539 metadata/md5-cache/kde-plasma/breeze-grub-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/discover-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kdecoration-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kgamma-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/khotkeys-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kscreen-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kscreenlocker-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/ksshaskpass-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/ksysguard-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kwallet-pam-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kwayland-integration-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kwayland-server-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kwin-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/kwrited-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/libkscreen-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/libksysguard-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/milou-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/oxygen-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-disks-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-integration-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-meta-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-nm-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-pa-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-sdk-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-vault-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/powerdevil-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/sddm-kcm-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/systemsettings-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.5
-2105091539 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.5
-2105121139 metadata/md5-cache/kde-plasma/drkonqi-5.21.5-r1
-2105141909 metadata/md5-cache/kde-plasma/bluedevil-5.21.5-r1
-2105141909 metadata/md5-cache/kde-plasma/kmenuedit-5.21.5
-2105300039 metadata/md5-cache/kde-plasma/breeze-5.21.5-r1
-2105300039 metadata/md5-cache/kde-plasma/libkworkspace-5.21.5-r1
-2105300039 metadata/md5-cache/kde-plasma/plasma-workspace-5.21.5
-2106011113 metadata/md5-cache/kde-plasma/Manifest.gz
 2106011113 metadata/md5-cache/kde-plasma/breeze-gtk-5.20.5
-2106011113 metadata/md5-cache/kde-plasma/breeze-gtk-5.21.5
-2106011113 metadata/md5-cache/kde-plasma/plasma-firewall-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/Manifest.gz
+2106051410 metadata/md5-cache/kde-plasma/bluedevil-5.21.5-r1
+2106051410 metadata/md5-cache/kde-plasma/breeze-5.21.5-r1
+2106051410 metadata/md5-cache/kde-plasma/breeze-grub-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/breeze-gtk-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/breeze-plymouth-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/discover-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/drkonqi-5.21.5-r1
+2106051410 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kde-cli-tools-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kde-gtk-config-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kdecoration-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kgamma-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/khotkeys-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kinfocenter-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kmenuedit-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kscreen-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kscreenlocker-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/ksshaskpass-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/ksysguard-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kwallet-pam-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kwayland-integration-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kwayland-server-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kwin-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/kwrited-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/libkscreen-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/libksysguard-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/libkworkspace-5.21.5-r1
+2106051410 metadata/md5-cache/kde-plasma/milou-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/oxygen-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-desktop-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-disks-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-firewall-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-integration-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-meta-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-nm-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-pa-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-sdk-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-vault-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-workspace-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/plymouth-kcm-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/powerdevil-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/sddm-kcm-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/systemsettings-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.21.5
+2106051410 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.21.5
 2103150309 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
 2103150309 metadata/md5-cache/lxde-base/lxde-icon-theme-0.5.1-r1
 2103150309 metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
@@ -48249,9 +48002,12 @@
 2106011113 metadata/md5-cache/mail-client/thunderbird-78.10.2
 2106020141 metadata/md5-cache/mail-client/alot-0.9.1
 2106020141 metadata/md5-cache/mail-client/alot-9999
-2106040440 metadata/md5-cache/mail-client/Manifest.gz
 2106040440 metadata/md5-cache/mail-client/geary-3.36.3.1
 2106040440 metadata/md5-cache/mail-client/geary-40.0
+2106071009 metadata/md5-cache/mail-client/Manifest.gz
+2106070109 metadata/md5-cache/mail-client/evolution-3.40.2
+2106071009 metadata/md5-cache/mail-client/thunderbird-78.11.0
+2106041039 metadata/md5-cache/mail-client/thunderbird-bin-78.11.0
 1910071209 metadata/md5-cache/mail-filter/spampd-2.42
 2006041239 metadata/md5-cache/mail-filter/MailScanner-4.84.5.2
 2101070439 metadata/md5-cache/mail-filter/sieve-connect-0.90
@@ -48285,9 +48041,7 @@
 2104212209 metadata/md5-cache/mail-filter/zdkimfilter-2.2
 2104250839 metadata/md5-cache/mail-filter/postgrey-1.37_p20190625-r1
 2104261339 metadata/md5-cache/mail-filter/amavisd-milter-1.7.0-r1
-2105021209 metadata/md5-cache/mail-filter/imapfilter-2.7.5
 2105021209 metadata/md5-cache/mail-filter/mailfilter-0.8.4
-2105021209 metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
 2105022239 metadata/md5-cache/mail-filter/gld-1.7-r4
 2105031239 metadata/md5-cache/mail-filter/popfile-1.1.3-r1
 2105031239 metadata/md5-cache/mail-filter/spamdyke-5.0.1
@@ -48301,9 +48055,6 @@
 2105081314 metadata/md5-cache/mail-filter/policyd-1.82-r4
 2105081314 metadata/md5-cache/mail-filter/postsrsd-1.10
 2105081314 metadata/md5-cache/mail-filter/procmail-3.22-r15
-2105081314 metadata/md5-cache/mail-filter/rspamd-2.6-r100
-2105081314 metadata/md5-cache/mail-filter/rspamd-2.7-r100
-2105081314 metadata/md5-cache/mail-filter/rspamd-9999
 2105081314 metadata/md5-cache/mail-filter/sigh-1607.1.6-r1
 2105131939 metadata/md5-cache/mail-filter/spamprobe-1.4d-r2
 2105180040 metadata/md5-cache/mail-filter/razor-2.85-r3
@@ -48311,11 +48062,16 @@
 2105180040 metadata/md5-cache/mail-filter/spamassassin-3.4.6
 2105180040 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
 2106011309 metadata/md5-cache/mail-filter/libmilter-1.0.2_p1-r2
-2106020141 metadata/md5-cache/mail-filter/Manifest.gz
 2106020141 metadata/md5-cache/mail-filter/afew-3.0.1
 2106020141 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
 2106020141 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
 2106020141 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r1
+2106071609 metadata/md5-cache/mail-filter/Manifest.gz
+2106071609 metadata/md5-cache/mail-filter/imapfilter-2.7.5
+2106071609 metadata/md5-cache/mail-filter/opendkim-2.10.3-r26
+2106071609 metadata/md5-cache/mail-filter/rspamd-2.6-r100
+2106071609 metadata/md5-cache/mail-filter/rspamd-2.7-r100
+2106071609 metadata/md5-cache/mail-filter/rspamd-9999
 2101231224 metadata/md5-cache/mail-mta/msmtp-1.8.12
 2101231224 metadata/md5-cache/mail-mta/msmtp-1.8.14
 2103130039 metadata/md5-cache/mail-mta/msmtp-1.8.15
@@ -48338,14 +48094,14 @@
 2105081314 metadata/md5-cache/mail-mta/postfix-3.6.0
 2105180040 metadata/md5-cache/mail-mta/qpsmtpd-0.95-r1
 2105180040 metadata/md5-cache/mail-mta/qpsmtpd-9999
-2105260410 metadata/md5-cache/mail-mta/protonmail-bridge-1.6.9
 2105260410 metadata/md5-cache/mail-mta/protonmail-bridge-1.8.1
 2105301739 metadata/md5-cache/mail-mta/exim-4.94.2-r3
 2106011039 metadata/md5-cache/mail-mta/postfix-3.7_pre20210529
 2106011309 metadata/md5-cache/mail-mta/sendmail-8.16.1-r1
-2106032239 metadata/md5-cache/mail-mta/Manifest.gz
 2106032239 metadata/md5-cache/mail-mta/notqmail-1.08-r3
 2106032239 metadata/md5-cache/mail-mta/notqmail-9999
+2106050239 metadata/md5-cache/mail-mta/Manifest.gz
+2106050239 metadata/md5-cache/mail-mta/protonmail-bridge-1.8.3
 2008070639 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2104031909 metadata/md5-cache/mate-base/mate-common-1.24.1
 2104031909 metadata/md5-cache/mate-base/mate-common-1.24.2
@@ -48404,7 +48160,6 @@
 1812141339 metadata/md5-cache/media-fonts/solarize-0_pre20140818
 2004032241 metadata/md5-cache/media-fonts/oto-0.5
 2103270039 metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
-2103270039 metadata/md5-cache/media-fonts/ahem-1.0
 2103270039 metadata/md5-cache/media-fonts/alee-fonts-13-r1
 2103270039 metadata/md5-cache/media-fonts/alegreya-sans-2.008
 2103270039 metadata/md5-cache/media-fonts/alegreya-serif-2.008
@@ -48413,11 +48168,9 @@
 2103270039 metadata/md5-cache/media-fonts/bitstream-cyberbit-2.0-r2
 2103270039 metadata/md5-cache/media-fonts/cardo-1.04
 2103270039 metadata/md5-cache/media-fonts/cascadia-code-2102.25
-2103270039 metadata/md5-cache/media-fonts/clearsans-1.00
 2103270039 metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1
 2103270039 metadata/md5-cache/media-fonts/comic-neue-2.3
 2103270039 metadata/md5-cache/media-fonts/corefonts-1-r7
-2103270039 metadata/md5-cache/media-fonts/croscorefonts-1.31.0
 2103270039 metadata/md5-cache/media-fonts/dzongkha-fonts-2009.09-r1
 2103270039 metadata/md5-cache/media-fonts/eb-garamond-0.016
 2103270039 metadata/md5-cache/media-fonts/ekushey-bangla-fonts-20070420
@@ -48484,7 +48237,6 @@
 2103270039 metadata/md5-cache/media-fonts/tex-gyre-2.501
 2103270039 metadata/md5-cache/media-fonts/thaifonts-scalable-0.7.2
 2103270039 metadata/md5-cache/media-fonts/tibetan-machine-font-1.901
-2103270039 metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
 2103270039 metadata/md5-cache/media-fonts/umeplus-fonts-20180604
 2103270039 metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
 2103270039 metadata/md5-cache/media-fonts/viga-1
@@ -48499,7 +48251,6 @@
 2103310849 metadata/md5-cache/media-fonts/solarize-9999
 2104060140 metadata/md5-cache/media-fonts/aquafont-2.7-r4
 2104060140 metadata/md5-cache/media-fonts/aquapfont-2.6-r2
-2104060140 metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
 2104060140 metadata/md5-cache/media-fonts/arkpandora-2.04
 2104060140 metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
 2104060140 metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
@@ -48568,7 +48319,6 @@
 2104180939 metadata/md5-cache/media-fonts/fira-code-5.2
 2104180939 metadata/md5-cache/media-fonts/oldstandard-2.2
 2104180939 metadata/md5-cache/media-fonts/pothana2k-2006-r1
-2104180939 metadata/md5-cache/media-fonts/roboto-2.138
 2104212209 metadata/md5-cache/media-fonts/ttf-bitstream-vera-1.10-r3
 2104290509 metadata/md5-cache/media-fonts/droid-113-r5
 2105041714 metadata/md5-cache/media-fonts/fontawesome-5.15.3
@@ -48628,12 +48378,19 @@
 2106011113 metadata/md5-cache/media-fonts/noto-emoji-20200317-r1
 2106011113 metadata/md5-cache/media-fonts/noto-emoji-20200916
 2106011113 metadata/md5-cache/media-fonts/noto-emoji-20201214
-2106011113 metadata/md5-cache/media-fonts/terminus-font-4.49
 2106020609 metadata/md5-cache/media-fonts/dejavu-2.37
-2106040440 metadata/md5-cache/media-fonts/Manifest.gz
 2106040440 metadata/md5-cache/media-fonts/cantarell-0.301
 2106031939 metadata/md5-cache/media-fonts/fantasque-sans-mono-1.8.0
 2106032239 metadata/md5-cache/media-fonts/unifont-13.0.01-r1
+2106070939 metadata/md5-cache/media-fonts/Manifest.gz
+2106070939 metadata/md5-cache/media-fonts/ahem-1.0
+2106070939 metadata/md5-cache/media-fonts/arabeyes-fonts-2.0-r1
+2106070939 metadata/md5-cache/media-fonts/clearsans-1.00
+2106070939 metadata/md5-cache/media-fonts/croscorefonts-1.31.0
+2106070939 metadata/md5-cache/media-fonts/roboto-2.138
+2106052239 metadata/md5-cache/media-fonts/terminus-font-4.49
+2106060109 metadata/md5-cache/media-fonts/terminus-font-4.49.1
+2106070939 metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
 1904252009 metadata/md5-cache/media-gfx/gimp-arrow-brushes-20190407
 1808310239 metadata/md5-cache/media-gfx/gpicview-0.2.5
 1902162309 metadata/md5-cache/media-gfx/jigl-2.0.1-r1
@@ -48750,8 +48507,6 @@
 2104121341 metadata/md5-cache/media-gfx/eom-1.24.0-r2
 2104121341 metadata/md5-cache/media-gfx/eom-1.24.1
 2104121341 metadata/md5-cache/media-gfx/fim-0.5_rc3
-2104121341 metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
-2104121341 metadata/md5-cache/media-gfx/geeqie-9999
 2104121341 metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
 2104121341 metadata/md5-cache/media-gfx/gnuclad-0.2.4
 2104121341 metadata/md5-cache/media-gfx/gozer-0.7-r3
@@ -48770,7 +48525,6 @@
 2104121341 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
 2104160809 metadata/md5-cache/media-gfx/transfig-3.2.5e-r1
 2104160809 metadata/md5-cache/media-gfx/xli-1.17.0-r5
-2104161439 metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
 2104161439 metadata/md5-cache/media-gfx/imageworsener-1.3.3
 2104161439 metadata/md5-cache/media-gfx/peps-2.0-r1
 2104161439 metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r2
@@ -48783,7 +48537,6 @@
 2104192239 metadata/md5-cache/media-gfx/xzgv-0.9.1
 2104231709 metadata/md5-cache/media-gfx/pngcrush-1.8.13
 2104290509 metadata/md5-cache/media-gfx/engauge-10.6
-2104280039 metadata/md5-cache/media-gfx/geeqie-1.6
 2104292109 metadata/md5-cache/media-gfx/gimp-2.10.22-r2
 2104292109 metadata/md5-cache/media-gfx/gimp-2.10.24
 2105050139 metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
@@ -48801,7 +48554,6 @@
 2105081314 metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
 2105081314 metadata/md5-cache/media-gfx/fdm-materials-4.8.0
 2105081314 metadata/md5-cache/media-gfx/freepv-0.3.0-r5
-2105081314 metadata/md5-cache/media-gfx/gmic-2.9.5
 2105081314 metadata/md5-cache/media-gfx/icoutils-0.32.3
 2105081314 metadata/md5-cache/media-gfx/iscan-2.30.4.2-r1
 2105081314 metadata/md5-cache/media-gfx/iscan-3.63.0
@@ -48829,7 +48581,6 @@
 2105081314 metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
 2105081314 metadata/md5-cache/media-gfx/solvespace-2.3
 2105081314 metadata/md5-cache/media-gfx/tgif-4.2.5-r2
-2105081314 metadata/md5-cache/media-gfx/tintii-2.10.0-r1
 2105081314 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210210
 2105081314 metadata/md5-cache/media-gfx/xloadimage-4.1-r12
 2105081314 metadata/md5-cache/media-gfx/xv-3.10a-r19
@@ -48856,11 +48607,8 @@
 2105210539 metadata/md5-cache/media-gfx/imagemagick-6.9.12.13
 2105210539 metadata/md5-cache/media-gfx/imagemagick-7.0.11.13
 2105231809 metadata/md5-cache/media-gfx/darktable-2.6.2
-2105231809 metadata/md5-cache/media-gfx/darktable-3.4.1
-2105231809 metadata/md5-cache/media-gfx/darktable-9999
 2105251609 metadata/md5-cache/media-gfx/argyllcms-2.2.0
 2105270009 metadata/md5-cache/media-gfx/feh-3.7
-2105261009 metadata/md5-cache/media-gfx/gmic-2.9.7
 2105261509 metadata/md5-cache/media-gfx/xpaint-3.1.3
 2105291839 metadata/md5-cache/media-gfx/gphoto2-2.5.27
 2105292209 metadata/md5-cache/media-gfx/mscgen-0.20
@@ -48891,8 +48639,6 @@
 2106011113 metadata/md5-cache/media-gfx/yafaray-3.5.1
 2106020141 metadata/md5-cache/media-gfx/cairosvg-2.5.2
 2106011809 metadata/md5-cache/media-gfx/fotoxx-21.41
-2106020609 metadata/md5-cache/media-gfx/gimp-2.99.6
-2106020609 metadata/md5-cache/media-gfx/gimp-9999
 2106020141 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
 2106020141 metadata/md5-cache/media-gfx/img2pdf-0.3.6
 2106020141 metadata/md5-cache/media-gfx/img2pdf-0.4.0
@@ -48912,20 +48658,13 @@
 2106030210 metadata/md5-cache/media-gfx/asymptote-2.70-r1
 2106030240 metadata/md5-cache/media-gfx/exiv2-0.27.3
 2106030240 metadata/md5-cache/media-gfx/graphite2-1.3.14
-2106022309 metadata/md5-cache/media-gfx/hydrus-441
 2106030240 metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5
 2106030240 metadata/md5-cache/media-gfx/sane-backends-1.0.31-r2
-2106030240 metadata/md5-cache/media-gfx/zbar-0.23-r1
-2106030240 metadata/md5-cache/media-gfx/zbar-0.23.1
-2106040440 metadata/md5-cache/media-gfx/Manifest.gz
 2106040440 metadata/md5-cache/media-gfx/ahoviewer-2.0.0_beta
 2106040440 metadata/md5-cache/media-gfx/entangle-3.0
 2106040440 metadata/md5-cache/media-gfx/eog-40.1
 2106040440 metadata/md5-cache/media-gfx/fbida-9999
 2106040039 metadata/md5-cache/media-gfx/flam3-3.1.1
-2106032239 metadata/md5-cache/media-gfx/freecad-0.19.1
-2106032239 metadata/md5-cache/media-gfx/freecad-0.19.2
-2106032239 metadata/md5-cache/media-gfx/freecad-9999
 2106040440 metadata/md5-cache/media-gfx/frogr-1.5
 2106040440 metadata/md5-cache/media-gfx/gnome-font-viewer-40.0
 2106040440 metadata/md5-cache/media-gfx/gnome-photos-40.0
@@ -48938,6 +48677,24 @@
 2106040440 metadata/md5-cache/media-gfx/shotwell-0.30.12
 2106040440 metadata/md5-cache/media-gfx/simple-scan-40.1
 2106040440 metadata/md5-cache/media-gfx/viewnior-1.7-r2
+2106071609 metadata/md5-cache/media-gfx/Manifest.gz
+2106071609 metadata/md5-cache/media-gfx/darktable-3.4.1
+2106071609 metadata/md5-cache/media-gfx/darktable-9999
+2106070109 metadata/md5-cache/media-gfx/eog-40.2
+2106071609 metadata/md5-cache/media-gfx/exact-image-1.0.2-r1
+2106051509 metadata/md5-cache/media-gfx/freecad-0.19.1
+2106051739 metadata/md5-cache/media-gfx/freecad-0.19.2
+2106051739 metadata/md5-cache/media-gfx/freecad-9999
+2106071609 metadata/md5-cache/media-gfx/geeqie-1.5.1-r1
+2106071609 metadata/md5-cache/media-gfx/geeqie-1.6
+2106071609 metadata/md5-cache/media-gfx/geeqie-9999
+2106071609 metadata/md5-cache/media-gfx/gimp-2.99.6
+2106071609 metadata/md5-cache/media-gfx/gimp-9999
+2106041139 metadata/md5-cache/media-gfx/gmic-2.9.7
+2106051609 metadata/md5-cache/media-gfx/hydrus-441-r1
+2106051609 metadata/md5-cache/media-gfx/hydrus-442
+2106071139 metadata/md5-cache/media-gfx/tintii-2.10.0-r1
+2106041439 metadata/md5-cache/media-gfx/zbar-0.23.1
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1702282326 metadata/md5-cache/media-libs/libxtract-0.6.6
@@ -48963,10 +48720,6 @@
 2011142339 metadata/md5-cache/media-libs/liblingoteach-0.2.3
 2012171209 metadata/md5-cache/media-libs/libopusenc-0.2.1
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
-2012311940 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.2
-2012311940 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.3
-2012311940 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.2
-2012311940 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.3
 2012311940 metadata/md5-cache/media-libs/libcdaudio-0.99.12-r2
 2012311940 metadata/md5-cache/media-libs/libdiscid-0.6.2
 2012311940 metadata/md5-cache/media-libs/libggiwmh-0.3.2-r1
@@ -48981,7 +48734,6 @@
 2101231224 metadata/md5-cache/media-libs/stimg-0.1.0
 2101231224 metadata/md5-cache/media-libs/zita-alsa-pcmi-0.3.2
 2101240039 metadata/md5-cache/media-libs/liblqr-0.4.2-r1
-2101240709 metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
 2102042339 metadata/md5-cache/media-libs/lsp-plugins-1.1.24
 2102151209 metadata/md5-cache/media-libs/lastfmlib-0.4.0-r1
 2102150839 metadata/md5-cache/media-libs/libmtp-1.1.18
@@ -49032,7 +48784,6 @@
 2104130239 metadata/md5-cache/media-libs/libopenraw-0.1.3
 2104121341 metadata/md5-cache/media-libs/libpagemaker-9999
 2104121341 metadata/md5-cache/media-libs/libprojectm-9999
-2104121341 metadata/md5-cache/media-libs/libquvi-0.9.4-r100
 2104121341 metadata/md5-cache/media-libs/libsmf-1.3
 2104121341 metadata/md5-cache/media-libs/libtaginfo-0.2.1
 2104121341 metadata/md5-cache/media-libs/libwmf-0.2.8.4-r8
@@ -49171,14 +48922,10 @@
 2105251439 metadata/md5-cache/media-libs/libopenshot-audio-0.2.0
 2105270539 metadata/md5-cache/media-libs/libuninameslist-20200413-r2
 2105272239 metadata/md5-cache/media-libs/exiftool-12.26
-2105281809 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
-2105281809 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
 2105291539 metadata/md5-cache/media-libs/libxspf-1.2.1
 2105291839 metadata/md5-cache/media-libs/liblscp-0.9.2
 2105291939 metadata/md5-cache/media-libs/libsidplayfp-2.2.0
 2105301509 metadata/md5-cache/media-libs/zxing-cpp-1.2.0
-2105312239 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
-2105312239 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5
 2105311239 metadata/md5-cache/media-libs/ffmpegsource-2.23
 2105311239 metadata/md5-cache/media-libs/ffmpegsource-9999
 2105311239 metadata/md5-cache/media-libs/flickcurl-1.26
@@ -49205,8 +48952,6 @@
 2106011113 metadata/md5-cache/media-libs/libmypaint-1.6.1
 2106011113 metadata/md5-cache/media-libs/libopenshot-0.2.5-r1
 2106011113 metadata/md5-cache/media-libs/lvtk-1.2.0-r1
-2106011113 metadata/md5-cache/media-libs/mlt-6.24.0-r1
-2106011113 metadata/md5-cache/media-libs/opencolorio-1.1.1
 2106011113 metadata/md5-cache/media-libs/opensubdiv-3.4.3
 2106011113 metadata/md5-cache/media-libs/partio-1.10.1
 2106011113 metadata/md5-cache/media-libs/partio-9999
@@ -49227,11 +48972,6 @@
 2106030240 metadata/md5-cache/media-libs/allegro-4.4.3.1
 2106030240 metadata/md5-cache/media-libs/allegro-5.2.6.0
 2106030240 metadata/md5-cache/media-libs/allegro-5.2.7.0
-2106030240 metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
-2106030240 metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1
-2106030240 metadata/md5-cache/media-libs/alsa-lib-1.2.4
-2106030240 metadata/md5-cache/media-libs/alsa-lib-1.2.5
-2106030240 metadata/md5-cache/media-libs/alsa-oss-1.1.8
 2106030240 metadata/md5-cache/media-libs/aribb24-1.0.3-r2
 2106030240 metadata/md5-cache/media-libs/audiofile-0.3.6-r4
 2106030240 metadata/md5-cache/media-libs/chromaprint-1.5.0
@@ -49334,7 +49074,6 @@
 2106030240 metadata/md5-cache/media-libs/libgphoto2-2.5.27-r1
 2106030240 metadata/md5-cache/media-libs/libharu-2.3.0-r2
 2106030240 metadata/md5-cache/media-libs/libheif-1.11.0
-2106030240 metadata/md5-cache/media-libs/libheif-1.12.0
 2106030240 metadata/md5-cache/media-libs/libheif-9999
 2106030240 metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
 2106030240 metadata/md5-cache/media-libs/libiec61883-1.2.0-r2
@@ -49440,7 +49179,6 @@
 2106030240 metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
 2106030240 metadata/md5-cache/media-libs/soxr-0.1.3-r1
 2106030240 metadata/md5-cache/media-libs/speex-1.2.0-r2
-2106030240 metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r3
 2106030240 metadata/md5-cache/media-libs/sratom-0.6.8
 2106030240 metadata/md5-cache/media-libs/taglib-1.12
 2106030240 metadata/md5-cache/media-libs/theoraplay-0_pre20180524
@@ -49454,11 +49192,9 @@
 2106030240 metadata/md5-cache/media-libs/vo-amrwbenc-9999
 2106030240 metadata/md5-cache/media-libs/vulkan-layers-1.2.162
 2106030240 metadata/md5-cache/media-libs/vulkan-layers-1.2.170
-2106030240 metadata/md5-cache/media-libs/vulkan-layers-1.2.179
 2106030240 metadata/md5-cache/media-libs/vulkan-layers-9999
 2106030240 metadata/md5-cache/media-libs/vulkan-loader-1.2.162-r1
 2106030240 metadata/md5-cache/media-libs/vulkan-loader-1.2.170
-2106030240 metadata/md5-cache/media-libs/vulkan-loader-1.2.179
 2106030240 metadata/md5-cache/media-libs/vulkan-loader-9999
 2106030240 metadata/md5-cache/media-libs/webrtc-audio-processing-0.3.1
 2106030240 metadata/md5-cache/media-libs/x264-0.0.20190903-r1
@@ -49471,7 +49207,6 @@
 2106030240 metadata/md5-cache/media-libs/zimg-3.0.1
 2106030240 metadata/md5-cache/media-libs/zimg-9999
 2106030240 metadata/md5-cache/media-libs/zvbi-0.2.35-r1
-2106040639 metadata/md5-cache/media-libs/Manifest.gz
 2106040440 metadata/md5-cache/media-libs/babl-0.1.84
 2106040440 metadata/md5-cache/media-libs/babl-0.1.86
 2106040440 metadata/md5-cache/media-libs/babl-9999
@@ -49494,7 +49229,6 @@
 2106040440 metadata/md5-cache/media-libs/gstreamer-1.18.4
 2106040440 metadata/md5-cache/media-libs/harfbuzz-2.8.1
 2106040440 metadata/md5-cache/media-libs/harfbuzz-9999
-2106031939 metadata/md5-cache/media-libs/ilmbase-2.5.6
 2106040209 metadata/md5-cache/media-libs/libcaca-0.99_beta19-r4
 2106040440 metadata/md5-cache/media-libs/libchamplain-0.12.20
 2106040440 metadata/md5-cache/media-libs/libepoxy-1.5.5
@@ -49516,17 +49250,41 @@
 2106040440 metadata/md5-cache/media-libs/mesa-21.1.1
 2106040440 metadata/md5-cache/media-libs/mesa-21.1.2
 2106040440 metadata/md5-cache/media-libs/mesa-9999
-2106040139 metadata/md5-cache/media-libs/mlt-6.26.1-r1
-2106031939 metadata/md5-cache/media-libs/openexr-2.5.6
 2106040440 metadata/md5-cache/media-libs/rlottie-0.2
 2106040440 metadata/md5-cache/media-libs/rlottie-0.2_p20210405
 2106040440 metadata/md5-cache/media-libs/rubberband-1.9.1-r1
-2106032309 metadata/md5-cache/media-libs/speexdsp-1.2.0
 2106031939 metadata/md5-cache/media-libs/tiff-4.3.0
 2106040440 metadata/md5-cache/media-libs/virglrenderer-0.8.2
 2106040440 metadata/md5-cache/media-libs/virglrenderer-9999
 2106040440 metadata/md5-cache/media-libs/waffle-1.7.0
 2106040440 metadata/md5-cache/media-libs/waffle-9999
+2106071609 metadata/md5-cache/media-libs/Manifest.gz
+2106052339 metadata/md5-cache/media-libs/alsa-lib-1.2.2-r1
+2106052339 metadata/md5-cache/media-libs/alsa-lib-1.2.3.2-r1
+2106052339 metadata/md5-cache/media-libs/alsa-lib-1.2.4
+2106052339 metadata/md5-cache/media-libs/alsa-lib-1.2.5_p20210604
+2106052339 metadata/md5-cache/media-libs/alsa-oss-1.1.8
+2106052339 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.2
+2106052339 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.3
+2106052339 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
+2106052339 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5
+2106052339 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.2
+2106052339 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.3
+2106052339 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
+2106052339 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5-r1
+2106051309 metadata/md5-cache/media-libs/ilmbase-2.5.6
+2106061609 metadata/md5-cache/media-libs/libheif-1.12.0
+2106041809 metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
+2106042139 metadata/md5-cache/media-libs/libogg-1.3.5
+2106071609 metadata/md5-cache/media-libs/libquvi-0.9.4-r100
+2106071609 metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r100
+2106071609 metadata/md5-cache/media-libs/mlt-6.24.0-r1
+2106071609 metadata/md5-cache/media-libs/mlt-6.26.1-r1
+2106071139 metadata/md5-cache/media-libs/opencolorio-1.1.1
+2106051309 metadata/md5-cache/media-libs/openexr-2.5.6
+2106070939 metadata/md5-cache/media-libs/speexdsp-1.2.0
+2106070939 metadata/md5-cache/media-libs/vulkan-layers-1.2.179
+2106070939 metadata/md5-cache/media-libs/vulkan-loader-1.2.179
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -49865,7 +49623,6 @@
 2106011113 metadata/md5-cache/media-plugins/mythplugins-31.0-r1
 2106011113 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
 2106020609 metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
-2106030240 metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
 2106030240 metadata/md5-cache/media-plugins/alsaequal-0.7.1
 2106030240 metadata/md5-cache/media-plugins/caps-plugins-0.9.26
 2106030240 metadata/md5-cache/media-plugins/cmt-plugins-1.17-r1
@@ -49946,8 +49703,6 @@
 2106030240 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r4
 2106030240 metadata/md5-cache/media-plugins/swh-plugins-0.4.17
 2106031009 metadata/md5-cache/media-plugins/vdr-epgsearch-2.4.0_p20210426
-2106040440 metadata/md5-cache/media-plugins/Manifest.gz
-2106040440 metadata/md5-cache/media-plugins/grilo-plugins-0.3.13
 2106040440 metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.18.4
 2106040440 metadata/md5-cache/media-plugins/gst-plugins-amr-1.18.4
 2106040440 metadata/md5-cache/media-plugins/gst-plugins-assrender-1.18.4
@@ -50021,6 +49776,12 @@
 2106040440 metadata/md5-cache/media-plugins/gst-transcoder-1.14.1
 2106040440 metadata/md5-cache/media-plugins/noise-repellent-0.1.5
 2106032239 metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
+2106071609 metadata/md5-cache/media-plugins/Manifest.gz
+2106052339 metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
+2106052339 metadata/md5-cache/media-plugins/alsa-plugins-1.2.5
+2106071609 metadata/md5-cache/media-plugins/grilo-plugins-0.3.13
+2106071109 metadata/md5-cache/media-plugins/x42-avldrums-0.4.2
+2106071109 metadata/md5-cache/media-plugins/x42-avldrums-9999
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
 2003051909 metadata/md5-cache/media-radio/flamp-2.2.05
@@ -50118,7 +49879,6 @@
 2011141839 metadata/md5-cache/media-sound/redoflacs-0.30
 2011141839 metadata/md5-cache/media-sound/volwheel-0.2.8-r1
 2012281255 metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
-2012311940 metadata/md5-cache/media-sound/mikmod-3.2.8
 2012311940 metadata/md5-cache/media-sound/timidity-eawpatches-12-r5
 2012311940 metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
 2101091409 metadata/md5-cache/media-sound/shnflacverify-0.3
@@ -50196,14 +49956,10 @@
 2103201139 metadata/md5-cache/media-sound/awesfx-0.5.1e
 2103201139 metadata/md5-cache/media-sound/gst123-0.3.5
 2103261839 metadata/md5-cache/media-sound/mp3splt-2.6.2
-2103301639 metadata/md5-cache/media-sound/alsa-utils-1.2.2
-2103301639 metadata/md5-cache/media-sound/alsa-utils-1.2.3
 2103311110 metadata/md5-cache/media-sound/cmus-9999
-2103310849 metadata/md5-cache/media-sound/entagged-tageditor-0.35
 2103310849 metadata/md5-cache/media-sound/gmusicbrowser-9999
 2103310520 metadata/md5-cache/media-sound/murmur-1.3.3
 2103310520 metadata/md5-cache/media-sound/murmur-1.3.4
-2103310541 metadata/md5-cache/media-sound/protux-0.50.100
 2103311110 metadata/md5-cache/media-sound/split2flac-122
 2103311110 metadata/md5-cache/media-sound/split2flac-9999
 2103310849 metadata/md5-cache/media-sound/teamspeak-client-3.5.6-r4
@@ -50216,7 +49972,6 @@
 2104120442 metadata/md5-cache/media-sound/terminatorx-4.0.1-r2
 2104121341 metadata/md5-cache/media-sound/abcmidi-2020.01.22
 2104121341 metadata/md5-cache/media-sound/alsaplayer-0.99.81-r1
-2104121341 metadata/md5-cache/media-sound/aqualung-1.1-r101
 2104121341 metadata/md5-cache/media-sound/audacious-9999
 2104121341 metadata/md5-cache/media-sound/aumix-2.9.1
 2104121341 metadata/md5-cache/media-sound/bitmeter-1.2-r2
@@ -50300,7 +50055,6 @@
 2105031209 metadata/md5-cache/media-sound/spotify-1.1.55
 2105050139 metadata/md5-cache/media-sound/wav2json-0.4
 2105081314 metadata/md5-cache/media-sound/aeolus-0.9.9
-2105081314 metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
 2105081314 metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
 2105081314 metadata/md5-cache/media-sound/amsynth-1.8.0
 2105081314 metadata/md5-cache/media-sound/audacity-2.4.2-r1
@@ -50339,7 +50093,6 @@
 2105081314 metadata/md5-cache/media-sound/mp3c-0.31-r1
 2105081314 metadata/md5-cache/media-sound/mp3check-0.8.7
 2105081314 metadata/md5-cache/media-sound/multimux-0.2.5.2
-2105081314 metadata/md5-cache/media-sound/mumble-9999
 2105081314 metadata/md5-cache/media-sound/murmur-9999
 2105081314 metadata/md5-cache/media-sound/musescore-3.6.2
 2105081314 metadata/md5-cache/media-sound/musescore-9999
@@ -50419,19 +50172,15 @@
 2105241039 metadata/md5-cache/media-sound/spotify-tray-1.3.1
 2105261209 metadata/md5-cache/media-sound/abcmidi-2021.05.25
 2105261539 metadata/md5-cache/media-sound/rip-1.07-r3
-2105281809 metadata/md5-cache/media-sound/alsa-utils-1.2.4
 2105281909 metadata/md5-cache/media-sound/chuck-1.4.0.1-r1
 2105291209 metadata/md5-cache/media-sound/schismtracker-20210525
 2105291839 metadata/md5-cache/media-sound/asunder-2.9.7
 2105291839 metadata/md5-cache/media-sound/qsampler-0.9.2
 2105301309 metadata/md5-cache/media-sound/qsynth-0.9.2
-2105312239 metadata/md5-cache/media-sound/alsa-utils-1.2.5
 2106011113 metadata/md5-cache/media-sound/apetag-1.12-r3
 2106011113 metadata/md5-cache/media-sound/ardour-6.6-r1
 2106011113 metadata/md5-cache/media-sound/ardour-6.7
 2106011113 metadata/md5-cache/media-sound/ardour-9999
-2106011113 metadata/md5-cache/media-sound/csound-6.15.0-r101
-2106011113 metadata/md5-cache/media-sound/csound-9999
 2106011113 metadata/md5-cache/media-sound/dir2ogg-0.13-r1
 2106011039 metadata/md5-cache/media-sound/drumstick-2.2.1
 2106011113 metadata/md5-cache/media-sound/ecasound-2.9.3
@@ -50452,7 +50201,6 @@
 2106011113 metadata/md5-cache/media-sound/rhythmbox-3.4.4
 2106011113 metadata/md5-cache/media-sound/solfege-3.23.4
 2106011113 metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
-2106011113 metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
 2106020141 metadata/md5-cache/media-sound/audiotools-3.1.1
 2106020141 metadata/md5-cache/media-sound/beets-1.4.9-r6
 2106020141 metadata/md5-cache/media-sound/beets-9999
@@ -50499,12 +50247,10 @@
 2106030240 metadata/md5-cache/media-sound/twolame-0.4.0
 2106030240 metadata/md5-cache/media-sound/wavpack-5.4.0
 2106031009 metadata/md5-cache/media-sound/whipper-0.10.0
-2106040440 metadata/md5-cache/media-sound/Manifest.gz
 2106040440 metadata/md5-cache/media-sound/a2jmidid-9
 2106040440 metadata/md5-cache/media-sound/a2jmidid-9999
 2106032239 metadata/md5-cache/media-sound/cadence-0.9.1
 2106032239 metadata/md5-cache/media-sound/cadence-9999
-2106040440 metadata/md5-cache/media-sound/gnome-music-40.0
 2106040440 metadata/md5-cache/media-sound/gnome-sound-recorder-40.0
 2106040440 metadata/md5-cache/media-sound/lollypop-1.2.35
 2106040440 metadata/md5-cache/media-sound/lollypop-1.4.18
@@ -50527,6 +50273,21 @@
 2106040440 metadata/md5-cache/media-sound/sound-juicer-3.38.0
 2106040109 metadata/md5-cache/media-sound/teamspeak-server-3.13.5
 2106040440 metadata/md5-cache/media-sound/wavbreaker-0.13
+2106071609 metadata/md5-cache/media-sound/Manifest.gz
+2106052339 metadata/md5-cache/media-sound/alsa-tools-1.2.2-r1
+2106052339 metadata/md5-cache/media-sound/alsa-utils-1.2.2
+2106052339 metadata/md5-cache/media-sound/alsa-utils-1.2.3
+2106052339 metadata/md5-cache/media-sound/alsa-utils-1.2.4
+2106052339 metadata/md5-cache/media-sound/alsa-utils-1.2.5-r1
+2106071609 metadata/md5-cache/media-sound/aqualung-1.1-r101
+2106071609 metadata/md5-cache/media-sound/csound-6.15.0-r101
+2106071609 metadata/md5-cache/media-sound/csound-9999
+2106070939 metadata/md5-cache/media-sound/gnome-music-40.0
+2106070939 metadata/md5-cache/media-sound/mikmod-3.2.8
+2106061139 metadata/md5-cache/media-sound/mpg123-1.28.0
+2106060009 metadata/md5-cache/media-sound/mumble-9999
+2106041109 metadata/md5-cache/media-sound/rosegarden-21.06
+2106051410 metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 1702282327 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1702282327 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
@@ -50666,8 +50427,6 @@
 2104192239 metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
 2104281009 metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r2
 2104302039 metadata/md5-cache/media-video/bdsup2sub-4.0.0-r3
-2105081314 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
-2105081314 metadata/md5-cache/media-video/aegisub-9999
 2105081314 metadata/md5-cache/media-video/alevt-1.6.2
 2105081314 metadata/md5-cache/media-video/atomicparsley-0.9.0
 2105081314 metadata/md5-cache/media-video/atomicparsley-wez-0.9.6
@@ -50713,17 +50472,12 @@
 2105081314 metadata/md5-cache/media-video/vdr-2.4.1-r3
 2105091239 metadata/md5-cache/media-video/vdr-2.4.6-r1
 2105081314 metadata/md5-cache/media-video/vdr-2.4.7-r1
-2105081314 metadata/md5-cache/media-video/vlc-3.0.12.1-r100
-2105081314 metadata/md5-cache/media-video/vlc-3.0.13
 2105081314 metadata/md5-cache/media-video/x264-encoder-0.0.20190903
 2105081314 metadata/md5-cache/media-video/x264-encoder-9999
-2105091539 metadata/md5-cache/media-video/kaffeine-2.0.18-r1
 2105101939 metadata/md5-cache/media-video/rav1e-0.3.5
 2105101939 metadata/md5-cache/media-video/rav1e-0.4.0
 2105101939 metadata/md5-cache/media-video/rav1e-0.4.1
 2105101939 metadata/md5-cache/media-video/rav1e-9999
-2105110539 metadata/md5-cache/media-video/vlc-3.0.9999
-2105110539 metadata/md5-cache/media-video/vlc-9999
 2105112109 metadata/md5-cache/media-video/webcamoid-8.7.1
 2105142109 metadata/md5-cache/media-video/oxine-0.7.1-r3
 2105162139 metadata/md5-cache/media-video/libva-utils-2.4.0
@@ -50738,10 +50492,6 @@
 2105311239 metadata/md5-cache/media-video/kino-1.3.4-r1
 2105311239 metadata/md5-cache/media-video/kino-1.3.4-r2
 2106011113 metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
-2106011113 metadata/md5-cache/media-video/mpv-0.33.1-r1
-2106011113 metadata/md5-cache/media-video/mpv-9999
-2106011113 metadata/md5-cache/media-video/obs-studio-26.1.2-r1
-2106011113 metadata/md5-cache/media-video/obs-studio-9999
 2106020141 metadata/md5-cache/media-video/devedeng-4.16.0-r1
 2106020141 metadata/md5-cache/media-video/gaupol-1.8-r1
 2106020141 metadata/md5-cache/media-video/gaupol-1.8-r2
@@ -50752,7 +50502,6 @@
 2106020141 metadata/md5-cache/media-video/openshot-2.5.1_p20210228
 2106020141 metadata/md5-cache/media-video/subliminal-2.1.0-r1
 2106020141 metadata/md5-cache/media-video/subliminal-9999
-2106020141 metadata/md5-cache/media-video/vcsi-7-r1
 2106020141 metadata/md5-cache/media-video/vidcutter-6.0.5
 2106020141 metadata/md5-cache/media-video/vidcutter-9999
 2106020141 metadata/md5-cache/media-video/vidify-2.2.6
@@ -50762,7 +50511,6 @@
 2106030240 metadata/md5-cache/media-video/ffmpeg-4.2.4
 2106030240 metadata/md5-cache/media-video/ffmpeg-4.3.1
 2106030240 metadata/md5-cache/media-video/ffmpeg-4.3.2
-2106030240 metadata/md5-cache/media-video/ffmpeg-4.4
 2106030240 metadata/md5-cache/media-video/ffmpeg-9999
 2106030210 metadata/md5-cache/media-video/guvcview-2.0.6-r2
 2106030240 metadata/md5-cache/media-video/mjpegtools-2.1.0-r4
@@ -50776,8 +50524,6 @@
 2106021839 metadata/md5-cache/media-video/streamdeck-ui-0.0_p20200102-r1
 2106021839 metadata/md5-cache/media-video/streamdeck-ui-9999
 2106030240 metadata/md5-cache/media-video/vcdimager-2.0.1
-2106030409 metadata/md5-cache/media-video/vlc-3.0.14
-2106040440 metadata/md5-cache/media-video/Manifest.gz
 2106040440 metadata/md5-cache/media-video/aravis-0.7.2
 2106040440 metadata/md5-cache/media-video/aravis-0.8.5
 2106040440 metadata/md5-cache/media-video/aravis-9999
@@ -50797,6 +50543,22 @@
 2106040440 metadata/md5-cache/media-video/pipewire-9999
 2106040440 metadata/md5-cache/media-video/pitivi-0.999-r4
 2106040440 metadata/md5-cache/media-video/totem-3.38.0
+2106071609 metadata/md5-cache/media-video/Manifest.gz
+2106071609 metadata/md5-cache/media-video/aegisub-3.2.2_p20160518-r101
+2106071609 metadata/md5-cache/media-video/aegisub-9999
+2106070939 metadata/md5-cache/media-video/ffmpeg-4.4
+2106051410 metadata/md5-cache/media-video/kaffeine-2.0.18-r1
+2106071609 metadata/md5-cache/media-video/mpv-0.33.1-r1
+2106071609 metadata/md5-cache/media-video/mpv-9999
+2106071609 metadata/md5-cache/media-video/obs-studio-26.1.2-r1
+2106071609 metadata/md5-cache/media-video/obs-studio-9999
+2106041039 metadata/md5-cache/media-video/pipewire-0.3.29
+2106070839 metadata/md5-cache/media-video/vcsi-7-r1
+2106071609 metadata/md5-cache/media-video/vlc-3.0.12.1-r100
+2106071609 metadata/md5-cache/media-video/vlc-3.0.13
+2106071609 metadata/md5-cache/media-video/vlc-3.0.14
+2106071609 metadata/md5-cache/media-video/vlc-3.0.9999
+2106071609 metadata/md5-cache/media-video/vlc-9999
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1910071209 metadata/md5-cache/net-analyzer/fprobe-1.1-r3
@@ -50891,9 +50653,7 @@
 2103310541 metadata/md5-cache/net-analyzer/kapacitor-1.5.5
 2103310520 metadata/md5-cache/net-analyzer/lilac-1.0.3-r1
 2103310849 metadata/md5-cache/net-analyzer/multipath-tcp-tools-999999
-2103310541 metadata/md5-cache/net-analyzer/munin-2.0.59
 2103310541 metadata/md5-cache/net-analyzer/munin-2.0.66
-2103310541 metadata/md5-cache/net-analyzer/munin-2.0.67
 2103301639 metadata/md5-cache/net-analyzer/nagios-core-4.4.6-r2
 2103301639 metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r2
 2103310849 metadata/md5-cache/net-analyzer/netselect-9999
@@ -51000,7 +50760,6 @@
 2104121341 metadata/md5-cache/net-analyzer/smokeping-2.7.3
 2104121341 metadata/md5-cache/net-analyzer/sniffit-0.5
 2104121341 metadata/md5-cache/net-analyzer/snort-2.9.16
-2104121341 metadata/md5-cache/net-analyzer/snort-2.9.16-r100
 2104121341 metadata/md5-cache/net-analyzer/softflowd-1.0.0
 2104121341 metadata/md5-cache/net-analyzer/squidview-0.86
 2104121341 metadata/md5-cache/net-analyzer/synscan-5.02
@@ -51011,17 +50770,14 @@
 2104121341 metadata/md5-cache/net-analyzer/tcptrack-1.4.2
 2104121341 metadata/md5-cache/net-analyzer/thcrut-1.2.5-r2
 2104121341 metadata/md5-cache/net-analyzer/thrulay-0.9-r1
-2104121341 metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
 2104121341 metadata/md5-cache/net-analyzer/traceproto-1.1.2_beta1
 2104121341 metadata/md5-cache/net-analyzer/trafshow-5.2.3-r1
 2104121341 metadata/md5-cache/net-analyzer/upnpscan-0.4-r3
 2104141939 metadata/md5-cache/net-analyzer/nessus-agent-bin-8.2.4
 2104141939 metadata/md5-cache/net-analyzer/nessus-bin-8.14.0
-2104161439 metadata/md5-cache/net-analyzer/snort-2.9.17
 2104170739 metadata/md5-cache/net-analyzer/gvm-10.0.1
 2104170739 metadata/md5-cache/net-analyzer/gvm-11.0.0
 2104170739 metadata/md5-cache/net-analyzer/gvm-20.8.0
-2104181109 metadata/md5-cache/net-analyzer/munin-2.0.67-r1
 2104190339 metadata/md5-cache/net-analyzer/netselect-0.4-r2
 2104190039 metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1
 2104180939 metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
@@ -51035,9 +50791,6 @@
 2104282039 metadata/md5-cache/net-analyzer/sslscan-2.0.10
 2104301339 metadata/md5-cache/net-analyzer/amap-5.4-r1
 2104301339 metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1
-2104292139 metadata/md5-cache/net-analyzer/nmap-7.80-r2
-2104292139 metadata/md5-cache/net-analyzer/nmap-7.91-r2
-2104292139 metadata/md5-cache/net-analyzer/nmap-9999
 2104292139 metadata/md5-cache/net-analyzer/nrpe-4.0.0
 2104292139 metadata/md5-cache/net-analyzer/nrpe-4.0.2
 2104302209 metadata/md5-cache/net-analyzer/cacti-spine-1.2.16
@@ -51153,20 +50906,13 @@
 2106011113 metadata/md5-cache/net-analyzer/netdata-1.29.2
 2106011113 metadata/md5-cache/net-analyzer/netdata-1.29.3
 2106011113 metadata/md5-cache/net-analyzer/netdata-1.30.1-r1
-2106011113 metadata/md5-cache/net-analyzer/netdata-1.31.0
-2106011113 metadata/md5-cache/net-analyzer/netdata-9999
-2106011113 metadata/md5-cache/net-analyzer/suricata-5.0.6
-2106011113 metadata/md5-cache/net-analyzer/suricata-6.0.2
 2106011113 metadata/md5-cache/net-analyzer/tcpflow-1.6.1
-2106011113 metadata/md5-cache/net-analyzer/wireshark-3.4.5
-2106011113 metadata/md5-cache/net-analyzer/wireshark-9999
 2106020141 metadata/md5-cache/net-analyzer/2ping-4.5.1
 2106020141 metadata/md5-cache/net-analyzer/carl-0.9-r5
 2106020141 metadata/md5-cache/net-analyzer/fail2ban-0.11.2
 2106020141 metadata/md5-cache/net-analyzer/fail2ban-9999
 2106020141 metadata/md5-cache/net-analyzer/flent-1.3.2
 2106020141 metadata/md5-cache/net-analyzer/graphite-web-1.1.5-r1
-2106020141 metadata/md5-cache/net-analyzer/graphite-web-1.1.7
 2106020141 metadata/md5-cache/net-analyzer/gvm-tools-2.0.0-r1
 2106020141 metadata/md5-cache/net-analyzer/gvm-tools-2.1.0
 2106020141 metadata/md5-cache/net-analyzer/gvm-tools-21.1.0
@@ -51189,7 +50935,6 @@
 2106020141 metadata/md5-cache/net-analyzer/prelude-correlator-5.2.0
 2106020141 metadata/md5-cache/net-analyzer/pypacker-4.9
 2106020141 metadata/md5-cache/net-analyzer/python-gvm-21.1.3
-2106020141 metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
 2106020141 metadata/md5-cache/net-analyzer/scapy-2.4.4-r1
 2106020141 metadata/md5-cache/net-analyzer/scapy-2.4.5
 2106020141 metadata/md5-cache/net-analyzer/scapy-9999
@@ -51202,9 +50947,25 @@
 2106020141 metadata/md5-cache/net-analyzer/wapiti-3.0.4
 2106020141 metadata/md5-cache/net-analyzer/wapiti-9999
 2106030210 metadata/md5-cache/net-analyzer/flowgrind-0.8.0-r2
-2106022309 metadata/md5-cache/net-analyzer/wireshark-3.4.6
-2106032239 metadata/md5-cache/net-analyzer/Manifest.gz
 2106032239 metadata/md5-cache/net-analyzer/squid-graph-3.2-r2
+2106071609 metadata/md5-cache/net-analyzer/Manifest.gz
+2106052239 metadata/md5-cache/net-analyzer/graphite-web-1.1.7
+2106070239 metadata/md5-cache/net-analyzer/munin-2.0.67-r1
+2106070939 metadata/md5-cache/net-analyzer/netdata-1.31.0
+2106070939 metadata/md5-cache/net-analyzer/netdata-9999
+2106071609 metadata/md5-cache/net-analyzer/nmap-7.80-r2
+2106071609 metadata/md5-cache/net-analyzer/nmap-7.91-r2
+2106071609 metadata/md5-cache/net-analyzer/nmap-9999
+2106071609 metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+2106071609 metadata/md5-cache/net-analyzer/snort-2.9.16-r100
+2106071609 metadata/md5-cache/net-analyzer/snort-2.9.17
+2106071609 metadata/md5-cache/net-analyzer/suricata-5.0.6
+2106071609 metadata/md5-cache/net-analyzer/suricata-6.0.2
+2106041109 metadata/md5-cache/net-analyzer/testssl-3.0.5
+2106071609 metadata/md5-cache/net-analyzer/tracebox-0.4.4-r100
+2106071609 metadata/md5-cache/net-analyzer/wireshark-3.4.5
+2106071609 metadata/md5-cache/net-analyzer/wireshark-3.4.6
+2106071609 metadata/md5-cache/net-analyzer/wireshark-9999
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2012311940 metadata/md5-cache/net-dialup/ppp-scripts-0
 2012311940 metadata/md5-cache/net-dialup/wvdial-1.61
@@ -51235,16 +50996,16 @@
 2105081314 metadata/md5-cache/net-dialup/rp-pppoe-3.14
 2105081314 metadata/md5-cache/net-dialup/xc-4.3.2-r4
 2105131709 metadata/md5-cache/net-dialup/ppp-2.4.9-r2
-2105171209 metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
-2105171209 metadata/md5-cache/net-dialup/accel-ppp-9999
 2105180040 metadata/md5-cache/net-dialup/sendpage-1.1.0-r4
 2105201809 metadata/md5-cache/net-dialup/rp-pppoe-3.15
 2105291209 metadata/md5-cache/net-dialup/moserial-3.0.16
 2105311239 metadata/md5-cache/net-dialup/linux-atm-2.5.2
-2106011113 metadata/md5-cache/net-dialup/Manifest.gz
 2106011113 metadata/md5-cache/net-dialup/freeradius-3.0.20-r1
 2106011113 metadata/md5-cache/net-dialup/freeradius-3.0.21-r1
 2106011113 metadata/md5-cache/net-dialup/freeradius-3.0.22
+2106071609 metadata/md5-cache/net-dialup/Manifest.gz
+2106071609 metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
+2106071609 metadata/md5-cache/net-dialup/accel-ppp-9999
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 1810090339 metadata/md5-cache/net-dns/s6-dns-2.3.0.1
 1906221109 metadata/md5-cache/net-dns/s6-dns-2.3.0.2
@@ -51280,22 +51041,14 @@
 2105022009 metadata/md5-cache/net-dns/nsd-4.3.4
 2105022009 metadata/md5-cache/net-dns/nsd-4.3.5
 2105022009 metadata/md5-cache/net-dns/nsd-4.3.6
-2105022239 metadata/md5-cache/net-dns/pdns-4.4.0-r100
 2105081314 metadata/md5-cache/net-dns/djbdns-1.05-r33
 2105081314 metadata/md5-cache/net-dns/djbdns-1.05-r35
-2105081314 metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
 2105081314 metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
 2105081314 metadata/md5-cache/net-dns/https_dns_proxy-0_pre20200925
 2105081314 metadata/md5-cache/net-dns/https_dns_proxy-9999
-2105081314 metadata/md5-cache/net-dns/pdns-recursor-4.4.2-r100
 2105101939 metadata/md5-cache/net-dns/dog-0.1.0
 2105122209 metadata/md5-cache/net-dns/bind-tools-9.16.15
-2105122339 metadata/md5-cache/net-dns/pdns-4.4.1
-2105122339 metadata/md5-cache/net-dns/pdns-recursor-4.4.3
-2105122339 metadata/md5-cache/net-dns/pdns-recursor-4.5.1
-2105150609 metadata/md5-cache/net-dns/dnsmasq-2.85
 2105161609 metadata/md5-cache/net-dns/mydns-1.2.8.31-r2
-2105171910 metadata/md5-cache/net-dns/dnsdist-1.6.0
 2105180040 metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r2
 2105180040 metadata/md5-cache/net-dns/fpdns-0.10.0_pre20130404-r1
 2105260410 metadata/md5-cache/net-dns/coredns-1.6.9
@@ -51320,8 +51073,15 @@
 2106030240 metadata/md5-cache/net-dns/unbound-1.13.0
 2106030240 metadata/md5-cache/net-dns/unbound-1.13.0-r1
 2106030240 metadata/md5-cache/net-dns/unbound-1.13.1
-2106032239 metadata/md5-cache/net-dns/Manifest.gz
 2106032239 metadata/md5-cache/net-dns/bind-9.16.15
+2106071609 metadata/md5-cache/net-dns/Manifest.gz
+2106071609 metadata/md5-cache/net-dns/dnsdist-1.5.1-r100
+2106071609 metadata/md5-cache/net-dns/dnsdist-1.6.0
+2106071609 metadata/md5-cache/net-dns/dnsmasq-2.85
+2106070839 metadata/md5-cache/net-dns/maradns-3.5.0020
+2106071609 metadata/md5-cache/net-dns/pdns-4.4.1
+2106071609 metadata/md5-cache/net-dns/pdns-recursor-4.4.3
+2106071609 metadata/md5-cache/net-dns/pdns-recursor-4.5.1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2103301639 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -51332,7 +51092,6 @@
 2103310520 metadata/md5-cache/net-firewall/firehol-3.1.7
 2103310849 metadata/md5-cache/net-firewall/ipt_netflow-2.5.1-r1
 2103310849 metadata/md5-cache/net-firewall/ipt_netflow-9999
-2103310520 metadata/md5-cache/net-firewall/nfacct-1.0.2
 2103310520 metadata/md5-cache/net-firewall/sanewall-1.1.6-r3
 2103310520 metadata/md5-cache/net-firewall/shorewall-5.2.8
 2104121341 metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
@@ -51357,9 +51116,10 @@
 2106011113 metadata/md5-cache/net-firewall/nftables-0.9.9
 2106011113 metadata/md5-cache/net-firewall/nftables-9999
 2106020141 metadata/md5-cache/net-firewall/ufw-0.36
-2106031039 metadata/md5-cache/net-firewall/Manifest.gz
 2106031039 metadata/md5-cache/net-firewall/firewalld-0.9.1-r1
 2106031039 metadata/md5-cache/net-firewall/firewalld-0.9.3-r1
+2106070939 metadata/md5-cache/net-firewall/Manifest.gz
+2106070939 metadata/md5-cache/net-firewall/nfacct-1.0.2
 1702282328 metadata/md5-cache/net-fs/openafs-legacy-0.1
 2012181339 metadata/md5-cache/net-fs/wdfs-1.4.2-r2
 2101312209 metadata/md5-cache/net-fs/smbnetfs-0.6.3
@@ -51469,7 +51229,6 @@
 2105101139 metadata/md5-cache/net-im/telegram-desktop-bin-2.7.4
 2105150209 metadata/md5-cache/net-im/prosody-modules-0_pre20210515
 2105161410 metadata/md5-cache/net-im/choqok-1.7.0
-2105160309 metadata/md5-cache/net-im/prosody-0.11.9
 2105180040 metadata/md5-cache/net-im/sendxmpp-1.24
 2105191009 metadata/md5-cache/net-im/signal-cli-bin-0.8.1
 2105210809 metadata/md5-cache/net-im/neochat-1.1.1
@@ -51486,13 +51245,10 @@
 2106011239 metadata/md5-cache/net-im/ejabberd-20.07
 2106011239 metadata/md5-cache/net-im/ejabberd-21.04
 2106011113 metadata/md5-cache/net-im/empathy-3.12.14
-2106011113 metadata/md5-cache/net-im/pidgin-2.14.1
 2106011113 metadata/md5-cache/net-im/pidgin-2.14.3-r1
 2106011113 metadata/md5-cache/net-im/pidgin-2.14.4
 2106011113 metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
-2106011113 metadata/md5-cache/net-im/swift-4.0.2-r102
 2106011113 metadata/md5-cache/net-im/telegram-desktop-2.7.1-r2
-2106011113 metadata/md5-cache/net-im/telegram-desktop-2.7.4
 2106011113 metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
 2106011113 metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
 2106011113 metadata/md5-cache/net-im/toxic-0.10.0-r1
@@ -51520,9 +51276,12 @@
 2106030240 metadata/md5-cache/net-im/slack-4.12.2
 2106030240 metadata/md5-cache/net-im/slack-4.13.0
 2106030240 metadata/md5-cache/net-im/slack-4.14.0
-2106030539 metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
-2106040739 metadata/md5-cache/net-im/Manifest.gz
 2106040739 metadata/md5-cache/net-im/element-desktop-bin-1.7.29
+2106071609 metadata/md5-cache/net-im/Manifest.gz
+2106041539 metadata/md5-cache/net-im/pidgin-2.14.5
+2106071609 metadata/md5-cache/net-im/prosody-0.11.9
+2106071609 metadata/md5-cache/net-im/swift-4.0.2-r102
+2106042209 metadata/md5-cache/net-im/telegram-desktop-2.7.4-r1
 2002112051 metadata/md5-cache/net-irc/bnc-2.9.4-r1
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2008302209 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
@@ -51543,7 +51302,6 @@
 2104030209 metadata/md5-cache/net-irc/eggdrop-1.9.0
 2104040139 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r1
 2104120016 metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
-2104121341 metadata/md5-cache/net-irc/epic5-2.0.1
 2104161439 metadata/md5-cache/net-irc/onis-0.8.2-r1
 2104180939 metadata/md5-cache/net-irc/cgiirc-0.5.10
 2105010839 metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r2
@@ -51578,8 +51336,6 @@
 2106011113 metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236-r1
 2106011113 metadata/md5-cache/net-irc/kvirc-9999
 2106011113 metadata/md5-cache/net-irc/telepathy-idle-0.2.2
-2106011113 metadata/md5-cache/net-irc/weechat-3.1
-2106011113 metadata/md5-cache/net-irc/weechat-9999
 2106011113 metadata/md5-cache/net-irc/znc-1.8.1
 2106011113 metadata/md5-cache/net-irc/znc-palaver-1.2.1
 2106020141 metadata/md5-cache/net-irc/eggdrop-1.9.1
@@ -51589,10 +51345,13 @@
 2106020141 metadata/md5-cache/net-irc/quasselgrep-0_p20200830
 2106012139 metadata/md5-cache/net-irc/znc-1.8.2
 2106012139 metadata/md5-cache/net-irc/znc-9999
-2106040440 metadata/md5-cache/net-irc/Manifest.gz
-2106040440 metadata/md5-cache/net-irc/hexchat-2.14.3-r100
-2106040440 metadata/md5-cache/net-irc/hexchat-9999
 2106040440 metadata/md5-cache/net-irc/polari-3.36.3
+2106071609 metadata/md5-cache/net-irc/Manifest.gz
+2106071139 metadata/md5-cache/net-irc/epic5-2.0.1
+2106071609 metadata/md5-cache/net-irc/hexchat-2.14.3-r100
+2106071609 metadata/md5-cache/net-irc/hexchat-9999
+2106071609 metadata/md5-cache/net-irc/weechat-3.1
+2106071609 metadata/md5-cache/net-irc/weechat-9999
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
 1907151840 metadata/md5-cache/net-libs/libsrsirc-0.0.14-r1
 2004032241 metadata/md5-cache/net-libs/rpc2-2.14
@@ -51758,7 +51517,6 @@
 2105081314 metadata/md5-cache/net-libs/libupnp-1.14.5
 2105081314 metadata/md5-cache/net-libs/libvncserver-0.9.13
 2105081314 metadata/md5-cache/net-libs/libwebsockets-4.1.6
-2105081314 metadata/md5-cache/net-libs/libwebsockets-4.2.0
 2105090839 metadata/md5-cache/net-libs/libzapojit-0.0.3
 2105081314 metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
 2105081314 metadata/md5-cache/net-libs/net6-1.3.14-r2
@@ -51796,10 +51554,8 @@
 2105220709 metadata/md5-cache/net-libs/gnet-2.0.8-r3
 2105261209 metadata/md5-cache/net-libs/libnftnl-1.2.0
 2105280639 metadata/md5-cache/net-libs/libbitcoinconsensus-0.21.0
-2105280039 metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1
 2105280039 metadata/md5-cache/net-libs/libnetconf2-2.0.1
 2105271709 metadata/md5-cache/net-libs/xrootd-ceph-5.2.0
-2105291209 metadata/md5-cache/net-libs/libgfbgraph-0.2.4
 2105291839 metadata/md5-cache/net-libs/libmbim-1.24.6
 2105291839 metadata/md5-cache/net-libs/libqmi-1.28.4
 2105300510 metadata/md5-cache/net-libs/grpc-1.38.0
@@ -51812,9 +51568,6 @@
 2106011113 metadata/md5-cache/net-libs/nodejs-12.22.1-r1
 2106011113 metadata/md5-cache/net-libs/nodejs-14.16.1
 2106011113 metadata/md5-cache/net-libs/nodejs-14.17.0
-2106011113 metadata/md5-cache/net-libs/nodejs-16.1.0
-2106011113 metadata/md5-cache/net-libs/nodejs-16.2.0
-2106011113 metadata/md5-cache/net-libs/nodejs-99999999
 2106011113 metadata/md5-cache/net-libs/pacparser-1.3.7-r1
 2106011113 metadata/md5-cache/net-libs/serf-1.3.9-r2
 2106011113 metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
@@ -51835,7 +51588,6 @@
 2106020141 metadata/md5-cache/net-libs/stem-1.8.0-r1
 2106020609 metadata/md5-cache/net-libs/telepathy-glib-0.24.2
 2106020609 metadata/md5-cache/net-libs/uhttpmock-0.5.3
-2106030240 metadata/md5-cache/net-libs/axtls-2.1.5-r100
 2106030240 metadata/md5-cache/net-libs/gnutls-3.7.1
 2106030240 metadata/md5-cache/net-libs/gnutls-3.7.2
 2106030240 metadata/md5-cache/net-libs/gssdp-1.0.3
@@ -51889,7 +51641,6 @@
 2106030240 metadata/md5-cache/net-libs/socket_wrapper-1.3.2
 2106030240 metadata/md5-cache/net-libs/srt-1.4.2
 2106030240 metadata/md5-cache/net-libs/srt-9999
-2106040440 metadata/md5-cache/net-libs/Manifest.gz
 2106040440 metadata/md5-cache/net-libs/dleyna-connector-dbus-0.4.0
 2106040440 metadata/md5-cache/net-libs/dleyna-core-0.7.0
 2106040440 metadata/md5-cache/net-libs/dleyna-renderer-0.7.0
@@ -51898,7 +51649,6 @@
 2106040440 metadata/md5-cache/net-libs/gssdp-1.2.3
 2106040440 metadata/md5-cache/net-libs/gtk-vnc-1.2.0
 2106040440 metadata/md5-cache/net-libs/gupnp-1.2.6
-2106031909 metadata/md5-cache/net-libs/ldns-1.7.1-r2
 2106040440 metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2
 2106040440 metadata/md5-cache/net-libs/libesmtp-1.0.6_p20200824
 2106040440 metadata/md5-cache/net-libs/libesmtp-9999
@@ -51917,6 +51667,18 @@
 2106032239 metadata/md5-cache/net-libs/onion-9999
 2106040440 metadata/md5-cache/net-libs/phodav-2.5
 2106040440 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
+2106071609 metadata/md5-cache/net-libs/Manifest.gz
+2106071609 metadata/md5-cache/net-libs/axtls-2.1.5-r100
+2106070939 metadata/md5-cache/net-libs/ldns-1.7.1-r2
+2106070939 metadata/md5-cache/net-libs/libgfbgraph-0.2.4
+2106070109 metadata/md5-cache/net-libs/libmbim-1.24.8
+2106070239 metadata/md5-cache/net-libs/libnetconf2-1.1.43-r1
+2106051939 metadata/md5-cache/net-libs/libnetconf2-1.1.46
+2106070109 metadata/md5-cache/net-libs/libqmi-1.28.6
+2106070939 metadata/md5-cache/net-libs/libwebsockets-4.2.0
+2106051939 metadata/md5-cache/net-libs/libyang-1.0.240
+2106041509 metadata/md5-cache/net-libs/nodejs-16.3.0
+2106041509 metadata/md5-cache/net-libs/nodejs-99999999
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1805290208 metadata/md5-cache/net-mail/nmzmail-1.1
 1711271440 metadata/md5-cache/net-mail/qprint-1.1
@@ -51981,8 +51743,6 @@
 2105021609 metadata/md5-cache/net-mail/asmail-2.1-r1
 2105021609 metadata/md5-cache/net-mail/dbmail-3.2.3-r3
 2105021609 metadata/md5-cache/net-mail/dbmail-3.2.5
-2105031339 metadata/md5-cache/net-mail/dovecot-2.3.13-r100
-2105031339 metadata/md5-cache/net-mail/dovecot-2.3.14
 2105021809 metadata/md5-cache/net-mail/fdm-2.0
 2105021809 metadata/md5-cache/net-mail/fdm-2.0-r1
 2105021809 metadata/md5-cache/net-mail/isync-1.3.1
@@ -52018,7 +51778,6 @@
 2105280939 metadata/md5-cache/net-mail/courier-imap-5.1.2
 2105280939 metadata/md5-cache/net-mail/courier-imap-5.1.3
 2106011113 metadata/md5-cache/net-mail/fetchmail-6.4.16
-2106011113 metadata/md5-cache/net-mail/fetchmail-6.4.19
 2106011113 metadata/md5-cache/net-mail/fetchmail-6.4.8
 2106011113 metadata/md5-cache/net-mail/mailutils-3.12-r1
 2106011113 metadata/md5-cache/net-mail/queue-repair-0.9.0-r2
@@ -52038,8 +51797,13 @@
 2106020141 metadata/md5-cache/net-mail/rss2email-3.12.3
 2106020141 metadata/md5-cache/net-mail/rss2email-3.13
 2106020141 metadata/md5-cache/net-mail/rss2email-3.13.1
-2106031009 metadata/md5-cache/net-mail/Manifest.gz
 2106031009 metadata/md5-cache/net-mail/checkpassword-0.90-r4
+2106071609 metadata/md5-cache/net-mail/Manifest.gz
+2106061939 metadata/md5-cache/net-mail/automx2-2021.4
+2106071609 metadata/md5-cache/net-mail/dovecot-2.3.13-r100
+2106071609 metadata/md5-cache/net-mail/dovecot-2.3.14
+2106070939 metadata/md5-cache/net-mail/fetchmail-6.4.19
+2106041809 metadata/md5-cache/net-mail/fetchmail-7.0.0_alpha8
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
 1702282329 metadata/md5-cache/net-misc/blinkperl-20030301-r2
@@ -52294,7 +52058,6 @@
 2104250839 metadata/md5-cache/net-misc/mstpd-0.0.9
 2104272239 metadata/md5-cache/net-misc/teamviewer-15.17.6-r1
 2104290509 metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1
-2104281939 metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r1
 2104290509 metadata/md5-cache/net-misc/minissdpd-1.5.20190824
 2104300409 metadata/md5-cache/net-misc/icaclient-21.3.0.38
 2104300409 metadata/md5-cache/net-misc/icaclient-21.4.0.11
@@ -52312,7 +52075,6 @@
 2105012139 metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
 2105011339 metadata/md5-cache/net-misc/wget2-1.99.2
 2105011339 metadata/md5-cache/net-misc/wget2-9999
-2105021539 metadata/md5-cache/net-misc/asterisk-13.38.2
 2105021539 metadata/md5-cache/net-misc/axel-2.17.10
 2105021539 metadata/md5-cache/net-misc/axel-2.17.8
 2105021539 metadata/md5-cache/net-misc/axel-2.17.9
@@ -52344,7 +52106,6 @@
 2105081314 metadata/md5-cache/net-misc/freerdp-2.3.2
 2105081314 metadata/md5-cache/net-misc/freerdp-2.9999
 2105081314 metadata/md5-cache/net-misc/freerdp-9999
-2105081314 metadata/md5-cache/net-misc/gerbera-1.8.0
 2105081314 metadata/md5-cache/net-misc/gerbera-9999
 2105081314 metadata/md5-cache/net-misc/grive-0.5.1-r1
 2105081314 metadata/md5-cache/net-misc/grive-0.5.2_pre20200205
@@ -52368,15 +52129,12 @@
 2105081314 metadata/md5-cache/net-misc/nextcloud-client-3.1.2
 2105081314 metadata/md5-cache/net-misc/ntp-4.2.8_p15
 2105081314 metadata/md5-cache/net-misc/omnisync-1.0_p20200130
-2105081314 metadata/md5-cache/net-misc/owncloud-client-2.7.4.2934
-2105081314 metadata/md5-cache/net-misc/owncloud-client-2.7.5.3180
 2105081314 metadata/md5-cache/net-misc/owncloud-client-2.7.6.3261
 2105081314 metadata/md5-cache/net-misc/proxytunnel-1.10.20200907
 2105081314 metadata/md5-cache/net-misc/proxytunnel-1.10.20210128
 2105081314 metadata/md5-cache/net-misc/proxytunnel-9999
 2105081314 metadata/md5-cache/net-misc/ptpd-2.3.1-r1
 2105081314 metadata/md5-cache/net-misc/ptpd-2.3.1-r2
-2105091139 metadata/md5-cache/net-misc/putty-0.75
 2105081314 metadata/md5-cache/net-misc/qtm-1.3.19-r1
 2105081314 metadata/md5-cache/net-misc/quagga-1.2.4
 2105081314 metadata/md5-cache/net-misc/rdate-1.4-r4
@@ -52413,7 +52171,6 @@
 2105100109 metadata/md5-cache/net-misc/whois-5.5.9
 2105101939 metadata/md5-cache/net-misc/websocat-1.6.0-r2
 2105111939 metadata/md5-cache/net-misc/remmina-1.4.16
-2105130739 metadata/md5-cache/net-misc/asterisk-13.38.2-r2
 2105132339 metadata/md5-cache/net-misc/chrony-4.1-r1
 2105140339 metadata/md5-cache/net-misc/kea-1.8.2
 2105131709 metadata/md5-cache/net-misc/kea-1.9.4
@@ -52438,8 +52195,6 @@
 2105190939 metadata/md5-cache/net-misc/batctl-2021.0
 2105200510 metadata/md5-cache/net-misc/anydesk-6.1.1
 2105201139 metadata/md5-cache/net-misc/kafka-bin-2.8.0
-2105221839 metadata/md5-cache/net-misc/asterisk-13.38.2-r3
-2105221839 metadata/md5-cache/net-misc/asterisk-16.18.0-r1
 2105230439 metadata/md5-cache/net-misc/remmina-1.4.17
 2105240639 metadata/md5-cache/net-misc/chrony-4.0-r2
 2105232009 metadata/md5-cache/net-misc/mikutter-4.1.5
@@ -52461,13 +52216,10 @@
 2105260009 metadata/md5-cache/net-misc/nextcloud-client-3.2.1
 2105260410 metadata/md5-cache/net-misc/rclone-1.53.3
 2105260410 metadata/md5-cache/net-misc/rclone-9999
-2105280039 metadata/md5-cache/net-misc/netopeer2-1.1.70-r1
 2105280039 metadata/md5-cache/net-misc/netopeer2-2.0.0
 2105271339 metadata/md5-cache/net-misc/nextcloud-client-3.1.3
 2105272239 metadata/md5-cache/net-misc/openssh-8.6_p1-r1
-2105280039 metadata/md5-cache/net-misc/sysrepo-1.4.122-r1
 2105280039 metadata/md5-cache/net-misc/sysrepo-2.0.1
-2105281139 metadata/md5-cache/net-misc/usbip-4.13-r1
 2105291739 metadata/md5-cache/net-misc/pedro-1.6-r1
 2105281909 metadata/md5-cache/net-misc/radvd-2.19-r1
 2105312109 metadata/md5-cache/net-misc/nextcloud-client-3.2.2
@@ -52475,7 +52227,6 @@
 2106011113 metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33
 2106011113 metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r2
 2106011113 metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1
-2106011113 metadata/md5-cache/net-misc/econnman-1.1-r2
 2106011113 metadata/md5-cache/net-misc/frr-7.5.1-r3
 2106011113 metadata/md5-cache/net-misc/ntpsec-1.1.9
 2106011113 metadata/md5-cache/net-misc/ntpsec-9999
@@ -52522,21 +52273,12 @@
 2106020141 metadata/md5-cache/net-misc/streamlink-2.0.0
 2106020141 metadata/md5-cache/net-misc/streamlink-9999
 2106020609 metadata/md5-cache/net-misc/vinagre-3.22.0-r3
-2106020141 metadata/md5-cache/net-misc/you-get-0.4.1520
-2106020141 metadata/md5-cache/net-misc/you-get-0.4.1525
-2106020141 metadata/md5-cache/net-misc/youtube-dl-2021.04.26
-2106020141 metadata/md5-cache/net-misc/youtube-dl-2021.05.16
-2106020141 metadata/md5-cache/net-misc/youtube-dl-9999
 2106031009 metadata/md5-cache/net-misc/clockspeed-0.62-r7
 2106030240 metadata/md5-cache/net-misc/curl-7.76.1
 2106030240 metadata/md5-cache/net-misc/curl-7.77.0
 2106030240 metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
 2106030240 metadata/md5-cache/net-misc/networkmanager-1.30.4
-2106021739 metadata/md5-cache/net-misc/wget-1.21.1
-2106040639 metadata/md5-cache/net-misc/Manifest.gz
-2106032239 metadata/md5-cache/net-misc/asterisk-18.4.0-r1
 2106040440 metadata/md5-cache/net-misc/casync-2_p20190407
-2106040309 metadata/md5-cache/net-misc/dhcp-4.4.2_p1
 2106040440 metadata/md5-cache/net-misc/dleyna-server-0.7.0
 2106040639 metadata/md5-cache/net-misc/dleyna-server-0.7.0-r1
 2106040440 metadata/md5-cache/net-misc/eventd-0.27.0-r1
@@ -52555,6 +52297,33 @@
 2106040440 metadata/md5-cache/net-misc/spice-gtk-0.38-r1
 2106040440 metadata/md5-cache/net-misc/spice-gtk-0.39
 2106040440 metadata/md5-cache/net-misc/spice-gtk-9999
+2106071639 metadata/md5-cache/net-misc/Manifest.gz
+2106071609 metadata/md5-cache/net-misc/asterisk-13.38.2
+2106071609 metadata/md5-cache/net-misc/asterisk-13.38.2-r2
+2106071609 metadata/md5-cache/net-misc/asterisk-13.38.2-r3
+2106071609 metadata/md5-cache/net-misc/asterisk-16.18.0-r1
+2106071609 metadata/md5-cache/net-misc/asterisk-18.4.0-r1
+2106070939 metadata/md5-cache/net-misc/dhcp-4.4.2_p1
+2106060839 metadata/md5-cache/net-misc/econnman-1.1-r2
+2106051539 metadata/md5-cache/net-misc/gerbera-1.8.2
+2106070939 metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r1
+2106070109 metadata/md5-cache/net-misc/modemmanager-1.16.6
+2106070239 metadata/md5-cache/net-misc/netopeer2-1.1.70-r1
+2106051939 metadata/md5-cache/net-misc/netopeer2-1.1.76
+2106060009 metadata/md5-cache/net-misc/openvswitch-2.15.0
+2106041309 metadata/md5-cache/net-misc/owncloud-client-2.8.2.4246
+2106041809 metadata/md5-cache/net-misc/proxytunnel-1.10.20210604
+2106071639 metadata/md5-cache/net-misc/putty-0.75
+2106070239 metadata/md5-cache/net-misc/sysrepo-1.4.122-r1
+2106051939 metadata/md5-cache/net-misc/sysrepo-1.4.140
+2106071509 metadata/md5-cache/net-misc/usbip-4.13-r1
+2106070139 metadata/md5-cache/net-misc/wget-1.21.1
+2106071139 metadata/md5-cache/net-misc/whois-5.5.10
+2106052339 metadata/md5-cache/net-misc/you-get-0.4.1525
+2106051109 metadata/md5-cache/net-misc/you-get-0.4.1527
+2106061039 metadata/md5-cache/net-misc/youtube-dl-2021.05.16
+2106060109 metadata/md5-cache/net-misc/youtube-dl-2021.06.06
+2106071339 metadata/md5-cache/net-misc/youtube-dl-9999
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2103310520 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -52627,9 +52396,7 @@
 2104121341 metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
 2104121341 metadata/md5-cache/net-p2p/rtorrent-0.9.8
 2104121341 metadata/md5-cache/net-p2p/syrep-0.9
-2104130209 metadata/md5-cache/net-p2p/vuze-5.7.6.0
 2104161439 metadata/md5-cache/net-p2p/gtorrentviewer-0.2b
-2104180939 metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
 2104180939 metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
 2104292109 metadata/md5-cache/net-p2p/classified-ads-0.13
 2104302009 metadata/md5-cache/net-p2p/ctorrent-3.3.2-r4
@@ -52641,8 +52408,6 @@
 2105081314 metadata/md5-cache/net-p2p/cpuminer-opt-9999
 2105081314 metadata/md5-cache/net-p2p/dbhub-0.451-r1
 2105081314 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
-2105081314 metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
-2105081314 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
 2105081314 metadata/md5-cache/net-p2p/fms-0.3.82
 2105081314 metadata/md5-cache/net-p2p/litecoind-0.10.4.0-r1
 2105081314 metadata/md5-cache/net-p2p/mldonkey-3.1.7-r2
@@ -52666,7 +52431,6 @@
 2106011113 metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.0
 2106011113 metadata/md5-cache/net-p2p/tremc-0.9.2
 2106020141 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r2
-2106020141 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
 2106020141 metadata/md5-cache/net-p2p/deluge-2.0.3-r8
 2106020141 metadata/md5-cache/net-p2p/deluge-9999
 2106020141 metadata/md5-cache/net-p2p/nicotine+-2.2.2
@@ -52674,8 +52438,12 @@
 2106020141 metadata/md5-cache/net-p2p/nicotine+-3.0.4
 2106020141 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 2106030139 metadata/md5-cache/net-p2p/syncthing-1.17.0
-2106031939 metadata/md5-cache/net-p2p/Manifest.gz
 2106031939 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r1
+2106071609 metadata/md5-cache/net-p2p/Manifest.gz
+2106070939 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r3
+2106071609 metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
+2106071609 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+2106061139 metadata/md5-cache/net-p2p/freenet-0.7.5_p1488-r1
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
 1702282329 metadata/md5-cache/net-print/ink-0.5.2
@@ -52791,7 +52559,6 @@
 2106020141 metadata/md5-cache/net-voip/sipvicious-0.3.3
 2004170509 metadata/md5-cache/net-vpn/mullvad-netns-0.2
 2004261409 metadata/md5-cache/net-vpn/networkmanager-sstp-1.2.0-r1
-2103310849 metadata/md5-cache/net-vpn/i2p-0.9.47
 2103310849 metadata/md5-cache/net-vpn/i2p-0.9.48
 2103310520 metadata/md5-cache/net-vpn/isatapd-0.9.7-r2
 2103301639 metadata/md5-cache/net-vpn/libreswan-3.32
@@ -52823,7 +52590,6 @@
 2104161439 metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.2
 2104161439 metadata/md5-cache/net-vpn/vpncwatch-1.8.1
 2104240909 metadata/md5-cache/net-vpn/libreswan-4.4
-2104250009 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210424
 2104272139 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
 2104290039 metadata/md5-cache/net-vpn/libreswan-4.3
 2104280009 metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.14
@@ -52861,8 +52627,9 @@
 2106011113 metadata/md5-cache/net-vpn/tor-0.4.5.7
 2106011113 metadata/md5-cache/net-vpn/tor-0.4.6.3_rc
 2106020141 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
-2106031139 metadata/md5-cache/net-vpn/Manifest.gz
-2106031139 metadata/md5-cache/net-vpn/strongswan-5.9.2
+2106071209 metadata/md5-cache/net-vpn/Manifest.gz
+2106070939 metadata/md5-cache/net-vpn/strongswan-5.9.2
+2106061309 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20210606
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -53027,7 +52794,6 @@
 2106011809 metadata/md5-cache/net-wireless/unifi-6.2.26
 2106030240 metadata/md5-cache/net-wireless/bluez-5.55
 2106030240 metadata/md5-cache/net-wireless/bluez-5.56-r1
-2106030240 metadata/md5-cache/net-wireless/bluez-5.58
 2106030210 metadata/md5-cache/net-wireless/gnuradio-3.8.2.0-r2
 2106030210 metadata/md5-cache/net-wireless/gnuradio-9999
 2106030409 metadata/md5-cache/net-wireless/kismet-2021.05.1
@@ -53037,13 +52803,14 @@
 2106022039 metadata/md5-cache/net-wireless/urh-2.9.2
 2106022039 metadata/md5-cache/net-wireless/urh-9999
 2106031009 metadata/md5-cache/net-wireless/wavemon-0.9.3-r1
-2106040440 metadata/md5-cache/net-wireless/Manifest.gz
 2106040440 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
+2106051410 metadata/md5-cache/net-wireless/Manifest.gz
+2106051410 metadata/md5-cache/net-wireless/bluez-5.58
+2106051410 metadata/md5-cache/net-wireless/bluez-5.58-r1
 2105180040 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
 2105180040 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2105180040 metadata/md5-cache/perl-core/CPAN-Meta-Requirements-2.125.0-r1
 2105180040 metadata/md5-cache/perl-core/Data-Dumper-2.154.0
-2105180040 metadata/md5-cache/perl-core/Devel-PPPort-3.310.0
 2105180040 metadata/md5-cache/perl-core/Digest-1.170.0-r1
 2105180040 metadata/md5-cache/perl-core/Digest-MD5-2.530.0
 2105180040 metadata/md5-cache/perl-core/Digest-SHA-5.880.0
@@ -53079,16 +52846,14 @@
 2105180040 metadata/md5-cache/perl-core/Text-Tabs+Wrap-2013.52.300-r1
 2105180040 metadata/md5-cache/perl-core/Thread-Semaphore-2.120.0-r1
 2105180040 metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
-2105180040 metadata/md5-cache/perl-core/Time-Local-1.230.0-r1
 2105180040 metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
-2105180040 metadata/md5-cache/perl-core/Unicode-Normalize-1.250.0
 2105180040 metadata/md5-cache/perl-core/libnet-1.270.0
 2105180040 metadata/md5-cache/perl-core/parent-0.228-r1
 2105180040 metadata/md5-cache/perl-core/podlators-2.5.3
 2105180040 metadata/md5-cache/perl-core/version-0.990.800
 2105190139 metadata/md5-cache/perl-core/File-Temp-0.231.100
-2105281809 metadata/md5-cache/perl-core/Manifest.gz
 2105281809 metadata/md5-cache/perl-core/Unicode-Collate-1.290.0
+2106062039 metadata/md5-cache/perl-core/Manifest.gz
 2008171609 metadata/md5-cache/ros-meta/mavros-1.2.0
 2008171609 metadata/md5-cache/ros-meta/mavros-9999
 2010141409 metadata/md5-cache/ros-meta/mavros-1.4.0
@@ -53260,8 +53025,6 @@
 2104161439 metadata/md5-cache/sci-astronomy/wcstools-3.9.5
 2104180939 metadata/md5-cache/sci-astronomy/xephem-3.7.7
 2105041239 metadata/md5-cache/sci-astronomy/gasgano-2.4.8
-2105081314 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
-2105081314 metadata/md5-cache/sci-astronomy/celestia-9999
 2105081314 metadata/md5-cache/sci-astronomy/esomidas-17.02-r1
 2105081314 metadata/md5-cache/sci-astronomy/galaxy-2.2-r1
 2105081314 metadata/md5-cache/sci-astronomy/montage-5.0
@@ -53284,9 +53047,11 @@
 2105311239 metadata/md5-cache/sci-astronomy/healpix-3.31
 2105311239 metadata/md5-cache/sci-astronomy/pal-0.9.7
 2106011113 metadata/md5-cache/sci-astronomy/stellarium-0.20.3
-2106011113 metadata/md5-cache/sci-astronomy/stellarium-0.20.4
-2106020141 metadata/md5-cache/sci-astronomy/Manifest.gz
 2106020141 metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
+2106071639 metadata/md5-cache/sci-astronomy/Manifest.gz
+2106071609 metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316-r100
+2106071609 metadata/md5-cache/sci-astronomy/celestia-9999
+2106071639 metadata/md5-cache/sci-astronomy/stellarium-0.20.4
 1806091739 metadata/md5-cache/sci-biology/aaindex-9.1-r1
 1703082208 metadata/md5-cache/sci-biology/biosql-1.0.1-r1
 1702282330 metadata/md5-cache/sci-biology/iqpnni-3.3.2-r1
@@ -53346,7 +53111,6 @@
 2104051739 metadata/md5-cache/sci-biology/sibsim4-0.20
 2104051739 metadata/md5-cache/sci-biology/update-blastdb-12.0.0
 2104120442 metadata/md5-cache/sci-biology/ApE-2.0.7-r1
-2104120442 metadata/md5-cache/sci-biology/amap-2.2-r3
 2104120442 metadata/md5-cache/sci-biology/picard-1.103
 2104121341 metadata/md5-cache/sci-biology/abyss-2.0.3-r2
 2104121341 metadata/md5-cache/sci-biology/bfast-0.7.0a
@@ -53425,8 +53189,9 @@
 2106020141 metadata/md5-cache/sci-biology/biopython-1.77
 2106020141 metadata/md5-cache/sci-biology/pysam-0.16.0.1
 2106032239 metadata/md5-cache/sci-biology/GBrowse-2.48-r1
-2106032239 metadata/md5-cache/sci-biology/Manifest.gz
 2106032239 metadata/md5-cache/sci-biology/bioperl-run-1.6.9
+2106062109 metadata/md5-cache/sci-biology/Manifest.gz
+2106062109 metadata/md5-cache/sci-biology/amap-2.2-r4
 2004241039 metadata/md5-cache/sci-calculators/datamash-1.7
 2101022239 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
 2104060140 metadata/md5-cache/sci-calculators/pcalc-3-r1
@@ -53444,10 +53209,10 @@
 2105161410 metadata/md5-cache/sci-calculators/keurocalc-1.3.0
 2105261609 metadata/md5-cache/sci-calculators/qalculate-gtk-3.19.0
 2105282309 metadata/md5-cache/sci-calculators/qalculate-gtk-3.18.0
-2106010209 metadata/md5-cache/sci-calculators/pcalc-4
 2106011113 metadata/md5-cache/sci-calculators/units-2.21
-2106021609 metadata/md5-cache/sci-calculators/Manifest.gz
 2106021609 metadata/md5-cache/sci-calculators/bc-gh-4.0.2
+2106042139 metadata/md5-cache/sci-calculators/Manifest.gz
+2106042139 metadata/md5-cache/sci-calculators/pcalc-4
 1808262139 metadata/md5-cache/sci-chemistry/xds-bin-20170930
 2002230040 metadata/md5-cache/sci-chemistry/bodr-10
 2009162339 metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
@@ -53479,7 +53244,6 @@
 2104180939 metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
 2104180939 metadata/md5-cache/sci-chemistry/mustang-3.2.2
 2104180939 metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20
-2104180939 metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
 2105081314 metadata/md5-cache/sci-chemistry/avogadro2-1.93.0
 2105081314 metadata/md5-cache/sci-chemistry/mm-align-20120321
 2105081314 metadata/md5-cache/sci-chemistry/molden-5.5
@@ -53518,7 +53282,6 @@
 2106020141 metadata/md5-cache/sci-chemistry/propka-3.2.0
 2106020141 metadata/md5-cache/sci-chemistry/pymol-2.4.0-r1
 2106020141 metadata/md5-cache/sci-chemistry/pymol-2.5.0
-2106030210 metadata/md5-cache/sci-chemistry/Manifest.gz
 2106022009 metadata/md5-cache/sci-chemistry/gromacs-2018.8
 2106022009 metadata/md5-cache/sci-chemistry/gromacs-2019.6
 2106022009 metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -53533,6 +53296,7 @@
 2106030210 metadata/md5-cache/sci-chemistry/numbat-0.999-r2
 2106030210 metadata/md5-cache/sci-chemistry/theseus-3.3.0-r1
 2106030210 metadata/md5-cache/sci-chemistry/votca-ctp-1.5.1-r1
+2106061909 metadata/md5-cache/sci-chemistry/Manifest.gz
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 1704192008 metadata/md5-cache/sci-electronics/labone-16.12.42529
 1804171239 metadata/md5-cache/sci-electronics/vbs-1.4.0
@@ -53544,7 +53308,6 @@
 2101231224 metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
 2101231224 metadata/md5-cache/sci-electronics/gtkwave-3.3.106
 2101231224 metadata/md5-cache/sci-electronics/voacapl-0.7.6
-2102222209 metadata/md5-cache/sci-electronics/kicad-meta-5.1.9
 2102241939 metadata/md5-cache/sci-electronics/fritzing-0.9.4-r2
 2103310849 metadata/md5-cache/sci-electronics/qelectrotech-9999
 2104052009 metadata/md5-cache/sci-electronics/qelectrotech-0.80
@@ -53579,11 +53342,6 @@
 2105081314 metadata/md5-cache/sci-electronics/gnucap-0.35.20091207-r1
 2105081314 metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
 2105081314 metadata/md5-cache/sci-electronics/gspiceui-1.1.0
-2105081314 metadata/md5-cache/sci-electronics/kicad-footprints-5.1.9
-2105081314 metadata/md5-cache/sci-electronics/kicad-i18n-5.1.9
-2105081314 metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.9
-2105081314 metadata/md5-cache/sci-electronics/kicad-symbols-5.1.9
-2105081314 metadata/md5-cache/sci-electronics/kicad-templates-5.1.9
 2105081314 metadata/md5-cache/sci-electronics/ktechlab-0.50.0-r1
 2105081314 metadata/md5-cache/sci-electronics/osqoop-1.2.0_pre20170131
 2105081314 metadata/md5-cache/sci-electronics/puff-20100127-r1
@@ -53591,9 +53349,7 @@
 2105121314 metadata/md5-cache/sci-electronics/gazebo-11.5.1
 2105232109 metadata/md5-cache/sci-electronics/librepcb-0.1.3
 2105310009 metadata/md5-cache/sci-electronics/librepcb-0.1.5
-2106011113 metadata/md5-cache/sci-electronics/Manifest.gz
 2106011113 metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
-2106011113 metadata/md5-cache/sci-electronics/kicad-5.1.9
 2106011113 metadata/md5-cache/sci-electronics/klayout-0.26.11
 2106011113 metadata/md5-cache/sci-electronics/klayout-0.27
 2106011113 metadata/md5-cache/sci-electronics/klayout-9999
@@ -53602,6 +53358,14 @@
 2106011113 metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1-r1
 2106011113 metadata/md5-cache/sci-electronics/sigrok-cli-0.7.2
 2106011113 metadata/md5-cache/sci-electronics/sigrok-cli-9999
+2106050239 metadata/md5-cache/sci-electronics/Manifest.gz
+2106050239 metadata/md5-cache/sci-electronics/kicad-5.1.10
+2106050239 metadata/md5-cache/sci-electronics/kicad-footprints-5.1.10
+2106050239 metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10
+2106050239 metadata/md5-cache/sci-electronics/kicad-meta-5.1.10
+2106050239 metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
+2106050239 metadata/md5-cache/sci-electronics/kicad-symbols-5.1.10
+2106050239 metadata/md5-cache/sci-electronics/kicad-templates-5.1.10
 1902251809 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
 1702282330 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1
 1702282330 metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r1
@@ -53679,12 +53443,9 @@
 2105081314 metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-9999
 2105081314 metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
 2105081314 metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-9999
-2105081314 metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
-2105081314 metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
 2105081314 metadata/md5-cache/sci-geosciences/qmapshack-1.15.2-r2
 2105251439 metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
 2105251509 metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
-2105251739 metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
 2105280439 metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0
 2105280439 metadata/md5-cache/sci-geosciences/gpsbabel-9999
 2105271009 metadata/md5-cache/sci-geosciences/gpxsee-9.0
@@ -53702,9 +53463,13 @@
 2106012239 metadata/md5-cache/sci-geosciences/qgis-3.18.3
 2106012239 metadata/md5-cache/sci-geosciences/qgis-9999
 2106020141 metadata/md5-cache/sci-geosciences/routino-3.3.3
-2106040440 metadata/md5-cache/sci-geosciences/Manifest.gz
 2106040440 metadata/md5-cache/sci-geosciences/geocode-glib-3.26.2
 2106040440 metadata/md5-cache/sci-geosciences/gnome-maps-40.1
+2106071609 metadata/md5-cache/sci-geosciences/Manifest.gz
+2106070109 metadata/md5-cache/sci-geosciences/gnome-maps-40.2
+2106071609 metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
+2106071609 metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+2106040809 metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1702282331 metadata/md5-cache/sci-libs/idlmarkwardt-20160319
@@ -53750,7 +53515,6 @@
 2101231224 metadata/md5-cache/sci-libs/xgks-pmel-2.5.5
 2101241709 metadata/md5-cache/sci-libs/nfft-3.5.2
 2101271009 metadata/md5-cache/sci-libs/lrslib-071
-2102050739 metadata/md5-cache/sci-libs/openlibm-0.7.4
 2102150339 metadata/md5-cache/sci-libs/idlcoyote-20161220
 2102161539 metadata/md5-cache/sci-libs/proj-7.2.1
 2102181209 metadata/md5-cache/sci-libs/cholmod-3.0.14
@@ -53825,11 +53589,7 @@
 2104161439 metadata/md5-cache/sci-libs/cifparse-obj-7.105
 2104161439 metadata/md5-cache/sci-libs/libint-2.6.0-r2
 2104161439 metadata/md5-cache/sci-libs/libpdb-991112-r1
-2104161439 metadata/md5-cache/sci-libs/libsc-2.2-r100
-2104161439 metadata/md5-cache/sci-libs/libsc-9999
 2104161439 metadata/md5-cache/sci-libs/lrslib-062
-2104161439 metadata/md5-cache/sci-libs/p4est-2.2-r100
-2104161439 metadata/md5-cache/sci-libs/p4est-9999
 2104161439 metadata/md5-cache/sci-libs/rosetta-db-3.4
 2104161439 metadata/md5-cache/sci-libs/superlu_mt-3.1
 2104180939 metadata/md5-cache/sci-libs/cdd+-077a
@@ -53848,7 +53608,6 @@
 2105050139 metadata/md5-cache/sci-libs/matio-1.5.21
 2105081314 metadata/md5-cache/sci-libs/ViSP-3.3.0
 2105081314 metadata/md5-cache/sci-libs/avogadrolibs-1.93.0
-2105081314 metadata/md5-cache/sci-libs/cbflib-0.9.3.3
 2105081314 metadata/md5-cache/sci-libs/cgcode-1.0-r2
 2105081314 metadata/md5-cache/sci-libs/cgnslib-3.4.0
 2105081314 metadata/md5-cache/sci-libs/clapack-3.2.1-r8
@@ -53894,7 +53653,6 @@
 2105081314 metadata/md5-cache/sci-libs/libccd-2.1
 2105081314 metadata/md5-cache/sci-libs/libccd-9999
 2105081314 metadata/md5-cache/sci-libs/libdap-3.18.1
-2105081314 metadata/md5-cache/sci-libs/libecpint-1.0.5
 2105081314 metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20201009
 2105081314 metadata/md5-cache/sci-libs/libigl-2.2.0
 2105081314 metadata/md5-cache/sci-libs/liborigin-3.0.0
@@ -53917,7 +53675,6 @@
 2105081314 metadata/md5-cache/sci-libs/openblas-0.3.14
 2105081314 metadata/md5-cache/sci-libs/openblas-0.3.15
 2105081314 metadata/md5-cache/sci-libs/opencascade-7.4.0-r4
-2105081314 metadata/md5-cache/sci-libs/opencascade-7.5.1
 2105081314 metadata/md5-cache/sci-libs/orocos-bfl-0.8.0
 2105081314 metadata/md5-cache/sci-libs/orocos_kdl-1.4.0-r2
 2105081314 metadata/md5-cache/sci-libs/orocos_kdl-9999
@@ -53996,7 +53753,6 @@
 2106011113 metadata/md5-cache/sci-libs/linux-gpib-4.3.4
 2106011113 metadata/md5-cache/sci-libs/med-4.1.0
 2106011113 metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
-2106011113 metadata/md5-cache/sci-libs/plplot-5.15.0-r101
 2106011113 metadata/md5-cache/sci-libs/volk-2.4.1
 2106011113 metadata/md5-cache/sci-libs/vtk-8.2.0
 2106011113 metadata/md5-cache/sci-libs/vtk-8.2.0-r1
@@ -54024,8 +53780,6 @@
 2106020141 metadata/md5-cache/sci-libs/tensorflow-estimator-2.3.0
 2106020141 metadata/md5-cache/sci-libs/tensorflow-estimator-2.4.0
 2106020439 metadata/md5-cache/sci-libs/vtk-9.0.1
-2106030240 metadata/md5-cache/sci-libs/Manifest.gz
-2106030240 metadata/md5-cache/sci-libs/ceres-solver-1.14.0
 2106030240 metadata/md5-cache/sci-libs/cfitsio-3.490
 2106030240 metadata/md5-cache/sci-libs/cxsparse-3.2.0
 2106030210 metadata/md5-cache/sci-libs/dealii-9.2.0-r1
@@ -54037,6 +53791,17 @@
 2106030210 metadata/md5-cache/sci-libs/mathgl-2.4.4-r1
 2106030240 metadata/md5-cache/sci-libs/mkl-2020.4.304
 2106030240 metadata/md5-cache/sci-libs/suitesparseconfig-5.4.0
+2106071609 metadata/md5-cache/sci-libs/Manifest.gz
+2106051609 metadata/md5-cache/sci-libs/ceres-solver-1.14.0
+2106071609 metadata/md5-cache/sci-libs/libsc-2.2-r100
+2106071609 metadata/md5-cache/sci-libs/libsc-9999
+2106062109 metadata/md5-cache/sci-libs/libsvm-3.25
+2106041109 metadata/md5-cache/sci-libs/opencascade-7.5.1-r1
+2106071609 metadata/md5-cache/sci-libs/p4est-2.2-r100
+2106071609 metadata/md5-cache/sci-libs/p4est-9999
+2106071609 metadata/md5-cache/sci-libs/plplot-5.15.0-r102
+2106051739 metadata/md5-cache/sci-libs/rtree-0.9.7
+2106060510 metadata/md5-cache/sci-libs/volk-2.5.0
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
 1912080309 metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -54159,9 +53924,10 @@
 2106011113 metadata/md5-cache/sci-mathematics/slepc-3.15.0
 2106020141 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
 2106011509 metadata/md5-cache/sci-mathematics/singular-4.2.0_p3
-2106030240 metadata/md5-cache/sci-mathematics/Manifest.gz
 2106030210 metadata/md5-cache/sci-mathematics/gsl-shell-2.3.0_beta1-r1
 2106030240 metadata/md5-cache/sci-mathematics/z3-4.8.10
+2106051139 metadata/md5-cache/sci-mathematics/Manifest.gz
+2106051139 metadata/md5-cache/sci-mathematics/z3-4.8.11
 2007260509 metadata/md5-cache/sci-misc/tango-9.2.5a
 2101231224 metadata/md5-cache/sci-misc/cdfplayer-12.2.0
 2101231224 metadata/md5-cache/sci-misc/fitsverify-4.18
@@ -54181,15 +53947,15 @@
 2105192139 metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
 2105192139 metadata/md5-cache/sci-misc/netlogo-bin-6.0.2-r1
 2105192139 metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
-2106020141 metadata/md5-cache/sci-misc/Manifest.gz
-2106020141 metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+2106061739 metadata/md5-cache/sci-misc/Manifest.gz
+2106052109 metadata/md5-cache/sci-misc/vitables-3.0.0-r2
+2106061739 metadata/md5-cache/sci-misc/vitables-3.0.2
 2011181909 metadata/md5-cache/sci-physics/geant-data-4.10.6.3
 2012051809 metadata/md5-cache/sci-physics/geant-data-4.10.7
 2102140209 metadata/md5-cache/sci-physics/looptools-2.15
 2102140209 metadata/md5-cache/sci-physics/siscone-3.0.5
 2103041409 metadata/md5-cache/sci-physics/geant-data-4.10.7.1
 2103311110 metadata/md5-cache/sci-physics/yoda-1.8.5
-2104120442 metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
 2104121341 metadata/md5-cache/sci-physics/pythia-6.4.28-r2
 2104192339 metadata/md5-cache/sci-physics/thepeg-2.0.4
 2105081314 metadata/md5-cache/sci-physics/bullet-3.07
@@ -54221,10 +53987,10 @@
 2106011113 metadata/md5-cache/sci-physics/root-6.24.00
 2106011113 metadata/md5-cache/sci-physics/root-6.24.9999
 2106011113 metadata/md5-cache/sci-physics/root-9999
-2106021609 metadata/md5-cache/sci-physics/Manifest.gz
 2106021609 metadata/md5-cache/sci-physics/bullet-3.17
 2106020141 metadata/md5-cache/sci-physics/lhapdf-6.3.0
 2106020141 metadata/md5-cache/sci-physics/qmeq-1.0_p202004
+2106062039 metadata/md5-cache/sci-physics/Manifest.gz
 1702282331 metadata/md5-cache/sci-visualization/circos-0.55-r1
 2101231224 metadata/md5-cache/sci-visualization/fig2sxd-0.22.1
 2102241843 metadata/md5-cache/sci-visualization/grace-5.1.25_p7
@@ -54240,10 +54006,6 @@
 2104290509 metadata/md5-cache/sci-visualization/opendx-samples-4.4.0-r2
 2104290509 metadata/md5-cache/sci-visualization/xgraph-12.1-r4
 2105041239 metadata/md5-cache/sci-visualization/gcalc-3.1_rc1-r2
-2105081314 metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
-2105081314 metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
-2105081314 metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
-2105081314 metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
 2105081314 metadata/md5-cache/sci-visualization/gr-0.50.0-r2
 2105081314 metadata/md5-cache/sci-visualization/gr-0.53.0
 2105081314 metadata/md5-cache/sci-visualization/opendx-4.4.4-r7
@@ -54267,12 +54029,13 @@
 2106021039 metadata/md5-cache/sci-visualization/paraview-5.9.1
 2106021109 metadata/md5-cache/sci-visualization/veusz-3.2
 2106021109 metadata/md5-cache/sci-visualization/veusz-3.3.1
-2106030210 metadata/md5-cache/sci-visualization/Manifest.gz
 2106030210 metadata/md5-cache/sci-visualization/kst-2.0.8-r1
 2106030210 metadata/md5-cache/sci-visualization/scidavis-2.4.0-r1
-2003191139 metadata/md5-cache/sec-policy/apparmor-profiles-2.13.4
-2010101309 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0
-2011251039 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.0-r1
+2106071609 metadata/md5-cache/sci-visualization/Manifest.gz
+2106071609 metadata/md5-cache/sci-visualization/fityk-1.3.1-r100
+2106071609 metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r1
+2106071609 metadata/md5-cache/sci-visualization/gnuplot-5.4.1-r2
+2106071609 metadata/md5-cache/sci-visualization/gnuplot-5.5.9999-r1
 2012030639 metadata/md5-cache/sec-policy/selinux-abrt-2.20200818-r2
 2012030639 metadata/md5-cache/sec-policy/selinux-accountsd-2.20200818-r2
 2012030639 metadata/md5-cache/sec-policy/selinux-acct-2.20200818-r2
@@ -55028,12 +54791,12 @@
 2104030739 metadata/md5-cache/sec-policy/selinux-xscreensaver-2.20210203-r1
 2104030739 metadata/md5-cache/sec-policy/selinux-xserver-2.20210203-r1
 2104030739 metadata/md5-cache/sec-policy/selinux-zabbix-2.20210203-r1
-2104290639 metadata/md5-cache/sec-policy/Manifest.gz
 2104290509 metadata/md5-cache/sec-policy/selinux-base-policy-2.20200818-r2
 2104290509 metadata/md5-cache/sec-policy/selinux-base-policy-2.20210203-r1
 2104290509 metadata/md5-cache/sec-policy/selinux-base-policy-9999
 2104290639 metadata/md5-cache/sec-policy/selinux-wireguard-2.20210203-r1
 2104290639 metadata/md5-cache/sec-policy/selinux-wireguard-9999
+2106041039 metadata/md5-cache/sec-policy/Manifest.gz
 1907281509 metadata/md5-cache/sys-apps/ckbcomp-1.164
 1711271440 metadata/md5-cache/sys-apps/clrngd-1.0.3
 1805272138 metadata/md5-cache/sys-apps/dnotify-0.18.0
@@ -55141,7 +54904,6 @@
 2101231224 metadata/md5-cache/sys-apps/ucspi-unix-1.0
 2101231224 metadata/md5-cache/sys-apps/usbmon-6.1
 2101231224 metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
-2101240209 metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
 2102061339 metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
 2102072039 metadata/md5-cache/sys-apps/edid-decode-0_pre20201230
 2102081709 metadata/md5-cache/sys-apps/usbguard-0.7.6-r1
@@ -55152,8 +54914,6 @@
 2102241843 metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
 2102241939 metadata/md5-cache/sys-apps/stroke-0.1.3-r1
 2103281039 metadata/md5-cache/sys-apps/init-system-helpers-1.60
-2103301639 metadata/md5-cache/sys-apps/apparmor-2.13.4
-2103301639 metadata/md5-cache/sys-apps/apparmor-3.0.0
 2103301639 metadata/md5-cache/sys-apps/apparmor-3.0.1
 2103301639 metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1
 2103310849 metadata/md5-cache/sys-apps/edid-decode-9999
@@ -55165,7 +54925,6 @@
 2103301639 metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
 2103310520 metadata/md5-cache/sys-apps/hd-idle-1.05-r1
 2103310520 metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
-2103310520 metadata/md5-cache/sys-apps/likwid-4.3.4
 2103310849 metadata/md5-cache/sys-apps/logwatch-9999
 2103310520 metadata/md5-cache/sys-apps/minijail-12
 2103301639 metadata/md5-cache/sys-apps/nvme-cli-1.10.1
@@ -55241,7 +55000,6 @@
 2104121341 metadata/md5-cache/sys-apps/preload-0.6.4-r3
 2104121341 metadata/md5-cache/sys-apps/radeontool-1.6.3_p20181127
 2104121341 metadata/md5-cache/sys-apps/renameutils-0.12.0
-2104121341 metadata/md5-cache/sys-apps/servicelog-1.1.15
 2104121341 metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0
 2104121341 metadata/md5-cache/sys-apps/uam-9999
 2104121341 metadata/md5-cache/sys-apps/usbguard-0.7.8
@@ -55284,7 +55042,6 @@
 2104180939 metadata/md5-cache/sys-apps/superdiag-1.4.0.20201120
 2104180939 metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214
 2104180939 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0-r1
-2104180939 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
 2104180939 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
 2104180939 metadata/md5-cache/sys-apps/zorroutils-0.05
 2104200039 metadata/md5-cache/sys-apps/fakechroot-2.20.1
@@ -55346,7 +55103,6 @@
 2105081314 metadata/md5-cache/sys-apps/openrc-9999
 2105081314 metadata/md5-cache/sys-apps/pcmciautils-018_p8-r3
 2105081314 metadata/md5-cache/sys-apps/qingy-1.0.0-r5
-2105081314 metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
 2105081314 metadata/md5-cache/sys-apps/rtl-entropy-0.1.2_p20180118-r1
 2105081314 metadata/md5-cache/sys-apps/sed-4.8
 2105081314 metadata/md5-cache/sys-apps/sensei-raw-ctl-0.0_pre20180729
@@ -55391,7 +55147,6 @@
 2105142339 metadata/md5-cache/sys-apps/help2man-1.48.3
 2105151909 metadata/md5-cache/sys-apps/inxi-3.3.04.1
 2105142339 metadata/md5-cache/sys-apps/kbd-2.4.0
-2105151639 metadata/md5-cache/sys-apps/less-586
 2105141239 metadata/md5-cache/sys-apps/logwatch-7.5.5
 2105142339 metadata/md5-cache/sys-apps/man-db-2.9.4
 2105141239 metadata/md5-cache/sys-apps/memtester-4.5.0
@@ -55460,20 +55215,11 @@
 2106020141 metadata/md5-cache/sys-apps/pkgcore-0.11.6-r1
 2106020141 metadata/md5-cache/sys-apps/pkgcore-0.11.8-r3
 2106020141 metadata/md5-cache/sys-apps/pkgcore-0.12.0
-2106020141 metadata/md5-cache/sys-apps/pkgcore-0.12.1
-2106020141 metadata/md5-cache/sys-apps/pkgcore-9999
 2106020141 metadata/md5-cache/sys-apps/portage-3.0.13
 2106020141 metadata/md5-cache/sys-apps/portage-3.0.17-r2
 2106020141 metadata/md5-cache/sys-apps/portage-3.0.18
-2106020141 metadata/md5-cache/sys-apps/portage-3.0.19
-2106020141 metadata/md5-cache/sys-apps/portage-9999
 2106020609 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.2
-2106030240 metadata/md5-cache/sys-apps/acl-2.2.53-r1
-2106030240 metadata/md5-cache/sys-apps/acl-2.3.0
 2106030240 metadata/md5-cache/sys-apps/acl-2.3.1
-2106030240 metadata/md5-cache/sys-apps/attr-2.4.48-r4
-2106030240 metadata/md5-cache/sys-apps/attr-2.4.48-r5
-2106030240 metadata/md5-cache/sys-apps/attr-2.5.0
 2106030240 metadata/md5-cache/sys-apps/attr-2.5.1
 2106030240 metadata/md5-cache/sys-apps/attr-9999
 2106030240 metadata/md5-cache/sys-apps/dbus-1.12.20-r1
@@ -55491,18 +55237,15 @@
 2106030240 metadata/md5-cache/sys-apps/sandbox-2.21
 2106030240 metadata/md5-cache/sys-apps/sandbox-2.22
 2106030240 metadata/md5-cache/sys-apps/sandbox-2.23
-2106030240 metadata/md5-cache/sys-apps/sandbox-2.24
 2106030240 metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28-r1
 2106030240 metadata/md5-cache/sys-apps/util-linux-2.36.2
 2106030240 metadata/md5-cache/sys-apps/util-linux-2.37
 2106030240 metadata/md5-cache/sys-apps/util-linux-9999
-2106040440 metadata/md5-cache/sys-apps/Manifest.gz
 2106040440 metadata/md5-cache/sys-apps/accountsservice-0.6.55
 2106031839 metadata/md5-cache/sys-apps/ack-3.5.0
 2106040440 metadata/md5-cache/sys-apps/baobab-40.0
 2106040440 metadata/md5-cache/sys-apps/bolt-0.9-r2
 2106040440 metadata/md5-cache/sys-apps/bolt-0.9-r3
-2106040440 metadata/md5-cache/sys-apps/dbus-broker-27
 2106040440 metadata/md5-cache/sys-apps/dbus-broker-28
 2106040440 metadata/md5-cache/sys-apps/dbus-broker-9999
 2106032239 metadata/md5-cache/sys-apps/duc-1.4.3-r1
@@ -55522,6 +55265,24 @@
 2106040440 metadata/md5-cache/sys-apps/systemd-9999
 2106040440 metadata/md5-cache/sys-apps/systemd-tmpfiles-246
 2106040440 metadata/md5-cache/sys-apps/systemd-tmpfiles-248.3
+2106071609 metadata/md5-cache/sys-apps/Manifest.gz
+2106060709 metadata/md5-cache/sys-apps/bolt-0.9.1
+2106062039 metadata/md5-cache/sys-apps/dbus-broker-29
+2106062039 metadata/md5-cache/sys-apps/flatpak-1.11.1
+2106041539 metadata/md5-cache/sys-apps/less-590
+2106071609 metadata/md5-cache/sys-apps/likwid-4.3.4
+2106050239 metadata/md5-cache/sys-apps/lsvpd-1.7.12
+2106070109 metadata/md5-cache/sys-apps/osinfo-db-20210531
+2106041109 metadata/md5-cache/sys-apps/pkgcore-0.12.1
+2106041109 metadata/md5-cache/sys-apps/pkgcore-9999
+2106041039 metadata/md5-cache/sys-apps/portage-3.0.19
+2106060039 metadata/md5-cache/sys-apps/portage-9999
+2106050409 metadata/md5-cache/sys-apps/ppc64-diag-2.7.7
+2106071609 metadata/md5-cache/sys-apps/qcontrol-0.4.2-r100
+2106071609 metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r100
+2106070939 metadata/md5-cache/sys-apps/sandbox-2.24
+2106050239 metadata/md5-cache/sys-apps/servicelog-1.1.15
+2106051410 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
 2101231224 metadata/md5-cache/sys-auth/pam_krb5-4.9
@@ -55597,9 +55358,6 @@
 2106021939 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.3
 2106030240 metadata/md5-cache/sys-auth/sssd-2.3.1-r2
 2106030240 metadata/md5-cache/sys-auth/sssd-2.5.0
-2106040440 metadata/md5-cache/sys-auth/Manifest.gz
-2106040440 metadata/md5-cache/sys-auth/elogind-246.10-r1
-2106040440 metadata/md5-cache/sys-auth/elogind-246.9.2
 2106040440 metadata/md5-cache/sys-auth/fprintd-1.90.8
 2106040440 metadata/md5-cache/sys-auth/fprintd-1.90.9
 2106040440 metadata/md5-cache/sys-auth/libfprint-1.0
@@ -55609,11 +55367,14 @@
 2106040239 metadata/md5-cache/sys-auth/polkit-0.116-r1
 2106040239 metadata/md5-cache/sys-auth/polkit-0.117
 2106040239 metadata/md5-cache/sys-auth/polkit-0.118
-2106040239 metadata/md5-cache/sys-auth/polkit-0.119
 2106040440 metadata/md5-cache/sys-auth/rtkit-0.13-r1
 2106040440 metadata/md5-cache/sys-auth/seatd-0.4.0-r1
 2106040440 metadata/md5-cache/sys-auth/seatd-0.5.0
 2106040440 metadata/md5-cache/sys-auth/seatd-9999
+2106070939 metadata/md5-cache/sys-auth/Manifest.gz
+2106050109 metadata/md5-cache/sys-auth/elogind-246.10-r1
+2106050109 metadata/md5-cache/sys-auth/elogind-246.9.2
+2106070939 metadata/md5-cache/sys-auth/polkit-0.119
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/flashbench-20120606
@@ -55710,9 +55471,10 @@
 2105291839 metadata/md5-cache/sys-block/gparted-1.3.0
 2105292209 metadata/md5-cache/sys-block/scsiping-0.0.1-r1
 2106011113 metadata/md5-cache/sys-block/fio-3.20-r2
-2106020141 metadata/md5-cache/sys-block/Manifest.gz
 2106020141 metadata/md5-cache/sys-block/seekwatcher-0.13
 2106020141 metadata/md5-cache/sys-block/targetcli-fb-2.1.53
+2106070739 metadata/md5-cache/sys-block/Manifest.gz
+2106070739 metadata/md5-cache/sys-block/fio-3.27
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
 1910191339 metadata/md5-cache/sys-boot/nettrom-2.3.3
@@ -55749,7 +55511,6 @@
 2105081314 metadata/md5-cache/sys-boot/gnu-efi-3.0.11
 2105081314 metadata/md5-cache/sys-boot/gnu-efi-3.0.12
 2105081314 metadata/md5-cache/sys-boot/grub-2.06_rc1
-2105081314 metadata/md5-cache/sys-boot/lilo-24.2
 2105081314 metadata/md5-cache/sys-boot/milo-2.4.18
 2105081314 metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
 2105081314 metadata/md5-cache/sys-boot/plymouth-9999
@@ -55762,8 +55523,9 @@
 2105131709 metadata/md5-cache/sys-boot/efibootmgr-17
 2105131709 metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1
 2106011113 metadata/md5-cache/sys-boot/grub-9999
-2106040440 metadata/md5-cache/sys-boot/Manifest.gz
 2106040440 metadata/md5-cache/sys-boot/systemd-boot-245
+2106070009 metadata/md5-cache/sys-boot/Manifest.gz
+2106070009 metadata/md5-cache/sys-boot/lilo-24.2
 1712240039 metadata/md5-cache/sys-cluster/native-mpi-0
 1911101439 metadata/md5-cache/sys-cluster/onesis-2.0.2
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
@@ -55811,7 +55573,6 @@
 2104121341 metadata/md5-cache/sys-cluster/kronosnet-1.19
 2104121341 metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
 2104121341 metadata/md5-cache/sys-cluster/libquo-9999
-2104121341 metadata/md5-cache/sys-cluster/lmod-9999
 2104121341 metadata/md5-cache/sys-cluster/ucx-1.10.0_rc5
 2104121341 metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
 2104161439 metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
@@ -55820,14 +55581,12 @@
 2104161439 metadata/md5-cache/sys-cluster/resource-agents-3.9.6
 2104161439 metadata/md5-cache/sys-cluster/resource-agents-4.0.1
 2104161439 metadata/md5-cache/sys-cluster/resource-agents-4.6.1
-2104170739 metadata/md5-cache/sys-cluster/vzctl-4.9.4
 2104180939 metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
 2104180939 metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
 2104180939 metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
 2104180939 metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
 2104180939 metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
 2104180939 metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
-2104291739 metadata/md5-cache/sys-cluster/lmod-8.4.20
 2105011039 metadata/md5-cache/sys-cluster/torque-4.1.7-r1
 2105011039 metadata/md5-cache/sys-cluster/torque-4.2.10-r1
 2105051639 metadata/md5-cache/sys-cluster/ipvsadm-1.31
@@ -55852,7 +55611,6 @@
 2105081314 metadata/md5-cache/sys-cluster/openmpi-1.8.8
 2105081314 metadata/md5-cache/sys-cluster/torque-6.0.4-r1
 2105081314 metadata/md5-cache/sys-cluster/wulfware-2.6.0
-2105180040 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
 2105260410 metadata/md5-cache/sys-cluster/gmqtt-0.3.0
 2105260410 metadata/md5-cache/sys-cluster/gmqtt-0.3.1
 2105260410 metadata/md5-cache/sys-cluster/k3s-1.19.10-r1
@@ -55962,7 +55720,6 @@
 2106020141 metadata/md5-cache/sys-cluster/ceph-14.2.21
 2106020141 metadata/md5-cache/sys-cluster/ceph-15.2.12
 2106020141 metadata/md5-cache/sys-cluster/ceph-15.2.13
-2106020141 metadata/md5-cache/sys-cluster/ceph-16.2.4
 2106020141 metadata/md5-cache/sys-cluster/cinder-17.1.0
 2106020141 metadata/md5-cache/sys-cluster/cinder-2020.2.9999
 2106020141 metadata/md5-cache/sys-cluster/heat-15.0.0
@@ -55990,10 +55747,15 @@
 2106030240 metadata/md5-cache/sys-cluster/openmpi-4.0.3
 2106030240 metadata/md5-cache/sys-cluster/openmpi-4.0.4
 2106030240 metadata/md5-cache/sys-cluster/openmpi-4.0.5
-2106032239 metadata/md5-cache/sys-cluster/Manifest.gz
 2106032239 metadata/md5-cache/sys-cluster/keepalived-2.0.20
 2106032239 metadata/md5-cache/sys-cluster/keepalived-2.1.5
 2106032239 metadata/md5-cache/sys-cluster/keepalived-2.2.2
+2106071609 metadata/md5-cache/sys-cluster/Manifest.gz
+2106071609 metadata/md5-cache/sys-cluster/ceph-16.2.4
+2106071609 metadata/md5-cache/sys-cluster/lmod-8.4.20
+2106071609 metadata/md5-cache/sys-cluster/lmod-9999
+2106071609 metadata/md5-cache/sys-cluster/slurm-20.11.0.1-r101
+2106071139 metadata/md5-cache/sys-cluster/vzctl-4.9.4
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1910271939 metadata/md5-cache/sys-devel/ucpp-1.3.4
 2002112051 metadata/md5-cache/sys-devel/ct-ng-1.24.0
@@ -56108,12 +55870,9 @@
 2106011113 metadata/md5-cache/sys-devel/distcc-3.3.3-r3
 2106011113 metadata/md5-cache/sys-devel/distcc-3.4
 2106011113 metadata/md5-cache/sys-devel/gdb-10.1
-2106011113 metadata/md5-cache/sys-devel/gdb-10.2
 2106011113 metadata/md5-cache/sys-devel/gdb-9999
 2106011113 metadata/md5-cache/sys-devel/lld-10.0.1
-2106011113 metadata/md5-cache/sys-devel/lld-10.0.1-r1
 2106011113 metadata/md5-cache/sys-devel/lld-11.1.0
-2106011113 metadata/md5-cache/sys-devel/lld-11.1.0-r1
 2106011113 metadata/md5-cache/sys-devel/lld-12.0.0
 2106011113 metadata/md5-cache/sys-devel/lld-12.0.1.9999
 2106011113 metadata/md5-cache/sys-devel/lld-12.0.1_rc1
@@ -56136,7 +55895,6 @@
 2106012039 metadata/md5-cache/sys-devel/kgcc64-10.3.0
 2106012039 metadata/md5-cache/sys-devel/kgcc64-11.1.0
 2106012039 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
-2106030240 metadata/md5-cache/sys-devel/Manifest.gz
 2106030240 metadata/md5-cache/sys-devel/clang-10.0.1
 2106030240 metadata/md5-cache/sys-devel/clang-11.1.0
 2106030240 metadata/md5-cache/sys-devel/clang-12.0.0-r1
@@ -56150,7 +55908,6 @@
 2106030240 metadata/md5-cache/sys-devel/clang-runtime-12.0.1_rc1
 2106030240 metadata/md5-cache/sys-devel/clang-runtime-13.0.0.9999
 2106030240 metadata/md5-cache/sys-devel/flex-2.6.4-r1
-2106021709 metadata/md5-cache/sys-devel/gcc-10.3.0
 2106030240 metadata/md5-cache/sys-devel/gettext-0.21
 2106030240 metadata/md5-cache/sys-devel/gettext-0.21-r1
 2106030240 metadata/md5-cache/sys-devel/llvm-10.0.1
@@ -56161,6 +55918,11 @@
 2106030240 metadata/md5-cache/sys-devel/llvm-13.0.0.9999
 2106030240 metadata/md5-cache/sys-devel/rust-std-1.51.0
 2106030240 metadata/md5-cache/sys-devel/rust-std-1.52.1
+2106071639 metadata/md5-cache/sys-devel/Manifest.gz
+2106071639 metadata/md5-cache/sys-devel/gcc-10.3.0
+2106071639 metadata/md5-cache/sys-devel/gdb-10.2
+2106041139 metadata/md5-cache/sys-devel/lld-10.0.1-r1
+2106041139 metadata/md5-cache/sys-devel/lld-11.1.0-r1
 2104120442 metadata/md5-cache/sys-fabric/libehca-1.2.2-r3
 2104120442 metadata/md5-cache/sys-fabric/libibumad-1.3.9
 2104121341 metadata/md5-cache/sys-fabric/mstflint-4.10.0_p3
@@ -56216,7 +55978,6 @@
 2012120139 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p9
 2012170209 metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.5.1
 2012311940 metadata/md5-cache/sys-firmware/bluez-firmware-1.2
-2101231224 metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
 2101231224 metadata/md5-cache/sys-firmware/atmel-firmware-1.3-r1
 2101251739 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p10
 2103281039 metadata/md5-cache/sys-firmware/vgabios-0.7a-r1
@@ -56238,8 +55999,6 @@
 2105141809 metadata/md5-cache/sys-firmware/intel-microcode-20210216_p20210514
 2105171109 metadata/md5-cache/sys-firmware/ipxe-1.21.1
 2105171109 metadata/md5-cache/sys-firmware/sgabios-0.1_pre10
-2105272239 metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
-2106011113 metadata/md5-cache/sys-firmware/Manifest.gz
 2106011113 metadata/md5-cache/sys-firmware/edk2-ovmf-201905
 2106011113 metadata/md5-cache/sys-firmware/edk2-ovmf-202008
 2106011113 metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
@@ -56248,6 +56007,9 @@
 2106011113 metadata/md5-cache/sys-firmware/seabios-1.14.0
 2106011113 metadata/md5-cache/sys-firmware/seabios-1.14.0-r1
 2106011113 metadata/md5-cache/sys-firmware/seabios-1.14.0-r2
+2106052339 metadata/md5-cache/sys-firmware/Manifest.gz
+2106052339 metadata/md5-cache/sys-firmware/alsa-firmware-1.2.1
+2106052339 metadata/md5-cache/sys-firmware/alsa-firmware-1.2.4
 1907071039 metadata/md5-cache/sys-fs/aufs-headers-4.14_p20190603
 1805272138 metadata/md5-cache/sys-fs/autorun-3.17
 1910022239 metadata/md5-cache/sys-fs/avfs-1.1.1
@@ -56341,7 +56103,6 @@
 2105050139 metadata/md5-cache/sys-fs/archivemount-0.8.12
 2105061139 metadata/md5-cache/sys-fs/lsscsi-0.32
 2105081314 metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
-2105081314 metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
 2105081314 metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
 2105081314 metadata/md5-cache/sys-fs/cachefilesd-0.10.9
 2105081314 metadata/md5-cache/sys-fs/compsize-1.3
@@ -56355,7 +56116,6 @@
 2105081314 metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
 2105090939 metadata/md5-cache/sys-fs/dislocker-0.7.3
 2105090939 metadata/md5-cache/sys-fs/dislocker-9999
-2105081314 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
 2105081314 metadata/md5-cache/sys-fs/e2fsprogs-1.45.6
 2105081314 metadata/md5-cache/sys-fs/e2fsprogs-1.45.7
 2105081314 metadata/md5-cache/sys-fs/e2fsprogs-1.46.1
@@ -56445,10 +56205,7 @@
 2106030240 metadata/md5-cache/sys-fs/eudev-4.9999
 2106030240 metadata/md5-cache/sys-fs/eudev-9999
 2106030240 metadata/md5-cache/sys-fs/libeatmydata-105-r2
-2106040539 metadata/md5-cache/sys-fs/Manifest.gz
-2106040440 metadata/md5-cache/sys-fs/fuse-3.10.3
 2106040440 metadata/md5-cache/sys-fs/fuse-3.9.3
-2106040209 metadata/md5-cache/sys-fs/reiser4progs-2.0.5
 2106040440 metadata/md5-cache/sys-fs/udev-245.5-r1
 2106040440 metadata/md5-cache/sys-fs/udev-246-r1
 2106040440 metadata/md5-cache/sys-fs/udev-247.2
@@ -56456,6 +56213,14 @@
 2106040440 metadata/md5-cache/sys-fs/udev-9999
 2106040539 metadata/md5-cache/sys-fs/zfs-2.0.4-r1
 2106040539 metadata/md5-cache/sys-fs/zfs-kmod-2.0.4-r1
+2106071139 metadata/md5-cache/sys-fs/Manifest.gz
+2106071139 metadata/md5-cache/sys-fs/aufs-util-4.14_p20190603
+2106071139 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
+2106070939 metadata/md5-cache/sys-fs/fuse-3.10.3
+2106070739 metadata/md5-cache/sys-fs/growpart-0.0.32
+2106051410 metadata/md5-cache/sys-fs/libeatmydata-129
+2106060139 metadata/md5-cache/sys-fs/libeatmydata-129-r1
+2106070939 metadata/md5-cache/sys-fs/reiser4progs-2.0.5
 2003261841 metadata/md5-cache/sys-kernel/installkernel-gentoo-1
 2010240809 metadata/md5-cache/sys-kernel/installkernel-systemd-boot-0
 2101162039 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
@@ -56485,88 +56250,9 @@
 2105130339 metadata/md5-cache/sys-kernel/linux-firmware-20210208
 2105130339 metadata/md5-cache/sys-kernel/linux-firmware-20210315
 2105130339 metadata/md5-cache/sys-kernel/linux-firmware-99999999
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.231
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.232
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.233
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.188
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.189
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.190
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.191
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.267
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.268
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.269
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.267
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.268
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.269
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.37
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.38
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.39
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.11.22
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.4
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.5
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.6
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.120
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.121
-2105281139 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.122
-2105281139 metadata/md5-cache/sys-kernel/git-sources-5.13_rc1
-2105281139 metadata/md5-cache/sys-kernel/git-sources-5.13_rc2
-2105281139 metadata/md5-cache/sys-kernel/git-sources-5.13_rc3
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-3.18
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-4.19
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-4.4
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-4.9
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-5.10
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-5.11
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-5.12
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
-2105281139 metadata/md5-cache/sys-kernel/linux-headers-5.9
-2105281139 metadata/md5-cache/sys-kernel/mips-sources-4.14.232
-2105281139 metadata/md5-cache/sys-kernel/mips-sources-4.19.190
-2105281139 metadata/md5-cache/sys-kernel/mips-sources-5.4.120
-2105281139 metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
-2105281139 metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
-2105281139 metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
-2105281139 metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
-2105281139 metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
-2105281139 metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
-2105281139 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
-2105281139 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
-2105281139 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
-2105281139 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
-2105281839 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
-2105281909 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
-2105281839 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
-2105300839 metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
-2105310139 metadata/md5-cache/sys-kernel/git-sources-5.13_rc4
 2106011113 metadata/md5-cache/sys-kernel/bliss-initramfs-8.1.0-r1
 2106011113 metadata/md5-cache/sys-kernel/bliss-initramfs-9.3.0
 2106011113 metadata/md5-cache/sys-kernel/linux-docs-5.10.17
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
-2106011113 metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
 2106020141 metadata/md5-cache/sys-kernel/kergen-0.1.5
 2106031039 metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
 2106031039 metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
@@ -56626,32 +56312,112 @@
 2106031039 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.121
 2106031039 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.122
 2106031039 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.123
-2106032339 metadata/md5-cache/sys-kernel/Manifest.gz
 2106032209 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.42
 2106032209 metadata/md5-cache/sys-kernel/gentoo-kernel-5.12.9
 2106032209 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.124
 2106032209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.42
 2106032209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.12.9
 2106032209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.124
-2106032009 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
-2106031909 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
-2106032009 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
-2106032009 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
-2106031809 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
-2106031809 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
-2106031909 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
 2106031909 metadata/md5-cache/sys-kernel/linux-firmware-20210518
 2106032209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.42
 2106032209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.12.9
 2106032209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.124
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.235
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.193
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.271
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.271
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.42
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-5.12.9
-2106031709 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.124
-2106032339 metadata/md5-cache/sys-kernel/zen-sources-5.12.9
+2106071509 metadata/md5-cache/sys-kernel/Manifest.gz
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.228
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.231
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.232
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.233
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.234
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.235
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.184
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.188
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.189
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.190
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.191
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.192
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.193
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.264
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.267
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.268
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.269
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.270
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.4.271
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.264
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.267
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.268
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.269
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.270
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.271
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.27
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.37
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.38
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.39
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.40
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.41
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.42
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.11.22
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.4
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.5
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.6
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.7
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.8
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.12.9
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.109
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.120
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.121
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.122
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.123
+2106071509 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.124
+2106071509 metadata/md5-cache/sys-kernel/git-sources-5.13_rc1
+2106071509 metadata/md5-cache/sys-kernel/git-sources-5.13_rc2
+2106071509 metadata/md5-cache/sys-kernel/git-sources-5.13_rc3
+2106071509 metadata/md5-cache/sys-kernel/git-sources-5.13_rc4
+2106071509 metadata/md5-cache/sys-kernel/git-sources-5.13_rc5
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-3.18
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-4.19
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-4.4
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-4.9
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-5.10
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-5.11
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-5.12
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-5.4-r1
+2106071509 metadata/md5-cache/sys-kernel/linux-headers-5.9
+2106071509 metadata/md5-cache/sys-kernel/mips-sources-4.14.235
+2106071509 metadata/md5-cache/sys-kernel/mips-sources-4.19.193
+2106071509 metadata/md5-cache/sys-kernel/mips-sources-5.4.124
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.10_p12
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.11_p8
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.12_p1
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.12_p2
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.12_p3
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.12_p4
+2106071509 metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
+2106071509 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+2106071509 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.10.11_p20210201
+2106071509 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.79_p20201201-r1
+2106071509 metadata/md5-cache/sys-kernel/raspberrypi-sources-5.4.9999
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.14.214_p104
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.14.226_p109
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.19.165_p70
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.19.188_p77
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.4.249_p212
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.4.267_p221
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.9.247_p162
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-4.9.263_p177
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-5.10.30_p37
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-5.10.4_p22
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-5.11.4_p11
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-5.4.109_p56
+2106071509 metadata/md5-cache/sys-kernel/rt-sources-5.4.84_p47
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.235
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.193
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.271
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.271
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.42
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-5.12.9
+2106071509 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.124
+2106071509 metadata/md5-cache/sys-kernel/zen-sources-5.12.9
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -56692,8 +56458,6 @@
 2105081314 metadata/md5-cache/sys-libs/db-5.1.29-r3
 2105081314 metadata/md5-cache/sys-libs/glibc-2.19-r2
 2105081314 metadata/md5-cache/sys-libs/glibc-2.25-r11
-2105081314 metadata/md5-cache/sys-libs/musl-1.2.2-r2
-2105081314 metadata/md5-cache/sys-libs/musl-9999
 2105081314 metadata/md5-cache/sys-libs/newlib-4.1.0
 2105081314 metadata/md5-cache/sys-libs/newlib-9999
 2105081314 metadata/md5-cache/sys-libs/tapi-1.30
@@ -56708,7 +56472,6 @@
 2105161410 metadata/md5-cache/sys-libs/kpmcore-20.12.3
 2105161410 metadata/md5-cache/sys-libs/kpmcore-21.04.1
 2105161809 metadata/md5-cache/sys-libs/pwdb-0.62-r2
-2105211039 metadata/md5-cache/sys-libs/freeipmi-1.6.8
 2105251409 metadata/md5-cache/sys-libs/db-4.5.20_p2-r6
 2105251409 metadata/md5-cache/sys-libs/db-4.6.21_p4-r5
 2105251409 metadata/md5-cache/sys-libs/db-4.7.25_p4-r5
@@ -56735,17 +56498,11 @@
 2106011113 metadata/md5-cache/sys-libs/libblockdev-2.24
 2106011113 metadata/md5-cache/sys-libs/libblockdev-2.25
 2106011113 metadata/md5-cache/sys-libs/libblockdev-9999
-2106011113 metadata/md5-cache/sys-libs/libcap-ng-0.7.11
-2106011113 metadata/md5-cache/sys-libs/libcap-ng-0.8
-2106011113 metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1
 2106011113 metadata/md5-cache/sys-libs/libcap-ng-0.8.2-r1
 2106011113 metadata/md5-cache/sys-libs/libhugetlbfs-2.23
 2106011113 metadata/md5-cache/sys-libs/libsmbios-2.4.3
 2106011113 metadata/md5-cache/sys-libs/openipmi-2.0.29
-2106021409 metadata/md5-cache/sys-libs/glibc-2.32-r8
 2106021409 metadata/md5-cache/sys-libs/glibc-2.33
-2106020141 metadata/md5-cache/sys-libs/libapparmor-2.13.4
-2106020141 metadata/md5-cache/sys-libs/libapparmor-3.0.0
 2106020141 metadata/md5-cache/sys-libs/libapparmor-3.0.1
 2106030240 metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
 2106030240 metadata/md5-cache/sys-libs/binutils-libs-2.35.2
@@ -56762,14 +56519,11 @@
 2106030240 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.45.7
 2106030240 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.1
 2106030240 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.46.2
-2106030240 metadata/md5-cache/sys-libs/gdbm-1.18.1-r1
 2106030240 metadata/md5-cache/sys-libs/gdbm-1.19
 2106030240 metadata/md5-cache/sys-libs/gpm-1.20.7-r3
 2106030240 metadata/md5-cache/sys-libs/ldb-2.2.1
 2106030240 metadata/md5-cache/sys-libs/ldb-2.3.0
 2106030240 metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
-2106030240 metadata/md5-cache/sys-libs/libcap-2.43
-2106030240 metadata/md5-cache/sys-libs/libcap-2.48
 2106030240 metadata/md5-cache/sys-libs/libcap-2.49
 2106030240 metadata/md5-cache/sys-libs/libcap-2.50-r1
 2106030240 metadata/md5-cache/sys-libs/libcxx-10.0.1
@@ -56798,7 +56552,6 @@
 2106030240 metadata/md5-cache/sys-libs/libseccomp-2.5.1-r1
 2106030240 metadata/md5-cache/sys-libs/libseccomp-9999
 2106030240 metadata/md5-cache/sys-libs/libselinux-3.1-r1
-2106030240 metadata/md5-cache/sys-libs/libselinux-3.2
 2106030240 metadata/md5-cache/sys-libs/libselinux-9999
 2106030240 metadata/md5-cache/sys-libs/libsemanage-3.1-r1
 2106030240 metadata/md5-cache/sys-libs/libsemanage-3.2
@@ -56829,8 +56582,6 @@
 2106030240 metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
 2106030240 metadata/md5-cache/sys-libs/pam-1.5.1
 2106030240 metadata/md5-cache/sys-libs/pam_wrapper-1.1.3
-2106030240 metadata/md5-cache/sys-libs/readline-8.0_p4
-2106030240 metadata/md5-cache/sys-libs/readline-8.1
 2106030240 metadata/md5-cache/sys-libs/readline-8.1_p1
 2106030240 metadata/md5-cache/sys-libs/slang-2.3.2
 2106030240 metadata/md5-cache/sys-libs/talloc-2.3.2
@@ -56839,8 +56590,14 @@
 2106030240 metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
 2106030240 metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
 2106030240 metadata/md5-cache/sys-libs/zlib-1.2.11-r4
-2106040440 metadata/md5-cache/sys-libs/Manifest.gz
 2106040440 metadata/md5-cache/sys-libs/libosinfo-1.9.0
+2106061909 metadata/md5-cache/sys-libs/Manifest.gz
+2106050439 metadata/md5-cache/sys-libs/freeipmi-1.6.8
+2106061209 metadata/md5-cache/sys-libs/glibc-2.32-r8
+2106041039 metadata/md5-cache/sys-libs/libselinux-3.2
+2106050239 metadata/md5-cache/sys-libs/libservicelog-1.1.19
+2106061239 metadata/md5-cache/sys-libs/musl-1.2.2-r2
+2106061239 metadata/md5-cache/sys-libs/musl-9999
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 2009221209 metadata/md5-cache/sys-power/dptfxtract-1.4.3
@@ -56869,9 +56626,6 @@
 2104121341 metadata/md5-cache/sys-power/powertop-9999
 2104121341 metadata/md5-cache/sys-power/suspend-1.0_p20190605
 2104121341 metadata/md5-cache/sys-power/suspend-1.0_p20200924
-2104121341 metadata/md5-cache/sys-power/thermald-2.4.1-r1
-2104121341 metadata/md5-cache/sys-power/thermald-2.4.2
-2104121341 metadata/md5-cache/sys-power/thermald-2.4.3
 2104190339 metadata/md5-cache/sys-power/powernowd-1.00-r5
 2104212209 metadata/md5-cache/sys-power/iasl-20200717
 2104252209 metadata/md5-cache/sys-power/acpitool-0.5.1-r2
@@ -56886,8 +56640,10 @@
 2105290309 metadata/md5-cache/sys-power/upower-0.99.11
 2106011113 metadata/md5-cache/sys-power/acpilight-1.2-r1
 2106011113 metadata/md5-cache/sys-power/acpilight-1.2-r2
-2106040440 metadata/md5-cache/sys-power/Manifest.gz
 2106040440 metadata/md5-cache/sys-power/switcheroo-control-2.4
+2106061009 metadata/md5-cache/sys-power/Manifest.gz
+2106061009 metadata/md5-cache/sys-power/thermald-2.4.3
+2106051109 metadata/md5-cache/sys-power/thermald-2.4.5
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2005291309 metadata/md5-cache/sys-process/minicoredumper-2.0.1-r1
 2009171809 metadata/md5-cache/sys-process/xjobs-20200726
@@ -57317,7 +57073,6 @@
 2105021609 metadata/md5-cache/www-apache/mod_qos-11.66
 2105081314 metadata/md5-cache/www-apache/anyterm-1.1.29-r1
 2105081314 metadata/md5-cache/www-apache/passenger-6.0.6
-2105081314 metadata/md5-cache/www-apache/passenger-6.0.7
 2105081314 metadata/md5-cache/www-apache/pwauth-2.3.10
 2105180040 metadata/md5-cache/www-apache/libapreq2-2.15-r1
 2105180040 metadata/md5-cache/www-apache/libapreq2-2.16
@@ -57325,10 +57080,10 @@
 2106011113 metadata/md5-cache/www-apache/mod_gnutls-0.11.0
 2106011113 metadata/md5-cache/www-apache/mod_wsgi-4.7.1
 2106011113 metadata/md5-cache/www-apache/mod_wsgi-4.7.1-r1
-2106012339 metadata/md5-cache/www-apache/mod_security-2.9.3-r100
 2106030909 metadata/md5-cache/www-apache/passenger-6.0.9
-2106031939 metadata/md5-cache/www-apache/Manifest.gz
 2106031939 metadata/md5-cache/www-apache/passenger-6.0.8
+2106071609 metadata/md5-cache/www-apache/Manifest.gz
+2106071609 metadata/md5-cache/www-apache/mod_security-2.9.3-r100
 1904250439 metadata/md5-cache/www-apps/icingaweb2-module-director-1.6.2
 1806241039 metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
 1702282334 metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1
@@ -57337,7 +57092,6 @@
 2101231224 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
 2101231224 metadata/md5-cache/www-apps/liquid_feedback_core-3.0.4
 2101231224 metadata/md5-cache/www-apps/webdavcgi-1.1.2
-2103260409 metadata/md5-cache/www-apps/webmcp-1.2.6-r1
 2103310520 metadata/md5-cache/www-apps/agendav-2.2.0
 2103310520 metadata/md5-cache/www-apps/baikal-0.7.2
 2103311110 metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
@@ -57361,8 +57115,6 @@
 2103301639 metadata/md5-cache/www-apps/kibana-bin-6.8.15
 2103311110 metadata/md5-cache/www-apps/nanoblogger-3.5_rc1-r1
 2103310520 metadata/md5-cache/www-apps/nextcloud-20.0.8
-2103310520 metadata/md5-cache/www-apps/owncloud-10.5.0
-2103310520 metadata/md5-cache/www-apps/owncloud-10.6.0
 2103310520 metadata/md5-cache/www-apps/rutorrent-3.8-r1
 2103310849 metadata/md5-cache/www-apps/rutorrent-9999
 2103310520 metadata/md5-cache/www-apps/trickster-0.1.9
@@ -57390,11 +57142,8 @@
 2104180939 metadata/md5-cache/www-apps/cvsweb-3.0.6-r1
 2104180939 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
 2104191209 metadata/md5-cache/www-apps/gitit-0.13.0.0-r1
-2104221939 metadata/md5-cache/www-apps/webmcp-2.1.0
 2104250839 metadata/md5-cache/www-apps/dokuwiki-20200729
 2104251239 metadata/md5-cache/www-apps/liquid_feedback_frontend-3.2.1
-2105021139 metadata/md5-cache/www-apps/cgit-1.2.3-r100
-2105021139 metadata/md5-cache/www-apps/cgit-9999
 2105010839 metadata/md5-cache/www-apps/redmine-4.1.2
 2105101939 metadata/md5-cache/www-apps/nextcloud-notify_push-0.1.7
 2105111909 metadata/md5-cache/www-apps/kibana-bin-7.12.1
@@ -57437,7 +57186,6 @@
 2105291839 metadata/md5-cache/www-apps/drupal-9.0.12
 2105291839 metadata/md5-cache/www-apps/drupal-9.1.7
 2105301109 metadata/md5-cache/www-apps/phpBB-3.3.4
-2106011113 metadata/md5-cache/www-apps/cgit-1.2.3-r200
 2106020141 metadata/md5-cache/www-apps/blohg-0.13-r4
 2106020141 metadata/md5-cache/www-apps/blohg-9999
 2106020141 metadata/md5-cache/www-apps/klaus-1.5.2
@@ -57449,14 +57197,17 @@
 2106021609 metadata/md5-cache/www-apps/radicale-3.0.6-r2
 2106020141 metadata/md5-cache/www-apps/roundup-2.0.0
 2106031009 metadata/md5-cache/www-apps/hugo-0.83.1
-2106032239 metadata/md5-cache/www-apps/Manifest.gz
 2106032239 metadata/md5-cache/www-apps/rt-4.4.4-r1
+2106071609 metadata/md5-cache/www-apps/Manifest.gz
+2106071609 metadata/md5-cache/www-apps/cgit-1.2.3-r100
+2106071609 metadata/md5-cache/www-apps/cgit-1.2.3-r200
+2106071609 metadata/md5-cache/www-apps/cgit-9999
+2106041239 metadata/md5-cache/www-apps/owncloud-10.7.0
+2106071609 metadata/md5-cache/www-apps/webmcp-1.2.6-r1
+2106071609 metadata/md5-cache/www-apps/webmcp-2.1.0
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2101131239 metadata/md5-cache/www-client/uget-2.2.1
-2101231224 metadata/md5-cache/www-client/luakit-2.2.1-r100
-2103310849 metadata/md5-cache/www-client/luakit-9999
 2103310849 metadata/md5-cache/www-client/surf-2.0
-2103310849 metadata/md5-cache/www-client/surf-9999
 2104121341 metadata/md5-cache/www-client/dillo-3.1_pre20181005
 2104121341 metadata/md5-cache/www-client/dillo-9999
 2104121139 metadata/md5-cache/www-client/fetch-1.0-r4
@@ -57498,15 +57249,11 @@
 2105292209 metadata/md5-cache/www-client/uget-9999
 2105311109 metadata/md5-cache/www-client/firefox-bin-89.0
 2106011409 metadata/md5-cache/www-client/chromium-91.0.4472.77
-2106011113 metadata/md5-cache/www-client/elinks-0.13.5-r100
-2106011113 metadata/md5-cache/www-client/elinks-9999
 2106011113 metadata/md5-cache/www-client/firefox-78.10.1
 2106011113 metadata/md5-cache/www-client/firefox-88.0.1
 2106011139 metadata/md5-cache/www-client/firefox-bin-78.11.0
 2106011113 metadata/md5-cache/www-client/seamonkey-2.53.7.1-r1
-2106012209 metadata/md5-cache/www-client/firefox-78.11.0
 2106012209 metadata/md5-cache/www-client/firefox-89.0
-2106020009 metadata/md5-cache/www-client/google-chrome-unstable-92.0.4515.40
 2106020009 metadata/md5-cache/www-client/microsoft-edge-dev-92.0.902.2
 2106020609 metadata/md5-cache/www-client/midori-9.0
 2106020039 metadata/md5-cache/www-client/opera-76.0.4017.175
@@ -57519,13 +57266,24 @@
 2106020141 metadata/md5-cache/www-client/qutebrowser-9999
 2106021639 metadata/md5-cache/www-client/seamonkey-2.53.8_beta1
 2106031009 metadata/md5-cache/www-client/chromium-92.0.4515.40
-2106040440 metadata/md5-cache/www-client/Manifest.gz
 2106040440 metadata/md5-cache/www-client/epiphany-40.1
 2106040009 metadata/md5-cache/www-client/google-chrome-beta-92.0.4515.40
 2106040009 metadata/md5-cache/www-client/microsoft-edge-beta-91.0.864.41
 2106040009 metadata/md5-cache/www-client/microsoft-edge-dev-92.0.902.4
 2106040009 metadata/md5-cache/www-client/opera-beta-77.0.4054.38
-2106040039 metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.3
+2106071609 metadata/md5-cache/www-client/Manifest.gz
+2106051139 metadata/md5-cache/www-client/chromium-93.0.4530.5
+2106071609 metadata/md5-cache/www-client/elinks-0.13.5-r100
+2106071609 metadata/md5-cache/www-client/elinks-9999
+2106070109 metadata/md5-cache/www-client/epiphany-40.2
+2106041609 metadata/md5-cache/www-client/firefox-78.11.0
+2106040909 metadata/md5-cache/www-client/google-chrome-unstable-93.0.4530.5
+2106071609 metadata/md5-cache/www-client/luakit-2.2.1-r100
+2106071609 metadata/md5-cache/www-client/luakit-9999
+2106071409 metadata/md5-cache/www-client/surf-2.1
+2106071409 metadata/md5-cache/www-client/surf-9999
+2106051809 metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.11
+2106061409 metadata/md5-cache/www-client/vivaldi-snapshot-4.0.2312.13
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -57560,29 +57318,25 @@
 2105260410 metadata/md5-cache/www-plugins/browserpass-3.0.7
 2105252239 metadata/md5-cache/www-plugins/chrome-binary-plugins-91.0.4472.77
 2106011113 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
-2106020009 metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.40_alpha
-2106040009 metadata/md5-cache/www-plugins/Manifest.gz
 2106040009 metadata/md5-cache/www-plugins/chrome-binary-plugins-92.0.4515.40_beta
+2106041839 metadata/md5-cache/www-plugins/Manifest.gz
+2106040909 metadata/md5-cache/www-plugins/chrome-binary-plugins-93.0.4530.5_alpha
+2106041839 metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
 2012311940 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2103301639 metadata/md5-cache/www-servers/boa-0.94.14_rc21-r2
 2104121341 metadata/md5-cache/www-servers/sniproxy-0.6.0-r1
 2104161439 metadata/md5-cache/www-servers/tomcat-10.0.5
 2104161439 metadata/md5-cache/www-servers/tomcat-9.0.45
-2104181139 metadata/md5-cache/www-servers/moonbridge-1.0.1
 2104252239 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 2105022339 metadata/md5-cache/www-servers/bozohttpd-20190228
 2105022339 metadata/md5-cache/www-servers/gatling-0.16-r1
 2105031009 metadata/md5-cache/www-servers/pound-2.7f-r1
 2105081314 metadata/md5-cache/www-servers/apache-2.4.46
-2105081314 metadata/md5-cache/www-servers/apache-2.4.46-r6
-2105081314 metadata/md5-cache/www-servers/apache-2.4.47
 2105081314 metadata/md5-cache/www-servers/civetweb-1.11
 2105081314 metadata/md5-cache/www-servers/civetweb-1.12
 2105081314 metadata/md5-cache/www-servers/fnord-1.11-r2
 2105081314 metadata/md5-cache/www-servers/h2o-2.2.6
 2105081314 metadata/md5-cache/www-servers/h2o-9999
-2105081314 metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
-2105081314 metadata/md5-cache/www-servers/lighttpd-1.4.58
 2105081314 metadata/md5-cache/www-servers/resin-4.0.48-r1
 2105081314 metadata/md5-cache/www-servers/thttpd-2.27.1
 2105081314 metadata/md5-cache/www-servers/thttpd-9999
@@ -57594,25 +57348,14 @@
 2105131439 metadata/md5-cache/www-servers/tomcat-9.0.46
 2105151010 metadata/md5-cache/www-servers/adsf-1.4.3
 2105151010 metadata/md5-cache/www-servers/adsf-1.4.5
-2105151010 metadata/md5-cache/www-servers/puma-3.12.5-r1
-2105151010 metadata/md5-cache/www-servers/puma-5.1.1
-2105151010 metadata/md5-cache/www-servers/puma-5.2.2
-2105151010 metadata/md5-cache/www-servers/puma-5.3.0
-2105151010 metadata/md5-cache/www-servers/puma-5.3.1
 2105180010 metadata/md5-cache/www-servers/pound-3.0
 2105221039 metadata/md5-cache/www-servers/adsf-1.4.6
-2105221009 metadata/md5-cache/www-servers/puma-5.3.2
-2105261039 metadata/md5-cache/www-servers/apache-2.4.48
 2105260410 metadata/md5-cache/www-servers/caddy-2.0.0
 2105260410 metadata/md5-cache/www-servers/caddy-2.2.3
 2105260410 metadata/md5-cache/www-servers/caddy-2.3.0
 2105260410 metadata/md5-cache/www-servers/caddy-2.3.0-r1
-2105261909 metadata/md5-cache/www-servers/nginx-1.21.0
-2105271009 metadata/md5-cache/www-servers/nginx-1.20.1
 2105291839 metadata/md5-cache/www-servers/tomcat-7.0.109
 2106011113 metadata/md5-cache/www-servers/nginx-unit-1.22.0
-2106011113 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
-2106011113 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r101
 2106011113 metadata/md5-cache/www-servers/varnish-6.0.6
 2106011113 metadata/md5-cache/www-servers/varnish-6.3.2
 2106011113 metadata/md5-cache/www-servers/varnish-6.4.0
@@ -57622,10 +57365,21 @@
 2106020141 metadata/md5-cache/www-servers/servefile-0.5.1
 2106020141 metadata/md5-cache/www-servers/tornado-6.0.4
 2106020141 metadata/md5-cache/www-servers/tornado-6.1
-2106040440 metadata/md5-cache/www-servers/Manifest.gz
 2106032239 metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
 2106032239 metadata/md5-cache/www-servers/monkeyd-9999
 2106040440 metadata/md5-cache/www-servers/pshs-0.4.1
+2106071609 metadata/md5-cache/www-servers/Manifest.gz
+2106071609 metadata/md5-cache/www-servers/apache-2.4.46-r6
+2106071609 metadata/md5-cache/www-servers/apache-2.4.47
+2106071609 metadata/md5-cache/www-servers/apache-2.4.48
+2106071609 metadata/md5-cache/www-servers/lighttpd-1.4.55-r100
+2106071609 metadata/md5-cache/www-servers/lighttpd-1.4.58
+2106071609 metadata/md5-cache/www-servers/moonbridge-1.0.1
+2106071609 metadata/md5-cache/www-servers/nginx-1.20.1
+2106071609 metadata/md5-cache/www-servers/nginx-1.21.0
+2106061039 metadata/md5-cache/www-servers/puma-5.3.2
+2106071609 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r100
+2106071609 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r101
 2101061509 metadata/md5-cache/x11-apps/luit-20190106
 2101231224 metadata/md5-cache/x11-apps/amlc-0.5.1
 2101231224 metadata/md5-cache/x11-apps/radeon-profile-20200824
@@ -57929,7 +57683,6 @@
 2106030240 metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r3
 2106030240 metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r3
 2106030240 metadata/md5-cache/x11-libs/xcb-util-xrm-1.3-r1
-2106040639 metadata/md5-cache/x11-libs/Manifest.gz
 2106040440 metadata/md5-cache/x11-libs/colord-gtk-0.2.0
 2106040440 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6
 2106040440 metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2
@@ -57949,6 +57702,9 @@
 2106040440 metadata/md5-cache/x11-libs/vte-0.64.1
 2106040440 metadata/md5-cache/x11-libs/xapps-1.8.9
 2106040440 metadata/md5-cache/x11-libs/xapps-2.0.6
+2106070209 metadata/md5-cache/x11-libs/Manifest.gz
+2106070209 metadata/md5-cache/x11-libs/libX11-1.7.2
+2106070109 metadata/md5-cache/x11-libs/vte-0.64.2
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -57976,7 +57732,6 @@
 1912301209 metadata/md5-cache/x11-misc/tdrop-0.3.0
 2001051839 metadata/md5-cache/x11-misc/sw-notify-send-1.2.1
 2002091809 metadata/md5-cache/x11-misc/idesk-0.7.5-r3
-2002112051 metadata/md5-cache/x11-misc/read-edid-1.4.2
 2002112051 metadata/md5-cache/x11-misc/x2vnc-1.7.2-r1
 2002112051 metadata/md5-cache/x11-misc/yabar-0.4.0_p20190316-r1
 2002230040 metadata/md5-cache/x11-misc/dxpc-3.9.2-r2
@@ -58183,7 +57938,6 @@
 2104192239 metadata/md5-cache/x11-misc/bbrun-1.6-r1
 2104192109 metadata/md5-cache/x11-misc/bbweather-0.6.3-r2
 2104192239 metadata/md5-cache/x11-misc/chgres-0.1-r2
-2104192239 metadata/md5-cache/x11-misc/devilspie2-0.43-r100
 2104192239 metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
 2104192239 metadata/md5-cache/x11-misc/gbase-0.5-r1
 2104192239 metadata/md5-cache/x11-misc/grabc-1.1-r2
@@ -58234,7 +57988,6 @@
 2105081314 metadata/md5-cache/x11-misc/qterm-0.7.3
 2105081314 metadata/md5-cache/x11-misc/qtfm-99999
 2105081314 metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
-2105081314 metadata/md5-cache/x11-misc/read-edid-3.0.2
 2105081314 metadata/md5-cache/x11-misc/screengrab-1.101
 2105081314 metadata/md5-cache/x11-misc/screengrab-2.0.0
 2105081314 metadata/md5-cache/x11-misc/screengrab-2.0.1
@@ -58265,12 +58018,9 @@
 2105081314 metadata/md5-cache/x11-misc/xnots-9999
 2105081314 metadata/md5-cache/x11-misc/xowl-9999
 2105081314 metadata/md5-cache/x11-misc/xplanet-1.3.1-r2
-2105081314 metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
-2105081314 metadata/md5-cache/x11-misc/xscreensaver-5.45
 2105081314 metadata/md5-cache/x11-misc/xsettingsd-1.0.2
 2105081314 metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r1
 2105100939 metadata/md5-cache/x11-misc/idesk-1
-2105120009 metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
 2105140409 metadata/md5-cache/x11-misc/dunst-1.6.1
 2105151439 metadata/md5-cache/x11-misc/obconf-2.0.4_p20150213
 2105142109 metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
@@ -58296,7 +58046,6 @@
 2105312239 metadata/md5-cache/x11-misc/synergy-1.14.0.1_rc
 2106011113 metadata/md5-cache/x11-misc/alacarte-3.36.0
 2106011113 metadata/md5-cache/x11-misc/compton-0.1_beta2-r1
-2106011113 metadata/md5-cache/x11-misc/dex-0.8.0
 2106011113 metadata/md5-cache/x11-misc/libinput-gestures-2.56
 2106011113 metadata/md5-cache/x11-misc/libinput-gestures-9999
 2106011113 metadata/md5-cache/x11-misc/polybar-3.5.5
@@ -58307,7 +58056,6 @@
 2106020141 metadata/md5-cache/x11-misc/arandr-0.1.10-r1
 2106020141 metadata/md5-cache/x11-misc/grub2-theme-preview-2.3.0
 2106020609 metadata/md5-cache/x11-misc/lightdm-1.30.0-r2
-2106020141 metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
 2106020141 metadata/md5-cache/x11-misc/mugshot-0.4.3
 2106020141 metadata/md5-cache/x11-misc/py3status-3.37
 2106020141 metadata/md5-cache/x11-misc/safeeyes-2.0.9-r2
@@ -58333,7 +58081,6 @@
 2106030240 metadata/md5-cache/x11-misc/primus-0.2-r3
 2106031009 metadata/md5-cache/x11-misc/rss-glx-0.9.1-r3
 2106030240 metadata/md5-cache/x11-misc/virtualgl-2.6.5-r4
-2106040440 metadata/md5-cache/x11-misc/Manifest.gz
 2106040440 metadata/md5-cache/x11-misc/colord-1.4.5-r1
 2106031539 metadata/md5-cache/x11-misc/fbpager-20090221-r1
 2106031539 metadata/md5-cache/x11-misc/fbpager-20090221-r2
@@ -58347,6 +58094,14 @@
 2106032239 metadata/md5-cache/x11-misc/xaos-3.6
 2106040440 metadata/md5-cache/x11-misc/xkeyboard-config-2.32
 2106040440 metadata/md5-cache/x11-misc/xkeyboard-config-9999
+2106071609 metadata/md5-cache/x11-misc/Manifest.gz
+2106070209 metadata/md5-cache/x11-misc/compose-tables-1.7.2
+2106071609 metadata/md5-cache/x11-misc/devilspie2-0.43-r100
+2106060709 metadata/md5-cache/x11-misc/dex-0.8.0
+2106071139 metadata/md5-cache/x11-misc/menulibre-2.2.1-r2
+2106070939 metadata/md5-cache/x11-misc/read-edid-3.0.2-r1
+2106071139 metadata/md5-cache/x11-misc/xscreensaver-5.44-r4
+2106071139 metadata/md5-cache/x11-misc/xscreensaver-5.45
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -58557,7 +58312,6 @@
 2105081314 metadata/md5-cache/x11-terms/qterminal-9999
 2105081314 metadata/md5-cache/x11-terms/root-tail-1.2-r4
 2105081314 metadata/md5-cache/x11-terms/roxterm-3.9.4
-2105081314 metadata/md5-cache/x11-terms/sakura-3.7.1
 2105081314 metadata/md5-cache/x11-terms/tilda-1.5.2
 2105101539 metadata/md5-cache/x11-terms/xterm-366
 2105101539 metadata/md5-cache/x11-terms/xterm-367
@@ -58580,12 +58334,14 @@
 2106020141 metadata/md5-cache/x11-terms/guake-9999
 2106020141 metadata/md5-cache/x11-terms/terminator-2.0.1
 2106020141 metadata/md5-cache/x11-terms/terminator-2.1.0
-2106020141 metadata/md5-cache/x11-terms/terminator-2.1.1
 2106020609 metadata/md5-cache/x11-terms/xfce4-terminal-0.8.10
 2106031009 metadata/md5-cache/x11-terms/zutty-0.9
-2106040440 metadata/md5-cache/x11-terms/Manifest.gz
 2106032239 metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r9
 2106040440 metadata/md5-cache/x11-terms/terminology-1.9.0
+2106071139 metadata/md5-cache/x11-terms/Manifest.gz
+2106070109 metadata/md5-cache/x11-terms/gnome-terminal-3.40.2
+2106071139 metadata/md5-cache/x11-terms/sakura-3.7.1
+2106061039 metadata/md5-cache/x11-terms/terminator-2.1.1
 1902221239 metadata/md5-cache/x11-themes/clearlooks-phenix-7.0.1
 1702282336 metadata/md5-cache/x11-themes/comix-xcursors-0.8.2
 1909210939 metadata/md5-cache/x11-themes/e-gtk-theme-0.19.3
@@ -58638,7 +58394,6 @@
 2101171109 metadata/md5-cache/x11-themes/fvwm_icons-1.0
 2101171109 metadata/md5-cache/x11-themes/fvwm_sounds-1.0
 2101190039 metadata/md5-cache/x11-themes/sound-theme-freedesktop-0.8
-2101231224 metadata/md5-cache/x11-themes/QGnomePlatform-0.6.1-r1
 2101231224 metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.1
 2101231224 metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
 2101231224 metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1
@@ -58713,9 +58468,7 @@
 2104301939 metadata/md5-cache/x11-themes/gtk-engines-candido-0.9.1
 2104301939 metadata/md5-cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
 2105012139 metadata/md5-cache/x11-themes/silver-xcursors-0.4-r3
-2105050839 metadata/md5-cache/x11-themes/papirus-icon-theme-20210501
 2105090839 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
-2105081314 metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
 2105090839 metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0
 2105090839 metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.10.1
 2105090839 metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0
@@ -58729,27 +58482,29 @@
 2105081314 metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
 2105081314 metadata/md5-cache/x11-themes/qtcurve-9999
 2105081314 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6-r1
-2105130739 metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
 2105191239 metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
 2105191239 metadata/md5-cache/x11-themes/hicolor-icon-theme-0.17
 2105201939 metadata/md5-cache/x11-themes/adwaita-qt-1.2.1
-2105201639 metadata/md5-cache/x11-themes/adwaita-qt-1.3.0
 2105212309 metadata/md5-cache/x11-themes/QGnomePlatform-0.7.1
 2105291839 metadata/md5-cache/x11-themes/adwaita-icon-theme-40.1.1
 2106011113 metadata/md5-cache/x11-themes/fvwm-crystal-3.6.5
 2106020609 metadata/md5-cache/x11-themes/elementary-xfce-icon-theme-0.15.2
-2106030240 metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
 2106030240 metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
 2106030240 metadata/md5-cache/x11-themes/gtk-engines-murrine-0.98.2-r1
 2106030240 metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109-r1
 2106030240 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
 2106030240 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
-2106040440 metadata/md5-cache/x11-themes/Manifest.gz
 2106040440 metadata/md5-cache/x11-themes/arc-theme-20210127
 2106040440 metadata/md5-cache/x11-themes/arc-theme-20210412
 2106040440 metadata/md5-cache/x11-themes/gnome-backgrounds-40.1
 2106040440 metadata/md5-cache/x11-themes/greybird-3.22.14
-2106031839 metadata/md5-cache/x11-themes/papirus-icon-theme-20210601
+2106071609 metadata/md5-cache/x11-themes/Manifest.gz
+2106062139 metadata/md5-cache/x11-themes/QGnomePlatform-0.8.0
+2106062139 metadata/md5-cache/x11-themes/adwaita-qt-1.3.1
+2106071609 metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r100
+2106042309 metadata/md5-cache/x11-themes/papirus-icon-theme-20210401
+2106061039 metadata/md5-cache/x11-themes/papirus-icon-theme-20210501
+2106042309 metadata/md5-cache/x11-themes/papirus-icon-theme-20210601
 2010121339 metadata/md5-cache/x11-wm/e16-1.0.21
 2011261339 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 2101171809 metadata/md5-cache/x11-wm/e16-1.0.22
@@ -58759,7 +58514,6 @@
 2101231224 metadata/md5-cache/x11-wm/bspwm-0.9.9
 2101231224 metadata/md5-cache/x11-wm/lumina-1.6.0
 2101231224 metadata/md5-cache/x11-wm/matwm2-0.1.2_pre3-r1
-2101231224 metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
 2101231224 metadata/md5-cache/x11-wm/sithwm-1.2.3
 2101231224 metadata/md5-cache/x11-wm/wmfs-20180520
 2102241843 metadata/md5-cache/x11-wm/cwm-6.6
@@ -58773,7 +58527,6 @@
 2103310849 metadata/md5-cache/x11-wm/dwm-9999
 2103311110 metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1
 2103310849 metadata/md5-cache/x11-wm/lumina-9999
-2103310849 metadata/md5-cache/x11-wm/notion-9999
 2103310849 metadata/md5-cache/x11-wm/wmfs-99999999
 2103310849 metadata/md5-cache/x11-wm/xmonad-contrib-0.16
 2104120442 metadata/md5-cache/x11-wm/metacity-3.36.1
@@ -58803,15 +58556,12 @@
 2104192339 metadata/md5-cache/x11-wm/ratpoison-9999
 2104192339 metadata/md5-cache/x11-wm/sawfish-1.12.90-r2
 2104200209 metadata/md5-cache/x11-wm/wm2-4-r1
-2104280939 metadata/md5-cache/x11-wm/icewm-2.3.3
 2104292109 metadata/md5-cache/x11-wm/i3-4.18
 2104292109 metadata/md5-cache/x11-wm/i3-4.18.3
 2105011709 metadata/md5-cache/x11-wm/metacity-3.40.0
 2105010839 metadata/md5-cache/x11-wm/subtle-0.11.3244
 2105010839 metadata/md5-cache/x11-wm/subtle-9999
 2105061309 metadata/md5-cache/x11-wm/blackbox-0.76-r1
-2105081314 metadata/md5-cache/x11-wm/awesome-4.3-r101
-2105081314 metadata/md5-cache/x11-wm/awesome-9999
 2105081314 metadata/md5-cache/x11-wm/ctwm-4.0.2
 2105081314 metadata/md5-cache/x11-wm/fvwm-2.6.9
 2105081314 metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
@@ -58819,24 +58569,19 @@
 2105071709 metadata/md5-cache/x11-wm/icewm-2.3.4
 2105081314 metadata/md5-cache/x11-wm/twm-1.0.11
 2105081314 metadata/md5-cache/x11-wm/wmii-3.9.2-r6
-2105161609 metadata/md5-cache/x11-wm/ctwm-4.0.3
 2105271739 metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
 2105281909 metadata/md5-cache/x11-wm/pekwm-0.1.17-r3
 2105291009 metadata/md5-cache/x11-wm/stumpwm-18.05
 2105291009 metadata/md5-cache/x11-wm/stumpwm-contrib-20180128
 2105291009 metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
-2106011113 metadata/md5-cache/x11-wm/herbstluftwm-0.9.1
-2106011113 metadata/md5-cache/x11-wm/herbstluftwm-9999
 2106011113 metadata/md5-cache/x11-wm/openbox-3.6.1-r3
 2106011113 metadata/md5-cache/x11-wm/openbox-9999
-2106020141 metadata/md5-cache/x11-wm/herbstluftwm-0.9.2
 2106011939 metadata/md5-cache/x11-wm/muffin-4.8.1
 2106020141 metadata/md5-cache/x11-wm/qtile-0.16.1
 2106020141 metadata/md5-cache/x11-wm/qtile-0.17.0
 2106020141 metadata/md5-cache/x11-wm/xpra-3.0.5-r2
 2106020141 metadata/md5-cache/x11-wm/xpra-4.1.3
 2106020141 metadata/md5-cache/x11-wm/xpra-4.2
-2106040440 metadata/md5-cache/x11-wm/Manifest.gz
 2106040440 metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
 2106040440 metadata/md5-cache/x11-wm/i3-4.19-r1
 2106040440 metadata/md5-cache/x11-wm/i3-4.19.1
@@ -58844,7 +58589,16 @@
 2106040440 metadata/md5-cache/x11-wm/i3-gaps-4.19.1
 2106040440 metadata/md5-cache/x11-wm/mutter-3.36.7-r1
 2106040440 metadata/md5-cache/x11-wm/mutter-40.1
-2106040440 metadata/md5-cache/x11-wm/mutter-40.1-r1
+2106071609 metadata/md5-cache/x11-wm/Manifest.gz
+2106071609 metadata/md5-cache/x11-wm/awesome-4.3-r101
+2106071609 metadata/md5-cache/x11-wm/awesome-9999
+2106070939 metadata/md5-cache/x11-wm/ctwm-4.0.3
+2106060039 metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
+2106060039 metadata/md5-cache/x11-wm/herbstluftwm-9999
+2106071009 metadata/md5-cache/x11-wm/icewm-2.4.0
+2106041139 metadata/md5-cache/x11-wm/mutter-40.1-r1
+2106071609 metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
+2106071609 metadata/md5-cache/x11-wm/notion-9999
 2105130739 metadata/md5-cache/xfce-base/thunar-4.16.8
 2105251739 metadata/md5-cache/xfce-base/exo-4.16.2
 2105251739 metadata/md5-cache/xfce-base/garcon-0.8.0
@@ -58917,4 +58671,4 @@
 2106020609 metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3-r7
 2106040440 metadata/md5-cache/xfce-extra/Manifest.gz
 2106040440 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0
-2106040739 metadata/md5-cache/Manifest.gz
+2106071639 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8dc5bd155543..867d36ea940f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Jun 2021 05:00:01 +0000
+Mon, 07 Jun 2021 14:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d2e80625bdaa..7584a1c40d37 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ec4308f738ba4c5ac094f53c33d11dd913968582 1622780503 2021-06-04T04:21:43+00:00
+bd4dea42d33c3815caa07588c3a1eb59e619afcf 1623072018 2021-06-07T13:20:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f9352fa22796..656327fe01d2 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1622781301 Fri 04 Jun 2021 04:35:01 AM UTC
+1623074701 Mon 07 Jun 2021 02:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1eeae90b630d..c8259c60f7ba 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Jun 2021 04:39:05 +0000
+Mon, 07 Jun 2021 14:08:50 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 50251d0dc5f2..3c831f291aa0 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index f7f414fbd79c..a295d3b9f860 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -3,5 +3,5 @@ AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d4
 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
 DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241
 EBUILD graphite-web-1.1.5-r1.ebuild 2920 BLAKE2B 0a32e53cc76ed3e6c34516e5f8b2efd1296f1928242fd3b7588110a8c9f4edc2ebcf2a1ea9a01be4c64a141b5b656c41a5d757a3b715182a416228a2ff0f777c SHA512 4e2e2866cd6bf262d00d3045b2e6a7f0066f090266aefa52d185fc70ad6401cd9dd26bdedaf24aeb42d9f45b812331bfc44cbb40934a6efde506dcb65b907115
-EBUILD graphite-web-1.1.7.ebuild 3057 BLAKE2B 11539160a39b5bd38dc143856fc0e3ecfca24da3f9d2a502e111d7f7653a634561e1582e1bf7ef0f3d82fb1843eb8c8eb5ba336ac483c5d2faf76dd84a8a64fe SHA512 bd88eb59bafdbb406636268424ab2c0c57633535db780c72cd5f47206fc89b81eeff5322ec3e27bb9d8393d6fd4af460e148ae752f11b42bcead8cad782b63dc
+EBUILD graphite-web-1.1.7.ebuild 3004 BLAKE2B be138374249aa9fc87469d38f1450c86c14c37dc610f5b66b78689ed153a4b7f65a391f0f2ff973a4e093ec064a4f0f68d31b1f8b3ae9151a10d08d26657eeec SHA512 502022409844ca1d7f70c922689457849b6d8ff268b5c1be5b33fced6a4097bbd3cd8535e189652d93ad42e7a9d36a0dbda314624715427cf0d054722370bce1
 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 8e52c1895dcf..53bd930f12a7 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-	# 1.1.7 supports up to 3.9, so it's a matter of deps
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no  # export USE_SETUPTOOLS to activate
 
 inherit distutils-r1 prefix
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 3383fa35e58a..94db402e56c7 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -11,14 +11,10 @@ AUX munin-node_conf.d_1.4.6-r2 188 BLAKE2B 419e475fb422a74d1c094145c25b7ad371e10
 AUX munin-node_init.d_2.0.19 598 BLAKE2B a6442b2873a01d3846ae502314bbdee4ac08ce94ee1dd9e2ca9dc15ba322b531fe4564a76e5cd6526b5b1be5bf06e31ca6c108e8e9f05c89d718c7531ef18a5f SHA512 c2429156972e6db9c75160dcb3419ea67a59801a70e4a13a07899ebea84db079d1efcbeb653e2abea3212fa7cfb96a35ff020daf4918d8fe2839b670ea63b31b
 AUX munin.apache.include 604 BLAKE2B 796293be594baefca293b6cc5f5d6f31c9ab28ecaa209c776aced2d2a0916ff4b61c195393f19355a6460bf2bde8baf41892e4f41905332996afde32e99397ea SHA512 de4797ccac5c9299dd55140300276f746febf3ac5bfebfc48901ca71fa0e035017917eba054b251cc2383c65f1e209e244906b34eebad237f43a7bd7171f6087
 AUX munin.apache.include-2.4 577 BLAKE2B efd0a424cb058b77aa19d6384fac085345f789264b19d878126ca826eda84e79714741529218d9715ba51e175cb1628839e1ca09733f67b370b2401e019c9351 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4
-DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
-DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f
 DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0
 DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4
-EBUILD munin-2.0.59.ebuild 12267 BLAKE2B d4fb2b1f62a4c1a3d1d69fa61e841c17ad6716fa824df49352ad2e5c5ddc39a035c828830302cd6414750c72e2b52198a76efd936d2300dd76529dc2994054ce SHA512 c306d35fe98c0dd9668068fcad1830cf1c5fd45839187b0a91cde40f075a7a042a737e4cc53cdbb27da5049f52021a63cb925040f5b2e54f91155811f7413252
 EBUILD munin-2.0.66.ebuild 12267 BLAKE2B 05ee840753229d97e2b1d5914191950bece83b6575cffa2a7ee50de4dfc3a16f892d8f660288315faccc570166e58fd391795a90fa3aa24531a5fd13752636e1 SHA512 b5ad10e6752dce09b925e05d42db944b5a8f25820b9fbfbfd0272b053539f2b70655ffaf745395f920f5d601ab65d1c0efeb27a3dc353f60b3d8c617f5949b2b
-EBUILD munin-2.0.67-r1.ebuild 12272 BLAKE2B 34a9bc056f46378c2da463caddff1f9ac778f93fa323d0245277a77e1873a4339bc8e1263af9346c3bbf6207349b6515bd0fa6d2a50a1ac6ab0e24b29ec275ec SHA512 486c73f7d3662d436ceedea9a4bd4c2e9cfd04c2c8914534bfba30db15c0c72103e2ea9df01ce4c93e2c9cbdc668e173ec958c1eb7af9e4b85e0b50497127e3a
-EBUILD munin-2.0.67.ebuild 12270 BLAKE2B a74e5cf89c8d8b313470d50ae2f291752d9bce83cb0be6342b0284387cc1d4b6eb35434d381f7a699df0468f4dadfc7626604b5fbebd60ed2d8da6baa225574b SHA512 a415f74e29caa56bf07a85d0c7886963bfcced603a05664d86e9af5a24b123e3242d048ad9f3f88b4d760a2da7cdfaa0f0ccffc844b337f6ee2a96a8c5c02437
+EBUILD munin-2.0.67-r1.ebuild 12271 BLAKE2B 10a07b895f01b3d331d19b77748fd012fba7ca6e0c241ebdcbd78e354ce497a6b921bdba4bb1797ede75240259dd8227ee1712ae263b539575d7b421246d1f86 SHA512 486179c0c6ba4b10105859b2d2f2454d4bb99b9f3afe57040da734579df018b45b6d43698f6cfe2dc6d677256196a7cee7088c9ae716f6fa43123be20872b27d
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.59.ebuild b/net-analyzer/munin/munin-2.0.59.ebuild
deleted file mode 100644
index 5e64da737295..000000000000
--- a/net-analyzer/munin/munin-2.0.59.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/munin/munin-2.0.67-r1.ebuild b/net-analyzer/munin/munin-2.0.67-r1.ebuild
index 8c12a08f9e6a..3bbe4cf30d7f 100644
--- a/net-analyzer/munin/munin-2.0.67-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/munin/munin-2.0.67.ebuild b/net-analyzer/munin/munin-2.0.67.ebuild
deleted file mode 100644
index d589b34da0d2..000000000000
--- a/net-analyzer/munin/munin-2.0.67.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHSET=1
-
-inherit java-pkg-opt-2 systemd
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Munin Server Monitoring Tool"
-HOMEPAGE="http://munin-monitoring.org/"
-SRC_URI="
-	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
-REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
-RESTRICT="!test? ( test )"
-
-# Upstream's listing of required modules is NOT correct!
-# Some of the postgres plugins use DBD::Pg, while others call psql directly.
-# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
-# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="
-	acct-user/munin
-	acct-user/munin-async
-	acct-group/munin
-	dev-lang/perl:=[berkdb]
-	dev-perl/DBI
-	dev-perl/Date-Manip
-	dev-perl/File-Copy-Recursive
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/Net-CIDR
-	dev-perl/Net-DNS
-	dev-perl/Net-Netmask
-	dev-perl/Net-SNMP
-	dev-perl/Net-Server[ipv6(-)?]
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	virtual/perl-MIME-Base64
-	virtual/perl-Storable
-	virtual/perl-Text-Balanced
-	virtual/perl-Time-HiRes
-	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
-	asterisk? ( dev-perl/Net-Telnet )
-	cgi? (
-		dev-perl/FCGI
-		dev-perl/CGI-Fast
-		)
-	dhcpd? (
-		>=net-misc/dhcp-3[server]
-		dev-perl/Net-IP
-		dev-perl/HTTP-Date
-		)
-	doc? ( dev-python/sphinx )
-	http? ( dev-perl/libwww-perl )
-	irc? ( dev-perl/Net-IRC )
-	ldap? ( dev-perl/perl-ldap )
-	kernel_linux? ( sys-process/procps )
-	memcached? ( dev-perl/Cache-Memcached )
-	mysql? (
-		virtual/mysql
-		dev-perl/Cache-Cache
-		dev-perl/DBD-mysql
-		)
-	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	!minimal? (
-		dev-perl/HTML-Template
-		dev-perl/IO-Socket-INET6
-		dev-perl/URI
-		>=net-analyzer/rrdtool-1.3[graph,perl]
-		virtual/ssh
-		)
-	"
-
-# Keep this seperate, as previous versions have had other deps here
-DEPEND="${DEPEND_COM}
-	dev-perl/Module-Build
-	java? ( >=virtual/jdk-1.5 )
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-		dev-perl/Test-LongString
-		dev-perl/Test-Differences
-		dev-perl/Test-MockModule
-		dev-perl/Test-MockObject
-		dev-perl/File-Slurp
-		dev-perl/IO-stringy
-		dev-perl/IO-Socket-INET6
-	)"
-RDEPEND="${DEPEND_COM}
-		virtual/awk
-		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
-		java? (
-			>=virtual/jre-1.5
-			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-		)
-		!minimal? (
-			virtual/cron
-			media-fonts/dejavu
-		)
-		selinux? ( sec-policy/selinux-munin )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	echo ${PV} > RELEASE || die
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
-	use cgi || cgidir="${T}/useless/cgi-bin"
-
-	local cgiuser=$(usex apache2 apache munin)
-
-	cat >> "${S}"/Makefile.config <<- EOF
-	PREFIX=\$(DESTDIR)/usr
-	CONFDIR=\$(DESTDIR)/etc/munin
-	DOCDIR=${T}/useless/doc
-	MANDIR=\$(PREFIX)/share/man
-	LIBDIR=\$(PREFIX)/libexec/munin
-	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
-	CGIDIR=${cgidir}
-	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
-	CGIUSER=${cgiuser}
-	DBDIR=\$(DESTDIR)/var/lib/munin
-	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
-	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
-	LOGDIR=\$(DESTDIR)/var/log/munin
-	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
-	JCVALID=$(usex java yes no)
-	STATEDIR=\$(DESTDIR)/run/munin
-	EOF
-}
-
-# parallel make and install need to be fixed before, and I haven't
-# gotten around to do so yet.
-src_compile() {
-	emake -j1
-	use doc && emake -C doc html
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]]; then
-		eerror "You cannot run tests as root."
-		eerror "Please enable FEATURES=userpriv before proceeding."
-		return 1
-	fi
-
-	local testtargets="test-common test-node test-plugins"
-	use minimal || testtargets+=" test-master"
-
-	LC_ALL=C emake -j1 ${testtargets}
-}
-
-src_install() {
-	local dirs="
-		/var/log/munin
-		/var/lib/munin/plugin-state
-		/var/lib/munin-node/plugin-state
-		/var/www/localhost/htdocs/munin
-		/etc/munin/plugin-conf.d
-		/etc/munin/plugins"
-	use minimal || dirs+=" /etc/munin/munin-conf.d/"
-
-	keepdir ${dirs}
-	fowners munin:munin ${dirs}
-
-	# parallel install doesn't work and it's also pointless to have this
-	# run in parallel for now (because it uses internal loops).
-	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
-
-	# we remove /run from the install, as it's not the package's to deal
-	# with.
-	rm -rf "${D}"/run || die
-
-	# remove the plugins for non-Gentoo package managers; use -f so that
-	# it doesn't fail when installing on non-Linux platforms.
-	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
-
-	insinto /etc/munin/plugin-conf.d/
-	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
-
-	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
-	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
-
-	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
-
-	dodir /usr/lib/tmpfiles.d
-	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
-	d /run/munin 0700 munin munin - -
-	EOF
-
-	systemd_dounit "${FILESDIR}"/munin-async.service
-	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
-	systemd_dounit "${FILESDIR}"/munin-node.service
-
-	cat >> "${T}"/munin.env <<- EOF
-	CONFIG_PROTECT=/var/spool/munin-async/.ssh
-	EOF
-	newenvd "${T}"/munin.env 50munin
-
-	dodoc README ChangeLog INSTALL
-	if use doc; then
-		cd "${S}"/doc/_build/html || die
-		docinto html
-		dodoc -r *
-		cd "${S}" || die
-	fi
-
-	dodir /etc/logrotate.d/
-	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
-		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
-
-	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
-
-	if use syslog; then
-		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
-			"${D}"/etc/munin/munin-node.conf || die
-	fi
-
-	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
-	# munin-node service is ran as user root, and only later drops
-	# privileges.
-	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
-		"${D}"/etc/munin/munin-node.conf || die
-
-	keepdir /var/spool/munin-async/.ssh
-	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
-	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
-	fperms 0750 /var/spool/munin-async{,/.ssh}
-	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
-
-	if use minimal; then
-		# This requires the presence of munin-update, which is part of
-		# the non-minimal install...
-		rm "${D}"/usr/libexec/munin/plugins/munin_stats
-	else
-		# remove font files so that we don't have to keep them around
-		rm "${D}"/usr/libexec/${PN}/*.ttf || die
-
-		if use cgi; then
-			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
-
-			keepdir /var/cache/munin-cgi
-			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
-			fowners $(usex apache2 apache munin) \
-				/var/cache/munin-cgi \
-				/var/log/munin/munin-cgi-{graph,html}.log
-
-			if use apache2; then
-				insinto /etc/apache2/vhosts.d
-				newins "${FILESDIR}"/munin.apache.include munin.include
-				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
-			fi
-		else
-			sed \
-				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
-				-i "${D}"/etc/munin/munin.conf || die
-		fi
-
-		keepdir /var/lib/munin/.ssh
-		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
-		IdentityFile /var/lib/munin/.ssh/id_ecdsa
-		IdentityFile /var/lib/munin/.ssh/id_rsa
-		EOF
-
-		fowners munin:munin /var/lib/munin/.ssh/{,config}
-		fperms go-rwx /var/lib/munin/.ssh/{,config}
-
-		dodir /usr/share/${PN}
-		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
-		# Force the shell to bash
-		SHELL=/bin/bash
-		# Mail reports to root@, not munin@
-		MAILTO=root
-
-		# This runs the munin task every 5 minutes.
-		*/5	* * * *		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#*/1 * * * *		/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#*/2 * * * *		/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#*/15 * * * *		nice /usr/libexec/munin/munin-html
-		EOF
-
-		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
-		# Mail reports to root@, not munin@, only execute one at a time
-		!mailto(root),serial(true)
-
-		# This runs the munin task every 5 minutes.
-		@ 5		/usr/bin/munin-cron
-
-		# Alternatively, this route works differently
-		# Update once a minute (for busy sites)
-		#@ 1	/usr/libexec/munin/munin-update
-		## Check for limit excess every 2 minutes
-		#@ 2	/usr/libexec/munin/munin-limits
-		## Update graphs every 5 minutes
-		#@ 5	nice /usr/libexec/munin/munin-graph
-		## Update HTML pages every 15 minutes
-		#@ 15	nice /usr/libexec/munin/munin-html
-		EOF
-
-		# remove .htaccess file
-		find "${D}" -name .htaccess -delete || die
-	fi
-}
-
-pkg_config() {
-	if use minimal; then
-		einfo "Nothing to do."
-		return 0
-	fi
-
-	einfo "Press enter to install the default crontab for the munin master"
-	einfo "installation from /usr/share/${PN}/f?crontab"
-	einfo "If you have a large site, you may wish to customize it."
-	read
-
-	ebegin "Setting up cron ..."
-	if has_version sys-process/fcron; then
-		fcrontab - -u munin < /usr/share/${PN}/fcrontab
-	else
-		# dcron is very fussy about syntax
-		# the following is the only form that works in BOTH dcron and vixie-cron
-		crontab - -u munin < /usr/share/${PN}/crontab
-	fi
-	eend $?
-
-	einfo "Press enter to set up the SSH keys used for SSH transport"
-	read
-
-	# generate one rsa (for legacy) and one ecdsa (for new systems)
-	ssh-keygen -t rsa \
-		-f /var/lib/munin/.ssh/id_rsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	ssh-keygen -t ecdsa \
-		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
-		-C "created by portage for ${CATEGORY}/${PN}" || die
-	chown -R munin:munin /var/lib/munin/.ssh || die
-	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
-
-	einfo "Your public keys are available in "
-	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
-	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
-	einfo "and follows for convenience"
-	echo
-	cat /var/lib/munin/.ssh/id_*.pub
-}
-
-pkg_postinst() {
-	elog "Please follow the munin documentation to set up the plugins you"
-	elog "need, afterwards start munin-node."
-	elog ""
-	elog "To make use of munin-async, make sure to set up the corresponding"
-	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
-	elog ""
-	if ! use minimal; then
-		elog "Please run"
-		elog "  emerge --config net-analyzer/munin"
-		elog "to automatically configure munin's cronjobs as well as generate"
-		elog "passwordless SSH keys to be used with munin-async."
-	fi
-	elog ""
-	elog "Further information about setting up Munin in Gentoo can be found"
-	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
-
-	if use cgi; then
-		chown $(usex apache2 apache munin) \
-			"${ROOT}"/var/cache/munin-cgi \
-			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
-
-		if use apache2; then
-			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
-			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
-			elog "host you want it to be served."
-			elog "If you want to enable CGI-based HTML as well, you have to add to"
-			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
-		else
-			elog "Effective CGI support has just been added in 2.0.7-r6."
-			elog "Documentation on how to use it is still sparse."
-		fi
-	fi
-
-	# we create this here as we don't want Portage to check /run
-	# symlinks but we still need this to be present before the reboot.
-	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
-		mkdir "${ROOT}"/run/munin
-		chown munin:munin "${ROOT}"/run/munin
-		chmod 0700 "${ROOT}"/run/munin
-	fi
-}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 61f33c834b56..f17a90f96f1d 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -9,6 +9,6 @@ EBUILD netdata-1.29.1.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72b
 EBUILD netdata-1.29.2.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.29.3.ebuild 3418 BLAKE2B 294e7bf5dc19a8f40a16fb7bf8f726868ae72bb1d3005d8efe5f915f81c2b0949078d3cc1a228ddcddf78939c8302cb58919fe3d3db56c7cec8c8db513dc74e1 SHA512 60ffc62fafaa1bc89d290b09877c632c72e7712f46644f799b9b9fdefc7020c5239063b824f4c1941b5875c72866c95a0aaeb2634fa7f699139eac43ab2808fc
 EBUILD netdata-1.30.1-r1.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
-EBUILD netdata-1.31.0.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
-EBUILD netdata-9999.ebuild 3484 BLAKE2B 564d1c7b417dbf3456a8b6a87666dc734bfcf77b23f5a067b368e87952dce2608816b7a1bd7e8cbf772590110eb8018d285a2b81601a671af9be58f16322fbac SHA512 ea4a69ebde4d634a77485a1d3c6a30d6b91beb813f449448ad75a7c34423f9c0f6c7e4a8dbe2ad52e8c8b0e737c839bea230b5ece0068e9544431638ed98cd4c
+EBUILD netdata-1.31.0.ebuild 3491 BLAKE2B ff5bbd8306c08adbd46c9aebd3a59407c7384dc926efda89da52f585959aabcc730458b156c2e8cb83681d4034046a211e32bd98bcc4dce6b1d4b66828519693 SHA512 5bda381e787ac5527d5fa15512e8168db758cb0161b1d07f6b2408099e9cad7a54d596ce26921827aac256a2ce6e44a78d27b9774d285b40698219b9a2222cdb
+EBUILD netdata-9999.ebuild 3491 BLAKE2B ff5bbd8306c08adbd46c9aebd3a59407c7384dc926efda89da52f585959aabcc730458b156c2e8cb83681d4034046a211e32bd98bcc4dce6b1d4b66828519693 SHA512 5bda381e787ac5527d5fa15512e8168db758cb0161b1d07f6b2408099e9cad7a54d596ce26921827aac256a2ce6e44a78d27b9774d285b40698219b9a2222cdb
 MISC metadata.xml 1288 BLAKE2B 33251404c09ccdd7ba653dae7204cf262201fdfc058766eb6b12bd4eacd99be5482867110726ced371a89db6ff022f0c89cf62425ef14f5a2e13734ad1caf70d SHA512 27087ff277f6bec908d23a66183344dfed06761a9b344a3c0d8ec2048e56ac0cb542c3d30bc22fa71cd91aee5d396b4786b546556ce7d64ea394781e05644220
diff --git a/net-analyzer/netdata/netdata-1.31.0.ebuild b/net-analyzer/netdata/netdata-1.31.0.ebuild
index 64c8c68c5aa7..250ba90c1511 100644
--- a/net-analyzer/netdata/netdata-1.31.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.31.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux real time system monitoring, done right!"
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 64c8c68c5aa7..250ba90c1511 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux real time system monitoring, done right!"
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 9c8a9389066b..58f84efa7406 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,3 +1,5 @@
 DIST testssl-3.0.4.tar.gz 9223535 BLAKE2B 658947ca7afc2b080edeed724f8185a3292736df1c71bd0bffd5a6f7ecfef7c56a1589c29eff84f278b2b788e63a881139a62ac714684209ed0cb8425f9a749e SHA512 663dc71dcaa37fe969121980274489fc2cf91450122001e98b8e78e510b1e3741b801fd767f6fca2d0735a184ea919b1672b2ba154ef074b146b6d5d47adc277
+DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
 EBUILD testssl-3.0.4.ebuild 1509 BLAKE2B caec077df5630d62cc64069c759898b011766bff45caa68a37d791fcd81a0bd8928311d7d22191b2f13e6ad27be2ba982580e8736379d56299fe46a4af9c022d SHA512 29cbeebce5e934054f8458c6d87288e2ef940b03f7c185c8ef35b4be2f28291d7c152b04b1213f37f5d23530ffb3cfff7cfd24deaa8b0f425c3471e132d75a31
+EBUILD testssl-3.0.5.ebuild 1511 BLAKE2B b1e088ade2a9897d655752acfbd5fa74491db293494c79297ff4c057c0140a72f48c4fa48d88d4d1a5df155573683d74dd17f7b8a0308b32b0477d46e1f3b962 SHA512 0b66ed1798780028f552f3787f5f27c38fc3a6a869301902de665230bb27e4939c82623050cef628ffdde23f2d87172f50ab647fcb54e687eabe2b7e035dc0fe
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-3.0.5.ebuild b/net-analyzer/testssl/testssl-3.0.5.ebuild
new file mode 100644
index 000000000000..6b56952e7f1a
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}.sh"
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="Tool to check TLS/SSL cipher support"
+HOMEPAGE="https://testssl.sh/"
+SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-iana.mapping.html
+
+	dobin ${PN}.sh
+
+	insinto /etc/${PN}
+	doins etc/*
+
+	if use bundled-openssl; then
+		exeinto /opt/${PN}
+		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 18df0e8819fc..c8b465869ac3 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 70e69bb9b58e..5c5cb4f4a0b8 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,8 +1,11 @@
 AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3a46256192fa1041db8ee6fe5ff5ac15285caacceb8222d2fb1dce1c617c41baea1da7fe15 SHA512 ea01c5cd9494a9dd5c8146f0de84c6bd4df3ba2221b52b87886892cbc13aad21f273ea1d056c3dd88ae5e15c1f6f820f9fe4b1dd4c9ae7082d7f7f78b3f8813e
 AUX maradns-3.5.0005-flags.patch 793 BLAKE2B 65a6cf4e0b77e19431e9c243bbb9a790ffbe064a66bf20747779c5401ba6e47b4b6cf21a73843ca8e259f296e5d2fca70dcd801fd45b3d3e2b7e784e9557cf24 SHA512 940b18ebfbcd7b8b83e505dd9e597599febd0ffb9c1b8d1e6bdc5749031c53e514467a9d62fd7d6e02d99d4226e09c87cc8124e5fb19a5c735dac25f99d4bfb5
+AUX maradns-3.5.0020-flags-ipv6.patch 3899 BLAKE2B 9a4bcca0f453b85a6f8c2fa2ce1731a6c454be01a39818eeaec0d06fa5e95d8a3f4b8e52262fc9ee4b45c7fd24231fc501cf9ff4327c9aadfefd1346f9a285ea SHA512 2d50ce4e0678f7303a7b48e31b0b175b494ef0ebf4ad623ff934f33d631a245663970b98df08f2ff68cb6a86a660cc47f9e4d0b55cd5cccacb1c18c66a75ac9d
 AUX maradns.service.in 159 BLAKE2B 2ecd43d92a6c804fd713c0e1e22a18049ab410ccb0b92ec9ffe7621605e1dfea65c880369d0530e59cf061f6fb402cd83175f38be27b43d82b65a7175434e648 SHA512 0de3b9141b8266cb6443b8a7fcb6243782059d2ea45b89421158ded607413eb491542c279f2a9b4455e9396e6ba20e46aed8f46eba3b04e5bd428f335c4b9582
 AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e208e90009900faf8f93c9c43ae80fe0b618202b2aff5cd2302af253a4d38d7d6486c8bc05 SHA512 e893020a934c5927b772189c034469055cd0d8a8ab3e066fe063e30999be6a6679e7b95c2761dec1326cec37fe5261541fbb27e9be796681764c75252b10e90b
 AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7
 DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
+DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4
 EBUILD maradns-3.5.0005.ebuild 2410 BLAKE2B a6703a7856b9344dfa5c17df257f8cdcf46013498c2acfb46a02bf2d2923692e9d9b9288b7ba3d15fe77a8fdd67ba444fc3283e3e43f01c97fff82a971fd928e SHA512 d09cddab2a6e4af7cdfbd48ce99b16a1759baf34c85376fd3ed16629c545abfa353eb95a074ce73f8af44ef8ed631daa128b3bc23bcb9b4ed39afec9bc0f86d6
+EBUILD maradns-3.5.0020.ebuild 2578 BLAKE2B 851a523dc89dcca6ec7a03aa717c36c7d12c3799e57beee16317440d916a6e6bf7ed81e05a8ba100fedceeac20e72081160c1f539e0ae028eaec7204a1448e53 SHA512 0493e2b92f656b75b0aab556980915144b5179f5540862a6b2dda7e35f493f3e8bb6234a2507377302fce916d62f913361699881d44b4436e7a67f01d04e49f8
 MISC metadata.xml 650 BLAKE2B de0597fe89738d9455f42c28ccb868f222170d4c554d46d8f266923f832ebc8e2eeb10b14481c361a0c03ec31e448684d61fbf4bf8f960935d6f7abe550b21b1 SHA512 119586844787fd28975f10a6546f3f28e9d99ef09f08293b24502fd5d5898724f35c6f2f31c68862eb5ec8fe6a3bee2f4f4d61581369430231f720777f20b153
diff --git a/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch
new file mode 100644
index 000000000000..4582dec4f56a
--- /dev/null
+++ b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch
@@ -0,0 +1,113 @@
+From 0a2159798edffdbc0fdba67b2ae4aeca118a2516 Mon Sep 17 00:00:00 2001
+From: Victor Kustov <ktrace@yandex.ru>
+Date: Mon, 31 May 2021 22:47:55 +0300
+Subject: [PATCH] fix
+
+---
+ build/Makefile.linux | 52 ++++++++++++++++++++++----------------------
+ configure            |  4 ++--
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/build/Makefile.linux b/build/Makefile.linux
+index 965c7fb..62c20b9 100644
+--- a/build/Makefile.linux
++++ b/build/Makefile.linux
+@@ -24,48 +24,48 @@ EXECS=server/maradns
+ # end the Solaris section
+ # Non-Solaris version of "M"
+ V="VERSION=$(VERSION)"
+-Q="DEFINES=-DSELECT_PROBLEM"
++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM"
+ 
+ # Debug
+ 
+ FLAGS = -O2 -Wall -DSELECT_PROBLEM
+-M="CC=$(CC) $(FLAGS)"
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+ 
+ all: 
+-	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
+-	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
+-	cd ../qual ; make $(M) ; cd ../server ; \
++	cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \
++	cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \
++	cd ../qual ; $(MAKE) $(M) ; cd ../server ; \
+ 	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
+-	cd ../tools ; make $(M) ; \
+-	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
+-	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++	cd ../tools ; $(MAKE) $(M) ; \
++	cd ../deadwood-*/src/ ; $(MAKE)  $(M) ; \
++	cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST
+ 
+ debug: 
+-	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
+-	cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \
+-	cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \
++	cd libs ; $(MAKE) $(D) DEBUG="-DDEBUG -DTHREADS" ; \
++	cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \
++	cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \
+ 	cd ../server ; \
+ 	make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \
+-	cd ../tools ; make $(D) ; \
+-	cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST
++	cd ../tools ; $(MAKE) $(D) ; \
++	cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST
+ 
+ clean:
+ 	rm -f $(OBJECTS) core $(EXECS) ; \
+-	cp build/Makefile.w Makefile ; cd dns ; make clean ; \
+-	cd ../libs ; make clean ; cd ../parse ; make clean ; \
+-	cd ../qual ; make clean ; \
+-	cd ../server ; make clean ; \
++	cp build/Makefile.w Makefile ; cd dns ; $(MAKE) clean ; \
++	cd ../libs ; $(MAKE) clean ; cd ../parse ; $(MAKE) clean ; \
++	cd ../qual ; $(MAKE) clean ; \
++	cd ../server ; $(MAKE) clean ; \
+ 	cp Makefile.recursive Makefile ; \
+-	cd ../test ; make clean ; \
+-	cd ../tools ; make clean ; \
+-	cd misc ; make clean ; \
+-	cd ../../utf8 ; make clean ; \
+-	cd ../tcp ; make clean ; \
+-	cd ../rng ; make clean ; \
+-	cd ../sqa ; make clean ; \
+-	cd ../deadwood-*/src ; make clean ; \
++	cd ../test ; $(MAKE) clean ; \
++	cd ../tools ; $(MAKE) clean ; \
++	cd misc ; $(MAKE) clean ; \
++	cd ../../utf8 ; $(MAKE) clean ; \
++	cd ../tcp ; $(MAKE) clean ; \
++	cd ../rng ; $(MAKE) clean ; \
++	cd ../sqa ; $(MAKE) clean ; \
++	cd ../deadwood-*/src ; $(MAKE) clean ; \
+ 	# ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm
+ 
+ strip:
+diff --git a/configure b/configure
+index 9e98ac8..fedbd87 100755
+--- a/configure
++++ b/configure
+@@ -174,14 +174,14 @@ if [ -z "$IPV6" ] ; then
+ 	cp tcp/Makefile.authonly tcp/Makefile
+ 	cp dns/Makefile.authonly dns/Makefile
+ 	cp tools/Makefile.authonly tools/Makefile
++	DEADWOOD_DIR=$( echo deadwood-* )
++	cp $DEADWOOD_DIR/src/Makefile.noipv6 $DEADWOOD_DIR/src/Makefile
+ else
+ 	cp server/Makefile.ipv6 server/Makefile
+ 	cp qual/Makefile.nothreads qual/Makefile
+ 	cp tcp/Makefile.ipv6 tcp/Makefile
+ 	cp dns/Makefile.authonly dns/Makefile
+ 	cp tools/Makefile.ipv6 tools/Makefile
+-	DEADWOOD_DIR=$( echo deadwood-* )
+-	cp $DEADWOOD_DIR/src/Makefile.ipv6 $DEADWOOD_DIR/src/Makefile
+ fi
+ 
+ echo
+-- 
+2.26.3
+
diff --git a/net-dns/maradns/maradns-3.5.0020.ebuild b/net-dns/maradns/maradns-3.5.0020.ebuild
new file mode 100644
index 000000000000..6bf474750b66
--- /dev/null
+++ b/net-dns/maradns/maradns-3.5.0020.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="https://maradns.samiam.org"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
+
+# The GPL-2 covers the init script, bug 426018.
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="examples ipv6"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl"
+DEPEND="
+	acct-group/maradns
+	acct-user/duende
+	acct-user/maradns"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags-ipv6.patch
+)
+
+src_prepare() {
+	default
+	python_fix_shebang tools/bind2csv2.py
+}
+
+src_configure() {
+	tc-export CC
+	./configure \
+		$(usex ipv6 --ipv6 "") || die "Failed to configure"
+}
+
+src_install() {
+	# Install the MaraDNS and Deadwood binaries
+	dosbin server/maradns
+	dosbin tcp/zoneserver
+	dosbin deadwood-${PV}/src/Deadwood
+	dobin tcp/{getzone,fetchzone}
+	dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
+
+	# MaraDNS docs, manpages, misc
+	docompress -x /usr/share/doc/${PF}/maradns.gpg.key
+	dodoc {CHANGELOG,COPYING,SUPPORT,maradns.gpg.key}
+	dodoc doc/en/{QuickStart,faq.*,*.md,README}
+	dodoc -r doc/en/{text,webpage,tutorial}
+	docinto deadwood
+	dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+	dodoc -r deadwood-${PV}/doc/internals
+
+	# Install examples (optional)
+	if use examples ; then
+		docinto examples
+		dodoc doc/en/examples/example_*
+	fi
+
+	# Install manpages
+	doman doc/en/man/*.[1-9]
+	doman deadwood-${PV}/doc/{Deadwood,Duende}.1
+
+	# Example configurations.
+	insinto /etc/maradns
+	newins doc/en/examples/example_full_mararc mararc_full.dist
+	newins doc/en/examples/example_csv2 example_csv2.dist
+	newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
+	keepdir /etc/maradns/logger
+
+	# Init scripts.
+	newinitd "${FILESDIR}"/maradns2 maradns
+	newinitd "${FILESDIR}"/zoneserver2 zoneserver
+	newinitd "${FILESDIR}"/deadwood deadwood
+
+	# systemd unit
+	# please keep paths in sync!
+	sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
+		-e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
+		"${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
+		|| die "failed to create the maradns.service file (sed)"
+
+	systemd_dounit "${T}"/maradns.service
+}
+
+pkg_postinst() {
+	elog "Examples of configuration files can be found in the"
+	elog "/etc/maradns directory, feel free use it like:"
+	elog "     cp /etc/maradns/mararc{_full.dist,}"
+	elog "and edit /etc/maradns/mararc as described in man mararc."
+}
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 57c17ce63165..cf88d03c172a 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,8 +1,6 @@
-AUX pdns-recursor-r2 1251 BLAKE2B 391f52b9c9b8ee1d01ca57b5e73106f350f474e12c5ca957cfe857a0a8f672a1347393d15c343601769ce58fc12034833fb5f012f7ae7b1d41d76d493be5ca71 SHA512 a607ac4e6edb095d7d097e255779ea574191793bbbdce1df7113e17dc777dfd8929a9332fc6cd4e98b59fe826e020efcf35a011ff4cef70433117fab4998584c
-DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
+AUX pdns-recursor-r2 1426 BLAKE2B 4407525f88d6e4299acdaa015e13866b70b2f697493218953c515e00af1476df7b8dbc87f6a39c50743d78b7f8efd2d3446e1a387f98ac4191cea2c04e10c175 SHA512 2f4d8458f6224a42103d28937d69228092c74c9c8c958833b292acf8959df1e617eafc13b65b95cf6eb4e06fb4fa7f23906c28b583865b6885949daaac12799e
 DIST pdns-recursor-4.4.3.tar.bz2 1398743 BLAKE2B d9429ef22bb2b196e42da91332332b38dee9220d490c8adda686b0bc144e0981ea4418973f4304d6d964ef8f6ac4adcde4bd3e6d6b208c620440eab1b11a7fc0 SHA512 bac69cbaabc1b0de0def681e07f7e77954e0d487732cb46dc722f7869576a8a477a4011f78c9cc66b5e9b45455eb81534602b2834dc1ad42b85f5f2801915cbb
 DIST pdns-recursor-4.5.1.tar.bz2 1463138 BLAKE2B 863cddbe4001b32cf457dc489bd39ad7b045f19183b1d13bc31bfd7fa28cc6e7e69755216715e0fd75fd0d724de20f7b89c89017fc42dff35de4e45e9351af75 SHA512 0cfbc95e3e84a2ab2cd88ee638b0ff26f5f35b64754086483555df28f045d64b5fdfab3e8c430c0b4e97dc4eda624226c37ec0f50902ffe5f84882d814e8051e
-EBUILD pdns-recursor-4.4.2-r100.ebuild 1943 BLAKE2B 399a16bbf1255ddf34affacb8d19fe3175aab3b93fbd00844fc4cab88152a40a52dba708f292c21299b7805e48ed7af9f3f7262596f5fd397ff4d7b4f0d53d9c SHA512 4798d926465bc53fb38dc28b83c3d1e5a444307933575119938a65761f303d141c31d3e89aad53458421dee3e0c764275022a6ecb45241833f038e75fdcc17b8
 EBUILD pdns-recursor-4.4.3.ebuild 2009 BLAKE2B 2ac02e0feb23ea88dd1a3cb11501b936df84e479ed6a12d091dc6969d541ed11172a5b62ee60fadf543904c79acbb9c55501cbce3e613fbee6ae5eaab26b9725 SHA512 e61b5b4daa36c405397827d522cc70d9923c9f4294b551b485759f549448b00b0613356a769696240c8a7f9dafbce8645b51b96200c2321f7c5f51ac49b4000f
 EBUILD pdns-recursor-4.5.1.ebuild 1893 BLAKE2B 1210686544fc58dfdde1d931ccd8e7757684b89a8dd1368c67e2466f508293178c80a92ef0550b9e037cee77dbb33be49053a3ace5a0debc3353812c0ddab96d SHA512 845010f783223095ce06793621906d1996dc6206ff77fd78c88951664a019aa719c601330a570236dbd3556ce03f9353930a8076aca69cfb04980b359bb8ecb5
 MISC metadata.xml 1008 BLAKE2B 1c82fd9262358bcf1ff0f8503bc8dfe9b640023133ca48711bc576df00312312b5e37a36ff10aac561ef1c71e20f64c5f0a4c431c60ca029220732fba0ee1bf9 SHA512 2deab5a88c42d3416b3da5b6d9d3ed9b2db0a5dcb3d8b7fc4c7a13b2219fd7df786bfef42ff5e3d7c2b40058592e892f380d126a0254013534e66e65499e7105
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-r2 b/net-dns/pdns-recursor/files/pdns-recursor-r2
index 01ce79167bbc..0ca3dfc18782 100644
--- a/net-dns/pdns-recursor/files/pdns-recursor-r2
+++ b/net-dns/pdns-recursor/files/pdns-recursor-r2
@@ -1,12 +1,18 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+get_config_option() {
+	awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}"
+}
+
 PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
 
 PDNS_CONFIG="${PDNS_CONFIGDIR}/recursor.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_CHROOTDIR="$( get_config_option chroot )"
+PDNS_SOCKETDIR="$( get_config_option socket-dir )"
+PDNS_SETUID="$( get_config_option setuid )"
+PDNS_SETGID="$( get_config_option setgid )"
 [ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns-recursor"
 
 name="PowerDNS Recursor"
@@ -31,7 +37,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+	checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
 }
 
 ping() {
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
deleted file mode 100644
index 59d7eaeaa9d4..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-4.4.2-r100.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit flag-o-matic lua-single
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="debug dnstap protobuf snmp sodium systemd"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	dnstap? ( protobuf )"
-
-DEPEND="${LUA_DEPS}
-	protobuf? (
-		dev-libs/protobuf
-		>=dev-libs/boost-1.42:=
-	)
-	dnstap? ( dev-libs/fstrm )
-	systemd? ( sys-apps/systemd:0= )
-	snmp? ( net-analyzer/net-snmp )
-	sodium? ( dev-libs/libsodium:= )
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.35:="
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1
-	acct-user/pdns
-	acct-group/pdns"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/_/-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-	filter-flags -ftree-vectorize
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--with-nod-cache-dir=/var/lib/powerdns \
-		--with-service-user=pdns \
-		--with-service-group=pdns \
-		--with-lua="${ELUA}" \
-		$(use_enable debug verbose-logging) \
-		$(use_enable systemd) \
-		$(use_enable dnstap dnstap) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		$(use_with snmp net-snmp)
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
-
-	# set defaults: setuid=nobody, setgid=nobody
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/' \
-		-e 's/^# quiet=$/quiet=on/' \
-		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
-		"${D}"/etc/powerdns/recursor.conf
-
-	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
-}
-
-pkg_postinst() {
-	local old
-
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 4.0.0-r1 || continue
-
-		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
-		ewarn "to pdns-recursor, please update your runlevels accordingly."
-
-		break
-	done
-}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 2b5ad585cefd..0fc0214719da 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,7 +1,5 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
-AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb2b24d2b5ff3e3596d00c4289017845c7a1751d0a43e83ba67e4b8e55e10aca892ba3d3aea SHA512 5ebc7cd236195543e67db5ed2c831ff6a1b9bdba5a72c179df72f84e4ade2dfc962a988ab02a7b893c62a7c3d8df7a15e2de3ae02413ff296a6404a7937eb8de
-DIST pdns-4.4.0.tar.bz2 1270854 BLAKE2B 2c855197d0b5f8fc141e4fa19268e68b9114353c7f89157023b9cd6b9559e788b55a9b0eeebea55d4ba0a206229d9c032f0c84c40ffd91c7277eb611a4bc966a SHA512 e7f35539915ee7945b537cfedae72e2b83c86b39c5e44a9268b8a086f44b30a33a64e0b65aad140ba02c349cedaa12820226578dea87c9b666dc75f8bd15c1f6
+AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
-EBUILD pdns-4.4.0-r100.ebuild 4509 BLAKE2B 856dc394f10dc1061beb849d3750039032cb2948dddf31eb58ccdd4e5b292d469ee612f43203406c5e9f13320e8a35a7f164c7f0dd3987088d10e3f48c09c027 SHA512 1af31ad6a37da79847e341bac25d90b106da6c42e2455be511f22ff74b09577dcef4fc6a929a1c031803e11f3a91ab8a3f77373f69eb0215c46aa6453d81130b
-EBUILD pdns-4.4.1.ebuild 4509 BLAKE2B 856dc394f10dc1061beb849d3750039032cb2948dddf31eb58ccdd4e5b292d469ee612f43203406c5e9f13320e8a35a7f164c7f0dd3987088d10e3f48c09c027 SHA512 1af31ad6a37da79847e341bac25d90b106da6c42e2455be511f22ff74b09577dcef4fc6a929a1c031803e11f3a91ab8a3f77373f69eb0215c46aa6453d81130b
+EBUILD pdns-4.4.1.ebuild 4328 BLAKE2B 12da4dca63939766d5511fc8de7a1fd746fa27089062db72c88663ea465ed00aab3214fbab324088b6a04300838f99f23a212209e9cd3d4f4ef266833175a0e3 SHA512 07cd6c982308d7dec13a676de3baa2781216e5a92417741faa2736f627c83c8af6016c4b6f427593ed86f2d76bc224473501284a4daaa2d51d2e0c16efa8a801
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/files/pdns-r1 b/net-dns/pdns/files/pdns-r1
index 4c5241e5155f..eeff5a08f634 100644
--- a/net-dns/pdns/files/pdns-r1
+++ b/net-dns/pdns/files/pdns-r1
@@ -1,15 +1,21 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+get_config_option() {
+	awk -v option="${1}" -F = '$1 == option { print $2 }' "${PDNS_CONFIG}"
+}
+
 PDNS_CONFIGDIR="${PDNS_CONFIGDIR:-/etc/powerdns}"
 PDNS_STOP_TIMEOUT="${PDNS_STOP_TIMEOUT:-10}"
 
 [ "${RC_SVCNAME}" != "pdns" ] && PDNS_INSTANCE="${RC_SVCNAME#pdns[.-]}" || PDNS_INSTANCE=""
 
 PDNS_CONFIG="${PDNS_CONFIGDIR}/pdns${PDNS_INSTANCE:+-${PDNS_INSTANCE}}.conf"
-PDNS_CHROOTDIR="$( awk -F = '$1 == "chroot" { print $2 }' "${PDNS_CONFIG}" )"
-PDNS_SOCKETDIR="$( awk -F = '$1 == "socket-dir" { print $2 }' "${PDNS_CONFIG}" )"
+PDNS_CHROOTDIR="$( get_config_option chroot )"
+PDNS_SOCKETDIR="$( get_config_option socket-dir )"
+PDNS_SETUID="$( get_config_option setuid )"
+PDNS_SETGID="$( get_config_option setgid )"
 [ -z "${PDNS_SOCKETDIR}" -a -z "${PDNS_CHROOTDIR}" ] && PDNS_SOCKETDIR="/var/run/pdns"
 
 name="PowerDNS Authoritative Server${PDNS_INSTANCE:+ (${PDNS_INSTANCE})}"
@@ -22,7 +28,7 @@ description_ping="Ping the PowerDNS instance"
 description_monitor="Starts in foreground with logging and console enabled"
 
 command="/usr/sbin/pdns_server"
-command_args="--config-dir=${PDNS_CONFIGDIR}${PDNS_INSTANCE:+ --config-name=${PDNS_INSTANCE}}"
+command_args="--config-dir=${PDNS_CONFIGDIR}${PDNS_INSTANCE:+ --config-name=${PDNS_INSTANCE}} --write-pid=yes"
 command_args_foreground="--daemon=no"
 command_args_background="--daemon=yes"
 yesno ${rc_verbose} || command_args_background="${command_args_background} >/dev/null 2>&1"
@@ -42,6 +48,10 @@ status() {
 	_ping || return 32
 }
 
+start_pre() {
+	checkpath --directory --owner "${PDNS_SETUID:-root}:${PDNS_SETGID:-root}" --mode 750 "${PDNS_CHROOTDIR}/${PDNS_SOCKETDIR}"
+}
+
 stop() {
 	default_stop || return
 	_ping || return 0
diff --git a/net-dns/pdns/pdns-4.4.0-r100.ebuild b/net-dns/pdns/pdns-4.4.0-r100.ebuild
deleted file mode 100644
index b37e0944e77c..000000000000
--- a/net-dns/pdns/pdns-4.4.0-r100.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="debug doc geoip ldap lua-records mydns mysql postgres protobuf remote sodium sqlite systemd tools tinydns test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	mydns? ( mysql )"
-
-DEPEND="${LUA_DEPS}
-	dev-libs/openssl:=
-	>=dev-libs/boost-1.35:=
-	lua-records? ( >=net-misc/curl-7.21.3 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-	sqlite? ( dev-db/sqlite:3 )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-	sodium? ( dev-libs/libsodium:= )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-RDEPEND="${DEPEND}
-	acct-user/pdns
-	acct-group/pdns"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-service-user=pdns \
-		--with-service-group=pdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-lua="${ELUA}" \
-		$(use_enable debug verbose-logging) \
-		$(use_enable lua-records) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	if use doc; then
-		docinto html
-		dodoc -r codedocs/html/.
-	fi
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		echo
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 3.2 || continue
-
-		echo
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-
-	if use postgres; then
-		for old in ${REPLACING_VERSIONS}; do
-			ver_test ${old} -lt 4.1.11-r1 || continue
-
-			echo
-			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
-			ewarn "This security fix needs to be applied manually to the database schema."
-			ewarn "Please refer to the official security advisory for more information:"
-			ewarn
-			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
-
-			break
-		done
-	fi
-}
diff --git a/net-dns/pdns/pdns-4.4.1.ebuild b/net-dns/pdns/pdns-4.4.1.ebuild
index b37e0944e77c..9fbdd03b8c85 100644
--- a/net-dns/pdns/pdns-4.4.1.ebuild
+++ b/net-dns/pdns/pdns-4.4.1.ebuild
@@ -130,12 +130,6 @@ pkg_postinst() {
 	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
 	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
 
-	if use ldap ; then
-		echo
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
 	local old
 	for old in ${REPLACING_VERSIONS}; do
 		ver_test ${old} -lt 3.2 || continue
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 3d58d7cfc341..63d39771b2e9 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/nfacct/Manifest b/net-firewall/nfacct/Manifest
index a20f8ddfdd16..cc94a3dd230c 100644
--- a/net-firewall/nfacct/Manifest
+++ b/net-firewall/nfacct/Manifest
@@ -1,3 +1,3 @@
 DIST nfacct-1.0.2.tar.bz2 265449 BLAKE2B 08da45f90a2982746633001265c93ff6d055bc0ec9bcfb731b60e3666a2ee2520ed499ea57815e524b6c49369415aa4215d0c8e6ea02c1ce76dbc22de2fc79ea SHA512 2d7a76a51ffb10601e67ceda2ce055e63a8da802a682aab3c96cfa38e1d9d0d7ae7fa204d17d555303216e2ceeb0965d6b25387634725cf35e0a7109d84b47b3
-EBUILD nfacct-1.0.2.ebuild 546 BLAKE2B b880ee3de697cf3a307a77e3bd265cf4f7e84471c2d3247f37aedc44bc3369e880cda35c03c13b87d9a00a32293b6bf54bbcdb90af08ce2a0ec5a7ad25d62bdb SHA512 aba8a8b31aaff4765535ca2225d97c27bd8b8041c9dd2316281c578eea038a64dcb225ece45974c1271704ea982a8806e5e4449bdbe4d80c263704435c1c9a8e
+EBUILD nfacct-1.0.2.ebuild 553 BLAKE2B 9ce45786b64c26e1143f50578fbdec41553e6a211568dcb8e9fcde114d1381886799a2daadfd7b8d14c49cd201fca3767cc37b2f5460c547f4b86e20ced2acaa SHA512 cbf6d62eb370e5609474b42a1bf18df6cb886bdfb9524a58f404ed37cde2b1b958708f086888bd589d696d27063a33eb942cbf0efe988a22a2b5276d75632372
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-firewall/nfacct/nfacct-1.0.2.ebuild b/net-firewall/nfacct/nfacct-1.0.2.ebuild
index e5e078f04e84..e8f02e4ce7f0 100644
--- a/net-firewall/nfacct/nfacct-1.0.2.ebuild
+++ b/net-firewall/nfacct/nfacct-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 RDEPEND="
 	net-libs/libmnl
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 96c260b47e49..4e6edad41ba1 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index a965076a6042..1aba0cd2efc6 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -6,11 +6,11 @@ AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0
 AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80e3d56ac235b766f8fdb7a926bd97769f4723871cb32672123ae84d04cee4c9936e39cff9430d087de9601362c SHA512 f754357cceb88053af2ee074e5926e0fb11613ba42a375a38aaec1b11172f55f9b1b99fca651a3f4af2c16326c5ae0f871b70df28b08f384917a97acc312579e
 AUX pidgin-2.14.3-remove_oscar_tests.patch 396 BLAKE2B 139f898c82283b896a50edb8d2e6825513b8549dee63f51d0d90b4e71a55685a2e5886a4fe84cf361ef1fb5f607876469d0501c7711afacd9b722b3401e19bf8 SHA512 cf6fe751035d4756f13843141d0ead9ad25275702143c2b2b30f8e3160545c3c72e9bb0e67ea258a622f950b4c3431c28943b9d63cf185c73bed2cb559e93508
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
 DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b5a291a838dab4b7cda99c76b3e411414b186ae493f08bd9764c65eab4b41eb9a45d340fe885f8bf9bf092911d43 SHA512 70f426900ce76afcdad76bcd06ebc320f562fe4089ec87c639d8d0d90823077f5e815932b62c3ff3da6270b3acfde3c8222d9b8c5cbb211421239c9dcc69b909
 DIST pidgin-2.14.4.tar.bz2 8724096 BLAKE2B 674b8cc306b5179c95a546f13e7ec7c2a13a22ff2ab502460435e2449e1a9fdb9e33baf2d8b81867a40251e3fe004dce5a0a371deab70587c694a10c6419f89d SHA512 78550b7c4678242861bc0b0a3c32ab03c9fd6e4f509a9b83f872f2e201fe69617c8407d4cc90205e74598f1b8fdddfeddc8f59b47179524a7af7a241eaf1fa0b
+DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.14.1.ebuild 7878 BLAKE2B 59062608078edceed4583384f9567c2fc6cd6da05ff9d70d99022fe8728c5ee7b083ca800a3f4d2ae0d572b3f637cbc1e3cadf91da16a213f1bcfca175d143e4 SHA512 edb48e42c5a84a00f29ce989fa3a130e8daf69156835fd857ef352a248edaab29ea11426d911ed917e28e0f21b20d81b16d616a9070998f7a5821eaebda19569
 EBUILD pidgin-2.14.3-r1.ebuild 7896 BLAKE2B da92c7b805ada2398e14ac3bea9e7bf18e2e6ff8e22681a09ccfa26a2f042baa425c81820deb95ebe55d314c67f94d1f8bc5dba681a172033ccae7895aa0d5b6 SHA512 75eeee3de9fc161a67c9113b34b2533b927b42882745ad1ced19717aaa99e0e325ab239f67d084ab7093282434ba25ad49c5923f17b1b9b74c090c52888c61ce
 EBUILD pidgin-2.14.4.ebuild 7569 BLAKE2B 7d512481c9c9dc2e48e07d78c245cf604bdcaff4e597db838fecd1dcb077aae8f4eb21a9ccb449d9b57c0d4148b0dc90f3c39410972927ae83c16f6b903ba4e3 SHA512 0733a0adb26ac17a9b40f88b48e313a125532f64666d0f5ea7b98f3e20ea5630cc1272d075a8301b17b697c0e1f7a3222b44bc8fb76ee4e5bf288bc806250b97
+EBUILD pidgin-2.14.5.ebuild 7569 BLAKE2B 7d512481c9c9dc2e48e07d78c245cf604bdcaff4e597db838fecd1dcb077aae8f4eb21a9ccb449d9b57c0d4148b0dc90f3c39410972927ae83c16f6b903ba4e3 SHA512 0733a0adb26ac17a9b40f88b48e313a125532f64666d0f5ea7b98f3e20ea5630cc1272d075a8301b17b697c0e1f7a3222b44bc8fb76ee4e5bf288bc806250b97
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.5.ebuild
similarity index 90%
rename from net-im/pidgin/pidgin-2.14.1.ebuild
rename to net-im/pidgin/pidgin-2.14.5.ebuild
index f90cd8e94cd7..0dacd39bee84 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
@@ -12,12 +12,11 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="https://pidgin.im/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
 	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
@@ -72,7 +71,6 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	networkmanager? ( net-misc/networkmanager )
 	idn? ( net-dns/libidn:= )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1
 "
 
 # We want nls in case gtk is enabled, bug #
@@ -102,7 +100,7 @@ REQUIRED_USE="
 "
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,simple"
+DYNAMIC_PRPLS="irc,jabber,simple"
 
 # List of plugins
 #   app-accessibility/pidgin-festival
@@ -136,14 +134,9 @@ DYNAMIC_PRPLS="irc,jabber,oscar,simple"
 #	x11-plugins/pidgimpd
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
 	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
 	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
 	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
 )
 
 pkg_pretend() {
@@ -187,6 +180,7 @@ src_configure() {
 
 	local myconf=(
 		--disable-mono
+		--disable-static
 		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
 		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
 		--x-includes="${EPREFIX}"/usr/include/X11
@@ -232,9 +226,9 @@ src_configure() {
 	fi
 
 	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python=${PYTHON} )
+		myconf+=( --with-python3=${PYTHON} )
 	else
-		myconf+=( --without-python )
+		myconf+=( --without-python3 )
 	fi
 
 	econf "${myconf[@]}"
@@ -248,9 +242,9 @@ src_install() {
 	if use gtk ; then
 		# Fix tray paths for e16 (x11-wm/enlightenment) and other
 		# implementations that are not compliant with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
 			mkdir "${pixmapdir}" || die
 			pushd "${pixmapdir}" >/dev/null || die
 			for f in ../status/*; do
@@ -261,7 +255,7 @@ src_install() {
 	fi
 	use perl && perl_delete_localpod
 
-	if use python && use dbus ; then
+	if use python || use dbus ; then
 		python_fix_shebang "${ED}"
 		python_optimize
 	fi
@@ -269,7 +263,7 @@ src_install() {
 	dodoc ${DOCS[@]} finch/plugins/pietray.py
 	docompress -x /usr/share/doc/${PF}/pietray.py
 
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 src_test() {
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index f02dace9b8f4..16b5d888641b 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,13 +1,13 @@
 AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312ca527a517a09f890f09d39fa0c97787c586990ba92c0ce2ee83e7c2387eef100f630a74f003ddc06adb93c379 SHA512 dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d
-AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 632 BLAKE2B 92aa9006febe4cb52e4273233f8592827e5d74afebc9d996c41cfc33588c0040b3b573a3730d0541ba8e0641e6733c491861c1bb60a5dc0f26f53b7941bf4572 SHA512 74557a9ac798f47d76cc9a0a514d3891c1a9f3c0667d5938be11d53d44704390dbf97d1e7be3c304cce2c9b8e3110ee04e6759ed28bf5f39d1cfee9f5c77f703
-AUX tdesktop-2.7.3-disable-webkit-separately.patch 3536 BLAKE2B 1bf255ba137c12a4d4a75321763327192f6cff81879843f042716daef0a9f9eb18b2a88e3048917adc5f36b9e4959be2a2c757f74a6aeeb9ca312ffcd7f55554 SHA512 aa62ae0319ad5ec86334e763e4c751f6508d7768a8916661fb217b91bf6a897802bc8f4820d058dc341bae69f6a0f0c34321e2a97e63bd0c715d36aa56532fef
-AUX tdesktop-2.7.3-webview-include-gdkx.patch 570 BLAKE2B 4d92c1e14e9df4609ab332c057977a9485867b3a23fc96c46a97d092a5f7083fccb479f87681bfc66964e4be13b4883c0d86ee079e9fd67e932daa2140c9610b SHA512 446a59387f3a76270d9242a19648d86acc0e589833e3aaedff708da0a90d5b55ae0108f28d79da45b4c8dc68c5ac6f6af4ec50203b411c0fcf2eccf4f8c9c753
+AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 482 BLAKE2B 70ea7d327b5e26433193f96ce6ad9f3daf534fd127277e58f9564aa88d49046ebb03b51359c84ab9063fef98468aa10b317842f4648357c8a9b225ec230e986e SHA512 8c788e21b674d02e4241c2c9699c69bbd03f8e8e3254f4c70ceb59e7f64823ba9a9dae60660598a7daea95bcc06de8a08c805d71ce74935d1cc3280b241752c8
+AUX tdesktop-2.7.3-disable-webkit-separately.patch 3016 BLAKE2B 54686aefe2a36871d73ac62fc186ccb0e61246d61e19e76ad4886bae45e0878df47058ed921445fd6a67e2ddc1516a38e74a28eb658734938a1e325e34663d17 SHA512 5bc252ab4fc3b1c27b84bc9c5c5c6a4545c39291b2410584fdef0a739e4e6b70e4de824c855f50852da3b8551e4dcd04a2caa805aecf5a67fc17d4854b917dea
+AUX tdesktop-2.7.3-webview-include-gdkx.patch 404 BLAKE2B cb9d282c79bfb7441b5eddf7fa1f3255ed1bee03d00fc71682f6b7acc2624a60d034a536e07c77f01433c93c8afa3383b1e57ba1a474de66078623ce2231b37b SHA512 92a60a59724597ce5daabe6a327a445182d6eac91ed009d72f833216393c7e55789caf88b914b0aa8d62eb11e6449b58c24239372d655af1fbe18a30c72b4ade
+AUX tdesktop-2.7.4-fix-disable-dbus-integration.patch 494 BLAKE2B 75e8be933873cc19a863423cb3996d14512586442abeb56ea83ef1a0ce3b58265611044285a6ebde390581e8206677136b97bd2361eaf612702ebd44411f2eed SHA512 bd223c7afabb72cacb89e689707aaff01509aafa1271aac5533f57ab88b52624b1f08647be51ea5c40123262eaeb3ea5646cecd00872465d5afd66f262e4bd98
 AUX tdesktop-2.7.4-voice-crash.patch 8437 BLAKE2B 6d03b16e8d60318e135340feeb39d6a077bc935f3ca6789da72ab063575128f356f8d4187552ac1ae1c270aed857802375016f84f8d2666facb7ea89c72284c3 SHA512 cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b
 AUX tdesktop-2.7.4-voice-ffmpeg44.patch 1118 BLAKE2B 21b34c6fbb002be362beb807a8323119b46bf6875de3367006a981808d4648fa56e859728ee10ae51a5655fc921e49412ac4bb81e17667b2e28017a64a10a3f2 SHA512 72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354
-AUX tdesktop-2.7.4-webview-fix-gcc11.patch 880 BLAKE2B 581425190b3951d1027c572587e1039d0cf2c5b91d0cebe6be8bd25943eedc3b9e481729f94c920e699526d864ac660d295b4a50ad6aba9ef178513a00b08099 SHA512 7098bca2a1538f66badac21639b3e10a3988acf1e16e50b3f32ed06571687493e87280b992ea1c24fcbd3e3215ccc6e27f327eec8acc7318f9c53b5dfa290c90
+AUX tdesktop-2.7.4-webview-fix-gcc11.patch 598 BLAKE2B d7bef91803e5cc6a7472c278fc24a9051f9f93a2d38840025a1cba64752a1b236ff275933038d0904ee1ac0d0c85098cfd4d4476b3b0dfb09a68938c8326b838 SHA512 acc5e9af3c628610130f0094eb793aa3ba4fe662f7d4a399da85ecdd6c4a2fa7af70925616e350d836836bcfc235a98a0fe0324d0ed38d45bfa230b345584fd3
 DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b
 DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
 EBUILD telegram-desktop-2.7.1-r2.ebuild 3955 BLAKE2B ebd8a7ce7cbb217f7277879a0b65cf13d99a78af157fb85f7453f8239fce90523ac0644146cc7a0ad8f87e66eb327c061896df4fafbf40931475713e693f5d9c SHA512 6a388a597113e102213b591f91395a59eef26458d4d4173d6a2e6e8d76c45a1f6e4b34dd83ae495bf4ff1d2639861608a73031460c43f9af97542eb9c755a68a
-EBUILD telegram-desktop-2.7.4-r1.ebuild 4426 BLAKE2B 5e4e2cd4578b95e06eef240282d718ea4e9a0c06c1beaad2e1d8c6ff4072efaf1d0d595adddc3c093d7403f1103a04b355447f0e6bc0cc536f59f4ed793e741c SHA512 9bee5ce937277e0c5edfefc8969a814fa2d4e09f3e8902bb53e9831b9889d24968b8c691513c2f155b26d918f52e0fffcfe829ae94164c97131cdb4adc1eeed9
-EBUILD telegram-desktop-2.7.4.ebuild 4266 BLAKE2B b7102112ec4afb170ff44ec54b34e0795d361e07dec623e7e3775ef4d993b8e0562124f5ec9dd74453aff20758f0ce7ef56c6dbfb5fd7cdcaba96191314f734d SHA512 d213159ee7e55e19d59aa693e841cf71df6a637e50d4eaea35a67af00a4f091d378c69a9e587925b3b59f538223f27b51a10affcec93c61635e84c24eb74475b
+EBUILD telegram-desktop-2.7.4-r1.ebuild 4585 BLAKE2B f14c9c4c6b6ac81a33efb08a0e3476d588139dc39877f46cf13f7c45152b46b741dc8a2ced4073e5d138657273e95c9690779f81595a423ca1695c0fbfc56db9 SHA512 ab97d3508c472d68cf364e33452b3f620fff439be45f38619488bc1aede593bdf71fd85760e9cca553819d6235f52bb94532d7ec835ab1af4c0dedbfd36c4c2d
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
index 5351a808ec4c..8563ee5fdca0 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-===================================================================
 --- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
 +++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
 @@ -754,10 +754,12 @@ void InstallLauncher(bool force) {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
index a143071401a9..8e56d10f0deb 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/CMakeLists.txt
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
 @@ -116,7 +116,7 @@ if (WIN32)
@@ -11,8 +9,6 @@ Index: tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
          find_package(PkgConfig REQUIRED)
  
          if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
 @@ -11,14 +11,14 @@
@@ -48,8 +44,6 @@ Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_l
  }
  
  } // namespace Webview
-Index: tdesktop-2.7.3-full/cmake/options.cmake
-===================================================================
 --- tdesktop-2.7.3-full.orig/cmake/options.cmake
 +++ tdesktop-2.7.3-full/cmake/options.cmake
 @@ -49,6 +49,13 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
@@ -66,8 +60,6 @@ Index: tdesktop-2.7.3-full/cmake/options.cmake
  if (DESKTOP_APP_USE_PACKAGED)
      target_compile_definitions(common_options
      INTERFACE
-Index: tdesktop-2.7.3-full/cmake/variables.cmake
-===================================================================
 --- tdesktop-2.7.3-full.orig/cmake/variables.cmake
 +++ tdesktop-2.7.3-full/cmake/variables.cmake
 @@ -32,6 +32,7 @@ option(DESKTOP_APP_DISABLE_DBUS_INTEGRAT
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
index 2f06bda3272a..491a8cd3e1dc 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
 @@ -12,6 +12,7 @@ extern "C" {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
new file mode 100644
index 000000000000..941a4ecc09cb
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
@@ -0,0 +1,21 @@
+--- tdesktop-2.7.4-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
++++ tdesktop-2.7.4-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
+@@ -13,15 +13,15 @@
+ namespace Platform {
+ namespace Notifications {
+ 
+-bool SkipAudio() {
++bool SkipAudioForCustom() {
+ 	return false;
+ }
+ 
+-bool SkipToast() {
++bool SkipToastForCustom() {
+ 	return false;
+ }
+ 
+-bool SkipFlashBounce() {
++bool SkipFlashBounceForCustom() {
+ 	return false;
+ }
+ 
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
index 0188eaf76f8a..3fa782814ba8 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
-===================================================================
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
 @@ -14,7 +14,6 @@
@@ -10,8 +8,6 @@ Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
  
  namespace Webview {
  namespace {
-Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
-===================================================================
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
 @@ -9,6 +9,8 @@
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
index 095e7419b7c7..bf094b208475 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
@@ -73,10 +73,11 @@ PATCHES=(
 	"${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
 	# https://github.com/desktop-app/lib_webview/pull/3
 	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
-
 	# https://github.com/telegramdesktop/tdesktop/issues/16217
 	"${FILESDIR}/tdesktop-2.7.4-voice-crash.patch"
 	"${FILESDIR}/tdesktop-2.7.4-voice-ffmpeg44.patch"
+	# https://github.com/telegramdesktop/tdesktop/commit/404538c98968d44d207671de3adde91b8df50721
+	"${FILESDIR}/tdesktop-2.7.4-fix-disable-dbus-integration.patch"
 )
 
 pkg_pretend() {
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
deleted file mode 100644
index 8081b9da583e..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/glibmm:2
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	media-libs/opus:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	media-libs/openal
-	~media-libs/tg_owt-0_pre20210422
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?] )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# https://github.com/desktop-app/cmake_helpers/pull/91
-	# https://github.com/desktop-app/lib_webview/pull/2
-	"${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch"
-	# https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a
-	"${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
-	# https://github.com/desktop-app/lib_webview/pull/3
-	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
-		-DDESKTOP_APP_DISABLE_WEBKIT_INTEGRATION=$(usex webkit OFF ON)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9065d980b47c..2fed1595ee92 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 9dc613481b8b..da6fae2672ff 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,4 @@
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-2.0.1.ebuild 1568 BLAKE2B 100df9db7341e429f863877e5f46f2de16bde3400d721fc8f657b8eb4c5de2d30cbc87877df31635823813a6710b76568123315903d367ce89e929b23df3fe97 SHA512 ff66e641e7f2ea0a24f41d5c97da58c172a2ae7362da77f4d07287cada4aff0b5946f15e333b1462b18d594728311db1ba3d191ea5c30967ee3822febb8ca717
+EBUILD epic5-2.0.1.ebuild 1552 BLAKE2B d37c0d333f875be8096b702432157cff223a4a0feba50c72f70d2698323e10746ab8d03b982cb4c74bbe359c894a3db300adb0c50ede90559faa198f70c251fb SHA512 c0b2be7dec14639c568f71096755cd39f1c723fd6aea93067a50712cd89bafa5da4165d9ccd2c71a43316d81a8f6817a3b1bfceacc700eac0bf9ad015c98066a
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
index d38b780348b7..45d0990c99fd 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit autotools ruby-single toolchain-funcs
+inherit autotools ruby-single
 
 DESCRIPTION="Epic5 IRC Client"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 995811722916..573a919bb62b 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 31604f525531..4c56ecd8b333 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
 EBUILD ldns-1.7.1-r1.ebuild 2608 BLAKE2B 602866130ab62202cd8543d0488c9ce574fc64014bbeae405099d7d7b25faa9e87aeb328b0b9770e2e6825ff79f030a338ecc69b8f706b79463df16971be1c8e SHA512 086e756a194ef7fc27b5c6557977fffcf81fcf1391b45bcff06a9c8c1b6a6bcfa5eebcd91f4d963d9595c37688fbae387afe09dab6ecf9c7f1540c913c65a4a8
-EBUILD ldns-1.7.1-r2.ebuild 2613 BLAKE2B 3177ada2108451a003cd2a815596d3270e867454d7c854cacf0481cfc180f42fb67ec4a03a21b71446f9c3f98f4a61956b909652fd001a57cc3390cc31694147 SHA512 032b6fd7ce7f8116a2423fc2e9d9a93fd7154f7c3237f0c26fbe2adcc9988ec0ec8a770ddbed3888523baeb0eb1c39e25dbc01c285cbca464e8995a326585a7b
+EBUILD ldns-1.7.1-r2.ebuild 2612 BLAKE2B b585dd3dd8d1a186570466da9d4d1f5fccba0c040b2c3f7cfe420a74f1a5f7e5b3c6dd02dc688d7b9bd76365be10297443556bfd294a191be1fedbe91ccfc6be SHA512 8f248298a703abdcd426f681d923ad355e92aa1d7324be284ff8c82585daba1547bba6734d8e01feb0ae6a8bcb38e564ad511cb368c4d1953df9aecb7ebfee53
 MISC metadata.xml 932 BLAKE2B 263b5d8d54aed15ae710d6f3d60ebe1683699c8aef9fd34fe5865ee5d1aa046ae40be8c1239b2ee3f7df57a8f8f6de57b7b693e2c4d7680fc8cfa269bd3cd832 SHA512 40c5a002f31a00ff586f3af4b1f112760a589aeec5846e5335bf39c6a6b2fd0e248dfcd62c1f4956f81f710db1f9998e0dd7b84acd658252d7006c8100631ae7
diff --git a/net-libs/ldns/ldns-1.7.1-r2.ebuild b/net-libs/ldns/ldns-1.7.1-r2.ebuild
index 1f2040607949..ca426ee12832 100644
--- a/net-libs/ldns/ldns-1.7.1-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
 
 # configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index 47774bc84806..a95138c693fe 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,3 +1,3 @@
 DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
-EBUILD libgfbgraph-0.2.4.ebuild 1241 BLAKE2B 74f8e77d78a0079d658bf04be4c29e22e0a8f4f409b9e838f64d655efbd4eedb2f08ee59a10b8a94dc7638cbad472bbcd8145edfcdb7151f32a894bfba959de9 SHA512 f5905a0cbc4bf51b51f61264d42861491d95b16fa114e44dd22730ddd641ebc6522872ed28c2bfb32390a26a626dc3d5ca80c5b759f2bc5fb5012b8df4b8de7d
+EBUILD libgfbgraph-0.2.4.ebuild 1248 BLAKE2B 784cf9f67ef6b3fc0248b13e93aea276892d7507996ed13d6078acffd35027497265df0ba6c0bcbca6c7b3802dfb6efc6c66a433b7173c69cf28a5eb621343e0 SHA512 87dbb6516ff6b16084d1de15bbcd9f4982b921d6b03aab6440ad58f48f4433e146de2f9b8bcd0074ba043b336181baf11188eb8d62ef70755ef3aff4a21edf56
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
index e73dd6ac9714..fd523668829d 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="+introspection"
 
 DEPEND="
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index ce0eebc13708..fcd298277aef 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,3 +1,5 @@
 DIST libmbim-1.24.6.tar.xz 511468 BLAKE2B 89c4fa25573d4e58ec993e4fa24e0ff3ab6146c905fd3110240d2dbd3ba20af8c135e5eb552b2c48b1166444e52023e314d70d4fe5904ede5e2c6d3d05724955 SHA512 b0b15aa5ffdc65e9d7af211df771f85021488258f7c50638ad109173a61ef38872b9ab42005cd972fd3cb24e617bd3fe7b0b79d335e2144558daa218fb2c4653
+DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
 EBUILD libmbim-1.24.6.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
+EBUILD libmbim-1.24.8.ebuild 822 BLAKE2B 0f7231820b6ac4497a1e70c1ae5ab473cb6b81022aa4e55e007899369115d59ac59fed6381da6024891700a1bed1d1fd26c45d021ae2d177ff4aecf5ed19a29b SHA512 e9882fd9e6fe5442924e87aa19ba803c5f4d808e8543a177114d471a1b734b64bff9db06d16ce83d414d46a6382bddc9ccee3ec3bc62de1226de345a76f448b1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.24.8.ebuild b/net-libs/libmbim/libmbim-1.24.8.ebuild
new file mode 100644
index 000000000000..322e88fb7990
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.24.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="udev"
+
+RDEPEND=">=dev-libs/glib-2.48:2
+	udev? ( dev-libs/libgudev:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-Werror \
+		--disable-static \
+		--disable-gtk-doc \
+		$(use_with udev)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 95e5da5fdbc5..8374d7b798de 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,5 +1,7 @@
 DIST libnetconf2-1.1.43.tar.gz 295502 BLAKE2B 49bd58d785a0b7b132c4503b0b8a823ff3578e6e1d30e0c0e4aecf6ebb6f769f465069ebbfce7fd090e64e0b798ab8977535c634f45e677cec00d7c73edaee20 SHA512 2aff10ef003d5ee1f72a3c01a0fd07f7a1ac3b1961c88a9616632255d7392d386e0acad97fc68b3f5f1a0b4804dcb0900afa625208ab0dd33cf03706f7a89f5d
+DIST libnetconf2-1.1.46.tar.gz 295868 BLAKE2B ac20dd66c779b9b509f09c1a45224679e2b5701758cf04511c89be90c9ba065c1356c3f50026fa9f6a2f83530437b57ff38ff5977557a9faf61493e0d47f69df SHA512 e1ee152499113f267c3cefbb43f9049ba61fc97228311cb0a68f457aec620059132996fa1878a081e99cfc005d709954282729ace4e937644b4b557db3b3db97
 DIST libnetconf2-2.0.1.tar.gz 292658 BLAKE2B d2821b4b66773b777764f7a453649a7ea60bacc418a8ff5c33e54b244a1f285b84ec8a1cc6d6285ff280c8631d79dfe9db352ad03781a7694762efd8545462ac SHA512 26f0a900387a8dbf5c12136d29529e7aba973dba4e1e3ff091cb70385a686533f041cfe647e273f6188b9494b67f771564b2e32f10e1fc61586112d88837f5c8
-EBUILD libnetconf2-1.1.43-r1.ebuild 879 BLAKE2B 5a8572372ad9624bfe9febd957147324e16dab068ec0769ada4dc7401ad79a35eeb7fc4fb4cd32214ad56181d31faad43e69611a2a4b20a1f01a51f94c1420f7 SHA512 247752a15849e0465a492abe70e7cb2af0c9a0d3eaad56b8f35c129f2811c728df590c7108a7cc6f73affba0fed67a512e8fee4b8f78b79c3964ae23e58c2708
+EBUILD libnetconf2-1.1.43-r1.ebuild 878 BLAKE2B e573672812370de3c8a2cff01a8a6f49107f0f9795580b5dc21ab5fce54eb10c915365d0e56de6084cf8834d79c4c8e82b59a574ceb4d7c733a985a78e89776a SHA512 15832faa005c46ee535eb3efc4a33c30defbdcd94d3840dd888edbe201043808204703b80097de6378a128d6fa32e57f5ade59438ad80b7a8d946ea4d1b798bd
+EBUILD libnetconf2-1.1.46.ebuild 885 BLAKE2B 4f6bb014eb66d0ed29ff8cc0614b833fc097e2998777ab2a4b85fc38cf4a54452c51a5bfc14e2b1215ed651df3335fe9f903612e65b957aa6c4545669081d692 SHA512 f46ed7aefecf8691744ecc60d8d03301293016dc7c9ba97dc63344a8960c59cd97e3b5a2bef1d24142e80ca43a764d13d8ecfe84f3e96e7a8a7c9bf07925597b
 EBUILD libnetconf2-2.0.1.ebuild 851 BLAKE2B 89b4a2d10b2854f7de7d69c52b440ffca2838ac9aca2c14845a775411cf58376abb12e9dc654b77be427a8b1f44e7d8fc24514ef578f9d01d885fc0e1dffff0e SHA512 962fe890bab221aeb26ce205c3e588a39543edf7579b3347a87aeefe2220516a8b736a2ab37dfc181b96502bf6b44a3d4bd85f71f4c6ec1d07391ffabaa0c355
 MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
index cb95c3d21da7..b10c5a5824c7 100644
--- a/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-1.1.43-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.46.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.46.ebuild
new file mode 100644
index 000000000000..82bf4c2b9ca5
--- /dev/null
+++ b/net-libs/libnetconf2/libnetconf2-1.1.46.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C library for building NETCONF servers and clients"
+HOMEPAGE="https://github.com/CESNET/libnetconf2"
+SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	>=net-libs/libyang-1.0.240:=
+	<net-libs/libyang-2.0.0:=
+	net-libs/libssh:0=[server]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 191b50a16457..c52b137555da 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,4 +1,6 @@
 DIST libqmi-1.28.4.tar.xz 1168088 BLAKE2B 828a8688a49a08f0848414b8e51c2ece4a0035ecdf449a5dc9e2cf3b6ecaf1525d5a1c29e329a584ec054f66b9a141d0ba3980b8affb34db3088ed2b5591a265 SHA512 dad3cd2740804d2ec6aa04f0f140d385c00d5a3854d75ccdf54ee6fa4f3cdfc02de5da21cd8b43d5a7c6b467b94b5001bc857fbab01aeedbdb51c0e3d9da9690
+DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
 EBUILD libqmi-1.28.4.ebuild 1222 BLAKE2B 4e226ffda064e482aec9c9fb12c93e8ec57b97aaa7d43048e5a183ef63579c3940ac7fbfc3ca8a3ca75c08c8131f4f890124e42e22de558a18cd9171b8392096 SHA512 b862fde5d896147e419b131bf9e123e4bf76171d557363db2cf77726509861d3c8db5bef9b3f706ac59e38f901cc2f18d413287bd637d0a43ac449ae252b7f15
+EBUILD libqmi-1.28.6.ebuild 1228 BLAKE2B beb397e75288d176644eccb208603199dd814a176c0351bde511559dcf1c2a566efe1623ba1b91410e784cca944204378c5a91b1f6fa9a753dd4496858b791f3 SHA512 b7efe428b4ae2a5c65e55a905b05e987f552605f571d64eb11b55dcaa3da705d0799936d08df14de9a6e5edaa91050818fe9c6bac63cd0938a8b370b9644f6cd
 EBUILD libqmi-9999.ebuild 1223 BLAKE2B 526c92280dd6838c08a7bc56d975a472bce40b04627cbf2a69402cee7a32fd11b2ca4a658a333b2215272226a380b93aedb8f58bd7669da931c037b4169b9059 SHA512 ec855e747177f058290f8b0375dec0d0e73bca68d8eba4a70203d0013d5a9938c121423c1bbdf23649e20a62c8e3a413627bbf5d555eee05a486cc0434c99205
 MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/libqmi-1.28.6.ebuild b/net-libs/libqmi/libqmi-1.28.6.ebuild
new file mode 100644
index 000000000000..ae2df1d55498
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.28.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.7"	# soname of libqmi-glib.so
+IUSE="gtk-doc +mbim"
+
+RDEPEND=">=dev-libs/glib-2.48
+	dev-libs/libgudev
+	mbim? ( >=net-libs/libmbim-1.18.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable mbim mbim-qmux)
+		$(use_enable gtk-doc)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 3cb938061098..68bce95bde9d 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,5 +1,5 @@
 DIST libwebsockets-4.1.6.tar.gz 12912895 BLAKE2B d6b8c96b8da4c177e7c730acb13bbba63996b1817bc0e0df36923c7ad3aabb6823f852c84bef865e85ed7eac1855273527ff6e92e413bbed8576388ce2ec7e3f SHA512 b83059b5405fe5c8bbfb6ef4cdfb66ce8b3fa2a660c013e64fa579f3ae09c70a6e3807d37ad4cff1d37b0c797959ba4e9c527be7e31520b3853161cfd6224a54
 DIST libwebsockets-4.2.0.tar.gz 14550541 BLAKE2B 9471d19b15decfee4407a596cb3f127534e12ac6bf49c81b04120a379ff8a8e1c7767e9a7e586ad69d5af23e869914c749da771f8db6431ac09718b971d261e0 SHA512 e1fb5b204a030ded8dfe2a75c66ec8d1a2e6a67e82c7709fe3c4277e0ccb5fb40c18db04e73c640d07ef4516aa266ae8b102f802b2a41b80980260cb6921f369
 EBUILD libwebsockets-4.1.6.ebuild 2301 BLAKE2B 373ea229a5dc8ef3af02fbdfd59efff220429f09cc620055c99a07dcf6e4e792db5a95ba70f0916cc30ad02322058feddd0b151abf55ae5d84aef1cc0ba3eacb SHA512 31064db3eccee69d33ae72b2ef0335850e765a1b85bcbb74b81c6be7d5acc1cd602f4eced2270ab83a755c738307aee742fd1dfdb5e335adcc7e9c28ce7e2d3e
-EBUILD libwebsockets-4.2.0.ebuild 2300 BLAKE2B 5cc5deb5bacde0abe6b2422643060df432c6ff553971ad01a03d5499e033b1dc058a25d3cfd8a4fe05c813032665409bbd3f6ca78fba60e60b1248b3ee640c77 SHA512 baa1c94f012584cc0cad30312a5eebbb27c38edb1736684bfba883f79d7e24aeb5b07c1c83549d4a47600113e5a19ed7233fae1720ec8b71c1382b9e3eebeb71
+EBUILD libwebsockets-4.2.0.ebuild 2302 BLAKE2B ccd6d0d167e36590d377144b1d35d2ff3cdd20c10b78616992fd39583a24bac5159732764e0395022bdc1d9977000e66047aa4bfd5a06f30322273396753dd61 SHA512 f97e085f9d3092a4f4ac24325ff92cf852681b0955a08724005d349f949a5ff21a41c803d7e427f18c6bc2d21f7fe7d2ca90bd662dfdfb52ef00fa0e80772bdf
 MISC metadata.xml 1720 BLAKE2B cd762542d4df782758246c55241a12ba6368b8db26d3814b777419b0a9b4fcf7b5a4682c6a05c41915c2b60a08efef003b83151f866d0bb3c9056fe50bd76a77 SHA512 2bf03ea4b6d1398ee685e40b4bbdba6a1f17527fba7100182c20fd5dfc87a1e88fe8cf3d02eb32f905af5ac8af5b250c98d00fb3a812602f314098bbf8f9813e
diff --git a/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
index 65df04b22fb8..763d47c6109a 100644
--- a/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/18" # libwebsockets.so.18
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl threads zip"
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 544b68bb13b5..aeaeb38814f5 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,7 @@
 DIST libyang-1.0.236.tar.gz 1669013 BLAKE2B c977c4abd2466e88519e91483d876bf0b9397b32bcca017eaa948d638a70d3275cdec36070bad8925c87e3a6756df924ed043a14ecb6d23de8b63992f8607e58 SHA512 7e8be96bc87ea5c906d90e09f4fbae0ed96718894d3fbc784172cdc68e9e2c034fc8a114bc1389fb74ef32dfb65e447acff24b82967af1530ffba94cd204e6e9
+DIST libyang-1.0.240.tar.gz 1667619 BLAKE2B ec988301ee422cf90fd6d50b31f42f28f5f09fd772218311723149548d565c48283dbe0f1cd7ac924f031cac63659af321079ccd65d10deb2edbe7d9d649f492 SHA512 5637037ef25fb96184d444f27a1e921a18a91745bce7e796357a71ca15eb47b9c3ba0833fe8f792e54e9f02ac26be5168fd386d5f957b8f4d695ddc213c17c33
 DIST libyang-2.0.7.tar.gz 1031818 BLAKE2B a3ad7dc0bcff14ea5fec0221f11efb2ef61efa8b4b3c8ebd6d58f3184cc1f1979c026985c1782d2f2177227a8aae815c6c4fa7063fb19156af78f65740623318 SHA512 edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
 EBUILD libyang-1.0.236.ebuild 988 BLAKE2B 5c426507aa166549c283169f65ac56136fa62857db55dad0d145d5a67c6ad99b9b6a34cf280063b0923c97441bf23625ab35449c14fb7375e27f32dad71c0d5f SHA512 cc300ada4d32f432a88da55eea518748774b7f7642738ac5e9c7b206c46ac0bcad2ae36a2c5af22655796a3ea3183360ca2e410655aa23d86a6849c06ca5125d
+EBUILD libyang-1.0.240.ebuild 897 BLAKE2B e5d1e73c16e8be086668fb4365205dda0aaf15cf592b47476c0c16fc61a785f1e3789096bac27950886092a567d6be5994058888f616b878fb35454e9846e9aa SHA512 5717df5882cf10a77b3bd57c77fe6981c70b96d7f007532d0a56de2971b816b65b310838178a0186d68f5cb32447efdc6a27dd5312f7031b2ea6e3bc11b61308
 EBUILD libyang-2.0.7.ebuild 861 BLAKE2B d0fd56392c038e0ea9a338fc5b6013c4871d0f463f60acdc6c09c86b3a41a01d6a750c57b8adad1ab305aa39aec4915472e2ea8873347f53230767a72bad8a9e SHA512 114e1c5c874d8c7fe74de3b0808f83c0e625a19e0b82059eda67a2d213208ec988d1f8c5d1e0cfb6bb5a58c90f21e7de0090803090bd8b47ff65bd3496d61340
 MISC metadata.xml 585 BLAKE2B b4ee06f08fd3f10d45796cb0b3bde13c0790c4883b3408f3c89f7b0812b49206b741556ad2b28772ff1b18a40ad517f988ff4301c1a4270d127ab6ba0632c752 SHA512 54ccc9ecd6b9981ce5544174a74c8d9d5517e8c56b7a28402cac8af3d854c7e41ab8e2a0ad5a0fbd4d6460f848ee9a31f64b6b74cc1b7a1333e2899ceae9ba6f
diff --git a/net-libs/libyang/libyang-1.0.240.ebuild b/net-libs/libyang/libyang-1.0.240.ebuild
new file mode 100644
index 000000000000..463140a483d6
--- /dev/null
+++ b/net-libs/libyang/libyang-1.0.240.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="YANG data modeling language library"
+HOMEPAGE="https://github.com/CESNET/libyang"
+SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( app-doc/doxygen[dot] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BUILD_TESTS=$(usex test)
+		-DENABLE_LYD_PRIV=yes
+		-DGEN_LANGUAGE_BINDINGS=no
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	multilib_is_native_abi && use doc && cmake_src_compile doc
+}
+
+multilib_src_install_all() {
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 389319e12d1d..8b8f2104752b 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -8,18 +8,15 @@ AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019
 AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-16.1.0-ppc64-segfault.patch 4664 BLAKE2B fd66e8e6332b763b008b56dcbf6c755e80f3494f995beef0b2d041c52fafdcfda8122de633754c989bf7c033e0980515e33b6369c19a5a8f7cbba269d798feeb SHA512 d1e886cafb64108f4c0a7200f8994c30fb15c60b3090bd151a080d2df71afec6996de408fa0dc671093c4c7c2312f4dfc4eee09bbc777cc00f7e122e6dce3a59
-AUX nodejs-16.1.0-test-repl-history-navigation.patch 1970 BLAKE2B 7c33e36c1faafabff42e0b98ca83fe25433fadfc77196158abb2a7e6fdaad09fcdeb0aed75a1424e8e96425b10a7e396b21cd8ac3cb06f20a632f4cf38b76060 SHA512 d53bc20931bc3f6c20ed0d9b050e95a2aa698b9dd73d0faf8628e6e0f07c030c3dd4d6504ec4b962c9932384d85683188692ef3fac264a73785f3c961ce72454
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
 DIST node-v14.17.0.tar.xz 33484212 BLAKE2B 0ad045b7e0b96f564f42cef703338fece2167cb8bfe32840b765b137e01491a43a9c31ce290a3379ffa834ddfe4e2e1f42f95d4d0014240151b06313e0339383 SHA512 7a7683523904580462077c8bf3ee9640f1b674c7df55655049ca50ca3cfdb2973b13088f2b65e4eccf4df2641cd9c86c9716bcd160a5d5863a969cb1e88de093
-DIST node-v16.1.0.tar.xz 33770472 BLAKE2B 2b7cf5f07dbf72eb25018cd046ce15cf6c5a444225e34d425614c19e69888b4f5c9488b079fed12e6fe52cb8dfdee20cf61c4df5a39f53e60b95c4da445f2091 SHA512 dc12078203940e7b280198ae15f51f68aaefcf8cab71a9f988952e67045e4b16dc48ec471abcc497bd15b0b426c06678e376b53762349d6568b48d52888cc2d5
-DIST node-v16.2.0.tar.xz 33786196 BLAKE2B be2784332cbbfa58cf24f830cd88117378c51b413167b6443ed90176bb0bd429005a99b5148f5d8315fd751dd34d83192c2a09753f84faf3d91080fa6e5eab44 SHA512 bf86427d29679f47d0596c532e84790ceea1784b4a06fc2a63969a1bdbf853b06d14f264c416f357c8ef097189566a44f962a678b5026bb4f781557f7b2bd363
+DIST node-v16.3.0.tar.xz 33801084 BLAKE2B aa1f2fc6639ccb995252e483b68e1b425a9ad47cd148f5536fad168e94b0582819df511f797b3a278fd54d45e45f64dc701a997c2f17ad72d94d8b02d590cf81 SHA512 f25243521869ee9d99c2490150f8f9361b1603e497364ec559917d5c76e4a857e6c25c90d54b11e5a9d16fabb85e12b052ea768f3c2977ff18e96d33f60d9eff
 EBUILD nodejs-12.22.1-r1.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
 EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
 EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
 EBUILD nodejs-14.17.0.ebuild 7083 BLAKE2B 9f8bfa1c3d01f79f62faf84764279727eb2bb27909c51e14dfdbd3540b8ea01e17b6eb789da165e309d5876fb362ef84b92fd63eeeff6aecd00ac0323231461c SHA512 f52f9c57ec23e60949246362205bcf3f5f61314d81c22c291caca23c5f706ae799e00456b387a3f375e7fc9e8c0f037b7de44fd14c1b9e1981bd7f56158c842a
-EBUILD nodejs-16.1.0.ebuild 6814 BLAKE2B ef9da264584d3bfdcc3c9c07d69bdeadc2e00a5bf094534799367488a27df0aa2dc296f9fde63683c0a43f095231f4d117268006947f01c2514704a1f40e1b66 SHA512 8eeba25b13eba364657c2e7999b9eccf18b6da0462911b5b95788639b3598c2f87593dd62dd4c6e173bf608790bc231cbf5cb8ce99678f49d69e7c06867881fc
-EBUILD nodejs-16.2.0.ebuild 6751 BLAKE2B 36bde76cfbfd2b96f332934993eab783ba8aa3fb1f86f027d91a9e5db5850c88bfd6e97ad2dd0c1e882999588cd90ff519879558ba66156ca577011c00e916d0 SHA512 e3938639db32b7ace5c84db61e2b9e84cf39581df42f06287063efcae02ddd7f5d2b0c1b60bdc8914e09651c44dce2cbf9549b5985a8dc381209b5463054a871
-EBUILD nodejs-99999999.ebuild 6590 BLAKE2B 893ec3a62202b9c38aa213175c405da66490b53bff00394d5b5d71508212735c12665dc88ca9929687aa43d36522ba7bc44a9cd3c88272ec55e807ebf48d194e SHA512 66c8892ddf86330fceebcc8646460f03eb9d719a878198c2953f4f72b39154a1aad290e200e40211d0cd3595d8f5939eac6fd1e7178c66d7ce5050592aa720e1
+EBUILD nodejs-16.3.0.ebuild 6644 BLAKE2B 695992d43c289484b349d066c1c8aca1974b5484e819d34cff8d5e2c5a44c75ee571bbb5b3cabf4dfb226c3633040f73061fc12a90592a89125654f61c9e838d SHA512 f77ef14a5b7a52245a3c1131e344f686b836270c90722dc0878747d132315069e07e412243d1a77fd39b15f9793a917a1d019ca97b9d66b9af7661167eec495e
+EBUILD nodejs-99999999.ebuild 6483 BLAKE2B a5d15db975cc25ebe8464c99f57ea34a7fa2c98a8874251a9e6bf6b9772040cea6455e31722b4796e17115b83a0363416985864cbf42045e2dac044214aba05c SHA512 1f7dc8503e02a11bc408c0ff476f10f5e056efe19bcc2cc526a214a8aee61439762d8e963ce8288cccaf3f51b78a4a461e9e587e485652fe7068cc9ecd125ee9
 MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
diff --git a/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch b/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch
deleted file mode 100644
index 724541a870db..000000000000
--- a/net-libs/nodejs/files/nodejs-16.1.0-test-repl-history-navigation.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7c8a60851c459ea18afbfc54bfc8cf7394ea56c3 Mon Sep 17 00:00:00 2001
-From: Antoine du Hamel <duhamelantoine1995@gmail.com>
-Date: Thu, 6 May 2021 12:00:07 +0200
-Subject: [PATCH] test,repl: fix tests when inspector is disabled
-
-Fixes: https://github.com/nodejs/node/issues/38558
-
-PR-URL: https://github.com/nodejs/node/pull/38564
-Reviewed-By: Anna Henningsen <anna@addaleax.net>
-Reviewed-By: James M Snell <jasnell@gmail.com>
-Reviewed-By: Rich Trott <rtrott@gmail.com>
----
- test/parallel/test-repl-history-navigation.js | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/test/parallel/test-repl-history-navigation.js b/test/parallel/test-repl-history-navigation.js
-index df4f0390a69c..527cf235bddd 100644
---- a/test/parallel/test-repl-history-navigation.js
-+++ b/test/parallel/test-repl-history-navigation.js
-@@ -559,14 +559,14 @@ const tests = [
-     env: { NODE_REPL_HISTORY: defaultHistoryPath },
-     test: ['const util = {}', ENTER,
-            'ut', RIGHT, ENTER],
--    expected: common.hasIntl && common.hasCrypto ? [
-+    expected: [
-       prompt, ...'const util = {}',
-       'undefined\n',
--      prompt, ...'ut', ' // il', '\n// {}',
--      'il', '\n// {}',
-+      prompt, ...'ut', ...(prev ? [' // il', '\n// {}',
-+                                   'il', '\n// {}'] : [' // il', 'il']),
-       '{}\n',
-       prompt,
--    ] : [],
-+    ],
-     clean: false
-   },
-   {
-@@ -577,7 +577,7 @@ const tests = [
-       'globalThis.util = {}', ENTER,
-       'ut', RIGHT, ENTER,
-       'Reflect.defineProperty(globalThis, "util", utilDesc)', ENTER],
--    expected: common.hasIntl && common.hasCrypto ? [
-+    expected: [
-       prompt, ...'const utilDesc = ' +
-       'Reflect.getOwnPropertyDescriptor(globalThis, "util")',
-       'undefined\n',
-@@ -588,7 +588,7 @@ const tests = [
-       prompt, ...'Reflect.defineProperty(globalThis, "util", utilDesc)',
-       'true\n',
-       prompt,
--    ] : [],
-+    ],
-     clean: false
-   },
- ];
diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild
deleted file mode 100644
index e1f164dff75c..000000000000
--- a/net-libs/nodejs/nodejs-16.1.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/nodejs/node"
-	SLOT="0"
-else
-	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-	S="${WORKDIR}/node-v${PV}"
-fi
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.17.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	virtual/pkgconfig
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
-	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
-	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-16.1.0-test-repl-history-navigation.patch
-	"${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if use lto; then
-			if tc-is-gcc; then
-				if [[ $(gcc-major-version) -ge 11 ]]; then
-					# Bug #787158
-					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
-				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	# All this test does is check if the npm CLI produces warnings of any sort,
-	# failing if it does. Overkill, much? Especially given one possible warning
-	# is that there is a newer version of npm available upstream (yes, it does
-	# use the network if available), thus making it a real possibility for this
-	# test to begin failing one day even though it was fine before.
-	rm -f test/parallel/test-release-npm.js
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	# LTO compiler flags are handled by configure.py itself
-	filter-flags '-flto*'
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use lto && myconf+=( --enable-lto )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		keepdir /etc/npm
-
-		# Install bash completion for `npm`
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	# parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
-	if has usersandbox ${FEATURES}; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-16.2.0.ebuild b/net-libs/nodejs/nodejs-16.3.0.ebuild
similarity index 98%
rename from net-libs/nodejs/nodejs-16.2.0.ebuild
rename to net-libs/nodejs/nodejs-16.3.0.ebuild
index 95fb8c3f56fe..f4ae0ff1f25f 100644
--- a/net-libs/nodejs/nodejs-16.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.3.0.ebuild
@@ -64,9 +64,6 @@ pkg_pretend() {
 					# Bug #787158
 					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
 				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
 			fi
 		fi
 	fi
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 2d45db3952a5..5177302ec77b 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -47,7 +47,7 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch  # still needed as of 2021-05-13
+	"${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch  # still needed as of 2021-06-04
 )
 
 pkg_pretend() {
@@ -61,9 +61,6 @@ pkg_pretend() {
 					# Bug #787158
 					die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
 				fi
-			else
-				# configure.py will abort on this later if we do not
-				die "${PN} only supports LTO for gcc"
 			fi
 		fi
 	fi
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index ae5a9ac1421e..023f22a0759d 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 001901a5eca0..899d74eca593 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -3,6 +3,8 @@ AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab713
 AUX init 611 BLAKE2B f84cd718a1ecfe2ed36fb875bde156e6b1700da5ddd115fb841a5d8cae638369238779647c113e1fea50a36069bdb1528917b31ca93b6d8d72686eedd7315c7a SHA512 3fccc3567428e1493daabc0bae87fb769bf7d8d807775ca7d1d3d7e4fdc982b176b3985f8b3b86a1dcbcab001227c685fdba7e08a8a343a2540ee3913412c721
 DIST automx2-2021.2.tar.gz 155311 BLAKE2B 6ace715e24a27a8e98f09920150bd5d6fef7567fa7c3884825140ea8eebebb1392dcfbfab2b5a464f7967adcf421af5997023a7d33f41036608948b59e58155f SHA512 89113d3a37ee66ae44f98d64480419e6c6b10662560a5319ca0f5522d6195a68f586ec94793c2212d859693a50455a8b43292dd859b912404b5abb2ddfc939b6
 DIST automx2-2021.3.1.tar.gz 169574 BLAKE2B cc9fcb1f2009e4c7ee9d827b89dbc7e0e95002b2ee7e6e30f1e27edcef439198db8e1ea3435a124dae3f6af19e12bb9f535af57e02fd56dd12185077db50bba8 SHA512 842cc824a8c10ac86f1d8c1f12984035f58c5c935ab7e0e306ed639100f850b47b65f911328f2d391f20dd2e7fad7c0eb6c533b2f2e1776261cffc934e8ae10a
+DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
 EBUILD automx2-2021.2.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
 EBUILD automx2-2021.3.1.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
+EBUILD automx2-2021.4.ebuild 1202 BLAKE2B 9c0bfc55e76600f440068b509134b929eeb44a8177b89d88b2e5396efaf1ff21e41705206d0a0c8ba1bf8684c791c8392fef7f680c30d5e161dac4937378c349 SHA512 1dda69009c3d6e64827506316c1f7b5c347502c3aa89f0a37e0d61ee8dfaa074eb0227874286e17023c3128762e18b84bced2e17b4069f9e608726e4db44f0ee
 MISC metadata.xml 911 BLAKE2B 165f90e9c2fba4a6c9aa505366f9c5bf0289f56a650d75b87ee4a5a3db10fb27e674bc26d15ab8de2990739f982e4ad2894f0bff24962f8c72c19c89457b6a5c SHA512 aed354750fee8837991bef5b71921081f59ddd32c6f5ace53a4249b5782b4e6023efa6343cf1ccc886b4a0936c89a43c376d209323320e98e7aec76172a3bd97
diff --git a/net-mail/automx2/automx2-2021.4.ebuild b/net-mail/automx2/automx2-2021.4.ebuild
new file mode 100644
index 000000000000..66b5081f4c4d
--- /dev/null
+++ b/net-mail/automx2/automx2-2021.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Email client autoconfiguration service"
+HOMEPAGE="https://automx.org/"
+SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="acct-user/automx2"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-migrate[${PYTHON_USEDEP}]
+	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/ldap3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -i -e "/('scripts'/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export AUTOMX2_CONF="tests/unittest.conf"
+	${EPYTHON} -m unittest discover tests/ || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		DOCS="*.adoc doc/*.adoc contrib/*sample.conf"
+		HTML_DOCS="doc/*.html doc/*.svg"
+	fi
+	sed -e "s/@EPYTHON@/${EPYTHON}/" "${FILESDIR}/init" | newinitd - "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc
+	newins "${FILESDIR}/conf" "${PN}.conf"
+	distutils-r1_python_install_all
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 767bd7925195..a5c28d645317 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,7 +7,9 @@ AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3
 DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
 DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
+DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
 EBUILD fetchmail-6.4.16.ebuild 2395 BLAKE2B a08af64ef0c391c4fb1e170d7981920542def0aaad22647f1954793852acf2b842b7f7b077ba9e5539a3cdf8737ae636e65101f108b8b541c7066de329d6ebc8 SHA512 9a9007af60a28487f6747bed0bbbb1aa8cd17f766a9ae4ef63ccf920eab0edac4ea22872a9dbc0bc1bf0610ca4727280cdd200b8506a3e032cba8b9cd4dc23eb
-EBUILD fetchmail-6.4.19.ebuild 2390 BLAKE2B 402ef8b65fa919ed191748ee402c65be2bcd73bc56b60c9895553979c80909b2eaf0c0cd956bcbf2ef5fc91da02b238dc88720e5b04a8dd7d44acc345fc94132 SHA512 b2c781abb9c809c544c1f932e00a90a89eb62a264c8b76fcd3baaad264c6468dfbd9c7fc66cf7571cf0dddecb537c2f0a3e58d3d826a5df8bdf95e5612a91121
+EBUILD fetchmail-6.4.19.ebuild 2389 BLAKE2B fd515cc8505dc7b96ea5b27766b689de3abce6751ba5a985d264bfcf3f77c018ee5818d38e50c9024b66471bad0c5f2ba99d86c4e4be6c344c9dba15bdf80fc1 SHA512 70f3a116f552cf47d7f9277588fcdc18b8ee4acbee8388b2d5cdd9c9033420769862ad644fa0e9f800e2108ecfd40ec0ede8b17e24f23f3f8965d6dce4b8736f
 EBUILD fetchmail-6.4.8.ebuild 2387 BLAKE2B 898edfe5dd3c8e3bb68103130af2e4fdd0e9c99a0c9fe31d1b5da9c2eb709400eb2aea7a9aacbe4c869e8175b23cd2c1f1635fbb87ee720d48e4fa932f9a25da SHA512 24279e83b1dc8427d9206fdca009f2852410ae00d06f4e8347a6ae530bc1dd58a65b66edb9ca115020322d4a10d69958839012fb6dbefb75334671d9227f7bcb
+EBUILD fetchmail-7.0.0_alpha8.ebuild 2509 BLAKE2B 0f652d7a1f9f41f8d512a1535f25f3faa5ec49d61394334979be0324b7e9b614f4dc19cd1a59c4ca219af82593e1402a1ddcc039cf87a00c37d8cfbcb2aa9833 SHA512 fb9f10979419fd96cc2c22d438c2806741107fd83e1b920690a95d53253a11f512fdf71a750af5680f181fd7d98f7c5a2eaaefd630c9333dcce043b1ef8a977a
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
index a15a16e3d01d..96584027a596 100644
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
new file mode 100644
index 000000000000..73e3f2376e41
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="tk?"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="kerberos nls +python socks +ssl tk"
+REQUIRED_USE="tk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		>=dev-libs/openssl-1.1.1:=
+	)
+	kerberos? (
+		virtual/krb5
+		>=dev-libs/openssl-1.0.2:=
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use python && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use python || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	use python && python_doscript contrib/fetchmail-oauth2.py
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3f4bd998a8e9..7b85b0571552 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c571a00746ac..4d4bd081e51f 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -26,5 +26,5 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
 EBUILD dhcp-4.4.2-r3.ebuild 8222 BLAKE2B a1d8cc6bae3fa9b0cbbf6c2acbf640478434c3ee9b21bb79bbf988a11b84712adf5322a805c93797f7a34220d36d0c43f190d9e06ccea4e19f9540b657decf2e SHA512 63866cde12580db53cdf6a59553714b9082d5f553936731640a616b22d0e9b2372ab902faa4db74c3629385ee73005230120b4ab8034797b46c641e672214a90
-EBUILD dhcp-4.4.2_p1.ebuild 8223 BLAKE2B 341d92ea2b402d1f9ea92cf70d815a91dced4e1280921f779610185d4bb3adc95366d93cf40199b217b18b076adf04d03ab8966754482d530bbf8101aad9ec1a SHA512 ede380412cbeb4043de20c88eaf2123c21fb55f03d65b3c5e3130ffd98147e6a65961430878ff4bd170e1081e33589666c87817cb96c3929cce49c9d9ef7a6a0
+EBUILD dhcp-4.4.2_p1.ebuild 8222 BLAKE2B a1d8cc6bae3fa9b0cbbf6c2acbf640478434c3ee9b21bb79bbf988a11b84712adf5322a805c93797f7a34220d36d0c43f190d9e06ccea4e19f9540b657decf2e SHA512 63866cde12580db53cdf6a59553714b9082d5f553936731640a616b22d0e9b2372ab902faa4db74c3629385ee73005230120b4ab8034797b46c641e672214a90
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index b073122583ba..0cb341b0cecd 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 03b4a8401607..cefb065075af 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r2.ebuild 860 BLAKE2B d639b8be7ea94639c23caf7069f71df9ba45ea43781a6bd01a10438141291a6f655bc178184009481d180bd7ae9c6e1dbefb488ff6249f54a6bdd68949a5dffd SHA512 1b8b7f1ba5fc97ee63c486f377d2961eecb9f71e99944629db66e60bc440eff8dc8dbfac527bc27eee917d34c70c311eb89532bbde82ead9093a1ebe2b36729c
+EBUILD econnman-1.1-r2.ebuild 861 BLAKE2B b12d76caae9b8188441a4cc36e0c1b0a13a3ca1c32e1b22df59ab0614ed8b130952422f90795468ea7c3bda839c39822ea3a88a5d8e43eb4b1569615957e5bd9 SHA512 50a97526f3aa8efa57b74d6e2f51ef38a15684a21d4a6dfd6025e439b1ddef34b68995b967d692ce0df0064a56a8b40fa5ff1886dd59f2abd789c14544419aec
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r2.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild
index 7ccef1ed1883..8ea76419802b 100644
--- a/net-misc/econnman/econnman-1.1-r2.ebuild
+++ b/net-misc/econnman/econnman-1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-single-r1
 
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 7a7eab0f069e..03b6860090bc 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,7 +1,7 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
-DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745
-EBUILD gerbera-1.8.0.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
+DIST gerbera-1.8.2.tar.gz 3589779 BLAKE2B 120654d5a9d1ac7dd29da401f2ca040e3331a27dd22a52fdc9c9a958a1a8e918ae6ca76926e636184f3b91475797432728462106eb4fbdc146737e88da07d8e7 SHA512 3831030b4960613e487bdba92323a4b8d7ed63352c1c9eb1ca5eacd3c91d4864d48ef1d1bec19a98b6abed0a827d18ba7940a814fe174b44c2808ad7b85a8756
+EBUILD gerbera-1.8.2.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
 EBUILD gerbera-9999.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.8.0.ebuild b/net-misc/gerbera/gerbera-1.8.2.ebuild
similarity index 100%
rename from net-misc/gerbera/gerbera-1.8.0.ebuild
rename to net-misc/gerbera/gerbera-1.8.2.ebuild
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index d30ec5ee9f73..8a77b8c7b305 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464
-EBUILD gnome-online-miners-3.34.0-r1.ebuild 898 BLAKE2B 912862579bd2cfe953cd35f8702a3768e433651a8a93c647c970e66fac2cc07c378214d380bb43d12e8864a00ca6f92f9273007185780b65986c29138b3c4351 SHA512 3ec1ba0cb89bdd4f0e59e89482212d9bf30a429c092980b117d195d87a865fe078fc9aaaf5facaa7de61e18b27893b92fbc0f7787d9734bc83d7d1c0058810e5
+EBUILD gnome-online-miners-3.34.0-r1.ebuild 905 BLAKE2B 281d226cb596077c5e20981a3bde383fef4dfacb9dc7fdbdb4b31f471febe877efadbb7e717420eadb1fe0e5b8eaf4919cbab0562928a2392420c4e035bb534b SHA512 9d1e05d9a4bf8f064a26d01ed822664bac8775f32148ee56732bb412626d6e3f4afdd846fe7917984a02c57ce4b68335c9a8a1bd80b7696f517e6e2cf533ee66
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
index 2b595426beb3..0330845cb380 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index b3b620b764a0..5bf167c2cec9 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,5 +1,7 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
 DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506
+DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
 EBUILD modemmanager-1.16.4.ebuild 3567 BLAKE2B 9e5825b5df612ecc0da6ef056a58fe12e62700be0a215fd67f5f31c9de377930ac15317ed689cda7d0a88f6d027c1757ecc52c5583cd3db8083dbe39d75f1dcd SHA512 f4456cd7b40dc0ba85ba6fa2f3ec8ed3ef9b370cb9b7ee64dfb66034caf9afb33997ea8215a661439533035f62590e98601830256b2fc7780fb775d717349aab
+EBUILD modemmanager-1.16.6.ebuild 3573 BLAKE2B d6c8acb639b624983310dc152115a4e2d3399a811b140e34a5ac8e82644908462346dbe19ab3de40b1e80b0cd866eebfc926d523a775279ce187f6b9d059578f SHA512 62a47e4013a9a45f3a4f2d511d1180e59e6787d2ae1015ea05f6121140c72f30f4383708004dc3d3c894bb25318e5215d9452f76cbbfe25503b36b6d05a940e4
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.16.6.ebuild b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
new file mode 100644
index 000000000000..d831eb774edc
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.48.0:2
+	udev? ( >=dev-libs/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.24.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
+	qmi? ( >=net-libs/libqmi-1.28.6:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+RDEPEND="${DEPEND}
+	policykit? ( acct-group/plugdev )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use systemd || use elogind; then
+		myconf+=(--with-systemd-suspend-resume)
+	else
+		myconf+=(--without-systemd-suspend-resume)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index b4a03bc43ee3..8bb5d0505e24 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,7 @@
 DIST netopeer2-1.1.70.tar.gz 170883 BLAKE2B 59dbb1f82b355d807769466fc95dcac0ef0b74711f299b29cc6653183b5ffbb832d69b4247e04f38bdb9218adfabe1fff20c6f76e198ca0860808ec3910d20bd SHA512 d60c7ac861a05f8ee325013786e25e7f987f28265d66df5568ffd92ee31016a2d07f6b8256572110b9a6a5d00cb68644d1c3c3cd638f609b0f4f806e9e6cf602
+DIST netopeer2-1.1.76.tar.gz 171127 BLAKE2B 77b97cc60185b8843c216f69d6e7c6366b66dd2de86ab6a08489131738a27e28e730e0d773a5115406ad83df7aa22ee80638b6661faf6394fccb986b3996e038 SHA512 c37e7e4cba1d78fa20cff48fe6cd73fc5c0f0c43989b061915e7f7928c147ed5380f79d74341220df32aeebccf5db7d1560b261570e789807ad53591bedb0232
 DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
-EBUILD netopeer2-1.1.70-r1.ebuild 1015 BLAKE2B b75b3dec3703a2cef4514743fd13153663d497b9384411345b39b4b0db6d2c3422a17b1b489971133e2c6c1c3c2c9141ad6ec5bafe8b1142bce66c54d872872c SHA512 92446cbfb98218c888e23f1f8bc56ed4b8dc02515234b1e4cb4ce1bc9126042bc062ab8f4817a7047a09c2ad823b34e1f3431783f9fdd9386b25fe4f74bd0b86
+EBUILD netopeer2-1.1.70-r1.ebuild 1014 BLAKE2B ed146b0a8bc26b6da5200e2766987cbee3672a4fa07fc7a210a071ac82230a17d57c331bb224929c4107aea2209704fe230573c9e53c1347e104528d59c3798f SHA512 49c34f131200aa54aa72f429f04021433ddda84ddf4448eabe58d1aa8055876b11dea74bc5a1ead59d1eb44bf95393a3b2e0d0671e9c3d51df1dc5ffed5e0626
+EBUILD netopeer2-1.1.76.ebuild 1016 BLAKE2B 29a306b4114bb72c5ad83dff2148269618751f7ad4bc4c3664329443c2102a85e43b4ff79aff8a2ff804a4070bd4cf9f62fe88fd81e607b22b8e77078b134eb0 SHA512 292f43496f1e61b1b70588a6bf684f7cfb580d630adcbafffdc94ed11de9e64a09c9bc2e896d7939eed475d8ca9ac330f48e65149dfc653996c73cde75326751
 EBUILD netopeer2-2.0.0.ebuild 925 BLAKE2B 1b527e1f11dd8c24f3e594d030877293c5ca6eee48515afeaea03efdc3891f05d5d810c52ac811393f65524192f7e30d04179e9a4635f3e9bb4e460b16b99d20 SHA512 5de23f009617944ba31c3472731cb79dfb3fb811ea65cc303c185ef1d3b0ce55a2728d4124b79d2523a377c17a19b80617858ce3aa662a6101799aca9c5fba24
 MISC metadata.xml 449 BLAKE2B e77e9d18382c642d6165e32716e8ae0c8e5964acb49249687269fcec0f678b194fa905f50458ad640c25ce7d47138b7062232d92e0649a4b5fb54487a47c4cc1 SHA512 51596d9786cae042106f29190c459161c3eadccd64b51f79e255a8a2ee470bacd1c990420d195e7b2e15e913f8ba418cf2140aa87eacfe2e8252de1e5f95a6ff
diff --git a/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild b/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
index 5d8fc5b128b1..395e51ac135f 100644
--- a/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
+++ b/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/net-misc/netopeer2/netopeer2-1.1.76.ebuild b/net-misc/netopeer2/netopeer2-1.1.76.ebuild
new file mode 100644
index 000000000000..a18b90eb1807
--- /dev/null
+++ b/net-misc/netopeer2/netopeer2-1.1.76.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Server for implementing NETCONF configuration management"
+HOMEPAGE="https://github.com/CESNET/netopeer2"
+SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-misc/curl:=
+	>=net-misc/sysrepo-1.4.140:=
+	<net-misc/sysrepo-2.0.0:=
+	>=net-libs/libnetconf2-1.1.46:=
+	<net-libs/libnetconf2-2.0.0:=
+	net-libs/libssh:=
+	>=net-libs/libyang-1.0.240:=
+	<net-libs/libyang-2.0.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_HOSTKEY=OFF
+		-DINSTALL_MODULES=OFF
+		-DMERGE_LISTEN_CONFIG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/netopeer2
+	doins -r scripts/.
+}
+
+pkg_postinst() {
+	elog "In order to do initial server setup please"
+	elog "run setup scripts located in /etc/netopeer2"
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 15bc0487b530..282bc5bf0d99 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -11,5 +11,7 @@ AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
+DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
 EBUILD openvswitch-2.14.1.ebuild 4412 BLAKE2B 349b7cae8d88f157b608189086b111d5ad0af227cc15a7dce04cfb94874e19551851fd09f12c414f2884294f86a6371bf956b37d9161072c5f612ebad7a557bc SHA512 35f1ddd7393bf0a57132ef1a7f3d2c872a057eb95f33dd7bc1703147c73675a4797b9b87d6fd0314e1f75cae29282e1305b91cb0a58d4862ccea2dc1ae5db349
+EBUILD openvswitch-2.15.0.ebuild 4370 BLAKE2B 7587be9823c2db3e0f7c815de8a226904b6c67fc2fe7edd1b7071e97906a10c89dc163f0a53771f88c51f6fd081a4e7203027a9434e9f0042eaafbc20d850394 SHA512 973d59ef1d51d4550bb671f607eda6b4737ba881dae26228c708f1e5769f443b44890acca2ea997014e80ad9dd67dbe8f293c401d64ab8880d9bbfb4e3c51c62
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
new file mode 100644
index 000000000000..7f44d4ded567
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+
+inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.13.3[${PYTHON_USEDEP}]
+	dev-python/twisted[conch,${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux[caps]"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="
+	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+		kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug 607280
+	export ovs_cv_flake8="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	# only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 9b6b7e57d598..fa94992856e5 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST ownCloud-2.7.4.2934.tar.xz 14151708 BLAKE2B ad6f3d827a2fdcead6fdc2514696e8fbdb75b2d365c9a09602b95b24c669695e3693167f5da305e27e6fb2266f106b50c578def1d1518730926a10f640defbd9 SHA512 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6
-DIST ownCloud-2.7.5.3180.tar.xz 14154036 BLAKE2B ebee57568b917c1c7dec8f41f172caf53d0bfe4eae5e24ec5c9adbf656bf667769b0ed341a13a899ff6a04cd779d92b145736dce5a4e72055d306b2f08e0a902 SHA512 9e788341c45753eb2d2c62d252cf453259474689fd7d498147e0f4548a9038bd44bdca1539f9617d383853f8f9ca2f24c575667fb96e2a1a4ceec30195d257c2
 DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
-EBUILD owncloud-client-2.7.4.2934.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
-EBUILD owncloud-client-2.7.5.3180.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
+DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178
 EBUILD owncloud-client-2.7.6.3261.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
+EBUILD owncloud-client-2.8.2.4246.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
 MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49
diff --git a/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild b/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild
deleted file mode 100644
index 4afe35f947d5..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	xdg_pkg_postinst
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild b/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
similarity index 100%
rename from net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild
rename to net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index ae1b12c3904f..23a4e7cdee83 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,6 +1,8 @@
 DIST proxytunnel-1.10.20200907.tar.gz 54711 BLAKE2B 79b5fc459ece793997b4407679498af29c53aa495802259f95ec600665fca815f9e43cafcbf1d0407c4f7184c21e7dae3f899413dbeeaf0924034e1bbd26cddb SHA512 f04570e87a0fda024661135b6598f87f1d7407c368fe3453300a655fefedb66ade96a742223de08b500ba9fc1fdc2e6519005ea38529ceaa3c1815f5012fca84
 DIST proxytunnel-1.10.20210128.tar.gz 54702 BLAKE2B e873f20c37b5c0dc66a2a6767cfb8d9f73e7cfceaf99e03750eb5fd72acd33bd42281c2eec7e1a72ccecdd7fcd62c8592926c55c206aad220ed5b0b9bc3d357e SHA512 188ab239362cc7c9fd05ddaeaa85aee45c9040ac8f39f10cd0a97c2b92f49a9f5b854690b945109474492955c46b1f5c87e3251bfe68b22d3f1b3a21cf17eda0
+DIST proxytunnel-1.10.20210604.tar.gz 54872 BLAKE2B f8e70bd81a541bd3ecf0ed09fedc57396531aeec460eaff125046700d1a9c69f110590a5b81f650fdaba0c5938dd401a2937ee7347a4e33a3b89ac36bb915a7c SHA512 8cf88cda45646575b1eebbca3e8fe0de0edb6bcbecfb5b06cc50fdb863717f7c72b0a52c6d0f70f99284c1b2914f455f0965366b16e331c12e1bb98296b9b7ae
 EBUILD proxytunnel-1.10.20200907.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
 EBUILD proxytunnel-1.10.20210128.ebuild 1099 BLAKE2B 232f1d29172e64b49632f180cf16646cb41204aeb043796fe831c73d06d3ebd3accb2a92c6aaad3126470f6954163636b67e98d6004245b7dd79f4126335b126 SHA512 2b28ade2060edee28e6e991d18728eeb0482fb445c7fafb3a28b85c94cf34a59f4e717b1da5ba3e1d9cd3bad43fe34ed75273aa6201e8d3b70d708afa682ae64
+EBUILD proxytunnel-1.10.20210604.ebuild 1099 BLAKE2B 232f1d29172e64b49632f180cf16646cb41204aeb043796fe831c73d06d3ebd3accb2a92c6aaad3126470f6954163636b67e98d6004245b7dd79f4126335b126 SHA512 2b28ade2060edee28e6e991d18728eeb0482fb445c7fafb3a28b85c94cf34a59f4e717b1da5ba3e1d9cd3bad43fe34ed75273aa6201e8d3b70d708afa682ae64
 EBUILD proxytunnel-9999.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild
new file mode 100644
index 000000000000..e15bad2afce3
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS INSTALL.md KNOWN_ISSUES LICENSE.txt README.md RELNOTES TODO )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+src_prepare() {
+	default
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
+	einstalldocs
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 14eb214306a2..95729085f11e 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -2,6 +2,6 @@ DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5
 DIST putty-0.75.tar.gz 2731167 BLAKE2B 529b2c65853b8f915afd0563c1a055244d919794a71cff43573910fa2d4a81efca060c12320a0d07ddf3b03064b7e27d00ae396d6a2c1e46dc1a06403cae5c17 SHA512 3dbc15485008a98daf60236061253e66b94a6e5da123fc84c5f0ac006c84e17c70fe748987677775e3b54a12297eb826cccf70a4fc039b633bc2d512938b3028
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.74.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
-EBUILD putty-0.75.ebuild 1705 BLAKE2B facfdddc435961582f8f437113f49efac9f65d027a6263aa38f2d31768c3737602756069ec201309c8275c50a0575b01d95124f701e7818f29ebdadd5a285b80 SHA512 096f01563f6af4253eeba726724f17caa681bc658f767254da6326310fa040a0784e952a6d65e0e2da47332b52df3c28379de1dde6603f04c02bba9b689c0b07
+EBUILD putty-0.75.ebuild 1702 BLAKE2B 7bf2b36d317be0075c8ccf668d063d1337e61c1f649b537281d0f74c7ae5f2997a1f5eff452a999f925ac77618703d06e14082d2becc6211efdda46893d8d0c8 SHA512 f6d56ae2990384113f2d4b55c547feb6ce51a56fa836c99e2503a3b8e8489767833c5d756d9bbf7109ce058458f45dcb4a50b6c72d782e9b4aaf82f9ca85ba75
 EBUILD putty-9999.ebuild 1746 BLAKE2B 112f9ce331c974edf1a5e7e9dd778bed19e5072be100302fe601a92cc9456be965dc0f2cf015a4630385b8c766b12bc497ef4504ee2bbcafea9e8dfe7e812f4d SHA512 87cae42323cbc63e4a739b7eed25925ed91467a5b06fbc68721f6f7afaa7af3e23e94428d1a497a7509fb44673d101b7b6b58e7f5140fa1bd008f1f95212ffab
 MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/putty-0.75.ebuild b/net-misc/putty/putty-0.75.ebuild
index de62fdf29a9f..26f9ce9c31a3 100644
--- a/net-misc/putty/putty-0.75.ebuild
+++ b/net-misc/putty/putty-0.75.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
 SRC_URI="
 	https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 424d4921ce04..c355dc79ba02 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,6 +1,8 @@
 AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597
 DIST sysrepo-1.4.122.tar.gz 679974 BLAKE2B 3161eb8635c3ea7a0168b1a0eb3250da7e8c134030e5c5443d492cb708f095f9af12f08257a7d0b86a084b121754a8f19fa408de5afc32ce82d92bb4c6c7a535 SHA512 ccd603913b0f31f26f990dba8430ad6c1033546cd764396c43cc6667919b486924fc2d2fade77eee9ef7a3329aae2ceaf4acc578613a0c7c1d2a53d3cbf2944c
+DIST sysrepo-1.4.140.tar.gz 683340 BLAKE2B bc9d51fc18450809e0428b32901a20516a82b29a58f0c8bb962c2cfada1bdac94116e8d436eb294d3c50efb3a829f6262666e5715212a1bd83282667cc5ab744 SHA512 9d10f61825438462442a2757293f73a143222dc7f0adafcfdd21a2439eea63fe8789c05765f58c5b3798b0321bc79c4e649f88b0bf0b5443bfac30d1c168325b
 DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
-EBUILD sysrepo-1.4.122-r1.ebuild 773 BLAKE2B 080c24c14b11ed46417c5a86204e888b8db85c927045a924d55824ee587823c72e135595443b2a0520addfaab84c0c76d2f97a6bff995baa423c422488394fcb SHA512 dc3de4b6afc417add8fc24c9ba17109111229b019ea81162017678c08d3189db80b37131051f32e10e5bd5cc3747bd88de265361aed3024b15b512fd7643e4f6
+EBUILD sysrepo-1.4.122-r1.ebuild 772 BLAKE2B 7425a6e27b426b7b6b62f47ced029fec376dac49a7bd1ca4192c0af7281b540d89695db22eff2d4c8648bb2a7d71be34c127592dfcbec4c443096c5e10ba7087 SHA512 e481e28e1532e179ee42fce9095bfc4d975642c66c4cd33af9b5508db69470689999aa859577c2eb9a7eb2667d2e091d1f457ef65a560273a0c23d3abc881060
+EBUILD sysrepo-1.4.140.ebuild 774 BLAKE2B 6f7998ed5a0bbc506477c05feced5915dcbdd45e06bc13c334188df54fc9a67cfafff230ae7e34123b45a4e5a005e2774ea04a8f2c4971793031e965467a8c06 SHA512 0a5ade7ed2d9751659a9324d2528a023319490ab8fef9059e055a2eaffeb6f953c20f062cb22a2a9d2a36c3149b11806c68f4b0a06f55442622c63d962fa393f
 EBUILD sysrepo-2.0.1.ebuild 786 BLAKE2B 676f6c564fb8fadd063a9bf4b0e380bf6441bcc6e959c802c48a3a8add0472838adb6fb074092333bf919171fca4406850fab59933ca88357003644f5f6e65ff SHA512 750d39de3bb4fdce534491a8d95eaaf528b4cdb4084125e7fcbaa0d4f457c6918956b820227ebe8842a8864fcc73be29e302f53c2146e5404e826143511d9f21
 MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba
diff --git a/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
index abea148c94a3..184ab5dc58ec 100644
--- a/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
+++ b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/sysrepo/sysrepo-1.4.140.ebuild b/net-misc/sysrepo/sysrepo-1.4.140.ebuild
new file mode 100644
index 000000000000..9958375e77dc
--- /dev/null
+++ b/net-misc/sysrepo/sysrepo-1.4.140.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="YANG-based configuration and operational state data store"
+HOMEPAGE="https://www.sysrepo.org"
+SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libyang-1.0.240:=
+	<net-libs/libyang-2.0.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index c3968e3f8fe4..9d28ddc5c497 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,5 +2,5 @@ AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
 EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7
-EBUILD wget-1.21.1.ebuild 3238 BLAKE2B 7d75816ce24a6527a2129d0edd8e6ec166dc08577332795cd675fcad30b6fb79b11c676a914e922b3cc208b5a4e64fb861019e6ac7b96f323e270b781857121a SHA512 652fa916716e742dfc5ae5146ac7336e0c1e1dc6e8e0ae04d874495396092882d54ca49ddb40a87e5f7ea8840675708b516d3deb26fc0d759738ec9d2e8657d7
+EBUILD wget-1.21.1.ebuild 3237 BLAKE2B cd8d8b3a9b1a2e3b130ef83fbd5c5ed2cee38977f734ada3be7accaf87f58f1796e3856219d47a7aee6a76c3408d75634fb36ee43c33bf40e3fdabad829941a2 SHA512 78fe6fdb7fe08af3042d2ba3cefdaaeea8f3781a72aa58f4630504433b4b8f760716272a007370c48923945e7bd305c7bfc3b976ecc49c514a5200a965de4f57
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild
index 44f295dc8b7d..b7c135951241 100644
--- a/net-misc/wget/wget-1.21.1.ebuild
+++ b/net-misc/wget/wget-1.21.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index c80dfb25cfb2..4fdb69c00c56 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,7 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
+DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28
 DIST whois-5.5.9.tar.gz 102516 BLAKE2B f5f15568558e9f82ed19dbd35fd43f3067953d4766477f71bfb5d638cbf328fe95012633daa90ad14a6bdf836161967684562f6e028bc204f2a9ed539600c92d SHA512 ab70181220a6d41dd9add04bd81836c89a626de1b45f617e9ab044a666f0ab99a4dee910cff4b0a6a3e47b5e0a7320c2c20f3ff95c2dfc852123d4f672629e16
+EBUILD whois-5.5.10.ebuild 1913 BLAKE2B fba85f7bcc9bd4132a95dd3cbe7070bfd6fef092626ef54f704b3978a2198c0a1b5e60451bf3bfcc080a1001ea319b8733c40f4e8aa430158a8cd455e9efd00d SHA512 4028276f4513a5a03fddb0eae2af822d1727a90baa11dc4728d97e7902220863fb9b99f566ff5e65d0a2a5ae2f4d80fa39e3a10cc9960033c73c062411837d15
 EBUILD whois-5.5.9.ebuild 1906 BLAKE2B 134054616f8e108d3668d4dcba8cd2ccdb78834c7a83f9342942e4b43487f537500a4e16524276787f80a43b56d9d4120e73bda25b3a9d36beab7985c06afbe0 SHA512 b36292da9d56227da3b300f0b85d47fe321fe130a63005dac2787d4a05db935f8621491bb21e39894ef2fdd7e6bfa32a53d08b9930ecf022dd17ee371cdfd2be
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.5.10.ebuild b/net-misc/whois/whois-5.5.10.ebuild
new file mode 100644
index 000000000000..4420819a3d8a
--- /dev/null
+++ b/net-misc/whois/whois-5.5.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+RESTRICT="test" #59327
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 2133050bc220..8173cb44830d 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,5 +1,5 @@
-DIST you-get-0.4.1520.tar.gz 164979 BLAKE2B 063c3a3d14c5430de49fc5ba4e70302048287dad812aef8ba9d2bc67d2089b6f1bcfe4e0db3edf9e1dd0621549104594c8df56acfe8567bd87fb22b9d8ec617d SHA512 fc211753110ffcd39412da82ee11b9a32d98fb9f6caee5ac94732d75c615a8e8439bac247564036b1359bf61422704089e6fca206367f5c7e8fc1f7ec3aff454
 DIST you-get-0.4.1525.tar.gz 164972 BLAKE2B 4ac50572a2714d523f4f3a53c0f7329b07faf88a3c22b26bac5b440383bd6d540854d9966c0b10c25b0c207d4e29c6dd09a06c55c68dbed13ba673c29f5f4eaa SHA512 2d9bc2e66da39dbe0146ad4ff88dd1b45ce17a2208b82196c96a36ed1f4a0a86ade274b3c7b8cf683cf46d69f813caed1e24f58a3a7677a29f1999707da9a5ba
-EBUILD you-get-0.4.1520.ebuild 508 BLAKE2B 384915fd1cc4b27a5d407a1a60fab8e2b0c4f0a32bd172111138ed1b5e701ba5c5414c542e6ac45452666f5ee93861f4dd9de458d082231bf662c997ce15073d SHA512 2d375049c7612dd263a59aacee83623a5b13d17df211b5089e27904e4918a2a75ec73eddc0ad6d96a4854faf3b7f5ecfa7adad82d7dbede1c41048e373e396ba
-EBUILD you-get-0.4.1525.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
+DIST you-get-0.4.1527.tar.gz 164994 BLAKE2B 5bdabefefa92d9fc8a6d7a0f97a4aa7f1e15161f3f8add7e5392ad2994abb0dc082a68301de0d0979a9158515788695413e3d5b1c343b51209b8a3bf22343aab SHA512 9543d49e1b6aadfc6e9af57457a567aa8a804efc255c86fecfbc90c150b9ad1231d38730735ad9cf075312e4ba83f4f3bd71f088d14b8928f7e6951535029f8c
+EBUILD you-get-0.4.1525.ebuild 508 BLAKE2B 384915fd1cc4b27a5d407a1a60fab8e2b0c4f0a32bd172111138ed1b5e701ba5c5414c542e6ac45452666f5ee93861f4dd9de458d082231bf662c997ce15073d SHA512 2d375049c7612dd263a59aacee83623a5b13d17df211b5089e27904e4918a2a75ec73eddc0ad6d96a4854faf3b7f5ecfa7adad82d7dbede1c41048e373e396ba
+EBUILD you-get-0.4.1527.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
 MISC metadata.xml 355 BLAKE2B 634db21b0e450020e42fa7576e04a3015f624b4d9ba3fe4d185897142d81497eecc14ffd35283e7903efb67a02368bbf1b27d507123675169abf0ab627c0b1bd SHA512 1dd99e270059527e7230eeffb8779664977af2f9000a1e4fc2025e377602ba4a1a3f6f8def34eb3854a9284638717eea469581cba61ab0ddf374272be62d7520
diff --git a/net-misc/you-get/you-get-0.4.1525.ebuild b/net-misc/you-get/you-get-0.4.1525.ebuild
index 93636c539412..a0cb7ef0a1e3 100644
--- a/net-misc/you-get/you-get-0.4.1525.ebuild
+++ b/net-misc/you-get/you-get-0.4.1525.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/net-misc/you-get/you-get-0.4.1520.ebuild b/net-misc/you-get/you-get-0.4.1527.ebuild
similarity index 95%
rename from net-misc/you-get/you-get-0.4.1520.ebuild
rename to net-misc/you-get/you-get-0.4.1527.ebuild
index a0cb7ef0a1e3..93636c539412 100644
--- a/net-misc/you-get/you-get-0.4.1520.ebuild
+++ b/net-misc/you-get/you-get-0.4.1527.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 9e63888ddea4..1dd9aa555f10 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2021.04.26.tar.gz 3333530 BLAKE2B cffa09f91a1bbfc5962177133711ec1fce4760ef4a073c01daede2cdc168a10cfd868ca536903127f5a3214aece1c111d1dae23739aac86e765d7ff21903c884 SHA512 d187b537fc71ca8e0c9422404f14bab20f66ee9ea10af40d94e9216a79d6b78c1c535600308d18905c34ede0934dbf4f642f58125e898130ce536bc053aa2a10
 DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
-EBUILD youtube-dl-2021.04.26.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
-EBUILD youtube-dl-2021.05.16.ebuild 2137 BLAKE2B fe26a208b04301c55e253adfa69189bcaa55624e1e7ac9103634383bb5c04537d1bd15552064d0ae07eb42ab19bd3be3497568d6b4dc74e8bf87748e211c08e1 SHA512 76d1a22b00c0d1625889b5bbd23bbae97a0408642d883127821a16896e3c48a0a809e40496777b65f45b34b6e20b38a7a168d087d781eb1b3e6575ab7fcc3ddc
-EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
+DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
+EBUILD youtube-dl-2021.05.16.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
+EBUILD youtube-dl-2021.06.06.ebuild 2104 BLAKE2B 569aa65da08a7dd77d3988ff9583a5af8f8c8f556d4d6b7742ddc7c7b11d8266a969cbd40a39f0fb22a245cb4d5a93ad5bdc771fb54b421f25f2cb2719bc387a SHA512 9d91adeafb7ad3f3caca35c5e65b7caaf86cdaa37b5b7c1a7312175dcd7665a4ac84bd5e72d2c7c3f81c6b33fabec9829ead0e94c3f7e3739019c045220ed47a
+EBUILD youtube-dl-9999.ebuild 2097 BLAKE2B 193cf2464a2d5f7fe0f6fcbbeefa919884d8bfff551446930a12a98afa0827ff178a9e8af7bc9df827d09ce539a824781b155286b57cd2e7f3e7e1629b08be1b SHA512 a51572c892c8774eccc3ebe098ba634a9c60d3b68e956e980e62313e0ddce524c5cf3e686b820f6a12ee60ef849512004d9677eeea6b54b0d3d1c2504a7ec801
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
index 6ca1748400e4..3d701ad41fa9 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
similarity index 91%
rename from net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
rename to net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index 3d701ad41fa9..8ec79bfd981f 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..10})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -15,7 +12,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 718c04ca9f29..50bd1337b3fd 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -30,7 +27,7 @@ src_prepare() {
 src_compile() {
 	distutils-r1_src_compile
 
-	emake ${PN}.{bash-completion,fish,zsh}
+	emake youtube-dl.{bash-completion,fish,zsh}
 }
 
 python_test() {
@@ -40,13 +37,13 @@ python_test() {
 python_install_all() {
 	# no manpage because it requires pandoc to generate
 
-	newbashcomp ${PN}.bash-completion ${PN}
+	newbashcomp youtube-dl.bash-completion youtube-dl
 
 	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
+	newins youtube-dl.zsh _youtube-dl
 
 	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
+	doins youtube-dl.fish
 
 	distutils-r1_python_install_all
 
@@ -55,13 +52,13 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
 	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "youtube-dl works fine on its own on most sites. However, if you want"
 	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
 	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
+	elog "a higher quality format without sound. youtube-dl will detect whether"
 	elog "ffmpeg is present and automatically pick the best option."
 	elog
 	elog "Videos or video formats streamed via RTMP protocol can only be"
@@ -70,6 +67,6 @@ pkg_postinst() {
 	elog "Downloading MMS and RTSP videos requires either mplayer"
 	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
 	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
 	elog "resulting MP4 files, consider installing media-video/atomicparsley"
 }
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 6b6bacf05c7a..f2e70ffa88fc 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 7067ed8ebcea..db2a7c70e4cb 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -2,5 +2,5 @@ AUX bttrack.conf 613 BLAKE2B ad791caf43fc5cf0e22f8fd01acab3d2f93feb827d64e07a1d6
 AUX bttrack.rc 519 BLAKE2B 829b1a4cdb29bae41e25e832d7383ea4fda3ec2473d6d9bebc2738f126c9c95a937cbce0473bf5cf3a049b75e00a0301c3d8b1179c8c46db5f327e467977d9bc SHA512 74255a6dae0d5b1b5809dd6b7b792bb1f681d9c002dd64c0b633e4c903af8748922abe4521d0e52f23ad2d1f12066bf6a2eec1ad8112251e081f07002609eae0
 DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014 SHA512 09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa
 EBUILD bittornado-0.4.1_p20160925-r2.ebuild 1436 BLAKE2B 7b6926352072848ba683c977771c3a77673161a5c7a40494b5e3d799e0c864faa99af78f84c1cff0f5f8ddc1cdf1a25dfc033ff191e70949a63642f837086905 SHA512 5c0b9da4dcd356f6b93117c88f6c8b46507929867e90ba68df5d32572b3b8df6ed16b175790d11b432f59caf329c37bd1886fd6b3d8aced900fb6b62e0d8abe4
-EBUILD bittornado-0.4.1_p20160925-r3.ebuild 1501 BLAKE2B af30e7d4f2a86b4298a6ba52a2433a45a9f51b7a36577c99f28c7cfc94ba55b0aad908f2eb5fb8f6c1e1ef4bb915cbc7cace7ec295164a159f673e6dd8c89d7f SHA512 92cd7ac2055286613bd537f8b421f504f9cb76efe4b4865b41b0fbb71f997ba2066f5c1b3d64740e807a52c9fea994392e847db009667ebac997c6f822dd1c23
+EBUILD bittornado-0.4.1_p20160925-r3.ebuild 1500 BLAKE2B 2ee5fca1f37d69f59abf1faa1ebd1c43a35f3991c58d5ebb8afcde85707096c07a45a7b742f73b97a73c6c41b7234441e2843c4a242ba0bbfe033b8c0439d3d7 SHA512 00bfe7d7d31dc735279c0af8cae63b9300e276775dfba3217cd6d90b62f549011cd10e8a50ca1f63d9a71d6dbfa59a5f2fa54a96a2b90101f3ed4ff69904af28
 MISC metadata.xml 251 BLAKE2B 2e57f7e8625022d92e5ff0f4ea468077072bf9de6a293b4b3626fc3f6bfa2c34cc1a4a07a2db9c1a5255fb524144a5d8c232e29a331169fee5303274ff5c59fd SHA512 92e2c6c337d3a54187195c333ae1fc7f7dddccad31a4a077037949d81ef125bc2b776cc65db09f1de5cef8bc47faae8dad17696db1ab85c9d81fb02a8cc17f2d
diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r3.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r3.ebuild
index b8e96a3722c6..d345a1be9903 100644
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r3.ebuild
+++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/effigies/BitTornado/archive/${EGIT_COMMIT}.tar.gz ->
 LICENSE="MIT GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index a31c50f61374..950c214d8468 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -9,5 +9,5 @@ AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d7
 DIST freenet-0.7.5_p1488.zip 7815529 BLAKE2B a63de0b365abe7fd3a7bdde735127c56d0bf220036932db93392893c21e8714cffa27b76357b9e429e5a915975030470035549c8010e3828bb503eaab5911c62 SHA512 5232d4d18bcf8775832aabee7392d0434cecb07114190ed9cd9bbab08fd693a1ac07f3ffad0835e4c5e3696961a234906cbee79c425e50cd29021b8bb77ef733
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
-EBUILD freenet-0.7.5_p1488.ebuild 4855 BLAKE2B 12f63a68db156d103f0d2e430181a334ea2cc3ee5d01bb96a9cc6eb60384034e56de49e13bc6eba10a7f2d3193e511ec1b932aaa91f2968da9703a18e3c86aae SHA512 22b76e2e092b303d4188dc906111d7c78fdda5621467888bdf7b628f6d38a3ccf127ad7645857968737fefe01ee34fed2aa24370b4c0b5db542ac9b1e250fe00
+EBUILD freenet-0.7.5_p1488-r1.ebuild 4847 BLAKE2B 8b2499a6b19b5dcf064f48558c454fe8239a2c26d9ffd579a4d250bdc6a2c1a3231efa969635aabea62cacc220cfc1224d19863a1c89f71b4605118f49408cec SHA512 8de3b3306225ef90a69066274ee05249dd0b17a7eed49a0de7fdb45746254dda2b10895dc8c1119e8dfff86a36807258bff6f1a660623f50513cabc4b5fb3dc0
 MISC metadata.xml 430 BLAKE2B 330d7821440f7a30d4eeb6c8586cf4de79358d9387d99cd6a3f8fc240d91fa78155dcca40ad3998bb158322c463166de729bd350bf132bb84222287df2d374fc SHA512 54fdbe9930d42e885eed81f57adcec04155e63aa6b4cd538d75094a4016405e9155b717bce464ad40ce16a3aa1c4e6b020913c5900eaed8d7f6f8e5de98e7a64
diff --git a/net-p2p/freenet/freenet-0.7.5_p1488.ebuild b/net-p2p/freenet/freenet-0.7.5_p1488-r1.ebuild
similarity index 96%
rename from net-p2p/freenet/freenet-0.7.5_p1488.ebuild
rename to net-p2p/freenet/freenet-0.7.5_p1488-r1.ebuild
index 19ab5d4372bf..a35f88dae0f3 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1488.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1488-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+nss test"
 
-CDEPEND="dev-java/bcprov:1.54
+CDEPEND="dev-java/bcprov:0
 	dev-java/commons-compress:0
 	dev-java/fec:0
 	dev-java/java-service-wrapper:0
@@ -58,7 +58,7 @@ JAVA_ANT_ENCODING="utf8"
 EANT_BUILD_TARGET="package"
 EANT_TEST_TARGET="unit"
 EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov-1.54,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
+EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
 EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
 
 S="${WORKDIR}/fred-build0${PV#*p}"
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 0104fad8b3d0..f251b438bdf8 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -5,13 +5,10 @@ AUX vuze-5.3.0.0-disable-updaters.patch 1726 BLAKE2B 8a1d7ec1196ee27019f513d5129
 AUX vuze-5.3.0.0-java5.patch 618 BLAKE2B d939b9708bc4fa2902d1b5f78ceb4d707ff59e421cc9b2308178d57e78dede189eeb0723bea8ac22a3b6502f59533f72a1207be59e36cca7c568d2e0c52ce120 SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c
 AUX vuze-5.3.0.0-remove-classpath.patch 545 BLAKE2B 52a33a81cf3803fa6f0f8e10b89b255c4e72cee2606c88abbc8c8566087d816fa0d8c951631cafb77f49c43ecc6edb78e4a083112dfc21c6df141218fb78d7be SHA512 867e932eab1f33af6a8320cbe1f1cf565b68f39c6e1c0188dada018de4b50823047a7e9a53d558c00fe2253c48e4e6276e7725681b33a115de694c43265cf42c
 AUX vuze-5.3.0.0-unbundle-json.patch 1322 BLAKE2B fc387740073933b9f99474dd2ac5e7ed8978e387ed5b903c7489d41684a6eafc44f4c85b7453d275988ad0105457966064b718e229cf8485d9fe4bb454062bb8 SHA512 60b8dc8216f5f51a4cb6c6b793d1b31b686f63d03e373741d76856a594468fa5c97781fc99fc9af30f2db8173bb86414cd52cb30ea7ebeac5a018633f661ce26
-AUX vuze-5.6.0.0-commons-lang-entities.patch 2085 BLAKE2B 547ab6aa8e964280f72bc161775c4eaec5371c06d8e98629013068d3d69b160f8cac36377a14811ad714cc011f3293d7c82dd873d2bbed536110ab4b4d6fd016 SHA512 a08d23a1947ad668048f49c8137d4494da662d65f5cf98acd5e44656f7d6a2bf691eebba4fd8033996594d1c4edc1a2eec3ce3f92d23b1818c03b405fc081899
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
 AUX vuze-5.7.6.0-commons-lang.patch 7613 BLAKE2B 00df394b0dddd442b693251d29a3bfd5c647e20b47bd94e1c5bf07267d0bee66f98c1ede2f2d070526f6829211755343184e25ee2e78c46100f5f866340571f2 SHA512 bc44e26d3ae93891e01023b2afe614c680caada24398459efa6640295b9bd9e0cc7e734c42364bac21082ec827c54f12d818b19db4ea20ff6b3046c145ffb998
-AUX vuze-5.7.6.0-unbundle-commons.patch 5156 BLAKE2B 641a0264521e97d808046a9d76cb362302dd25679a6e8df6878646d59f04b1a6cc0ab1fd7e83d8f76cb7250b9b2fbd64cf1efbbbc4eb14a0432f2eceea3c22c7 SHA512 f4c5082b618a2feb9c19bb1ddc53e7a61f1511d804488ce279e3c3174fc185d93d31316de58d185e3f6a6f19af11d587c9b11c4361c3f07622c11843eff6b51c
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
 EBUILD vuze-5.7.6.0-r1.ebuild 4068 BLAKE2B 1df51a38b5663a9869e2f572341cc0e7ddddfe5544ce659ea5f7419921349e83663f62fa52dfc3f3b72d6047b03a5e7975c583de619d765de1467e0d7810f2b1 SHA512 3d31e3b0bb898524720a4807762bbb17df573f0f6886ed5dd930c6a3be22f064355d86f09c6d4ff0dba7b0a08ca32bf53508799eff15a0e5cd9a4a2c8f02adb4
 EBUILD vuze-5.7.6.0-r2.ebuild 4068 BLAKE2B cc886730154ee78f0a29f3e92dc989a6ab2e25bebe9ac1ffe18b24dc1118289152b573620ecc3bd6f0e044dc18c706cb7346d5a019f8db78eeee30e7e81fb546 SHA512 d9b7faa5b51d359fce3a5812ceb9c3c6069bc8952d684bf0f58e72b119bb2e7682d3ec5d4ed7485fa83ef75cbbf281e8e0e546de5f5b8a4041155233ccde1266
-EBUILD vuze-5.7.6.0.ebuild 4110 BLAKE2B d2318a6f7b57f629ac3211256b24475012133c9ac102020d88ac0681af93d7d746cf317e07709f1f328f8a72cf4ffc852677424e0ffb1cafa367019cd147602a SHA512 de63a2b00b95cc31f25e20dde85791721fcfee763fa491ec2c973b5d1a496d3327233bf3839afe41e3f11836b4943e97cfa23f6828f8f0d6c82c9b1fe58c5f3d
 MISC metadata.xml 313 BLAKE2B fc77cc23994c00f76b282bfb170062f085fb1c83ced23e4a38d141acb5e2c4d259988541a0538de48dfe7e943132d4446467df8745b1e171ecdf3ece1f2e0eff SHA512 f77617dfe493bf5cc08c1db751bb8eed8275938f57c9fbe19584adf19bdaa4481c9bf3ece012859641f0e811ae2ce4ce058899a6c3075defc738c25e21b300d1
diff --git a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch b/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
deleted file mode 100644
index c58d475995ee..000000000000
--- a/net-p2p/vuze/files/vuze-5.6.0.0-commons-lang-entities.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java b/org/gudy/azureus2/core3/util/AddressUtils.java
-index 6691951..38f14ee 100644
---- a/org/gudy/azureus2/core3/util/AddressUtils.java
-+++ b/org/gudy/azureus2/core3/util/AddressUtils.java
-@@ -494,11 +494,11 @@ AddressUtils
- 			try{
- 					// unfortunately we have an incompatible base64 standard in i2p, they replaced / with ~ and + with -
- 				
--				char[]	encoded = to_decode.toCharArray();
-+				byte[]	encoded = to_decode.getBytes();
- 				
- 				for ( int i=0;i<encoded.length;i++){
- 					
--					char c = encoded[i];
-+					byte c = encoded[i];
- 					
- 					if ( c == '~' ){
- 						encoded[i] = '/';
-diff --git a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-index a67a8a2..da4a46c 100644
---- a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-@@ -25,7 +25,7 @@ package org.gudy.azureus2.pluginsimpl.local.utils.xml.simpleparser;
- import javax.xml.parsers.*;
- 
- import org.xml.sax.*;
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.lang.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.Constants;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -656,17 +656,8 @@ SimpleXMLParserDocumentImpl
- 		     					replacement = new String( buffer, 0, buffer_pos );
- 		     					
- 		     				}else{
--		     							     							     					
--			     				int num = Entities.HTML40.entityValue( ref );
--			     					
--		     					if ( num != -1 ){
--		     					
--		     						replacement = "&#" + num + ";";
--		     						
--		     					}else{
--		     						
--		     						replacement = new String( buffer, 0, buffer_pos );
--		     					}
-+
-+								replacement = StringEscapeUtils.escapeHtml(ref);
- 		     				}
- 		     				
- 		     				char[] chars = replacement.toCharArray();
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch b/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
deleted file mode 100644
index d8643dbe680f..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.6.0-unbundle-commons.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java
-index bec05e1..9481f86 100644
---- a/com/aelitis/azureus/core/metasearch/Result.java
-+++ b/com/aelitis/azureus/core/metasearch/Result.java
-@@ -28,7 +28,7 @@ import java.util.Locale;
- import java.util.Map;
- import java.util.Random;
- 
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.lang.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.DisplayFormatters;
- import org.gudy.azureus2.core3.util.HostNameToIPResolver;
-@@ -464,6 +464,6 @@ public abstract class Result {
- 		if ( input == null ){
- 			return( null );
- 		}
--		return( Entities.HTML40.unescape( input ));
-+		return( StringEscapeUtils.unescapeHtml( input ));
- 	}
- }
-diff --git a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-index 2d353b8..8ebf9ff 100644
---- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-@@ -87,14 +87,14 @@ public class WebResult extends Result {
- 	public void setNameFromHTML(String name) {
- 		if(name != null) {
- 			name = removeHTMLTags(name);
--			this.name = Entities.HTML40.unescape(name);
-+			this.name = StringEscapeUtils.unescapeHtml(name);
- 		}
- 	}
- 	
- 	public void setCommentsFromHTML(String comments) {
- 		if(comments != null) {
- 			comments = removeHTMLTags(comments);
--			comments = Entities.HTML40.unescape(comments);
-+			comments = StringEscapeUtils.unescapeHtml(comments);
- 			comments = comments.replaceAll(",", "");
- 			comments = comments.replaceAll(" ", "");
- 			try{
-@@ -107,7 +107,7 @@ public class WebResult extends Result {
- 	public void setCategoryFromHTML(String category) {
- 		if(category != null) {
- 			category = removeHTMLTags(category);
--			this.category = Entities.HTML40.unescape(category).trim();
-+			this.category = StringEscapeUtils.unescapeHtml(category).trim();
- 			/*int separator = this.category.indexOf(">");
- 			
- 			if(separator != -1) {
-@@ -136,7 +136,7 @@ public class WebResult extends Result {
- 	public void setNbPeersFromHTML(String nbPeers) {
- 		if(nbPeers != null) {
- 			nbPeers = removeHTMLTags(nbPeers);
--			String nbPeersS = Entities.HTML40.unescape(nbPeers);
-+			String nbPeersS = StringEscapeUtils.unescapeHtml(nbPeers);
- 			nbPeersS = nbPeersS.replaceAll(",", "");
- 			nbPeersS = nbPeersS.replaceAll(" ", "");
- 			try {
-@@ -151,7 +151,7 @@ public class WebResult extends Result {
- 	public void setNbSeedsFromHTML(String nbSeeds) {
- 		if(nbSeeds != null) {
- 			nbSeeds = removeHTMLTags(nbSeeds);
--			String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
-+			String nbSeedsS = StringEscapeUtils.unescapeHtml(nbSeeds);
- 			nbSeedsS = nbSeedsS.replaceAll(",", "");
- 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
- 			try {
-@@ -166,7 +166,7 @@ public class WebResult extends Result {
- 	public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
- 		if(nbSuperSeeds != null) {
- 			nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
--			String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
-+			String nbSuperSeedsS = StringEscapeUtils.unescapeHtml(nbSuperSeeds);
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
- 			try {
-@@ -248,7 +248,7 @@ public class WebResult extends Result {
- 	public void setPublishedDateFromHTML(String publishedDate) {
- 		if(publishedDate != null && publishedDate.length() > 0) {
- 			publishedDate = removeHTMLTags(publishedDate);
--			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
-+			String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
- 			this.publishedDate = dateParser.parseDate(publishedDateS);
- 		}
- 	}
-@@ -257,7 +257,7 @@ public class WebResult extends Result {
- 	public void setSizeFromHTML(String size) {
- 		if(size != null) {
- 			size = removeHTMLTags(size);
--			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
-+			String sizeS = StringEscapeUtils.unescapeHtml(size).replace((char)160,(char)32);
- 			sizeS = sizeS.replaceAll("<[^>]+>", " ");
- 			//Add a space between the digits and unit if there is none
- 			sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
-@@ -303,7 +303,7 @@ public class WebResult extends Result {
- 	public void setVotesFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-@@ -317,7 +317,7 @@ public class WebResult extends Result {
- 	public void setVotesDownFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
diff --git a/net-p2p/vuze/vuze-5.7.6.0.ebuild b/net-p2p/vuze/vuze-5.7.6.0.ebuild
deleted file mode 100644
index c6c1b2348292..000000000000
--- a/net-p2p/vuze/vuze-5.7.6.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg-utils
-
-MY_PV=$(ver_rs 1- "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/swt:3.8[cairo]
-	dev-java/commons-cli:1
-	dev-java/json-simple:0
-	dev-java/commons-lang:2.1"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.8"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	"${FILESDIR}"/${P}-unbundle-commons.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	"${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
-#	"${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
-)
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	if [[ -f build.xml ]]; then
-		die "upstream has build.xml again, don't overwrite"
-	fi
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-src_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	default
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="256"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 4252879c3e8c..923d3fd432d1 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 13fe8ffb2ff0..a02b7f87c25b 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,8 +1,6 @@
 AUX i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 1110 BLAKE2B 9e34a568f94baed130c6f9dd3cda2f6ae6e409d7c41bff8fca5226fa6e84d989b46e84672440c8dcfb861d237075093c8a7bfab50d7b2385ca376e11524bc876 SHA512 204150b938fafe5b521d381ed6c517624cec3b47d564d84ae21e7884d87348a3fd4387b193e466df5c152f6262e29e1e88f9f970a78cf516839099b16fd5938a
 AUX i2p.init 391 BLAKE2B e62a23021db61ba93adaf1ff9c2f0bb9372cee3921544c9ca498f3472dc64c700a0fb78d2fed9dafc0fa98c97670f67266a2e0f8c594c7c1352d15e1b23d7586 SHA512 12c69b2c5918a23219d84f2c1ded286ced6f78564241372bead318ddcb77876e90c800735f7ed6e92c03f69dfeb990ec43e40efd1e9ee32888b404d1e2e9643a
 AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
-EBUILD i2p-0.9.47.ebuild 6219 BLAKE2B f8f9dec30525d43bad24a7972fa9df12746fc70b4bce1931eacb07eab7dfe771d50ccb7d651452e37ab88aeda25e7d40254fc55b1723b8496e6e90279f16dd22 SHA512 e5a3ff6e87e53baf70f9e1f77302b500572345d42bea2a6706a39d422c2529162d7678237e7decd6a4f873f8e38141d98763fbbfefe6c7d5eddc0ad9d91b05b1
 EBUILD i2p-0.9.48.ebuild 4767 BLAKE2B afe3a7ff68167e428630be309ee2aaa7241c8b07318ac0e736040f33366183dbdf49e2bdc0e80e9579b83c06e3373a0e7397d0aa16e82411d203a979031037e4 SHA512 dab89bf22336afad01ba285b64b893a22b627122c675697ca9d73fc9a9132b99cf0cc44fd3e009fdcdc1e819be5a3be2bf1b219a9b9133f0ef0560348fd3db6a
 MISC metadata.xml 739 BLAKE2B 68bcb6a0d90cad753651e15a66cf169d6a7649eecb25917bd03ca1489d7cfc7e49bf54f84ec05149689802f9ddedd4d6421a0c0281a4684a55b854e04e6c0734 SHA512 e161bd04600c577d14beef7e95a58da20661555a481a9993a56daaa0f219b15d1e2f5502464a407645973d84ed0092cefb172d8565ac4fca3b592dd412bf96b5
diff --git a/net-vpn/i2p/i2p-0.9.47.ebuild b/net-vpn/i2p/i2p-0.9.47.ebuild
deleted file mode 100644
index a775e06556d9..000000000000
--- a/net-vpn/i2p/i2p-0.9.47.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
-
-LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
-SLOT="0"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND="
-	dev-java/bcprov:1.50
-	dev-java/jrobin:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-jstl-impl:0
-	dev-java/tomcat-jstl-spec:0
-	dev-java/java-service-wrapper:0
-	dev-java/commons-logging:0
-	dev-java/slf4j-simple:0
-	java-virtuals/servlet-api:3.1
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/eclipse-ecj:*
-	nls? ( >=sys-devel/gettext-0.19 )
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-	)
-"
-
-RDEPEND="${CP_DEPEND}
-	acct-user/i2p
-	acct-group/i2p
-	virtual/jre:1.8
-	net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET="junit.test"
-JAVA_ANT_ENCODING="UTF-8"
-
-PATCHES=(
-	"${FILESDIR}/${P}-DataHelper-decompress-fix-length-check.patch"
-)
-
-src_prepare() {
-	if use test; then
-		# no *streaming as requiring >dev-java/mockito-1.9.5
-		sed -e "/streaming.*junit\.test/d" \
-			-i build.xml ||
-			die "unable to remove ministreaming tests"
-	fi
-
-	# as early as possible to allow generic patches to be applied
-	default
-
-	java-ant_rewrite-classpath
-
-	java-pkg-2_src_prepare
-
-	# We're on GNU/Linux, we don't need .exe files
-	echo "noExe=true" > override.properties || die
-	if ! use nls; then
-		echo "require.gettext=false" >> override.properties || die
-	fi
-
-	# avoid auto starting browser
-	sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
-		"installer/resources/clients.config" || die
-
-	# generate wrapper classpath, keeping the default to be replaced later
-	i2p_cp="" # global forced by java-pkg_gen-cp
-	java-pkg_gen-cp i2p_cp
-	local lib i=2
-	local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
-	for lib in ${i2p_cp//,/ }
-	do
-		cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
-	done
-
-	# add generated cp, hardcode system VM, setting system's conf
-	sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \
-		-e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
-		-e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
-		-e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
-		-e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
-		-e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
-		-e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
-		-i installer/resources/wrapper.config ||
-		die "unable to apply gentoo config"
-	local prop i=2
-	for prop in \
-		"i2p.dir.base=${EPREFIX}/usr/share/i2p" \
-		"i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
-		"i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
-		"i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
-		"i2p.dir.log=${EPREFIX}/var/log/i2p" \
-		"i2p.dir.pid=${EPREFIX}/tmp" \
-		"i2p.dir.temp=${EPREFIX}/tmp"
-	do
-		echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
-			die "unable to apply gentoo config"
-	done
-}
-
-src_test() {
-	# store built version of jars, overwritten by testing
-	mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
-		die "unable to save jars before tests"
-
-	# generate test classpath
-	local cp
-	cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
-	EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
-
-	# redo work undone by testing
-	mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
-		die "unable to restore jars after tests"
-}
-
-src_install() {
-	# cd into pkg-temp.
-	cd "${S}/pkg-temp" || die
-
-	# we remove system installed jar and install the others
-	rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
-		die "unable to remove locally built jar already found in system"
-	java-pkg_dojar lib/*.jar
-
-	# create own launcher
-	java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
-	# Install main files and basic documentation
-	insinto "/usr/share/i2p"
-	doins blocklist.txt hosts.txt *.config
-	dodoc history.txt INSTALL-headless.txt LICENSE.txt
-	doman man/*
-
-	# Install other directories
-	doins -r certificates docs eepsite geoip scripts
-	java-pkg_dowar webapps/*.war
-
-	# Install daemon files
-	newinitd "${FILESDIR}/i2p.init" i2p
-	systemd_dounit "${FILESDIR}/i2p.service"
-
-	# setup log
-	keepdir /var/log/i2p
-	fowners i2p:i2p /var/log/i2p
-
-	# setup user
-	keepdir /var/lib/i2p
-	fowners i2p:i2p /var/lib/i2p
-}
-
-pkg_postinst() {
-	local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
-
-	[ -e "${old_i2pdir}" ] || return
-
-	elog "User is now delegated to acct-user, ${new_i2pdir} is split"
-	elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
-
-	migrate() {
-		local dest="${1}"
-		shift
-
-		local ret=true
-		for src
-		do
-			[ -e "${src}" ] || continue
-			mv "${src}" "${dest}" || ret=false
-		done
-
-		$ret
-	}
-
-	ebegin "Migrating"
-	local ret=0
-	chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
-	migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
-	migrate "${new_i2pdir}/config" \
-		"${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
-		ret=1
-	migrate "${new_i2pdir}/router" \
-		"${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
-		ret=1
-	migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
-		ret=1
-	rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
-	rmdir "${old_i2pdir}" || ret=1
-
-	if ! eend $ret
-	then
-		ewarn "There was some file remaining in ${old_i2pdir}."
-		ewarn "Please check it there is something of value there."
-		ewarn "remove it when migration is done."
-	fi
-}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index ebb7fc171c8a..63ae6257aca7 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -4,5 +4,5 @@ DIST strongswan-5.9.1.tar.bz2 4590867 BLAKE2B 1515764352e7473c47f853a5aa68e582d1
 DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815e39b8a88be349ad0a78b531a983d3b3919d5c9f3b97793b0b2569f2c6b151cc3b5d9b145a8bfd663db6f79d8ff3dd6 SHA512 dca30b9be7847e0af59d1526c2e38d440b6729055cb3f0f0637d50d7381df465c7b59e79662efe63870a7a5a44eef696c02231274d2764f9e3c430ce2fd694f6
 EBUILD strongswan-5.9.0.ebuild 9527 BLAKE2B 2ef6b0a313b9fccdd5b389f09fc0cb46f1bdbcf72888ee026e194aa7abd595e034591ffd10db3e75109c18a1779cde184e2e51572a3e1aaedcf1ceaa841ea1f0 SHA512 ae80168f8334a9ea110a3e7ea87e083a530f4219f1d687dd0559318ef189d08333872758f0987bdb8f2e2e538a8cd4c434d1bc8ea07aa427bf6de77803daf1ae
 EBUILD strongswan-5.9.1.ebuild 9473 BLAKE2B fce96a09c5ea4b6c9466f82b9707914ad6333a414b9866634827c4fbb6e02c67988e518140ce82c7fb2156d53f59cc9e45dbb8eacd4c6f93387ad7cccf0153b4 SHA512 657a5d92574c578cb14d9c0b34998681d57a86f1b9fc4b2edc98c056f3a98a0eb594b7c7e8e867172872515fae04367ab55a11583564588d9e3c580e0f072a1a
-EBUILD strongswan-5.9.2.ebuild 9474 BLAKE2B 61dd6f87c24e323b382525bb7202d308168040cedfd820d87b1790ed75883b79ef0b9a98dd173bfc6e88d9164ee87465d662e839307bac29879df7be463bf17e SHA512 410ac369665e64abacf2542e6c3f8d3fa39a2fd0c64944a931d3a65507eb1b677beb0a351469e327b53dd5c4c358d037eb34c0e130809b286e15a84d32310c6b
+EBUILD strongswan-5.9.2.ebuild 9473 BLAKE2B fce96a09c5ea4b6c9466f82b9707914ad6333a414b9866634827c4fbb6e02c67988e518140ce82c7fb2156d53f59cc9e45dbb8eacd4c6f93387ad7cccf0153b4 SHA512 657a5d92574c578cb14d9c0b34998681d57a86f1b9fc4b2edc98c056f3a98a0eb594b7c7e8e867172872515fae04367ab55a11583564588d9e3c580e0f072a1a
 MISC metadata.xml 4148 BLAKE2B cee80f9768668f9c455b812471498725970cef329ab4e36d727d3a2201980944a251286cf1d26ff3195c770a2709b3b8a484f5c473bf75acf4d9b9eb82325d60 SHA512 1a093806557dc1f9d40c2221dd1fe11900830008026218864e6cdd463218c5d876911ef78d5c21b6d9f9226dcce1c71acdc270f9a8eabdf1847e61c975ae24ad
diff --git a/net-vpn/strongswan/strongswan-5.9.2.ebuild b/net-vpn/strongswan/strongswan-5.9.2.ebuild
index 8f197987d174..b7b28afa8ea2 100644
--- a/net-vpn/strongswan/strongswan-5.9.2.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index d0fe9d1c6738..b905d048f6d3 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,3 +1,3 @@
-DIST wireguard-linux-compat-1.0.20210424.tar.xz 264200 BLAKE2B e1d96786d60489e85312f2927c0c5f8d43cccef9c4929856d9e892c91351f091e6a457e4673dd0c4987a614b9c13be4a4d9d485390c3a45fdefdad5dc7131213 SHA512 f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b
-EBUILD wireguard-modules-1.0.20210424.ebuild 3565 BLAKE2B 60951d7183ea718b731a9a8d46f4a14ee699fccaed6f5aef151545cc37b7d9adb505a59105c697c8819fc0436ac0212284a2c45d63d953585c8d7c54993fa285 SHA512 31eb0a567b3480110f1d41a569acf705ed1f8e53e05529b12e2a21a74ae1cb78578f8769c00e219c788ccd6dce624ce58b57b0efeae370245ad1bb28723a26a6
+DIST wireguard-linux-compat-1.0.20210606.tar.xz 264952 BLAKE2B cc8368cf764826bbf9f76246faa8b1a366df0e2e65b14ddb52b663cc75ac5edf89e8da7646aa6b0ae952000289ba18174bcfdf0fa7ee5f6d9c81e2f5f3d6e114 SHA512 ef8ec9f3d87982bf24b7934d9eabe605391888955110b655baf26867c80b619f549edc5527cbc6098c1f385b977a5b5d580ccaa82129571a64133a40d072c9b6
+EBUILD wireguard-modules-1.0.20210606.ebuild 3565 BLAKE2B 60951d7183ea718b731a9a8d46f4a14ee699fccaed6f5aef151545cc37b7d9adb505a59105c697c8819fc0436ac0212284a2c45d63d953585c8d7c54993fa285 SHA512 31eb0a567b3480110f1d41a569acf705ed1f8e53e05529b12e2a21a74ae1cb78578f8769c00e219c788ccd6dce624ce58b57b0efeae370245ad1bb28723a26a6
 MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20210424.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild
similarity index 100%
rename from net-vpn/wireguard-modules/wireguard-modules-1.0.20210424.ebuild
rename to net-vpn/wireguard-modules/wireguard-modules-1.0.20210606.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7641adedd10c..e3eedd625835 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a6d73cf301bb..9b5b0dc83574 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -5,6 +5,7 @@ AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7
 AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.56-avdtp-disconnects.patch 1424 BLAKE2B 200325eb1c1c5ed7d3dfada1214fca26f2eb8de70bbffe0810c7ffc7dd3d672b0c834f25ccba79e35c0c1322047e45fdd8076e4e54644e50ef71fb6415e33a6c SHA512 e44856abfc8ca92744c90723b0d76aab8c19fc44c3f84231c5c9340b85ce0b7a7cb9c41d65b68515845195ef8a50a274067d00555f2751ab1597403a87b80a2d
+AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
@@ -13,5 +14,6 @@ DIST bluez-5.56.tar.xz 2053080 BLAKE2B b901deae4047ebe96c034c20c9d7e6c275d3c1fd3
 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
 EBUILD bluez-5.55.ebuild 9650 BLAKE2B 30746b26e632aee07a0480d11493a8f45b7236863454956cc42b9e5a7448b132cf906f3ed4fdf51fdee7ebbdf57b55dda77f20407c8fd3595dbd26338f48af51 SHA512 300c443a9b0a1e54902ee928e1cd34ee2eb3de36624c6d2e0c3f839cffe5415667c92049be539983d456526f94f733be5f54fd7fef06342f856ac94ced0be785
 EBUILD bluez-5.56-r1.ebuild 9551 BLAKE2B 752a728bbc6834f2a3698fd3b24fec59f155a6d9f631c52a3ea368b7b80723da73f7a7a9e079cce4dd027fb5dba9732eeeac492ed3b45c496437cdff1976dc3e SHA512 d5b6f9b73e9ac45a21e9e204e69f4fbcb3e511e91e9b927468d79549b8c0f4b069eb6d1d2d5bda80d013c98d0614784d17b200980bcd52d89e6ce3bc0ea516a5
-EBUILD bluez-5.58.ebuild 9422 BLAKE2B a2e20352d44729cdd8bfd6e4751ac465878a9200a22864d0964d2b98119696adb2e200539ca6bad1a280a6341388c8257cdbce4dcd93aa14f53b04aeae70cba0 SHA512 b660be7ed71d9a257352dd1ec887591b5391125b8c2c5355bb70ab02f579c547ab124c6a409bbfb657c99506be3143613b3b6b7b1835099fc3f32b5acccd7b21
+EBUILD bluez-5.58-r1.ebuild 9503 BLAKE2B 5065bd6d983ac9fb5e65c654a26b2f0faeb9a0de73599843baa23a115d48668e1a43c5e9ac7ce2edb5ff7ca005e3b79de59dd997a7d32aa34185d943c7ca6c47 SHA512 1406014f94570199a9e23a1220a92758d17a8e74ff90a61b0f347dce818aa0d5a94830d72bd48e4fcbf34e17c79832b5a0018c080e418733a94ed1a9b2940fe3
+EBUILD bluez-5.58.ebuild 9421 BLAKE2B 1f0dfb997e628516a64113539e77bb545eda978bb12ce4579c05bcd8300f15c81ba84e00145018bf15837e46955d243310be80b16e320312330927183d9b709e SHA512 ac32dd551cc508a44ff9e3a045f5535bdcae4279f2da7529208a390f4e247de6c253252aed3fc3114967a3ea576de16858f40b091bf0479a8b7a961fede43804
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild
new file mode 100644
index 000000000000..c34a9ecc702d
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.58-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwids-20121202.2
+	btpclient? ( >=dev-libs/ell-0.39 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.39
+		>=dev-libs/json-c-0.13:=
+		sys-libs/readline:0=
+	)
+	midi? ( media-libs/alsa-lib )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
+	udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# rfkill: Fix reading from rfkill socket
+	"${FILESDIR}"/${P}-rfkill.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+)
+
+pkg_setup() {
+	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+	# to prevent bugs like:
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
+				~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL"
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
+	if use mesh || use test; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
+		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH
+		~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
+	fi
+	if use test; then
+		# http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER"
+	fi
+	linux-info_pkg_setup
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
+	fi
+
+	eautoreconf
+
+	if use cups; then
+		# Only not .am to not need to run eautoreconf only because of this
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev hid2hci) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also they can break without"
+			ewarn "previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			dobin tools/btmgmt
+			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
+			dobin attrib/gatttool
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
+		fi
+
+		# Not installed by default after being built, bug #666756
+		use btpclient && dobin tools/btpclient
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# Drop python2 only test tools
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
+
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-pkgincludeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	if use user-session && use systemd; then
+		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
+	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh-gatt/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+	use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/bluez/bluez-5.58.ebuild b/net-wireless/bluez/bluez-5.58.ebuild
index e3eed24ecf61..51471cbc5ae3 100644
--- a/net-wireless/bluez/bluez-5.58.ebuild
+++ b/net-wireless/bluez/bluez-5.58.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/bluez/files/bluez-5.58-rfkill.patch b/net-wireless/bluez/files/bluez-5.58-rfkill.patch
new file mode 100644
index 000000000000..dd7f2f978e72
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.58-rfkill.patch
@@ -0,0 +1,84 @@
+From 382646b490c1c336dd32f9186293616ceb4d808b Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Mon, 3 May 2021 14:45:00 +0200
+Subject: [PATCH 1/2] rfkill: Fix reading from rfkill socket
+
+The kernel will always send exactly one event, but the size of the
+passed struct will depend on the length of the submitted read() and the
+kernel version. i.e. the interface can be extended and we need to expect
+for a read to be longer than expected if we ask for it.
+
+Fix this by only requesting the needed length and explicitly check the
+length against the V1 version of the structure to make the code a bit
+more future proof in case the internal copy of the struct is updated to
+contain new fields.
+---
+ src/rfkill.c | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/src/rfkill.c b/src/rfkill.c
+index ec9fcdfdd..2099c5ac5 100644
+--- a/src/rfkill.c
++++ b/src/rfkill.c
+@@ -53,12 +53,12 @@ struct rfkill_event {
+ 	uint8_t  soft;
+ 	uint8_t  hard;
+ };
++#define RFKILL_EVENT_SIZE_V1    8
+ 
+ static gboolean rfkill_event(GIOChannel *chan,
+ 				GIOCondition cond, gpointer data)
+ {
+-	unsigned char buf[32];
+-	struct rfkill_event *event = (void *) buf;
++	struct rfkill_event event = { 0 };
+ 	struct btd_adapter *adapter;
+ 	char sysname[PATH_MAX];
+ 	ssize_t len;
+@@ -69,34 +69,32 @@ static gboolean rfkill_event(GIOChannel *chan,
+ 
+ 	fd = g_io_channel_unix_get_fd(chan);
+ 
+-	memset(buf, 0, sizeof(buf));
+-
+-	len = read(fd, buf, sizeof(buf));
++	len = read(fd, &event, sizeof(event));
+ 	if (len < 0) {
+ 		if (errno == EAGAIN)
+ 			return TRUE;
+ 		return FALSE;
+ 	}
+ 
+-	if (len != sizeof(struct rfkill_event))
++	if (len < RFKILL_EVENT_SIZE_V1)
+ 		return TRUE;
+ 
+ 	DBG("RFKILL event idx %u type %u op %u soft %u hard %u",
+-					event->idx, event->type, event->op,
+-						event->soft, event->hard);
++					event.idx, event.type, event.op,
++						event.soft, event.hard);
+ 
+-	if (event->soft || event->hard)
++	if (event.soft || event.hard)
+ 		return TRUE;
+ 
+-	if (event->op != RFKILL_OP_CHANGE)
++	if (event.op != RFKILL_OP_CHANGE)
+ 		return TRUE;
+ 
+-	if (event->type != RFKILL_TYPE_BLUETOOTH &&
+-					event->type != RFKILL_TYPE_ALL)
++	if (event.type != RFKILL_TYPE_BLUETOOTH &&
++					event.type != RFKILL_TYPE_ALL)
+ 		return TRUE;
+ 
+ 	snprintf(sysname, sizeof(sysname) - 1,
+-			"/sys/class/rfkill/rfkill%u/name", event->idx);
++			"/sys/class/rfkill/rfkill%u/name", event.idx);
+ 
+ 	fd = open(sysname, O_RDONLY);
+ 	if (fd < 0)
+-- 
+2.31.1
+
diff --git a/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild b/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
deleted file mode 100644
index 77ffd2042b3b..000000000000
--- a/perl-core/Devel-PPPort/Devel-PPPort-3.310.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=WOLFSAGE
-MODULE_VERSION=3.31
-inherit perl-module
-
-DESCRIPTION="Perl/Pollution/Portability"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Devel-PPPort/Manifest b/perl-core/Devel-PPPort/Manifest
deleted file mode 100644
index 7fd4e6fae6e7..000000000000
--- a/perl-core/Devel-PPPort/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Devel-PPPort-3.31.tar.gz 218537 BLAKE2B de65f41650935e661677dffc977eed5d134127ccdee8b721d90c634b901edd5e282d6da6583d62d93025684c0fbd6940eff45142eac31a271b73cc477c17c6d6 SHA512 7c139bbf80b06abda61de5f1aaff162d0e6bcec3f06c75a8519610d0e5766c9a24513d36681dd082aaee2238eedab9c971c89d0c31ebd16b43f2ed9d9da12e71
-EBUILD Devel-PPPort-3.310.0.ebuild 266 BLAKE2B 75d9f59ca6f72b56371172e4b655fc33e24c6313b3ab150141429c5c27bf8f5e5828e686cb89fb884a8f2b9de360748431a2348a88fd1e8bbf651faacc32745e SHA512 8c2db4ad25b3baee9f27eb38d76caddb91786b46452185a5d6a72071fbeb4a49a9793c585340b529be4d3a89189e8e2060b9d238b21f97b98708ad6e813dc86a
-MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 1bf55e622046..98efd311a7e3 100644
Binary files a/perl-core/Manifest.gz and b/perl-core/Manifest.gz differ
diff --git a/perl-core/Time-Local/Manifest b/perl-core/Time-Local/Manifest
deleted file mode 100644
index 7f53986f381b..000000000000
--- a/perl-core/Time-Local/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Time-Local-1.2300.tar.gz 19818 BLAKE2B dbf357a4732106101c78ff1c012be2e747b7cdc06d91ddfe2821a616cbfd0580510963b9ee57d60cd10e3689019b57a5b939995da0be2c00b65033bb4ec94519 SHA512 812a4e1d8820becfc4c19a3a862e5234744b4124b99fd33c856e331e0f2f6131b98ae9e8cfde637c9db5b2de036f643424f4d2d15bdb47fa57dffd8f3bdeeb41
-EBUILD Time-Local-1.230.0-r1.ebuild 273 BLAKE2B d3341b2517ad2b9b90b7ec79b81b5777cb9cadd6128b390dedb2989cb9b0a99c1cf070dcb9b188b3893021a7089ceb07177b317c5ba1ec5714a975eb893d654f SHA512 8393b440afc3322a4b301955caeb6c454f141e1d9318f26d8e5bee9d6b771b2f01367992678758eaf5e6d8d331c9c87bdfe46087a2eb94a09dc0445480cbe382
-MISC metadata.xml 392 BLAKE2B 04bebfad63ff66ecb651decfd7ec84b647924dd1ae46a2924a1d11289275db19446ca3a5235bf25391f6af5f3e7356c95218ae825d5732dfe28d0c8e844ead23 SHA512 6ad91f1b442496cb1fb99609419469d8ab3254ab90e8692f97d6756299e4a6cfc57673e1c2a99e366fe0dd17bb470eb182a3760dd42baa2683368478431bccae
diff --git a/perl-core/Time-Local/Time-Local-1.230.0-r1.ebuild b/perl-core/Time-Local/Time-Local-1.230.0-r1.ebuild
deleted file mode 100644
index e2bca90b89c0..000000000000
--- a/perl-core/Time-Local/Time-Local-1.230.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=DROLSKY
-MODULE_VERSION=1.2300
-inherit perl-module
-
-DESCRIPTION="Implements timelocal() and timegm()"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Time-Local/metadata.xml b/perl-core/Time-Local/metadata.xml
deleted file mode 100644
index a781efa28090..000000000000
--- a/perl-core/Time-Local/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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">Time-Local</remote-id>
-    <remote-id type="cpan-module">Time::Local</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/Unicode-Normalize/Manifest b/perl-core/Unicode-Normalize/Manifest
deleted file mode 100644
index e043c1bf7c43..000000000000
--- a/perl-core/Unicode-Normalize/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Unicode-Normalize-1.25.tar.gz 40530 BLAKE2B 2f2377b8db42535cd44133311a4ed5387956002d37c92fd6a0b02d9e861597eea2ba7049d7a3b2152c1bbf2b82a863a47bfdde1b5c7ef544e895cb2608d9df52 SHA512 f28c19e0293cf75cc0aab669ae0a0543f6a1a39e1e50ff32ab37abd8e85efc73e8b9075e581212b6da576ecbf8c0e9ddb7b9b352674aa3a04c77f9aaf4717866
-EBUILD Unicode-Normalize-1.250.0.ebuild 394 BLAKE2B 1f2d34b62ca0377450267231d75ef1f0ad2f87793ab5752d79be2ef24a4bc3025240d0f7d4386fbd254a864306eafa2089ecea0903d1665f83a3a8a7463e4c6d SHA512 a65b2cdc8066eac3e48920087b6f3b0a82953983a4a828a29d613b807264029b5e450a69f2d199b27d110a7defe1bee116ec2d07cd01e68050f9dc2963341c4a
-MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild b/perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild
deleted file mode 100644
index 01e5e85d1104..000000000000
--- a/perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=KHW
-MODULE_VERSION=1.25
-inherit perl-module
-
-DESCRIPTION="Unicode Normalization Forms"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-SRC_TEST="do"
diff --git a/perl-core/Unicode-Normalize/metadata.xml b/perl-core/Unicode-Normalize/metadata.xml
deleted file mode 100644
index 2b9a936fc0a1..000000000000
--- a/perl-core/Unicode-Normalize/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index dcc822c6335e..f3cead5827c6 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 461959670b63..38621c7f6d36 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -23,6 +23,7 @@ app-text/bibletime
 app-text/calibre
 app-text/cb2bib
 app-text/sigil
+dev-lang/typescript
 dev-python/spyder
 dev-python/spyder-line-profiler
 dev-python/spyder-memory-profiler
@@ -33,6 +34,7 @@ dev-python/spyder-vim
 dev-util/kdevelop:5
 dev-util/kdevelop-php:5
 dev-util/kdevelop-python:5
+gnome-extra/gnome-shell-extension-pop-shell
 kde-apps/akonadi-calendar:5
 kde-apps/akonadi-import-wizard:5
 kde-apps/akonadiconsole:5
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 6c2a19639026..cfa6f8f09ee1 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -364,10 +364,6 @@ app-text/evince dvi nautilus postscript t1lib xps
 net-wireless/blueman appindicator
 x11-libs/gtk+ cloudprint
 
-# Steev Klimaszewski <steev@gentoo.org> (2016-03-04)
-# Chromium uses an internal tcmalloc that doesn't support this arch yet.
-www-client/chromium tcmalloc
-
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index ff9223177e38..5bd532ae7d8d 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-06-06)
+# deps not keyworded
+net-analyzer/netdata kinesis mongo
+
 # Michał Górny <mgorny@gentoo.org> (2021-03-06)
 # LLVM 9 has been removed.
 dev-util/perf clang
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index dc1ed5ab98c9..05881727de15 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -4,6 +4,10 @@
 # PPC Specific use flags
 #
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-06-06)
+# XEN does not support ppc/ppc64 yet
+xen
+
 # David Seifert <soap@gentoo.org (2020-05-17)
 # Mono is hopelessly broken on ppc32
 mono
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 45bd08d58a8c..d92f83aeac0e 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -51,6 +51,7 @@ gnome-extra/gnome-shell-extension-dash-to-panel
 gnome-extra/gnome-shell-extension-desktop-icons
 gnome-extra/gnome-shell-extension-desktop-icons-ng
 gnome-extra/gnome-shell-extension-gsconnect
+gnome-extra/gnome-shell-extension-pop-shell
 gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
diff --git a/profiles/package.mask b/profiles/package.mask
index 64aa1c4a5fb7..427d93f61966 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2021-06-05)
+# A backport for 'older Python versions' with no revdeps.
+# Removal on 2021-07-05.  Bug #794268.
+dev-python/chainmap
+
+# Stephan Hartmann <sultan@gentoo.org> (2021-06-05)
+# Dev channel releases are only for people who
+# are developers or want more experimental features
+# and accept a more unstable release.
+>=www-client/chromium-93
+
+# Bernard Cafarelli <voyageur@gentoo.org> (2021-06-04)
+# Alpha versions of fetchmail 7
+# Add support for OAUTH2 for those needing it
+=net-mail/fetchmail-7.0.0_alpha*
+
 # Michał Górny <mgorny@gentoo.org> (2021-06-02)
 # This is Python 2/3 compatibility layer that was used shortly
 # by dev-python/pip.  No revdeps left.
@@ -41,11 +57,11 @@ dev-python/csv23
 # Sam James <sam@gentoo.org> (2021-06-01)
 # Possible issues with new ALSA release
 # See bug #793410
-=media-libs/alsa-lib-1.2.5
+=media-libs/alsa-lib-1.2.5_p20210604
 =media-libs/alsa-topology-conf-1.2.5
-=media-libs/alsa-ucm-conf-1.2.5
-=media-sound/alsa-utils-1.2.5
-=sys-firmware/alsa-firmware-1.2.5
+=media-libs/alsa-ucm-conf-1.2.5-r1
+=media-plugins/alsa-plugins-1.2.5
+=media-sound/alsa-utils-1.2.5-r1
 
 # Michał Górny <mgorny@gentoo.org> (2021-05-31)
 # Requires removed media-libs/opencv version.
@@ -144,6 +160,7 @@ dev-python/csv23
 # remove some stuff to make redacted happy
 # bug #793800
 app-admin/glance
+app-emulation/spice-html5
 dev-python/aodhclient
 dev-python/automaton
 dev-python/castellan
@@ -346,15 +363,6 @@ sci-libs/fftw:2.1
 # ago, dead upstream. Bug #779421, removal in 30 days.
 media-sound/gramofile
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-09)
-# PortageXS saw its last release in 2016 and would need
-# a new upstream maintainer. Multiple bugs, e.g.,
-# 688238, 625536, 613114, 473394, 332611, 289524, 264680
-# Masked for removal in 30 days, including reverse deps.
-dev-perl/PortageXS
-app-portage/demerge
-app-portage/perl-info
-
 # Sam James <sam@gentoo.org> (2021-05-09)
 # Not working properly with cmake.eclass port
 # bug #788448
@@ -366,95 +374,14 @@ app-portage/perl-info
 # bug #731266
 >=net-mail/cyrus-imapd-3.4.0
 
-# Joonas Niilola <juippis@gentoo.org> (2021-05-06)
-# sci-libs/cbflib: Doesn't compile with GCC-10 or GCC-11. Was never
-# ported to work with GCC-10+. sci-chemistry/rasmol depends on cbflib.
-# Both packages have updates ignored in Gentoo, and their ebuilds
-# pretty much untouched during git-era. Both had their latest upstream
-# version release in 2018. Removal in ~30 days. Bug #788508
-sci-libs/cbflib
-sci-chemistry/rasmol
-
 # David Seifert <soap@gentoo.org> (2021-05-05)
 # Causes unsolvable package conflicts, bug #788310
 >=media-libs/openexr-3
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# no consumers, dead homepage
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787329
-app-misc/jitac
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# last release in 2009
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787332
-app-office/hourglass
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# no consumers, last release in 2005
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787368
-dev-util/jarwizard
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# no consumers, last release in 2008
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787428
-media-sound/entagged-tageditor
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# no consumers, last release in 2009
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787434
-media-sound/protux
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# no consumers, last release in 2011
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787656
-sci-physics/jaxodraw
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785400
-dev-java/cldc-api
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-30)
-# Superceded by dev-perl/Image-Sane. Tests hang, bug 626594
-# Removal in 30 days.
-dev-perl/Sane
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-30)
-# Outdated, not pulled in by any virtuals anymore, no
-# keywords. Removal in 30 days.
-perl-core/Devel-PPPort
-perl-core/Time-Local
-perl-core/Unicode-Normalize
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-30)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/787152
-dev-java/tagsoup
-
-# Michał Górny <mgorny@gentoo.org> (2021-04-29)
-# The most recent release is still broken with current
-# dev-python/coverage.  Inactive downstream maintainer.  No revdeps.
-# Removal on 2021-05-29.  Bug #786666.
-dev-python/pytest-testmon
-
 # Eray Aslan <eras@gentoo.org> (2021-04-29)
 # Mask experimental software
 =mail-mta/postfix-3.7*
 
-# Stephan Hartmann <sultan@gentoo.org> (2021-04-24)
-# Dev channel releases are only for people who
-# are developers or want more experimental features
-# and accept a more unstable release.
->=www-client/chromium-92
-
 # Ulrich Müller <ulm@gentoo.org> (2021-04-20)
 # Version 3.15 is broken with Emacs 27.2.
 =app-emacs/mic-paren-3.15-r0
@@ -687,10 +614,6 @@ app-admin/amazon-ec2-init
 =sys-libs/db-6.2*
 =sys-libs/db-18.1*
 
-# Mikle Kolyada <zlogene@gentoo.org> (2014-06-27)
-# Masked for proper testing. (Major updates in the code).
-~dev-perl/PortageXS-0.2.12
-
 # Mike Gilbert <floppym@gentoo.org> (2014-03-04)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 8d28a9e60438..b94126cc4298 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -1,7 +1,6 @@
 slotmove net-irc/kvirc 4 0
 move x11-apps/xtitle x11-misc/xtitle
 move kde-base/kde-meta kde-apps/kde-meta
-move dev-perl/Unicode-Normalize perl-core/Unicode-Normalize
 move media-video/nvenc media-video/nvidia_video_sdk
 move dev-python/socksipy dev-python/PySocks
 slotmove <sci-libs/libint-2 0 1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 611e5b225cc5..55ac5abc00fb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1005,6 +1005,7 @@ app-portage/g-sorcery:bson - Support BSON file format for package DB
 app-portage/gemato:gpg - Install dependencies needed for OpenPGP signature verification support
 app-portage/gemato:tools - Install additional utilities (benchmarks, hash testing tools, fast Manifest generators) to /usr/share/gemato.
 app-portage/grs:server - Install all the tools building systems
+app-portage/kuroneko:scraper - Include the dependencies necessary for Bugzilla scraping.
 app-portage/layman:cvs - Support dev-vcs/cvs based overlays
 app-portage/layman:darcs - Support dev-vcs/darcs based overlays
 app-portage/layman:g-sorcery - Support app-portage/g-sorcery based overlays
@@ -2426,7 +2427,6 @@ dev-python/networkx:pandas - Provides a DataFrame, which is a tabular data struc
 dev-python/networkx:scipy - Enables scipy backend
 dev-python/networkx:yaml - Provides YAML format reading and writing
 dev-python/nltk-data:extra - Install the complete set of data files. Otherwise, only files required by tests are installed.
-dev-python/nose:coverage - Pull in dev-python/coverage needed for nose-xcover plugin.
 dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
 dev-python/pandas:full-support - Pull all packages to give pandas full support
 dev-python/paramiko:server - Enable server feature
@@ -3125,8 +3125,8 @@ games-fps/quake2-icculus:demo - Install the demo files (quake2-demodata) and con
 games-fps/quake2-icculus:qmax - Build the pretty version (quake max)
 games-fps/quake2-icculus:rogue - Build support for the 'Ground Zero' Mission Pack (rogue)
 games-fps/quake2-icculus:xatrix - Build support for the 'The Reckoning' Mission Pack (xatrix)
-games-fps/quakeforge:wildmidi - enable libWildMidi support
-games-fps/quakeforge:xdg - enable XDG support
+games-fps/quakeforge:client - Build Normal and QuakeWorld clients alongside the servers
+games-fps/quakeforge:wildmidi - Use media-sound/wildmidi for midi support
 games-fps/qudos:demo - Install the demo files (quake2-demodata) and configure for use
 games-fps/qudos:mods - Build support for the quake2 mission packs
 games-fps/qudos:qmax - Build the pretty version (quake max)
@@ -7783,6 +7783,7 @@ sys-apps/portage:ipc - Use inter-process communication between portage and runni
 sys-apps/portage:native-extensions - Compiles native "C" extensions (speedups, instead of using python backup code). Currently includes libc-locales. This should only be temporarily disabled for some bootstrapping operations. Cross-compilation is not supported.
 sys-apps/portage:rsync-verify - Enable full-tree cryptographic verification of Gentoo repository rsync checkouts using app-portage/gemato.
 sys-apps/portage:xattr - Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.
+sys-apps/ppc64-diag:rtas - Add support for the Run Time Abstraction Services (RTAS)
 sys-apps/proot:care - Build dynamic CARE binary (more info - https://proot-me.github.io)
 sys-apps/qingy:opensslcrypt - Encrypt communications between qingy and its GUI using dev-libs/openssl
 sys-apps/razercfg:gui - Installs GUI configuration utility and status bar applet. Requires dev-python/PyQt5
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 3776eb267926..d240205a7a78 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 122d3f7c532b..c2ec562707f6 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -17,5 +17,5 @@ DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2
 DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
 EBUILD stellarium-0.20.2.ebuild 2707 BLAKE2B 8ee26adab18fbcd8a7d5008811240fc8ce52b6d0213b2eb240e424a3d0f388c062438e3271945627e56568deb5383ad2731d1cefc3884880555b276a567d3979 SHA512 164e30343263375578d4c3692d3d144790a5dc1caa4d234605c7512d7af467e13f776a9c32f2b43435bc9cec25184ec650ad4481705b329b6541b811cec51763
 EBUILD stellarium-0.20.3.ebuild 3941 BLAKE2B 9341847ecff93659da7f03b15c1ca35f2f4c12b52863d5e66fdce9d19c23c9f7502d958ad78d6aeb327dfb628315cde23ef1e644b1047ac72cf699409affcb95 SHA512 6b7ba8a5e7330135722399438fb8c5f6100fc9d8d3630c247b9f03db456d3a4bd03c7240fe040a5d020c84c15e1d482b015867d02dc4a8decbb21b3253bda50f
-EBUILD stellarium-0.20.4.ebuild 3984 BLAKE2B ed4cb472ad2cadc3fb2e0827d80637f4b62f7bd5b43e58cb3a1ce32cee253f7678fea4abb5c35a229071fc04682bc86f0418e154b6c9a0447552b3ed9e31f619 SHA512 4a70bb2d0653bd9f57a3db840ce8128d6382994acd79f6050707f5ca991c4f11fb516887b9199ffe5b1ea25c51940ec7316d7ea0e37a5ad77d556156f1a9fe3b
+EBUILD stellarium-0.20.4.ebuild 3980 BLAKE2B 0e1c9517aaf37c258e8343adee97b5932c06b0d5210eca3151c8f8431002c9c4dad1e62885d51fb7d0828a7099c7a6fa20ba516c90b7e452bc679eec03ee7393 SHA512 a1b0ada116ed34164ee771c68d7b84a5f1fbb16294dd31963d84ab927cf112ba92fd48aeea070ec2ec73922acc236cbd44e72f6f709eb0aabaa8033291dbd6bf
 MISC metadata.xml 1196 BLAKE2B 85a24121661eb11ff4ce9d7aee0113d18f92b968ee91cb6b4fdca237ef9f05d6616c879de3c341dc23ebac42c473aafa1eadfce0b184e5b569f1caf497d62429 SHA512 df106274882a1db20200940254725c74da0632a9232de9b432849aad0aa6d5d0a533556f45f8cc767d3d4a8d26ae6d838ac0628b6c625a5cfab38f19432a1b36
diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
index 92d2cb4a3543..25de0105315a 100644
--- a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="debug deep-sky doc gps media nls stars telescope test"
 
 # Python interpreter is used while building RemoteControl plugin
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index ab58022f4571..f72044713d95 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/amap/Manifest b/sci-biology/amap/Manifest
index d76312d85849..eb89d028a7b0 100644
--- a/sci-biology/amap/Manifest
+++ b/sci-biology/amap/Manifest
@@ -1,5 +1,5 @@
 AUX amap-2.2-includes.patch 1088 BLAKE2B 3b870c229f3efb9819d9f176b59b014ad4bae3034ed4fe9f8c8474ebf8ce7c8373efef66c3c61c8f6fe04a645243f09639aa4a4c95ee75f692e504f4478fcf77 SHA512 e9c2ae7ea75f059b816a8562c9ac79e343d73b9a3d63ac1182fe41b3634bf0b949738a4bdd90c09f61bb4505a721e2faa98334b81ad17c0d7360a2e3f37f9044
 AUX amap-2.2-makefile.patch 1201 BLAKE2B e404de0909f501dbf5005d6c995fbb6ecf588fe06798483703c25d29c070faa6ce5eb06e98e35b8deeeddbeb309eb6560d13af6a0fa64ec9435d00e41f2bfad2 SHA512 8cd43b70299e12f32dd6b46a73e6ef10c7e85b5ec6d152aef69f54954a1083c92570c40bf35ea363084a3626161c3e28d214bb2c5fb76bb396d9be2edaa869a3
 DIST amap.2.2.tar.gz 102861 BLAKE2B 7f9b1cb747946232db0b5b469896cc4f83ef78d190e929e28f37df790dfac342e6e7f913797bc9ff00191253318db2d42f79577dc72128d62a21d0e241bfb0e1 SHA512 a297b6eb1b52d5deab65db5bb1344b06a85c7ef6fa4b550798501041091357e605543eaadd85c053a74e857ebdd7b846dca4b226c5c61bedc329bf93c886c18f
-EBUILD amap-2.2-r3.ebuild 1135 BLAKE2B bc214283c42ef027c605c678ef08b5b385cbcc9763580c6dc54f3c2a9ad44bb8005681b28b6a4036400ced23bb61b9766a467b8892df457590bee45f652e51bd SHA512 d5bbb29ad83fd210b3ba7f84884f4bb517d132fbdaa58b658c679cccd96f1219f9fe3d6f8f58a029a10c782e916f441a9e8de969390c168c0202fb230fdb21a1
+EBUILD amap-2.2-r4.ebuild 1142 BLAKE2B c4bf57de7f838559bb4fc5c1b6358802fb54dd2a1d5ef401218ce4c2efaf829f8a0c05a45333b81747539d286bb2e5d0233ea19177aa7ef59b691581c27f3ad9 SHA512 22230076080ef49996c9cc8adea62b488a877f95832d88f53094b71ba868b33c5bc5bee170a444f4a4a928e152b1fa8f348fecfbc37600f02db4a79bc4722e8f
 MISC metadata.xml 257 BLAKE2B c0d9bf845137c20d86333bbe5f6f7d27e5ae2edbdd6997f870a6678825b5494b8160a4dc5fba6221f252e1146c57d3237f3d7feb098a9beed9c272f57f30d708 SHA512 5be44a06c71b100dfe66effc1d12a9801f6daf2e252f74b6499528644db9b3dd00d51827a984817b78755e8d544f9c674c27c6a370c4c4414ce26a09b478b69b
diff --git a/sci-biology/amap/amap-2.2-r3.ebuild b/sci-biology/amap/amap-2.2-r4.ebuild
similarity index 85%
rename from sci-biology/amap/amap-2.2-r3.ebuild
rename to sci-biology/amap/amap-2.2-r4.ebuild
index 7776e25bc56e..df3b16efba30 100644
--- a/sci-biology/amap/amap-2.2-r3.ebuild
+++ b/sci-biology/amap/amap-2.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit java-pkg-opt-2 java-ant-2 toolchain-funcs
 MY_P=${PN}.${PV}
 
 DESCRIPTION="Protein multiple-alignment-based sequence annealing"
-HOMEPAGE="http://bio.math.berkeley.edu/amap/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://baboon.math.berkeley.edu/${PN}/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="java"
 
-RDEPEND="java? ( >=virtual/jre-1.5 )"
-DEPEND="java? ( >=virtual/jdk-1.5 )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
+DEPEND="java? ( >=virtual/jdk-1.8:* )"
 
 S=${WORKDIR}/${PN}-align
 
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index c0971e6ea212..2051fd298748 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 70a3dbc834ae..2666e7ebf9ea 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,5 +1,5 @@
 DIST pcalc-3.tar.xz 66908 BLAKE2B 40473405f564d5dc5fd43f6f7fc4a80d41d7c9b09f8f6915408313aa45ecaa860b27debe0131fa0450b9b62a7ed4157bc433c7866910211551c6b159113cecc3 SHA512 55b6644300a8eb5224df5a0885907c10847df7ab6296d012eb2bb638876687ddbe23d5b76e31ac6ff4c159e44940d5cf6ba747f2a410943fdc25c9d9855fd60e
 DIST pcalc-4.tar.xz 68948 BLAKE2B f7d17e3ebf76aeccd9b7c74fe6ecfa7de94d8450d302e3b094b57f4050e0be2448887ea131496ab00ee140d0a44b0dd8d5b5564feb8fdc47d2fbbe5010af73d9 SHA512 6492ca89c5f60549f9388d8b7edad21c1c912feea0ee1a1271d730a63832c3b562b1a6bc9f69a0bd3118407906646c8d8fbed6c6d9a62db6a6bbde22579c1fd0
 EBUILD pcalc-3-r1.ebuild 567 BLAKE2B bffe0740f9c9c0b56d60f32247cf43574d6385bcdc905fdf4e015be0b8014ddd75217347bb701b18668517ba4e71a9538a8e698de015ae2eceec8c3e6645c9a5 SHA512 401fc19c238e642aeab0e1e33f3edc42bbb408047e05ca58d908f7357ff352e4d7f9906d661c15c959dc8a74c47bc733a22b537b358ecedea47ddb123abc5d75
-EBUILD pcalc-4.ebuild 549 BLAKE2B 990bae0f2c2d3a2b0762c9a96d99472ab9de8b4334ca6504f537b5bffd6da72f391189b737c6b6fa28d1d693707fd4240976400b9b21eba585871d45ccd58480 SHA512 faf2fc1eae6c6a39c2769c69aa8432487e0d62eaf811e8b18939f0db76c1d01dcc9c3070727d9afe1df50735af6535d197d7c3946cbf661fa2bbcd1f81ab2a5a
+EBUILD pcalc-4.ebuild 548 BLAKE2B b5d42660040605f5267534eb20d9840940f686646f13ffe7a955dc3362738c44477a7cb9c5af80fced1d7732252e6d0e749e9b1209241c25574853fca834b616 SHA512 dc3247cf8d381842ca7c7d8c9c44bfde01277a2dfa8a661587d23793dbaf1027b1f296a4b774dd80e2ad7fb4e8ac3f7981eaed79f784b2212e8e0210e49b6cbc
 MISC metadata.xml 380 BLAKE2B 966f815d92d6c5680629d5bb6bf5b6124aa1bf6a747d914c94e66148a6e7d8b53e9931e56436a99d0ccc5bbbea1cb6e2a0bb3054fa31a4dd6f7fad54f279893f SHA512 45ac8682dd7d9e8c414354090b2733f3c715e9b76db3ab3e1e852282bf460f3a6881626d49c73b7975fbc238485ed38881187dd4c392469108bad1b15022465a
diff --git a/sci-calculators/pcalc/pcalc-4.ebuild b/sci-calculators/pcalc/pcalc-4.ebuild
index 7a4f1569c05c..b2fa7f4a86e2 100644
--- a/sci-calculators/pcalc/pcalc-4.ebuild
+++ b/sci-calculators/pcalc/pcalc-4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-devel/flex"
 
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 5fbce5ab2332..b475d967f233 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
deleted file mode 100644
index 1578aefbece1..000000000000
--- a/sci-chemistry/rasmol/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 2.7.5-bundled-lib.patch 2513 BLAKE2B d913fb8572abb58ffcb6a48f2f855432e33ef74168b6461d3b2d18bba9c0fedb33a975a5d754ac9ffc56644d9256bf428694afbf0b3a078421ab372c6c84570d SHA512 940e85bbe35ed6055d8deb1d761e925aec3b60d63c3e91bcc3c08596f1b8269efd4c8a257ff9efdbe32888e987852e85ed19cba5566d8d610e8d625a23b0994a
-AUX rasmol-2.7.5.2-format-security.patch 1617 BLAKE2B d9a083ae6c72724359274da5b61683b615ca1daf8e0dd8763e999ee7cfbe7ec23cdefffd4d5fda94c9d5366c812f51fef663578d9c39805b6a6eaa8f9e3c569a SHA512 cab29465d5830e669eca152880ae60c403f90668ee5bf97e3694b6e754e2e23086a520717c2df990c74fcfbafc761a460bea111d868a57ae63f13bce1603f074
-AUX rasmol-2.7.5.2-glib.h.patch 770 BLAKE2B 1c83587711540a9e2b91b53ffd0836cde27f040c593b7d771eb185edf8e72b50f09d1c38ef0b2510effee95649bbaf3adf7d0340f49a38381bd15200fd94e749 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e
-AUX rasmol-2.7.5.2-longlong.patch 396 BLAKE2B 68ce4bff3584bbc6331ad5e27171d23e443be2d24b60bbd45dd02d4f04b5531cfd7fdb18904471c85ef107875fb23574f6b3212b78706746cc73c39d09cda801 SHA512 4c3ce01ade36fe8a9512bdac62bcd47268bcc5a0448f4af69b26d8add9cc8495d376bac33a8ae5aeae42fa114a1cba980ce86559bf2d52334257f2e001c011d3
-DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 BLAKE2B dcc9bfe9381ebab6bbf5a12e233490f076ead2388a22e3186421e3489bedde987813b1f65ce7b17ef168389c33d03bd7d4a8162635c0a79b3dc704eade23715d SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f
-EBUILD rasmol-2.7.5.2-r2.ebuild 2335 BLAKE2B 3eb46ccf0799da8a5514e963193593ee4319cda48f474c616bb09191e59163c49d922f1c865b43fc5e49abc4e146c0725a66a95527e8ae55aff79368d9ee3ebc SHA512 c67480fea952676dbaee686ca6e6a5c4a7b0750b72ab45247f469c8643ec8a4a46b5d60c89aab531c84666560a3414fc0ccd176dab0ea17094cc7c7db3ff9bc8
-MISC metadata.xml 355 BLAKE2B 71f9b1537eea00556419ae1c9920458d86992e3c0b01083d55ca02f162c420f82e8f52ee8af224573912e2b988497901702962ed3b54342991f22e1eec37ce2e SHA512 98822367149551ef6af6d75e4bd0b9104f1a625a5a17e1a2dad32e7ed83345870dc45392525cfe7e49514eae29f986e8ac2ed253ec22fec94d6152f96620b916
diff --git a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
deleted file mode 100644
index 10705165ad47..000000000000
--- a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/src/Imakefile b/src/Imakefile
-index 03be00e..a0c68f9 100755
---- a/src/Imakefile
-+++ b/src/Imakefile
-@@ -176,7 +176,7 @@ XFORMSLIB_DIR = /usr/local
- #endif
- endif
- XFORMSLIB_INCLUDE_DIR = $(XFORMSLIB_DIR)/include
--XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib -lforms
-+XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib
- #endif
- #endif
- #endif
-@@ -281,17 +281,10 @@ RASMOLDIR = $(USRLIBDIR)/rasmol/
- 
- #ifndef USE_XFORMSLIB
- DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
--          -D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \
--          -I$(CQRLIB_INCLUDE_DIR) \
--          -I$(CVECTOR_INCLUDE_DIR) \
--          -I$(NEARTREE_INCLUDE_DIR)
-+          -D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib
- #else
- DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
--	-D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \
--	-I$(CQRLIB_INCLUDE_DIR) \
--	-I$(CVECTOR_INCLUDE_DIR) \
--	-I$(NEARTREE_INCLUDE_DIR) \
--  	-I$(XFORMSLIB_INCLUDE_DIR)
-+	-D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib
- #endif
- 
- 
-@@ -317,11 +310,11 @@ OBJS = rasmol.o molecule.o abstree.o cmndline.o command.o transfor.o \
- # Additional RS6000 AIX MITSHM Library
- # LDLIBS = -lm -lXi -lXextSam $(XLIB)
- 
--LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(XFORMSLIB) $(GTKLIBS) \
--			$(CBFLIB_LDLIB) \
--			$(CQRLIB_LDLIB) \
--			$(CVECTOR_LDLIB) \
--			$(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB)
-+LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(GTKLIBS) \
-+			-lcbf \
-+			-lCQRlib \
-+			-lCVector \
-+			-lCNearTree -lgfortran
- 
- 
- #
-@@ -425,11 +418,11 @@ $(NEARTREE_DIR):
- $(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR)
- #endif		  
- 
--$(OBJS):  $(EXTPKGDIR) $(CBFLIB_OBJDEP) \
--			$(CQRLIB_OBJDEP) \
--			$(CVECTOR_OBJDEP) \
--			$(NEARTREE_OBJDEP) \
--			$(XFORMSLIB_OBJDEP)
-+# $(OBJS):  $(EXTPKGDIR) $(CBFLIB_OBJDEP) \
-+#			$(CQRLIB_OBJDEP) \
-+#			$(CVECTOR_OBJDEP) \
-+#			$(NEARTREE_OBJDEP) \
-+#			$(XFORMSLIB_OBJDEP)
- 
- 
- gtkwin.c: gtkui.h
-diff --git a/src/Makefile.in b/src/Makefile.in
-index fc6d0af..bad90fc 100755
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -165,7 +165,7 @@ $(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR)
- 
- all:		postdownload rasmol rastxt
- 
--rasmol:		postdownload $(X11OBJS) $(CBFLIBDIR)/lib/libcbf.a
-+rasmol:		postdownload $(X11OBJS) 
- 		$(CC) -o rasmol $(LFLAGS) $(X11OBJS) $(X11LIBS)
- 		chmod 755 rasmol
- 
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch
deleted file mode 100644
index 22eb229d8a3d..000000000000
--- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-format-security.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urp RasMol-2.7.5.2/src/command.c RasMol-2.7.5.2_sprintf/src/command.c
---- RasMol-2.7.5.2/src/command.c	2011-05-15 01:23:49.000000000 +0700
-+++ RasMol-2.7.5.2_sprintf/src/command.c	2014-02-12 18:02:24.633489549 +0700
-@@ -1286,7 +1286,7 @@ void ShowRecordCommand( void ) {
-         if (record_on[1]) WriteString("record appearance on\n");
-         else WriteString("record apperance off\n");
-         if (RecordMaxMS == 1.) {
--            sprintf(param,RecordTemplate);
-+            sprintf(param, "%s", RecordTemplate);
-         } else{
-             sprintf(param,RecordTemplate,millisec<0?0:millisec);
-         }
-@@ -1381,7 +1381,7 @@ void ShowPlayCommand( void ) {
-             WriteString(param);
-         }
-         if (PlayMaxMS == 1.) {
--            sprintf(param,PlayTemplate);
-+            sprintf(param, "%s", PlayTemplate);
-         } else{
-             sprintf(param,PlayTemplate,millisec<0?0:millisec);
-         }
-@@ -1469,7 +1469,7 @@ void WriteMovieFrame( void ) {
-         RecordPause = True;
-     } else {
-         if (RecordMaxMS == 1.) {
--          sprintf(param,RecordTemplate);
-+          sprintf(param, "%s", RecordTemplate);
-         } else{
-           sprintf(param,RecordTemplate,millisec);
-         }
-@@ -1505,7 +1505,7 @@ static int PlayMovieFrame( void ) {
-         for (play_frame[1] = 0;play_frame[1]<=millisec; play_frame[1]++) 
-         {
-             if (RecordMaxMS == 1.) {
--                sprintf(param,PlayTemplate);
-+                sprintf(param, "%s", PlayTemplate);
-             } else{
-                 sprintf(param,PlayTemplate,millisec-play_frame[1]);
-             }
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch
deleted file mode 100644
index 69c19dae5e8d..000000000000
--- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-glib.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- src/egg-macros.h           |    3 ++-
- src/eggfileformatchooser.c |    2 ++
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/src/egg-macros.h b/src/egg-macros.h
-index 9a7caad..1a6bce0 100644
---- a/src/egg-macros.h
-+++ b/src/egg-macros.h
-@@ -9,7 +9,8 @@
- #ifndef _EGG_MACROS_H_
- #define _EGG_MACROS_H_
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
-+#include <glib/gprintf.h>
- 
- G_BEGIN_DECLS
- 
-diff --git a/src/eggfileformatchooser.c b/src/eggfileformatchooser.c
-index 32ce2ab..febfc2e 100644
---- a/src/eggfileformatchooser.c
-+++ b/src/eggfileformatchooser.c
-@@ -19,6 +19,8 @@
- #include "eggfileformatchooser.h"
- #include "egg-macros.h"
- 
-+#include <glib.h>
-+#include <glib/gprintf.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <string.h>
diff --git a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch b/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch
deleted file mode 100644
index 3cff0fa2f98f..000000000000
--- a/sci-chemistry/rasmol/files/rasmol-2.7.5.2-longlong.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp rasmol-2.7.5-23Jul09/src/rasmol.h rasmol-2.7.5-23Jul09-64b/src/rasmol.h
---- rasmol-2.7.5-23Jul09/src/rasmol.h	2009-07-20 21:08:43.000000000 +0700
-+++ rasmol-2.7.5-23Jul09-64b/src/rasmol.h	2013-02-22 14:40:00.378574163 +0700
-@@ -125,6 +125,8 @@
- #define VECTOR_FAR 
- #endif
- 
-+#define _LONGLONG
-+
- /*========================*/
- /*  Default User Options! */
- /*========================*/
diff --git a/sci-chemistry/rasmol/metadata.xml b/sci-chemistry/rasmol/metadata.xml
deleted file mode 100644
index 59ea086025a2..000000000000
--- a/sci-chemistry/rasmol/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">openrasmol</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
deleted file mode 100644
index 534cffb9bba5..000000000000
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch fortran-2 multilib prefix toolchain-funcs
-
-MY_P="RasMol_${PV}"
-VERS="13May11"
-
-DESCRIPTION="Molecular Graphics Visualisation Tool"
-HOMEPAGE="http://www.openrasmol.org/"
-#SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
-SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz"
-#SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/RasMol.tar.gz"
-
-LICENSE="|| ( GPL-2 RASLIC )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cvector
-	dev-util/gtk-builder-convert
-	>=sci-libs/cbflib-0.9.2
-	>=sci-libs/cqrlib-1.1.2
-	>=sci-libs/neartree-3.1.1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/vte:0"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1"
-
-#S="${WORKDIR}/${PN}-2.7.5-${VERS}"
-S="${WORKDIR}/RasMol-${PV}"
-
-src_prepare() {
-	cd src || die
-
-	epatch \
-		"${FILESDIR}"/${P}-glib.h.patch \
-		"${FILESDIR}"/${P}-format-security.patch \
-		"${FILESDIR}"/${P}-longlong.patch
-
-	if use amd64 || use amd64-linux; then
-		mv rasmol.h rasmol_amd64_save.h && \
-		echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h
-	fi
-
-	sed \
-		-e 's:-traditional::g' \
-		-i Makefile* || die
-
-	cat > Imakefile <<- EOF
-	#define PIXELDEPTH 32
-	#define GTKWIN
-	EOF
-
-	cat Imakefile_base >> Imakefile || die
-	epatch "${FILESDIR}"/2.7.5-bundled-lib.patch
-
-	eprefixify Imakefile
-
-	sed \
-		-e 's:vector.c:v_ector.c:g' \
-		-e 's:vector.o:v_ector.o:g' \
-		-e 's:vector.h:v_ector.h:g' \
-		-i *akefile* || die
-
-	sed \
-		-e 's:vector.h:v_ector.h:g' \
-		-i *.c *.h || die
-
-	mv vector.c v_ector.c || die
-	mv vector.h v_ector.h || die
-
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -DGTKWIN || die
-}
-
-src_compile() {
-	emake -C src clean
-	emake \
-		-C src \
-		DEPTHDEF=-DTHIRTYTWOBIT \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	libdir=$(get_libdir)
-	insinto /usr/${libdir}/${PN}
-	doins doc/rasmol.hlp
-	dobin src/rasmol
-	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
-	doman doc/rasmol.1
-	insinto /usr/${libdir}/${PN}/databases
-	doins data/*
-
-	dohtml -r *html doc/*.html html_graphics
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index cdc3a2bc1558..42fbdf11b4c8 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 827fc3073132..78045b1a241c 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155
-EBUILD kicad-footprints-5.1.9.ebuild 435 BLAKE2B c9beff3509330723d542a89eb2c011eb63be5bbcde98c351108d010fefdcd63acdbb62449801596858d71114f8a15b153b0db13c439e53c4a0003758f2c76225 SHA512 89d12bc654c80f6541b5f769042f93c5ed64861eb9541697b6b7c8909d8f18885cdd00233b71436fe5626a122ed1a1e447c5d7ad82ff8a2dfa96352cfc8417ff
+DIST kicad-footprints-5.1.10.tar.bz2 3382220 BLAKE2B c2725a83e1d817cbf748dcf173383a53ee00c917d50c00368feb29150d14d1172df8e2b87fa0b8a2f3921658baae833048889c16d45469c7e888002fc63e9fc7 SHA512 624f5bf4a7e9b30ca1f7f8aa4d8270baf59667c91e65b8beb3c36b546fc4fbabd6221cb408458eb166e0364c7b8c77923b5809d94aea3ec65ae58c65055b6eb7
+EBUILD kicad-footprints-5.1.10.ebuild 435 BLAKE2B c9beff3509330723d542a89eb2c011eb63be5bbcde98c351108d010fefdcd63acdbb62449801596858d71114f8a15b153b0db13c439e53c4a0003758f2c76225 SHA512 89d12bc654c80f6541b5f769042f93c5ed64861eb9541697b6b7c8909d8f18885cdd00233b71436fe5626a122ed1a1e447c5d7ad82ff8a2dfa96352cfc8417ff
 MISC metadata.xml 765 BLAKE2B 683e6562f3e3125a5bfacaf329be7d4a36e755816726507f0dabe26147c995536d37875833c0d943cd9c1a890fba2959ecdd9ccb667449009e988cf3cae0dbcb SHA512 7da9a552823e83b2a099fcfcb0ba1bb28b7faf60bbdd37fd70e7fafa40869999a0af8139053ed7a1b101b042b4d0bdfe5a1870ee18182899abfba10b620d482a
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.10.ebuild
similarity index 100%
rename from sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild
rename to sci-electronics/kicad-footprints/kicad-footprints-5.1.10.ebuild
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index b8873ebacfc0..9ae145fe3cff 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d
-EBUILD kicad-i18n-5.1.9.ebuild 460 BLAKE2B b4090cb8b86e3dea31620c8532e3ea5367fea3cbbff5b9f50b9d65d1a29c13a2e990c2b4d7beb3631f87ff7d87abfee3f62c8df2c86fbe83240a88f08ef0d6ca SHA512 962cdb1369df1d10e05271c01af34bb1affd281e3971de9b5bccdadfdf47a17f063a8d31d3c7788a85f1ec6254b768579d7b747d987ae1538b2c68ae67549aeb
+DIST kicad-i18n-5.1.10.tar.bz2 2934783 BLAKE2B b836c12d5265d9da36a4647b8f8e956c7a7a1ebc8a9467f0c4b1ae6d3deaddaddd6c42811bfa6d89440015f1273bb2356bbd91b43ed62e25b402f4b203f598bc SHA512 c40d170ae247f376da03159eeddafbbb1828612ce274714f6111f1be16d122808e7ecdbd3d79dcf90f13f43ed55d603055eafcaf69cab7323367db711631f789
+EBUILD kicad-i18n-5.1.10.ebuild 460 BLAKE2B b4090cb8b86e3dea31620c8532e3ea5367fea3cbbff5b9f50b9d65d1a29c13a2e990c2b4d7beb3631f87ff7d87abfee3f62c8df2c86fbe83240a88f08ef0d6ca SHA512 962cdb1369df1d10e05271c01af34bb1affd281e3971de9b5bccdadfdf47a17f063a8d31d3c7788a85f1ec6254b768579d7b747d987ae1538b2c68ae67549aeb
 MISC metadata.xml 478 BLAKE2B 517564607aa1f61c5a6df0051402838fcf6d5ea1e2dc4950f38d463e959dcba447e47d3478b729afaf2a73f2c121acfc9b3aa6eef3740db942d9edebdf215860 SHA512 9192c6b3852ad652b47e754f077b035b75c67119a6c3282bd5b17e0b4df32c017b2f02f83733f002d944435b8ad9481153569248913c2c030de42f9af70a9e26
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.10.ebuild
similarity index 100%
rename from sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild
rename to sci-electronics/kicad-i18n/kicad-i18n-5.1.10.ebuild
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index c7616ef2ffd1..36a021b3147a 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD kicad-meta-5.1.9.ebuild 620 BLAKE2B 65e0125c6b6d1c9d608dc80fc1a90094f34e653dc36d967f33eb6177042bc5fa7848cb14086911de3aa15be2816b67a019cdda326f1fde22ec55f2f2cf0f16b7 SHA512 0c7976d70ea6965aa6472257a16b81811b85129e155781a491d809c0b2e456a83cd2a0cc9e71f67ed894d1d26e037985c073618bec59083f3a268b5c85ba65b7
+EBUILD kicad-meta-5.1.10.ebuild 620 BLAKE2B 65e0125c6b6d1c9d608dc80fc1a90094f34e653dc36d967f33eb6177042bc5fa7848cb14086911de3aa15be2816b67a019cdda326f1fde22ec55f2f2cf0f16b7 SHA512 0c7976d70ea6965aa6472257a16b81811b85129e155781a491d809c0b2e456a83cd2a0cc9e71f67ed894d1d26e037985c073618bec59083f3a268b5c85ba65b7
 MISC metadata.xml 624 BLAKE2B 71c179dc2e1259e6bc60ec33b8d305377a36ab4394c2dca43e239b3e2693e3abd07a47f03ecf3377c49c7bbb2782c1465639c411cefb9aeee6411873cede0037 SHA512 d9a888716a957c146afcaf390976721851b47f0f3a87c9b728800e21df31ef9deeb3b26b36e9dcee3fdaef15ae48d88c708c3d43098cb51b5ead280d674ebd2f
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.10.ebuild
similarity index 100%
rename from sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild
rename to sci-electronics/kicad-meta/kicad-meta-5.1.10.ebuild
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index af75c8daa6fb..e01db22d0e35 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0
-EBUILD kicad-packages3d-5.1.9.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90
+DIST kicad-packages3d-5.1.10.tar.bz2 727194444 BLAKE2B 87d210be8e32e84f29d67f861962f869f62ba1828a6557f75642c652e81239543bbe4d3a2ae8dc34767266d16cb2a51dfb8c79062b9bb90ae359001f39b7684f SHA512 95c25fe94f3e198208f073c121d234508aa8e67a621d17bc1737d14fe860c9a8cece6e7b66037f9a9c7f1a06f104b942dc2ff59f318e8b6854bdddb1d238faf4
+EBUILD kicad-packages3d-5.1.10.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90
 MISC metadata.xml 975 BLAKE2B e71ae29f52e1eef3f91fe1d2e20e3b7bc1d795787007766c756e94bdee05e070df7f47c339cc4bc77557e77c031de0328a57dc8de949c20b3bd8507c0ff0b7ea SHA512 218ca87f07b072d45ebd010bb85b63b505abedb66cdfc5401f40d6842fe3cf78a9e98eeef9ce196300cc0cee8d7f227e5fe09e763e8669957190641065a061b3
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
similarity index 100%
rename from sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild
rename to sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 91f71d154956..1df1fd5615a1 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3
-EBUILD kicad-symbols-5.1.9.ebuild 429 BLAKE2B d9f18913bda85462cfeb321b03ca36c8cece223c7ad00233e3d1ddd81a09c33072dea13d19b1babc2a1b6263e593af4163cbe6e2845a9aca28f1aeeee3f7366d SHA512 4d5fb02b38b7cbd944f675b8be69fd9a2f6b4838ca4d535dd37eff4304d7227da15f9d860622552f7e46992fe909eac24a7e0f63af982805c525e3e4e861644a
+DIST kicad-symbols-5.1.10.tar.bz2 1815573 BLAKE2B 030847bef5b0420fcbc0d77adcf14f5e08b738ef7c547fae9da70fb70ad1f94149eaf482d1d3da667b369bad6e08995fd3920807cec45bb46efde882404ce820 SHA512 f9dd5a0ee135bb37e1be723c6213f3c2148b1579fab5f56c859d0ca0b55afb81143244cdaedd6d14ab73228176be9770b7dc04a4fe118e9b9f1464c5f79c6b46
+EBUILD kicad-symbols-5.1.10.ebuild 429 BLAKE2B d9f18913bda85462cfeb321b03ca36c8cece223c7ad00233e3d1ddd81a09c33072dea13d19b1babc2a1b6263e593af4163cbe6e2845a9aca28f1aeeee3f7366d SHA512 4d5fb02b38b7cbd944f675b8be69fd9a2f6b4838ca4d535dd37eff4304d7227da15f9d860622552f7e46992fe909eac24a7e0f63af982805c525e3e4e861644a
 MISC metadata.xml 723 BLAKE2B d31f05802f9ad89b8f2c040595fa75cb37ff9ea14cc6cd38acd7b24360b0d9ae72ebf69ca8022352b88bd3d2f5abf05df1042e2e92e74aa6cb186e2ca98a8e83 SHA512 426b9dc1492aaa8e0214c04b6cccc195e3e05290ec32f29339ad044b9dcfa651b40a55a1a0c8f9dd0c93c5c60a1ae0bfeb9a1d779f4f5429a55f8b381f9b3d65
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.10.ebuild
similarity index 100%
rename from sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild
rename to sci-electronics/kicad-symbols/kicad-symbols-5.1.10.ebuild
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 637c1735fda6..02ab1f4507fd 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e
-EBUILD kicad-templates-5.1.9.ebuild 438 BLAKE2B 4c32d3f7a0231ac4333f90cb64e36ef336e3af2c3cad57fac2a8a92bc946d136f7905a4fa8272a5e4ee11013561f230f1a6e7c6041a264ba62947b24fb3387fb SHA512 c82e3e3e366f60478598e26524767de65302f241da8d368f2278ff81cfb3b1384fdfc84dba2f4b2b77a2bf405c081462ef68f80a353a6cf8056d9c103041da2a
+DIST kicad-templates-5.1.10.tar.bz2 1552124 BLAKE2B 95e876fb049abc5fb1210bea63e389c88b43efbd8154ee95d4f910621954795c20228f5a12a5d692ca771d55783c7b9c6942c21bc27d54027a68aa91152a406a SHA512 2e2f3fbf79f82e3539d6ee31aef5c854695683b7cd142a4293c37ef04845f6d90e8fb2f4f9027efc0e3211703336d4dc65f2573266be0a20b1b139fbe3ee55cf
+EBUILD kicad-templates-5.1.10.ebuild 438 BLAKE2B 4c32d3f7a0231ac4333f90cb64e36ef336e3af2c3cad57fac2a8a92bc946d136f7905a4fa8272a5e4ee11013561f230f1a6e7c6041a264ba62947b24fb3387fb SHA512 c82e3e3e366f60478598e26524767de65302f241da8d368f2278ff81cfb3b1384fdfc84dba2f4b2b77a2bf405c081462ef68f80a353a6cf8056d9c103041da2a
 MISC metadata.xml 483 BLAKE2B 162a91061d886c47f37d3e208aa555d7203a35c6773b0c1c12444bc8ad32ef30baa590e25af030a2b54440760ef93b5768ea7c3a84f0a745572b2d78fa46549d SHA512 8bf8391eb2b66d03353ac50492cd8b504cc739597dd0a67b49bbbcdd895b8a5c99a03f3e4d982294f36c7afc705699a1c8319ea132506472da7b654d799d8bea
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.10.ebuild
similarity index 100%
rename from sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild
rename to sci-electronics/kicad-templates/kicad-templates-5.1.10.ebuild
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 2c4cfaddced3..99c2388c8344 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,6 +2,6 @@ AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d33
 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
-DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
-EBUILD kicad-5.1.9.ebuild 4465 BLAKE2B 16b0c54f9dd11c7d3804f15c99ce8ec67be4a63c96b2941dc0786eb67133944320103472f8c48697d32fea58290068a2c6a7cee620b76b1fd85a96b3113ee41d SHA512 8ee198bfa529c73f246c2a33566165757b0b1d9a2cd78385dfecc32fa2b741504cff34e46319d840bbee5348cfcb69a40f5ae5d25d11b3e9e89675fa3cbb46b2
+DIST kicad-5.1.10.tar.bz2 18586889 BLAKE2B 2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975 SHA512 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
+EBUILD kicad-5.1.10.ebuild 4992 BLAKE2B 2db0e275594533782b7502887c234f5308b3c3bf619fbf17e513f33a028f9c841d94ff29508f5909d7c613c16a7352f664325642903132ce39665efef0ffa845 SHA512 de161c52a52515ecec62d86268edbb3d51fc8cf137987a2f004265d42465ceafdcaf36d328d1fe690acc94abbc6892ddca13c56e2231d71be66c9695831c800f
 MISC metadata.xml 1043 BLAKE2B 01782b6dbb1f44de2c100eff987f9f3715afc7e860c782b333cbc8a87e8d117f0111c09c563e79859a7247d7931a5d46623461459118e0e3a55b7e5883f6aa02 SHA512 463508b78ca804425e53877e79e394b9d4977c5c65955c5f47ff1e1ab8eb1a45c576a50c22d49c5855bfcdb07d17ec41d39b90ff5e36ab00a8515a5bc805ce02
diff --git a/sci-electronics/kicad/kicad-5.1.9.ebuild b/sci-electronics/kicad/kicad-5.1.10.ebuild
similarity index 85%
rename from sci-electronics/kicad/kicad-5.1.9.ebuild
rename to sci-electronics/kicad/kicad-5.1.10.ebuild
index f738cbde21de..b7970b620c2e 100644
--- a/sci-electronics/kicad/kicad-5.1.9.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	occ? ( sci-libs/opencascade:=[vtk(+)] )
 	oce? ( sci-libs/oce )
 	python? (
 		$(python_gen_cond_dep '
@@ -79,6 +79,15 @@ src_unpack() {
 	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
 }
 
+src_prepare() {
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i CMakeModules/FindOpenCASCADE.cmake || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	xdg_environment_reset
 
@@ -104,10 +113,20 @@ src_configure() {
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
+	if use occ; then
+		if has_version ">=sci-libs/opencascade-7.5"; then
+			mycmakeargs+=(
+				-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
+				-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
+			)
+		else
+			# <occ-7.5 uses different layout
+			mycmakeargs+=(
+				-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+				-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+			)
+		fi
+	fi
 
 	cmake_src_configure
 }
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index b4dc5eddc52f..887a9b3f401c 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 2297fcd58d32..00d39a7bd8e8 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-maps-40.1.tar.xz 3543432 BLAKE2B adfffdcf6e3730414ebdf1da0727ee3c20d02b7e1c57f13070d5a08d9895d24f91ad452efac1465e881912f93fe4417cb255ff62324920ae73d482183d50cdbc SHA512 319d819737f6b370cd5344d4483e06781e362930610dbc4745641a208e71f753bf894693009690a6fe04bceac75ab5aa7788ae2511425cd0bd2b9229a5d0111c
+DIST gnome-maps-40.2.tar.xz 3542008 BLAKE2B 65f23bf61e2e3c24afa80b74400dd929510c91ec463aa7e36759b1ddc60814538e21d883df37b98b5d4da851705e5f8e78e9d54a8b50a9cfd490a3e965f34b87 SHA512 6214ebeb8f5dc5fb28e0aab659a2b9f56d6b0c7b9248cd3482a268a6694ca04c75d91686a7029ec96904efcfca91a028d66d17b6311efa7e95b76379c68f6a0e
 EBUILD gnome-maps-40.1.ebuild 1487 BLAKE2B 455f501a0654cdae1c74a92391c3cde774d7ea6f9ce8f208700b820d40911fe17a44e49f279a47a123f97fbc645f78cb6e28c47e691f4c0eb07fdabd39143443 SHA512 e3210f34b4ca43f83436b2ee7896be63f95e87d862d79dc7351f7003b8c3335c42f68e37848b529e57c6ed8d71db206fffa073923ce6fe66c8321ef1acb68579
+EBUILD gnome-maps-40.2.ebuild 1489 BLAKE2B 941c151bfc2d1bd975db5dbc5eef7957b2a8cd767d9aacb56c6980123f230d055093b52787067ffe94ce7f4b3e93190249507b80e0b3ef8451d5ed639f7abe0e SHA512 f11ae943a1f93b14eec7baefa23401974659e2c3e33e63cd02779981afddfedcebd0b9c0b0e6ff124186a49a512331ff7c14b4ea1fdb2109011c9e7e377f7f13
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.2.ebuild
new file mode 100644
index 000000000000..eb37149677c7
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	x11-libs/pango[introspection]
+	>=dev-libs/gjs-1.66.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libhandy-0.84:1=
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10:=
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 2c3d4bc27f01..9263eb363b78 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -2,5 +2,5 @@ AUX qmapshack-1.15.2-no-hacks-kthxbye.patch 1369 BLAKE2B 01a896d00a15553dbf027d9
 DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637787201bed1763bad026f866060d60a756f18858e76d95ea2420a3183f36147f2c72d151f377e8f2bc9108832266ff4 SHA512 536ba1c2fb3516560307c18eb76ef2b86fecaa1bc0fa4bcef25c8eb2e6c6dee5c3a9a81d6a9d05a147234df7c703937fd9e841696316c350694b0494705f885c
 DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4
 EBUILD qmapshack-1.15.2-r2.ebuild 1282 BLAKE2B c149bdc91387d706c25c341088ac5663a7a536247a9d7662c2b29b5a621e4bfe3fa331ee045b7397a6c45a66a72f4a02225fd91c5d07eb05fb7f4d2265c2d293 SHA512 b4161a42a97ae5c6c285d4c381462753cd17cd79fe6b72e023a871405531de4964a9c1aedf985d08839f4637b61720bbb88c148881c3056318c434904a170ba3
-EBUILD qmapshack-1.16.0.ebuild 967 BLAKE2B ebbc04bc31566ff3ae3e371adb779a009317e9cdb8a3b2d339bc879f4b49502d10966a6dd1011a951bb9380587e4a6b18a7a31621a4a731f2854d7928d2a1d27 SHA512 f2d7d31759d6fcbef1cb252d21f86799d32951b3b4ccc540b8d80901dac953cbec805ccabd4a9b3340dd95b4fcb02ed62489b183ae84dbf1adf4485df3257fbd
+EBUILD qmapshack-1.16.0.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6
 MISC metadata.xml 831 BLAKE2B 92b3728e320927f7988568ad8b0c7a7b56dc06e8d354e26960f7002652f0a34b6223631179da2d9213f531d135757f17c68589309a0e1736194231a3567df821 SHA512 d69f75e5c21d93c8f0569c8f7429b14f8c9972dead06ebc5bfedaf280c376029ddf4d5f68904472986a5b6f57d9e6a6ef2bdba1edbe440e21d3eca1c65072ba6
diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
index 49979017d07e..6c1736186d87 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-qt/qtwebengine:5[widgets]
 	>=sci-geosciences/routino-3.1.1
 	sci-libs/alglib
-	sci-libs/gdal
+	sci-libs/gdal:=
 	>=sci-libs/proj-8:=
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7dad758f68e9..415aa70338ff 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest
deleted file mode 100644
index 83b916a1bd62..000000000000
--- a/sci-libs/cbflib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cbflib-0.9.3.3-unbundle.patch 8308 BLAKE2B f0038332a7e9fbdd45cd2747046df1d1ec6e5bd44b7e6e3dbac0e14e2be2c0d69317a96c6ce395fd7310139b9445d73019bef7ee60a931c4a68cf2572400fcbc SHA512 21f39214e188cc8fb76326765aba7da4d15c1b70d41c193016733d5b3d14e499178e25c45c807e7c9cabaf3a7f4e3e97c5ed2a8b383472ec9f4e4cbea9b3522d
-DIST CBFlib-0.9.3.3.tar.gz 5787633 BLAKE2B c07b73f037f84c84613dd33a7b403d9f934d58abe12016167a6d9ef7633827ad46bef0813b5040790d4da03980285527b43ec0a899e46d8e4823f68fdcbe0765 SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff
-EBUILD cbflib-0.9.3.3.ebuild 1250 BLAKE2B 5faa13aab5e256bbf11c5bc0f9c6950d130be7c6425560eabc17bc6d5a7b1510c1101e414bc8e293024a9539d2f0284e91018171465605ed3b04b3d5729041e1 SHA512 0c91b5d6a7e50ecd1db3d8d9d95529cfec0971a382818006680cf3efc42bdf26cf9101c87cbed3826549a0717fe8a60fafe7e5a2818a3a7aacba45a81857b750
-MISC metadata.xml 987 BLAKE2B cfa565415af63f3eeb4afd33c5147da2619a7d5be4f871582fcef209cb606e55b40d95bd3f9e4d6c1fa938e849afc46140e761ada76ecbc9b744d9c2a8601674 SHA512 1917afb5bc1a5dbcd9e5ec175ac355e79929fd5ece8be7ea8606bf1ef7329affffa56efa5281df7d2c2eea4e1e3ef224c8310ee8cbeb1c44a0b32b232dadf007
diff --git a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild b/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
deleted file mode 100644
index 4d53d2881cf6..000000000000
--- a/sci-libs/cbflib/cbflib-0.9.3.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P1="CBFlib-${PV}"
-#MY_P2="CBFlib_${PV}"
-MY_P2="CBFlib_0.9.3"
-
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files"
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/"
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz"
-#	test? (
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz
-#		mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz
-#	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-S=${WORKDIR}/${MY_P1}
-
-RDEPEND="sci-libs/hdf5:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle.patch
-)
-
-src_prepare() {
-	rm -rf Py* drel* dRel* ply* || die
-
-	append-fflags -fno-range-check
-
-	tc-export CC CXX AR RANLIB FC F77
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUNPACKED_DIRECTORY="${S}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym ${PN} /usr/include/cbf
-}
diff --git a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch b/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
deleted file mode 100644
index ef24c4b94b22..000000000000
--- a/sci-libs/cbflib/files/cbflib-0.9.3.3-unbundle.patch
+++ /dev/null
@@ -1,181 +0,0 @@
- CMakeLists.txt | 118 +++------------------------------------------------------
- 1 file changed, 6 insertions(+), 112 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75054d6..15bab99 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -279,7 +279,7 @@ project (CBFlib C CXX Fortran)
- enable_testing()
- set (CBF_CMAKE_DEBUG "ON")
- 
--set(CMAKE_C_FLAGS "-Wall -fno-strict-aliasing")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-strict-aliasing")
- 
- #
- #  User setable parameters
-@@ -530,42 +530,6 @@ find_package(ZLIB)
- 
- 
- 
--#Load external packages in build directory at cmake time
--add_subdirectory(${CBF__EXTERNAL_PACKAGES}  "${CBF__EXT_PKG}")
--
--find_file(CBF_EXT_PKG_BLD_RUNNING cbf_ext_pkg_build_running "${CBF__EXT_PKG}")
--if (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
--  file(WRITE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running" "cbf_ext_pkg_build_running")
--  CBF_DEBUG_MESSAGE("CMAKE_COMMAND:        ${CMAKE_COMMAND}")
--  CBF_DEBUG_MESSAGE("CBFlib_SOURCE_DIR:    ${CBFlib_SOURCE_DIR} ")
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} ${CBFlib_SOURCE_DIR}
--    RESULT_VARIABLE CBF_BUILD_RESULT)
--  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target HDF5
--    RESULT_VARIABLE CBF_BUILD_RESULT)
--  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
--  execute_process(
--    COMMAND ${CMAKE_COMMAND} --build ${CBFlib_BINARY_DIR} --target TIFF
--    RESULT_VARIABLE CBF_BUILD_RESULT)
--  CBF_DEBUG_MESSAGE("CBF_BUILD_RESULT: ${CBF_BUILD_RESULT}")
--  file(REMOVE "${CBF__EXT_PKG}/cbf_ext_pkg_build_running")
--endif (${CBF_EXT_PKG_BLD_RUNNING} STREQUAL "CBF_EXT_PKG_BLD_RUNNING-NOTFOUND")
--
--
--file(GLOB CBF_HDF5_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*hdf5*")
--CBF_DEBUG_MESSAGE( "CBF_HDF5_LIBRARY_PATH:  ${CBF_HDF5_LIBRARY_PATH}")
--file(GLOB CBF_TIFF_LIBRARY_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib/*tif*")
--CBF_DEBUG_MESSAGE( "CBF_TIFF_LIBRARY_PATH: ${CBF_TIFF_LIBRARY_PATH}")
--
--if ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
--  MESSAGE(STATUS "Must build external packages in ${CBF__EXT_PKG}")
--  MESSAGE(STATUS "Then rerun cmake")
--  MESSAGE(WARNING "Finishing run to make Makefiles")
--endif ("|${CBF_HDF5_LIBRARY_PATH}|" STREQUAL "||" OR "|${CBF_TIFF_LIBRARY_PATH}|" STREQUAL "||")
--
--
- #
- # Data Directories
- #
-@@ -579,35 +543,6 @@ set(CBF_DATAURLBASE	"http://downloads.sf.net/cbflib")
- set(CBF_DATAURLI  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Input.tar.gz")
- set(CBF_DATAURLO  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output.tar.gz")
- set(CBF_DATAURLS  "${CBF_DATAURLBASE}/CBFlib_${CBF_VERSION}_Data_Files_Output_Sigs_Only.tar.gz")
--#
--# Load and unpack the Data Files
--#
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRI} ${CBF_DATAURLI})
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRO} ${CBF_DATAURLO})
--CBF_LOAD_TARBALL(${CBF__DATA} ${CBF_DATADIRS} ${CBF_DATAURLS})
--#
--# Verify the checksums
--#
--file(GLOB CBF_DATADIRI_FILES "${CBF_DATADIRI}/*")
--file(GLOB CBF_DATADIRO_FILES "${CBF_DATADIRO}/*")
--foreach(loop_file ${CBF_DATADIRI_FILES} )
--  if (NOT "${loop_file}" MATCHES "[*.]md5")
--    file(MD5 "${loop_file}" loop_file_md5)
--    file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
--    if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--      message(WARNINH "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
--    endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--  endif (NOT "${loop_file}" MATCHES "[*.]md5")
--endforeach(loop_file)
--foreach(loop_file ${CBF_DATADIRO_FILES} )
--  if (NOT "${loop_file}" MATCHES "[*.]md5")
--    file(MD5 "${loop_file}" loop_file_md5)
--    file(STRINGS "${loop_file}.md5" loop_file_md5_orig LIMIT_COUNT 1)
--    if (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--      message(WARNING "loop_file: ${loop_file}:|${loop_file_md5}|${loop_file_md5_orig}|")
--    endif (NOT ("${loop_file_md5}" STREQUAL "${loop_file_md5_orig}"))
--  endif (NOT "${loop_file}" MATCHES "[*.]md5")
--endforeach(loop_file)
- 
- 
- #
-@@ -775,7 +710,7 @@ add_library(cbf_shared SHARED  ${CBF_C_SOURCES})
- set_target_properties(cbf_shared PROPERTIES OUTPUT_NAME "cbf")
- set_target_properties(cbf_shared PROPERTIES LINKER_LANGUAGE C)
- set_target_properties(cbf_shared PROPERTIES SOVERSION "${CBF_APIVERSION}")
--target_link_libraries(cbf_shared ${CBF_HDF5_LIBRARY_PATH})
-+target_link_libraries(cbf_shared hdf5)
- 
- #
- # Build the static and shared IMG libraries
-@@ -791,7 +726,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CBFlib_BINARY_DIR}/solib")
- add_library(img_shared SHARED  ${CBF__EXAMPLES}/img.c)
- set_target_properties(img_shared PROPERTIES OUTPUT_NAME "img")
- set_target_properties(img_shared PROPERTIES LINKER_LANGUAGE C)
--target_link_libraries(img_shared ${CBF_HDF5_LIBRARY_PATH})
-+target_link_libraries(img_shared hdf5 m )
- 
- 
- #
-@@ -829,26 +764,6 @@ target_link_libraries(fcb_shared ${CBF_HDF5_LIBRARY_PATH})
- #
- #  C and C++ examples
- #
--CBF_ADD_C_EXAMPLE(convert_image "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(convert_minicbf "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(makecbf "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(adscimg2cbf "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/adscimg2cbf_sub.c" "")
--CBF_ADD_C_EXAMPLE(cbf2adscimg "${CBF__EXAMPLES}" "${CBF__EXAMPLES}/cbf2adscimg_sub.c" "")
--CBF_ADD_C_EXAMPLE(cbf_tail "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(changtestcompression "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(img2cif "${CBF__EXAMPLES}" "" "img_static")
--CBF_ADD_C_EXAMPLE(cif2cbf "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(cbf2nexus "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(minicbf2nexus "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(cbf_template_t "${CBF__DECTRIS_EXAMPLES}" "" "")
--CBF_ADD_CXX_EXAMPLE(testcell "${CBF__EXAMPLES}" "" "")
--CBF_ADD_CXX_EXAMPLE(sauter_test "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(sequence_match "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(tiff2cbf "${CBF__EXAMPLES}" "${CBF__EXT_PKG}/${CBF_TIFF}/libtiff/tif_sprint.c" "${CBF_TIFF_LIBRARY_PATH}")
--CBF_ADD_C_EXAMPLE(testulp "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testhdf5 "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testtree "${CBF__EXAMPLES}" "" "")
--CBF_ADD_C_EXAMPLE(testalloc "${CBF__EXAMPLES}" "" "")
- 
- 
- 
-@@ -876,26 +791,9 @@ target_link_libraries(test_xds_binary     fcb_static)
- #
- # install
- #
--install (TARGETS makecbf DESTINATION bin)
--install (TARGETS img2cif DESTINATION bin)
--install (TARGETS cif2cbf DESTINATION bin)
--install (TARGETS adscimg2cbf DESTINATION bin)
--install (TARGETS cbf2adscimg DESTINATION bin)
--install (TARGETS changtestcompression DESTINATION bin)
--install (TARGETS convert_image DESTINATION bin)
--install (TARGETS convert_minicbf DESTINATION bin)
--install (TARGETS minicbf2nexus DESTINATION bin)
--install (TARGETS cbf_template_t DESTINATION bin)
--install (TARGETS testcell DESTINATION bin)
--install (TARGETS sauter_test DESTINATION bin)
--install (TARGETS sequence_match DESTINATION bin)
--install (TARGETS tiff2cbf DESTINATION bin)
--install (TARGETS cbf_static DESTINATION lib)
--install (TARGETS cbf_shared DESTINATION lib)
--install (TARGETS fcb_static DESTINATION lib)
--install (TARGETS fcb_shared DESTINATION lib)
--install (TARGETS img_static DESTINATION lib)
--install (TARGETS img_shared DESTINATION lib)
-+install (TARGETS cbf_shared DESTINATION lib${LIB_SUFFIX})
-+install (TARGETS fcb_shared DESTINATION lib${LIB_SUFFIX})
-+install (TARGETS img_shared DESTINATION lib${LIB_SUFFIX})
- install (DIRECTORY ${CBF__INCLUDE}/ DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
- install (DIRECTORY ${CBF__BIN_INCLUDE}/* DESTINATION include/cbflib FILES_MATCHING PATTERN "*.h")
- 
-@@ -914,10 +812,6 @@ endif ()
- #
- # tests  -- to be extended
- #
--add_test(NAME cbftest_makecbf
--  COMMAND ${CMAKE_COMMAND}
--    -DCMD1=$<TARGET_FILE:makecbf> -DARG11=${CBF_DATADIRI}/example.mar2300 -DARG12=makecbf.cbf
--    -P ${CMAKE_CURRENT_SOURCE_DIR}/runcommands.cmake)
- add_test(cbftest_testalloc ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testalloc)
- add_test(cbftest_testhdf5 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testhdf5)
- add_test(cbftest_testtree ${VALGRIND_COMMAND} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testtree)
diff --git a/sci-libs/cbflib/metadata.xml b/sci-libs/cbflib/metadata.xml
deleted file mode 100644
index e0080f59068f..000000000000
--- a/sci-libs/cbflib/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription>
-CBFLIB is a library of ANSI-C functions providing a simple mechanism
-for accessing Crystallographic Binary Files (CBF files) and Image-supporting
-CIF (imgCIF) files. The CBFLIB API is loosely based on the CIFPARSE API for
-mmCIF files. Starting with this release, CBFLIB performs validation checks
-on reading of a CBF. If a dictionary is provided, values will be validated
-against dictionary ranges and enumerations. Tags missing under parent-child
-relationships or category key requirements will be reported. CBFlib provides
-functions to create, read, modify and write CBF binary data files and imgCIF
-ASCII data files.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cbflib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 0434fb753764..7cb03fb408ca 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,3 +1,3 @@
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
-EBUILD ceres-solver-1.14.0.ebuild 2320 BLAKE2B 1371d359bcb5765179d5f20bb7af27df05c4c5d0680f193b10a4a9ee1001611ff625f86080d440b8e64502aea74cc1d5558b127da315d8a9bee6a81973dbb530 SHA512 c95e5ff53e84131030575eb517f13fd1a14aad098802b32325e11d9187a708c3c54440d5cfc652460f690be90983a4759833fc1b932a0274146b455cb6204a18
+EBUILD ceres-solver-1.14.0.ebuild 2390 BLAKE2B 6aa1716982173734e1f95f2ba76b18ae27854811c35d95f8b2812fd6ff7ff1b74adb7c4f674e4834b5ee65e1a5a159d9cd656d28a9fbdda6192da84060150e8c SHA512 1e8da4d8abbfe6705841a453a9db6e5d672c40efff438afe32085b7ad43b7801970184d1869726ce9ec28b32e6c076f84a7fa622417b88bcd9f7072602bd235a
 MISC metadata.xml 1451 BLAKE2B c23657557890c4b62551c79eb7a3b07ef0921f5766b9d771d85e1cf156b03a9d783f6d307504ce5cfc810e096bd990f2aef58f7da6cf912df3fbafa7b63f257e SHA512 e9867b3e997e1c28e900f1148287ed052d5e29440c7f8d99b61432c8870d8f6d7368d387f9cc72bb948a412b77ad8e4cc2f418c41ad60f21c8027e23f36d71aa
diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 30cce977960d..4bd35e1b7fc8 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake-multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="Nonlinear least-squares minimizer"
@@ -23,8 +23,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
 	>=dev-cpp/eigen-3.3.4:3
 	doc? (
-		dev-python/sphinx
-		dev-python/sphinx_rtd_theme
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
 	)
 	lapack? ( virtual/pkgconfig )
 "
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index 6d135e3ce191..e060b8562a42 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,5 +1,3 @@
-DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
 DIST libecpint-1.0.6.tar.gz 1331016 BLAKE2B 9b1a8452b6810eaca17eb9e6efe876537ae32e980593ec89681fa4b2d6eaf5a908d5971c774eccd75858025599eeeb119a74b03fdbf7bcee644316dc6acad0d9 SHA512 8b0bf20d263891255ea8828cb9df7c919155ef461a66ae6c8979e9996e3392ea1b7adf21ef9ad9188e2f56547c1e2b525c3711f7cd1ace2b3c09b8ae38f75ee8
-EBUILD libecpint-1.0.5.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 EBUILD libecpint-1.0.6.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.5.ebuild b/sci-libs/libecpint/libecpint-1.0.5.ebuild
deleted file mode 100644
index 47004ee7019c..000000000000
--- a/sci-libs/libecpint/libecpint-1.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
-HOMEPAGE="https://github.com/robashaw/libecpint"
-SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/pugixml"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBECPINT_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 9ca7a9e73fad..5426c179e873 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,5 +1,7 @@
 AUX 3.11-openmp.patch 943 BLAKE2B 39f092a108f808711dd928595cd82d507f6154efd549c319047c7a94edb772887338209549dba99cca4ed0a8106dc40ef4afd3a42dfe41d7d884f7f630391bfe SHA512 17bcea4da6a6aa32192ce7fb66e7eefef5e037ca2afd968e67de385938555975abe2103ee2cc50d02cd21d9783e9334eac93de694d6e685f13af80c49e42af38
 AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d40254df9668de8719fbacd6cbadd685d38e2935c13e1778d8a260ef0733672bfc5c719a9e5d9a8832cbbe8ca8 SHA512 f4c2e2f6556604bf3572e341176c855e87caf4c3db8c2b347ce4e7a7948d21b708a7df29d5bf9b741dd3f34e08a0750572b94bd5e94bb4052f1ba4b9ae50e918
 DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
+DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 EBUILD libsvm-3.24.ebuild 2674 BLAKE2B 710e0e5791defed993a820b2bc8cc500d6df28b739b726bc4a4181b16892035c3d0e088cbb92284915c131905673acaf0e169ad03928d14f306c9bdc76c18145 SHA512 909838eeb6af0280d4cc7ec27e84c9ffa5c44544bb2a3a5ca9da862e4ace9f40a8b8ecff6131ef7504558ec35ecba3c24be27806bc45088aaee46dd157d13d79
+EBUILD libsvm-3.25.ebuild 2683 BLAKE2B b57d0d18bebd2f4b441a0d36831206e1354e108fe0f7a5576b2328f99068c37ad67d236afb24ca8e12d19f84175d9ac04302792cc8cf3e99f96b410664ba20fa SHA512 f8fe08780d85e0d2882829c1f3e28e7b331b1b6751f768e778d8dba12c2b248bccfa3c0fe931fcd2d4789ea7d666c14b95b8423a14fe3b40b7a5df5661944b62
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.25.ebuild b/sci-libs/libsvm/libsvm-3.25.ebuild
new file mode 100644
index 000000000000..f4a2fdf7ebd9
--- /dev/null
+++ b/sci-libs/libsvm/libsvm-3.25.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
+
+DESCRIPTION="Library for Support Vector Machines"
+HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
+SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="java openmp python tools"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	java? ( >=virtual/jdk-1.8:* )
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.8:* )
+	python? ( ${PYTHON_DEPS} )
+	tools? ( sci-visualization/gnuplot )
+"
+
+PATCHES=(
+	"${FILESDIR}/3.11-openmp.patch"
+	"${FILESDIR}/3.14-makefile.patch"
+)
+
+pkg_setup() {
+	if use openmp; then
+		if ! tc-has-openmp; then
+			ewarn "OpenMP is not supported by your currently selected compiler"
+
+			if tc-is-clang; then
+				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
+				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
+			fi
+
+			die "need openmp capable compiler"
+		fi
+
+		append-cflags -fopenmp
+		append-cxxflags -fopenmp
+		append-cppflags -DOPENMP
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
+		|| die "Failed to fix paths in python files"
+	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
+		|| die "Failed to fix paths for svm-grid"
+	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
+		|| die "Failed to rename grid.py to svm-grid"
+
+	if use java; then
+		local JAVAC_FLAGS="$(java-pkg_javac-args)"
+		sed -i \
+			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
+			java/Makefile || die "Failed to fix java makefile"
+	fi
+	tc-export CXX CC
+}
+
+src_compile() {
+	default
+	use java && emake -C java
+}
+
+src_install() {
+	dobin svm-train svm-predict svm-scale
+	dolib.so *.so*
+	doheader svm.h
+
+	DOCS=( README )
+
+	if use tools; then
+		local t
+		for t in tools/*.py; do
+			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
+		done
+
+		mv tools/README{,.tools} || die
+		DOCS+=( tools/README.tools )
+
+		insinto /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/examples
+		doins heart_scale
+		doins -r svm-toy
+	fi
+
+	if use python ; then
+		installation() {
+			touch python/__init__.py || die
+			python_moduleinto libsvm
+			python_domodule python/*.py
+		}
+		python_foreach_impl installation
+
+		mv python/README{,.python} || die
+		DOCS+=( python/README.python )
+	fi
+
+	HTML_DOCS=( FAQ.html )
+	if use java; then
+		java-pkg_dojar java/libsvm.jar
+		HTML_DOCS+=( java/test_applet.html )
+	fi
+
+	einstalldocs
+}
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index ffd5ef735163..d38e10a1da6d 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -14,5 +14,5 @@ AUX opencascade-7.5.env.in 4643 BLAKE2B f3492a12e0e0fd31bed8c65e8aa7af68f84a9e75
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 EBUILD opencascade-7.4.0-r4.ebuild 3957 BLAKE2B 4118554fff8ff80f64ce581dd5f233211d4a77d4366ada96ae646e819ad03adebfa8561ff9c4b9f9fcfed6cc2bad65fe6db0373d434768fcf5cc8a1808fe34e6 SHA512 a7783c641793480726433be75fd5c7260d9f62e32347aa1ee4e68b97adc5e18d829984f05e84e42c120a1c027c0ad15ee73e646c708466e0eeb2a9440b9726ac
-EBUILD opencascade-7.5.1.ebuild 4415 BLAKE2B 49fe2fbcfb8933608ee516b8a1eb23e7968a922c74f7b8cb36ae25179c6a09e413f4fb2ddad16de77b9ae0bd766d3fff86cc7ff7e950d474877a462204b2fa85 SHA512 e4c18a8406a8956b4133992e94ee8a4da20f16d36221d08bdced57c3255a0a22e9352984974ae645b8ce7c8fe86576c412e8b7040e1ff1b86b264f0209fbe960
+EBUILD opencascade-7.5.1-r1.ebuild 4784 BLAKE2B 824ba3dc6e3a314ae80d7cbc0e9b359b1444679318d8dd478ed0bb259b7dd867a53cf59e8b32b7aa9c9a905256618537058c85cc9af7a350e76ef58aee448903 SHA512 fc2478a817e26724bb4dd80d270b9788a3b13a1250c1a7e88779b457518cb5a4c58eae3acb85fa5a12f691a0f467e683b312026cca570a537ca8efcc33299b63
 MISC metadata.xml 1074 BLAKE2B 88bba4427a254f02a0ca70936c0931ceb72a5d752c6664502cd20dbd6cc294080222d9ef143334c147b77667a342f7912384b8af92a1b90868d243294f72215f SHA512 b42f338af31848be031702bbee6cfe105db4c6ffa5970e7229b5a63841097af1b60eb886f4513ec86f0b27fd0c7ad090b635061c737714ae43b7b45db02172f9
diff --git a/sci-libs/opencascade/opencascade-7.5.1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
similarity index 92%
rename from sci-libs/opencascade/opencascade-7.5.1.ebuild
rename to sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
index 474b381f5561..ffa4d80678e2 100644
--- a/sci-libs/opencascade/opencascade-7.5.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
@@ -80,6 +80,13 @@ src_prepare() {
 
 	sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
 		-i adm/templates/OpenCASCADEConfig.cmake.in || die
+
+	# There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some
+	# assumptions it makes about installation paths. Rather than fixing it, just
+	# get rid of the mechanism altogether - its purpose is to allow a
+	# side-by-side installation of release and debug libraries.
+	sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \
+		-i "adm/cmake/occt_toolkit.cmake" || die
 }
 
 src_configure() {
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index d80a2b237f9c..e7cec303e773 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,5 +1,3 @@
-DIST openlibm-0.7.4.tar.gz 366281 BLAKE2B fde965cdf66e8a872761e3df0715527d768a12a44b03af16a16898e66223ddb16809d13966a3ec222eb1b4fda2d560b614975c731df755a99b1d5f53a3da12fe SHA512 d824f909c52dfe78a5e090187d32f8c4744776235bfe3ad1fdb68ea3d3f8d1d358f228d0c83fbd5baa558a603c66c171e74e3f2c0cdb3d517f19930eadd35a91
 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
-EBUILD openlibm-0.7.4.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
 EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/openlibm-0.7.4.ebuild b/sci-libs/openlibm/openlibm-0.7.4.ebuild
deleted file mode 100644
index ca3ab8af5117..000000000000
--- a/sci-libs/openlibm/openlibm-0.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="High quality system independent, open source libm"
-HOMEPAGE="https://github.com/JuliaLang/openlibm"
-SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
-# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	default
-	sed -e "/^OLM_LIBS :=/s/^/#/" \
-		-e "/install: /s/install-static//" \
-	-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX FC AR LD
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc README.md
-}
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index feb00ba5a979..0a55cc03b138 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r101.ebuild 7365 BLAKE2B 861295cc021c38f2f0dc5f0b8e3defd09598aac5471153541aae2c512d5032560ec028164c7c8eecc7ad65d73529900fb6d2661ce831c67180947062bb55e130 SHA512 04c0ee802ae4cbd40dfec62ec178fdb31cdb3fd9808f40a4a36589a28013f930ca27a68a7b9063412dcada8cbf13735b45203dc59c3d002ddab52b42cb0e6d81
+EBUILD plplot-5.15.0-r102.ebuild 7504 BLAKE2B 8461982fe592d9168266f291e5b6ea36ebdcaedc0e88c202d81962db1fa11d51d554528fdf56a890587a1969ea524696ba3fdcd87c28a3d98d1abd428d150dec SHA512 06a5d6cf5908ea8270208fcd9c6fcd4820f0a95b772cae4ee5c2d7e220ccf80e492d73062e01e9ee5c7b34c21092d0a0bb04523d100db842d57dfd0abcbdfef7
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/plplot-5.15.0-r101.ebuild b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
similarity index 96%
rename from sci-libs/plplot/plplot-5.15.0-r101.ebuild
rename to sci-libs/plplot/plplot-5.15.0-r102.ebuild
index a8ca91a4eed2..25ff02cc744c 100644
--- a/sci-libs/plplot/plplot-5.15.0-r101.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r102.ebuild
@@ -6,7 +6,9 @@ EAPI=7
 WX_GTK_VER=3.0-gtk3
 FORTRAN_NEEDED=fortran
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+# fails with ninja, due to USE=java missing swig output dependencies
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 toolchain-funcs virtualx wxwidgets
 
@@ -36,7 +38,7 @@ RESTRICT="
 RDEPEND="
 	cairo? ( x11-libs/cairo:0=[svg?,X] )
 	gd? ( media-libs/gd:2=[jpeg?,png?] )
-	java? ( >=virtual/jre-1.5:* )
+	java? ( >=virtual/jre-1.8:* )
 	latex? (
 		app-text/ghostscript-gpl
 		virtual/latex-base
@@ -88,7 +90,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	java? (
-		>=virtual/jdk-1.5
+		>=virtual/jdk-1.8:*
 		dev-lang/swig
 	)
 	lua? ( dev-lang/swig )
@@ -290,8 +292,10 @@ src_install() {
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 
+	use python && python_optimize
+
 	if use java; then
 		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
+		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/libplplotjavac_wrap.so
 	fi
 }
diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
index 2984fc2893df..ffbd4eba5758 100644
--- a/sci-libs/rtree/Manifest
+++ b/sci-libs/rtree/Manifest
@@ -1,3 +1,5 @@
 DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
+DIST Rtree-0.9.7.tar.gz 44877 BLAKE2B 4ee5ad4c478ada448a8faa5ba29bdfbb67bc2f688cb8c6f465f4637fbd890cbd997f24573b25a936b7ceb503cc0b7684a1932e6ac91a85e4c37730ee9a6d39f0 SHA512 35b39e29f6d2b9cf4e774191bed69ade515680d07213f0ba74748da11ba916b41c93dfc4f489d7320855f3722ac8b5b58bac4614ea95e6230fcffe33f4332607
 EBUILD rtree-0.9.4-r1.ebuild 622 BLAKE2B a049bc3c2ffe5097533ac435a6eb0218a6e8139c9023a5f5f4bf75a47d726c08cda67173b9a414db1b6ff18da685737851e7648c3d295a0aec5156d69d0f198b SHA512 c48970d96ed4bae2fe3f6fec4c03e375a766c7b448e1326fd77c1d0dfa6338e6e64cf6548ab9b3041d438f0a543cf16f87b77bc5c16cd8c062c56f8c50f4ac72
-MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
+EBUILD rtree-0.9.7.ebuild 636 BLAKE2B 21b484de0c2f5df823efe0f0cfb061133389769f1365caa9491121c6b2d31893536c6bf5807f19930379a073a47760d80b4f65ff3111d2491aa0801856d552f4 SHA512 7b70451a0ec57e33cd7a762edb3f3524482cba35e698dbc9b7505954b620a09939aa07855c9ca4edb7cbf9eeadbbf3fa1120e4b594dc331645a6378cf675c83f
+MISC metadata.xml 838 BLAKE2B dc4e6490095118fcf8ff5a8e8660774e0a320d0d4396aff76841ea2e26b2329e094ecc1e524443137365e744273bb4443feab7dd0c2c5eec423bbd7a501b2cfa SHA512 a42b53908a909d3d4c9e3eb27067210553e176e7adaca2374a0868267503fddc64db89dfd9ae21bfc183d911d3ec36f9994abd911250776ec457bbb8b417acbc
diff --git a/sci-libs/rtree/metadata.xml b/sci-libs/rtree/metadata.xml
index d03728e20d7e..a0a47a2da71d 100644
--- a/sci-libs/rtree/metadata.xml
+++ b/sci-libs/rtree/metadata.xml
@@ -5,6 +5,10 @@
         <email>3dprint@gentoo.org</email>
         <name>Gentoo 3D Printer Project</name>
     </maintainer>
+    <maintainer type="person">
+        <email>andrewammerlaan@gentoo.org</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
     <longdescription>
         Rtree is a ctypes Python wrapper of libspatialindex that provides a number of advanced spatial indexing
         features for the spatially curious Python user.
diff --git a/sci-libs/rtree/rtree-0.9.7.ebuild b/sci-libs/rtree/rtree-0.9.7.ebuild
new file mode 100644
index 000000000000..751660dc98d3
--- /dev/null
+++ b/sci-libs/rtree/rtree-0.9.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+MY_PN="Rtree"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="R-Tree spatial index for Python GIS"
+HOMEPAGE="https://rtree.readthedocs.io"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+BDEPEND="dev-python/wheel[${PYTHON_USEDEP}]"
+RDEPEND="sci-libs/libspatialindex"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+DEPEND+="
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index c3baec6a12c0..3adca653a52f 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,3 +1,5 @@
 DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
+DIST volk-2.5.0.tar.xz 322280 BLAKE2B edbf0f7ffecf08e8f0d8ebbb85a9bc943286c5d022442d0d7e480be4ecbd696a8b2e87e4d16d7133467b429e4894a1d166c534b5a05630cb313906aed8476cfe SHA512 94e5af925d6b6e157445ca80c2ba47a92f5ee681716d2a70a5519caa30a603b3f31a9f1ccbd14ef65349645b56a3f406b4aa1f354c322be60bd76d646a4850c6
 EBUILD volk-2.4.1.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
+EBUILD volk-2.5.0.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/volk-2.5.0.ebuild b/sci-libs/volk/volk-2.5.0.ebuild
new file mode 100644
index 000000000000..aff22b50715c
--- /dev/null
+++ b/sci-libs/volk/volk-2.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+#https://github.com/gnuradio/volk/issues/383
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1
+
+DESCRIPTION="vector optimized library of kernels"
+HOMEPAGE="http://libvolk.org"
+SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="orc test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}
+	!<net-wireless/gnuradio-3.8
+	dev-libs/boost:=
+	orc? ( dev-lang/orc )"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]')"
+
+RESTRICT="test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ORC=$(usex orc)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_PROFILING=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b75c18fcb9c5..862209234051 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index b309dd9d7303..52dc2747dbe8 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
 DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
+DIST z3-4.8.11.tar.gz 4799940 BLAKE2B 5478f9f45f2dc8ea5d2b781e79d886e77eed5ae034498b434dae349aa76f05836d8fd3134a08b381830b57acb3896ac51337d5bbe480dcce4770f2cd4fbee841 SHA512 ceab703d0413d0135e0f4e6c3ba2bb58d6a4823385edb0bf7ecc96949a3073b687d415a2674c86c9f876adb52823f98f9fbbc107d799ed756dc16292f9864894
 EBUILD z3-4.8.10.ebuild 2425 BLAKE2B 23db5049ead16c9323773aa20d487b76cfb6d2126f1b93f7e507b5db93db490daf5a6a03b9a090404bd48182c0bf4a92aa3452bb9278b13cff89e235661f7e88 SHA512 3f69ea5e9b9de7dbf99ac2886791dc7947e12c9542fab93b9da9a82c8fb2273f07f5441ac54a1f5e8bc839c9f62815f95ea049e2c50e060eb11befbe676fd7ed
+EBUILD z3-4.8.11.ebuild 2430 BLAKE2B ecfd9ccb8df8578e7f2f18ebed60e95476bb7f67c95825c51d19fb50db5562bf3de65b8cbac8f868ea2bb0c1a33c4a4e3fe800800d02086b3ab76ee91261239e SHA512 7e9fea4bf7c6818f8c8035eb9ff59f1c59731f73da90dc5661709495363b1c474f8e0267fd5967a956aba7643995150b960a9d67cbf8e7568e880c4dc4c35061
 MISC metadata.xml 616 BLAKE2B c35cac6f5810148c69a612d6b04ed4cacdbf066e61951ea1433336f14b2b058c4dd50530b547021007489122f5e94407b30641dc9ccf3b59a345e7a09e5fdd28 SHA512 eaf72a29601e96d5312120a1fc01a0b3dd2b7d8dbee70f6052e8ff7a7e07ae8b768d1417b7f4b523e755e5569092f2685bba77beaf3d7c455ccbd057cc9b670a
diff --git a/sci-mathematics/z3/z3-4.8.11.ebuild b/sci-mathematics/z3/z3-4.8.11.ebuild
new file mode 100644
index 000000000000..fdef20fc1775
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.11.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake-multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )"
+BDEPEND="
+	doc? ( app-doc/doxygen )"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md RELEASE_NOTES
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 2320f69388ba..aaf17e8a2f69 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/vitables/Manifest b/sci-misc/vitables/Manifest
index d8de7dd202d9..ae246935131e 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,3 +1,5 @@
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
-EBUILD vitables-3.0.0-r2.ebuild 909 BLAKE2B 75cc8fbd1e3e57e3057ec2c7ab764071bb80e5877d1d6d264262df6a17d7f927279aafc15d45f55d426d931c6f3bc010f8b41c317824f70a397149f06cae7d21 SHA512 88a9b0f279b00c63451845eed6cae777dcdb7a0eb45a3b4147d12a5a70a8a29bff2f913d9b3a902e3db1b16f63cfe95c78b4b50bf74eeb67c3d664e4d245b05e
+DIST ViTables-3.0.2.tar.gz 921231 BLAKE2B 5800cf222260f0d4c4c7c652f8ecab32b764f3555d7a19bc3aca6acdb68648b0b381389737a67f8b2d558ba09dc9f9837103a6c3c27ca6f7b9c0b0ca31bf8978 SHA512 d9b5fc0c5c31cd663a5ce8af415b8e7feef89b5d542933dbb8809961b9bdf325d115238526856f928e8326192e73c8cd84879566d569d70c6418921dac444766
+EBUILD vitables-3.0.0-r2.ebuild 911 BLAKE2B 0c21c4e3f0f78870b274fe9311e8fcc4891d499ef9884f1adc63b9152acf394cc3dfbb6f696c1510840a348b6cc5f691aeac4c731d4b77f6bfb0d778cd3bb2f3 SHA512 ba19b6c130b03552497268fef74e5a731a9d4e3704dbf867fda6d4701751a1c122f26e89e073af7c0111d2398d708479b941717f9a1e4555c4d90d1c00d66922
+EBUILD vitables-3.0.2.ebuild 871 BLAKE2B 4ec706f87683e20878c6d5af838c72b3a673ded2e59c4b96984a16c24c8bada30d1e31f9e55fa3b9b7fd767726e9ac8eb7046b0138e38003e8da3410ca4208b1 SHA512 f9699b5e8d0973d704cb8325986f7c02a6760fbbe07383206bfed5371f4340f4b2d8a07775fa34a056eb8657b17c68cd7c0b0f80f2197bb98c945cc190f3bce7
 MISC metadata.xml 637 BLAKE2B 5de3507f0c14fd0a8af230464a40a60f861433cddea38ea9490a00477f7677045845e48465d1684b0e93cc94ad6423b416e4993aabc23c793114c70365f514c6 SHA512 3e891f2f726db29eb10ae7f26e4dd30abeb8cc3d251b119c226cccfa6ca8fc90311dae6b96acd810e95423674fb57017cae938f48e213d4a873da2d9e9ee7789
diff --git a/sci-misc/vitables/vitables-3.0.0-r2.ebuild b/sci-misc/vitables/vitables-3.0.0-r2.ebuild
index 0bf8fafb5f12..9dcf272e5e66 100644
--- a/sci-misc/vitables/vitables-3.0.0-r2.ebuild
+++ b/sci-misc/vitables/vitables-3.0.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/sci-misc/vitables/vitables-3.0.2.ebuild b/sci-misc/vitables/vitables-3.0.2.ebuild
new file mode 100644
index 000000000000..d334a4dbd1b0
--- /dev/null
+++ b/sci-misc/vitables/vitables-3.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="ViTables"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
+HOMEPAGE="https://vitables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytables[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			<dev-python/sip-5[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+	')
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 32adfaafbeaf..cfc34a49569d 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/jaxodraw/Manifest b/sci-physics/jaxodraw/Manifest
deleted file mode 100644
index 1e41a54b457c..000000000000
--- a/sci-physics/jaxodraw/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST axodraw4j_2008_11_19.tar.gz 20930 BLAKE2B f2478df46f47c931bba71b1f43717d2d01a1a8282acc54582ed1ba5596dec8f03600e01f93a61ef4949f95a274a00b8ec62d2dffb283353de244950c4763531e SHA512 81bfcbd1b121104e0058654ac5520d0f570f9a915e9f6dfb8c52c11e9cf92f1e01c800182c2dc34e503a6eceafdff462b4f57dfa5bb5db979101a106c10d88c8
-DIST jaxodraw-2.0-1_src.tar.gz 3740719 BLAKE2B 0e5915e6a7d4214b272ec8f558ca8d2ed8607a646110f64993da9fc38f26299f67dc45cb6b6e0b0efe2abd6c22099711393683f8deff6874f4b1fd211d9580ca SHA512 ec5866ba03b6f3ecb01ce92f95aa90959153b92eb571f10764d4d10f2fb7a7a0d02a325eb221600526c94faadd53466cf894e4dcba7201e3494555a6330dba02
-EBUILD jaxodraw-2.0.1-r1.ebuild 1391 BLAKE2B 70a13896fb6722d36029fb20f3b608c4d185fc817487ab8672da4ee7f471c0d3b46c2a602a78523f87fd4f7b47656d2eb20d402b03a90201a34c573ea6325997 SHA512 2bc48162da541e335265d9a2c9fb7b9a3d1a64e0a588c5bdb10f006a03e13eb55a082c5af14b8c8c55952f5e1a7785605e404205ab78c0b2701a9b8b46ecb891
-MISC metadata.xml 314 BLAKE2B de15ff9538f435d67aff206e41111c7f1fb9ec23b79666476d82212c4cbee07f304b46d78efda392ca5740e0c54e3bc1cc16e7578cf626eeee53de147a4f98b6 SHA512 1f40f324bf0a347ef9bcd3345a6ae23890a29b7b436fc8508d0bfeb4df8bddfa3754807e63fa40f8978cd7109755ae5b056462beae202ba577ca588d29a30f8c
diff --git a/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild b/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild
deleted file mode 100644
index 4e03b5e6e0a3..000000000000
--- a/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 versionator eutils
-
-MY_PV="$(replace_version_separator 2 -)"
-
-DESCRIPTION="Java program for drawing Feynman diagrams"
-HOMEPAGE="http://jaxodraw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}_src.tar.gz
-	http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=">=virtual/jdk-1.4
-	latex? ( dev-texlive/texlive-pstricks:0 )"
-
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/JaxoDraw-${MY_PV}"
-
-src_install() {
-	java-pkg_newjar build/${PN}-${MY_PV}.jar ${PN}.jar
-
-	newicon src/site/xdocs/images/favicon.ico jaxodraw.ico
-	make_desktop_entry jaxodraw JaxoDraw jaxodraw.ico
-
-	use source && java-pkg_dosrc src/main/java/net
-
-	dodoc src/doc/BUGS src/doc/CHANGELOG src/doc/README src/doc/TODO
-	use doc && java-pkg_dojavadoc build/javadoc
-
-	java-pkg_dolauncher "${PN}"
-
-	if use latex; then
-		dodir /usr/share/texmf/tex/latex/misc/
-		insinto /usr/share/texmf/tex/latex/misc/
-		doins "${S}/../axodraw4j.sty"
-	fi
-}
-
-tex_regen() {
-	if use latex; then
-		einfo "Regenerating TeX database..."
-		/usr/bin/mktexlsr /usr/share/texmf /var/spool/texmf > /dev/null
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	tex_regen
-}
-
-pkg_postrm() {
-	tex_regen
-}
diff --git a/sci-physics/jaxodraw/metadata.xml b/sci-physics/jaxodraw/metadata.xml
deleted file mode 100644
index 5a55b59119c9..000000000000
--- a/sci-physics/jaxodraw/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jaxodraw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 289c08538590..baf27f568ec8 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index bfa7b8e2e77f..85d2b6932fdd 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,9 +1,4 @@
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
-DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD apparmor-profiles-2.13.4.ebuild 616 BLAKE2B 4edd168013f3e74682680cd9f6545ae831b075a18a4d316cc2e98ae10890977bbaac357bdb1b517ba7420708fbff5be4de184857e56587f669d3ddc7307f315e SHA512 badd1879d23544758ec5ba2085b676a37210fa59d7c1ae6e6d7ee36fdd7357fb94e9e0bac00caab3439cf09370b24d0dec4c0134d7f0ece267c5be505f2df039
-EBUILD apparmor-profiles-3.0.0-r1.ebuild 623 BLAKE2B bb06ee53c7a4ca1ea061f7449ad8d1dd924efe0be0fa331a11a6d02f9d6e39b184ebfec334dfeb9bbac7850a850fc47d00c200f99c0d41673bd2f065abe2a3a5 SHA512 bea3769e6f17b609131d5d0aa54f381288385ce7804fdf5331db541e8d1fb7adda11f3112fa1c8e6c756808346a8f2d009fe11b0aa3f146072a19dcf143b8a36
-EBUILD apparmor-profiles-3.0.0.ebuild 619 BLAKE2B 4b0d2efaba135e0ab90a6321f1bc4ca1e0d14772f6c4c882be90a99019b6d689dc26b088f99ed0e546120e84a9f3f627669c5f1adff8cf70090300e102abbce6 SHA512 66383f42f0dfc541b21dc6951bc9b238f8bff7dad1353b0b75fdd1fd8afb70f3979cc2f0b9aafbd1c88c649cf532689ebb1ce1b23badf58eba2fb85b49f93048
 EBUILD apparmor-profiles-3.0.1.ebuild 620 BLAKE2B 307cbe904ff2dcc267dab13b478c89cbb449c3eeeb4d4e3fc972c1ce3abf6ae8e86d3eb66fa9926f9856d3357ea0f0a0ca11d9fe5c33a0b1637a2910b1586011 SHA512 c334bb3c8b135a46a58db08f16dd9a9532c79d6f29e3d960263792243d412322d95676722db10ce752fd5f0faccd5cdc25e765d8615fd65a6b4af5b388b04fe9
 EBUILD apparmor-profiles-9999.ebuild 731 BLAKE2B a79150eaeea4626e1126dd612c7b1f58548fa9bb9a1fd786adbb03eeab2f05707b4a40d96691c754ec233a65a5eafbb5b7b25208f65356bcfaf2d819efc69277 SHA512 81d444b4577b3f23957d69cb14d1b0474047807567965a74b1fca7a86d48a1c2c370b163da3c780293170a86a7931e248a1e88430fb7bde736f19f7ad4431880
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-2.13.4.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-2.13.4.ebuild
deleted file mode 100644
index 0f15c107cf41..000000000000
--- a/sec-policy/apparmor-profiles/apparmor-profiles-2.13.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="A collection of profiles for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="minimal"
-
-RESTRICT="test"
-
-S=${WORKDIR}/apparmor-${PV}/profiles
-
-src_install() {
-	if use minimal ; then
-		insinto /etc/apparmor.d
-		doins -r apparmor.d/{abstractions,tunables}
-	else
-		default
-	fi
-}
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild
deleted file mode 100644
index e03119a08670..000000000000
--- a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="A collection of profiles for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="minimal"
-
-RESTRICT="test"
-
-S=${WORKDIR}/apparmor-${PV}/profiles
-
-src_install() {
-	if use minimal ; then
-		insinto /etc/apparmor.d
-		doins -r apparmor.d/{abi,abstractions,tunables}
-	else
-		default
-	fi
-}
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
deleted file mode 100644
index 46576ffed516..000000000000
--- a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="A collection of profiles for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="minimal"
-
-RESTRICT="test"
-
-S=${WORKDIR}/apparmor-${PV}/profiles
-
-src_install() {
-	if use minimal ; then
-		insinto /etc/apparmor.d
-		doins -r apparmor.d/{abstractions,tunables}
-	else
-		default
-	fi
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2759268d49e7..74f6ba07d672 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 353187705100..ede2a50e5abe 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,7 +1,3 @@
-DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
 DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
-EBUILD acl-2.2.53-r1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
-EBUILD acl-2.3.0.ebuild 1354 BLAKE2B 6463639b3008515864594574eefde4ab927ba559087d8f989beb1dca1f928ff73a583e46b7f0415a8e6d7a21a4930b444db811ed8cbcd39b89f79364a3a6cba5 SHA512 de765bf94d376c2ba4ece69c9750b717304676639a145362ee598e0b218cad21f1dfb151aa82df6f338d0944a26900788950220dcaf60a5c33e4225241578a8e
 EBUILD acl-2.3.1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
deleted file mode 100644
index 5ab955ac8363..000000000000
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal usr-ldscript
-
-DESCRIPTION="Access control list utilities, libraries, and headers"
-HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND="
-	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# bug #580792
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Filter out -flto flags as they break getfacl/setfacl binaries
-	# bug #667372
-	filter-flags -flto*
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable static-libs static)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable nls)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# Tests call native binaries with an LD_PRELOAD wrapper
-	# bug #772356
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	default
-
-	# Move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-}
diff --git a/sys-apps/acl/acl-2.3.0.ebuild b/sys-apps/acl/acl-2.3.0.ebuild
deleted file mode 100644
index 7ffef6cfc235..000000000000
--- a/sys-apps/acl/acl-2.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal usr-ldscript
-
-DESCRIPTION="Access control list utilities, libraries, and headers"
-HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND="
-	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# bug #580792
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Filter out -flto flags as they break getfacl/setfacl binaries
-	# bug #667372
-	filter-flags -flto*
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable static-libs static)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable nls)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# Tests call native binaries with an LD_PRELOAD wrapper
-	# bug #772356
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	default
-
-	# Move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 52b6b667266a..54795177340e 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,15 +1,9 @@
 AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
-AUX apparmor-2.13.1-makefile.patch 884 BLAKE2B 4400b00ab143c0ea3b1c14f996131fd023b66c01e694dcd9306d6e00f561f72a608df7a26e3692a8e851b0c91a227eb84d96fb5145b19535ee50ac61c37ec811 SHA512 c324d1dc2101e073df2bc6c3696396becb45e5c25e4c1d6797145554e0499c79353d3a2ad2cced18f42bb1cc315f8590ea2c1b7ee9a3882d5c483380f7c86c6d
 AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548
-AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148
 AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf47a509bdc41a93c886bb6cac60a126d9495e0825f9f76dd927b9b84a84154fc55f84bcfc9c934095b SHA512 06da247b62d6e612e0c48610c8c2e7831b9030659106482c8000758e591f3ce42b175210336b903e07b20eb5ef2cc3eb592424b06fe933449964e9c2262ebf35
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
-DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD apparmor-2.13.4.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919
-EBUILD apparmor-3.0.0.ebuild 1631 BLAKE2B 554f5fbdcdcde96debac49f3ecd615346c17f3f916f24b21ddec5970978d21e08450084cfd80135f273b153fe61596b96c55fd31b5eeef7f2b288c605d63c221 SHA512 4bd655a6fd9f99cfb1b53cba3a8441bccb864ff826f4e27c0bc91a84e7e35e3bd76a97b00f45c87aabf9d196be26b516a02d24f9ea22cccce43eb9ac77623451
 EBUILD apparmor-3.0.1.ebuild 1738 BLAKE2B cd4d8d6f808bb7c8475f24a8d1b36700d1ada1194105ff12d91da9d6e45cbb25479b3ccb6f41a08cc1473c2be2a78f12b017f357df003dd4572a04a4028c61af SHA512 0d2d0d9d17fdd4abc604d27fc4fcc5b62c3740186765ee6170967905996b00da5cb8b0543f5ca6f48e07f5d953fc8510fcb08981e55a21318a3f795ad3e8a4db
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.13.4.ebuild b/sys-apps/apparmor/apparmor-2.13.4.ebuild
deleted file mode 100644
index a4c693e37c5c..000000000000
--- a/sys-apps/apparmor/apparmor-2.13.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RESTRICT="test" # bug 675854
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild b/sys-apps/apparmor/apparmor-3.0.0.ebuild
deleted file mode 100644
index 36c5b717c4b8..000000000000
--- a/sys-apps/apparmor/apparmor-3.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RESTRICT="test" # bug 675854
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-
-	# bug 634782
-	sed -e "s/cpp/$(tc-getCPP) -/" \
-		-i ../common/list_capabilities.sh \
-		-i ../common/list_af_names.sh || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch b/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch
deleted file mode 100644
index 239ff81f5cdc..000000000000
--- a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@
- CONFDIR=/etc/apparmor
- INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
- LOCALEDIR=/usr/share/locale
--MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 aa-teardown.8
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 aa-teardown.8
- 
- YACC	:= bison
- YFLAGS	:= -d
-@@ -371,11 +371,9 @@
- .PHONY: install-indep
- install-indep: indep
- 	install -m 755 -d $(INSTALL_CONFDIR)
--	install -m 644 subdomain.conf $(INSTALL_CONFDIR)
-+	install -m 755 -d ${DESTDIR}/usr/libexec
- 	install -m 644 parser.conf $(INSTALL_CONFDIR)
--	install -m 755 -d ${DESTDIR}/var/lib/apparmor
--	install -m 755 -d $(APPARMOR_BIN_PREFIX)
--	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
-+	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
- 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
- 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
- 
diff --git a/sys-apps/apparmor/files/apparmor-init b/sys-apps/apparmor/files/apparmor-init
deleted file mode 100644
index 48877e4b6117..000000000000
--- a/sys-apps/apparmor/files/apparmor-init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Load all configured profiles for the AppArmor security module."
-description_reload="Reload all profiles"
-
-extra_started_commands="reload"
-
-aa_action() {
-	local arg=$1
-	local return
-
-	shift
-	$*
-	return=$?
-
-	if [ ${return} -eq 0 ]; then
-		aa_log_success_msg $arg
-	else
-		aa_log_failure_msg arg
-	fi
-
-	return $return
-}
-
-aa_log_action_start() {
-	ebegin $1
-}
-
-aa_log_action_end() {
-	eend $1
-}
-
-aa_log_success_msg() {
-	einfo $1
-}
-
-aa_log_warning_msg() {
-	ewarn $1
-}
-
-aa_log_failure_msg() {
-	eerror $1
-}
-
-aa_log_skipped_msg() {
-	einfo $1
-}
-
-aa_log_daemon_msg() {
-	einfo $1
-}
-
-aa_log_end_msg() {
-	eend $1
-}
-
-. /usr/libexec/rc.apparmor.functions
-
-start() {
-	ebegin "Starting AppArmor"
-	eindent
-
-	if ! is_apparmor_loaded ; then
-		load_module
-		if [ $? -ne 0 ]; then
-			eerror "AppArmor kernel support is not present"
-			eend 1
-			return 1
-		fi
-	fi
-
-	parse_profiles load
-
-	eoutdent
-}
-
-stop() {
-	ebegin "Stopping AppArmor"
-	eindent
-	apparmor_stop
-	eoutdent
-}
-
-reload() {
-	# todo: split out clean_profiles into its own function upstream
-	# so we can do parse_profiles reload && clean_profiles
-	# and do a proper reload instead of restart
-	apparmor_restart
-}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index a8f0077392cc..a16927a1edc8 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,12 +1,5 @@
-AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552004c7b7ce224898ffd8a362342703225e7015f896d2c97013194ea3a8e61768174265b42d6dc565187aaf1712062 SHA512 af131267a4cc22322df8234ce4abf8a27f917aeb801a423696a51f935ee40bf155206cf40b7f510849e1a276808502ab48ade0a520b3f06969c5df2415055fe1
-AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
-DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
 DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b
-EBUILD attr-2.4.48-r4.ebuild 2353 BLAKE2B 47e89fd3a2737de71b9a526c816b24ad0dad2c38c333333b4217fcdefd46caaa0148ddbe27ffe0baeb3be1517839a146c0e564fb1a00c67e1c01df2a441508ee SHA512 e384c8cfb28af3885e2ed1e5813d14f95af2081c457efb14757d4ed9a9f40c2ce9d007c2f28f3473d4743597bfe236c966c55f0784ccfc402ad4ae8270e1005a
-EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
-EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
 EBUILD attr-2.5.1.ebuild 2468 BLAKE2B 288f532b6b14be26f9bb2a0c0dd2076c0894fd50a424a11744aa142934bb2246c614a38a29c1bcded98b52fb7cf107eb3889181cd7a2e71fef23f57fe8e5098b SHA512 0c3d996b35bdb7ca12c29c14002ff9cc3b3c2dfdef46b1198b2fd212e4fe065da7a22086c5caef790ea0d866e9fae7dce66478ae372ec19462ba2639061637b1
 EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
deleted file mode 100644
index 02c33f7c1f4f..000000000000
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-perl-5.26.patch"
-	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-)
-
-pkg_setup() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-}
-
-src_prepare() {
-	default
-	elibtoolize #580792
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	tc-ld-disable-gold #644048
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-2.4.48-r5.ebuild b/sys-apps/attr/attr-2.4.48-r5.ebuild
deleted file mode 100644
index 2de4d8189160..000000000000
--- a/sys-apps/attr/attr-2.4.48-r5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-perl-5.26.patch"
-		"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-	)
-
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-disable-gold #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-2.5.0.ebuild b/sys-apps/attr/attr-2.5.0.ebuild
deleted file mode 100644
index 7465baca96b8..000000000000
--- a/sys-apps/attr/attr-2.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-disable-gold #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
deleted file mode 100644
index 49b4c1a57665..000000000000
--- a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 406eab7aa09da9df787a964d3c152c0bda6e23c4 Mon Sep 17 00:00:00 2001
-From: Troy Dawson <tdawson@redhat.com>
-Date: Mon, 24 Jul 2017 14:42:06 +0200
-Subject: [PATCH attr] test: escape left brace in a regex in test/run
-
-... to fix test-suite failure with perl-5.26.0
-
-Bug: https://bugzilla.redhat.com/1473853
----
- test/run | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/run b/test/run
-index 4b1f8d0d6134..07e916c41947 100755
---- a/test/run
-+++ b/test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
--- 
-2.16.1
diff --git a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
deleted file mode 100644
index 5691b15420ce..000000000000
--- a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Fri, 17 Aug 2018 14:07:31 +0200
-Subject: Switch back to syscall()
-
-Switch back to syscall() for the *xattr system calls.  The current
-mechanism of forwarding those calls to glibc breaks libraries like
-libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
--fsanitize=address).
-
-Those libraries provide wrappers for functions defined in other shared
-libraries, usually glibc, do their own processing, and forward calls to
-the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name").  In
-our case, dlsym returns the libattr_*xattr wrappers.  However, when our
-wrappers try calling glibc, they end up calling the libfakeroot /
-libasan wrappers instead because those override the original symbols =>
-recursion.
-
-The libattr_*xattr wrappers will only be used when symbols are looked up
-at runtime (dlopen / dlsym).  Programs linking against libattr will
-directly use the glibc provided symbols.  Therefore, the slightly worse
-performance of syscall() won't affect any of the "normal" users of
-libattr.
----
- libattr/syscalls.c | 26 ++++++++++++++------------
- 1 file changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/libattr/syscalls.c b/libattr/syscalls.c
-index 3013aa0..721ad7f 100644
---- a/libattr/syscalls.c
-+++ b/libattr/syscalls.c
-@@ -22,6 +22,8 @@
- 
- #include "config.h"
- 
-+#include <unistd.h>
-+#include <sys/syscall.h>
- #include <sys/xattr.h>
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
-@@ -31,67 +33,67 @@
- int libattr_setxattr(const char *path, const char *name,
- 		     void *value, size_t size, int flags)
- {
--	return setxattr(path, name, value, size, flags);
-+	return syscall(__NR_setxattr, path, name, value, size, flags);
- }
- 
- int libattr_lsetxattr(const char *path, const char *name,
- 		      void *value, size_t size, int flags)
- {
--	return lsetxattr(path, name, value, size, flags);
-+	return syscall(__NR_lsetxattr, path, name, value, size, flags);
- }
- 
- int libattr_fsetxattr(int filedes, const char *name,
- 		      void *value, size_t size, int flags)
- {
--	return fsetxattr(filedes, name, value, size, flags);
-+	return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
- }
- 
- ssize_t libattr_getxattr(const char *path, const char *name,
- 			 void *value, size_t size)
- {
--	return getxattr(path, name, value, size);
-+	return syscall(__NR_getxattr, path, name, value, size);
- }
- 
- ssize_t libattr_lgetxattr(const char *path, const char *name,
- 			  void *value, size_t size)
- {
--	return lgetxattr(path, name, value, size);
-+	return syscall(__NR_lgetxattr, path, name, value, size);
- }
- 
- ssize_t libattr_fgetxattr(int filedes, const char *name,
- 			  void *value, size_t size)
- {
--	return fgetxattr(filedes, name, value, size);
-+	return syscall(__NR_fgetxattr, filedes, name, value, size);
- }
- 
- ssize_t libattr_listxattr(const char *path, char *list, size_t size)
- {
--	return listxattr(path, list, size);
-+	return syscall(__NR_listxattr, path, list, size);
- }
- 
- ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
- {
--	return llistxattr(path, list, size);
-+	return syscall(__NR_llistxattr, path, list, size);
- }
- 
- ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
- {
--	return flistxattr(filedes, list, size);
-+	return syscall(__NR_flistxattr, filedes, list, size);
- }
- 
- int libattr_removexattr(const char *path, const char *name)
- {
--	return removexattr(path, name);
-+	return syscall(__NR_removexattr, path, name);
- }
- 
- int libattr_lremovexattr(const char *path, const char *name)
- {
--	return lremovexattr(path, name);
-+	return syscall(__NR_lremovexattr, path, name);
- }
- 
- int libattr_fremovexattr(int filedes, const char *name)
- {
--	return fremovexattr(filedes, name);
-+	return syscall(__NR_fremovexattr, filedes, name);
- }
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
--- 
-cgit v1.0-41-gc330
-
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 3a2a6595195a..6851a06adf6d 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,6 +1,8 @@
 AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
+DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
 EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f
 EBUILD bolt-0.9-r3.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
+EBUILD bolt-0.9.1.ebuild 1349 BLAKE2B 06096ee9038a236782116306126ec7838827788173da85f59debc72ff70cc1ff71ee3f48f0a5b293990609fca2d0770ec3a6e68eb6f3225b3fd06873f2c6d3e2 SHA512 1c207d5b6d983700e1d6bbf04c5e8339203a6ad1da70ec74644f67c6df0f8b0562b99af905ea744c14244917c74081c67bb0ada05a2c4d128ac68ef651ca037d
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9.1.ebuild b/sys-apps/bolt/bolt-0.9.1.ebuild
new file mode 100644
index 000000000000..34cd766665ec
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	dev-util/glib-utils
+	virtual/libudev
+	virtual/udev
+	dev-util/umockdev
+	sys-auth/polkit[introspection]
+	systemd? ( sys-apps/systemd )
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 5 6; then
+		CONFIG_CHECK="~THUNDERBOLT"
+		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+	else
+		CONFIG_CHECK="~USB4"
+		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
+	fi
+	check_extra_config
+
+	CONFIG_CHECK="~HOTPLUG_PCI"
+	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
+	check_extra_config
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index a9b88e7377f3..eb074e618f38 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,20 +1,17 @@
-DIST c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz 24719 BLAKE2B 817c03739f56a3b741120896f98089bd6a379395b2f8e99697a79a3a2bdc855358a73b079434428c416373821e0e134acf6e30ef9bb9a384d25438c633e02433 SHA512 6a237100e66eef2413bf498d97a8fe1ca1b568df1f99276603f0b1627437a7f5741c38068cbafc49664f2a0438785a0ef7fb1de0fdb6768741585f1606d094e2
+DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
 DIST c-dvar-eeb91604574f7c5b12b270f8355f7e6cf1720f4c.tar.gz 24723 BLAKE2B 5206b4e85cdeffabc91e0feca17762ce10bf69815bad8d739af5eacf499ee4fe03058db1d2f4b2fe06cd93fa48eb637e68b50726a40e8b431f0fc526f830f114 SHA512 21d793ae449290c21c98904a43482ce1cbdead9fd1cd857214feeedd2e04e829f6ec4a8372f6b237eeeb5fcb5f96901ef8374d497afe6f70316f6a944a385443
 DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
-DIST c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz 13950 BLAKE2B 2cec6d49f7e698ee7f9514f8726c7c01dc72d2c186832122efcabeea37e082d0922be742c83f69c1ef93a820575c05dc2bb10790b41c2491e8c3719afbe5a37a SHA512 a3e82a24dc8119d90d573d87f5d92f24029490cae1564f66030f6781c95fa50c2c720378a8fbd07511007f1f53debbf62ca9ea86fdd905c42f325f28f35bd876
-DIST c-list-96455db9f04a6c9101a00957161551aea700b6aa.tar.gz 9221 BLAKE2B 3caa352a7be8ece056e69afbf556530f0a134f4fda987f4b46ec26e8b97d220726853b532a0479019374e90c06c9e1ff82198b04805b48db0a240d7929b08590 SHA512 ed4deb39dde17a57f4c8c9c8320e0df0cefe9a761fe5d684ee9a982d2175c5fba50c9fa29059844e96f46b008a6dc1ac1d17c47b1b52fc057ccb55dc7bd85148
+DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
 DIST c-list-f1eadf27377ef2f74b3cfd16185f54a219df2aae.tar.gz 9350 BLAKE2B c2db7f5e67f9575362c059545f3fa0bef4672e1195aeb57edbf50d8265e72f120540178cfaee8f49e0a9494e3ed56a4a10d23de237035d15b529dcfc47184da9 SHA512 c2a0f21bbf90b7dcfe9858aeb4f141202a7f5d7b980189f7ec6dec2eed9b70d78b82be5009ec7ae1a99911e2489a1734b8017cfb709d7625addda5b1a738dff6
 DIST c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz 25957 BLAKE2B 76b67a5efeafbf68fe3f1db732d1ad878cee7c23596dda096649c30205582f3d7fca99c5b99ced69b027cd3100351da03aacad00c3aa24d3a0604b09093ecb99 SHA512 57305a5a438a2dd69662dec02117d2636e50f901cb92a251c3844a343108ebeeaa208bb09dbeb22dc1b8d1171719442f4ccc248d89909cdd7310b7db6cfcd6cb
-DIST c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz 25948 BLAKE2B 82e3692fd747191fc160ae5add4e037696f9209f7ef3003bcb72def18c96a7368b5e6408d38de6c0609ef27fa6762d9323a85e0ab5d1a50d8b10cca99b2930d1 SHA512 9ab0c6062e5cfb771c4f31a9c8d82f744762d2f9acf24849bcc6f04de57e85fc0f8487ef8c8484e2e0f0baec83a3011b1425ddd183c2836f90906636f1db8d94
 DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c705c47ca22dfb3cb0a277ea96156806d1c0e9913da48a2baeea4e2e455e7f417f48db24c94770b7e471655a1c109a23679ce11ed802447e0b41ac3c60f822e SHA512 499fb764a2f72e1151c0007975720b56912f88f0ef92bb88c6b1870fcc8e815af8b377e1e6fb9829426757781134d9ec20cf04cda273ca2a5c128705b36dd3ef
-DIST c-shquote-95e4713a0de475688a5727a5d776dccbc69d3d28.tar.gz 10635 BLAKE2B 90dd5c343dcc7de13a7cc5a495052c058499fb7fcdf44d5463a45714ea8e330fc3c9756c84302f454cd46ef32801b74962d9e49ab930ebc6729cbdb1de9e8056 SHA512 494c55cb676998afc56e40f00661f49698e596a51019e9f227b111b4f16d7f2e65056adc57858c688957a07c972dadd217af2bbb95e390760ef758259e54a769
-DIST c-stdaux-346623b40eb8137cae7568a69ee42253ff098ff7.tar.gz 13046 BLAKE2B 19b22cc7cb6f4a5a970295a36ceecadf8d1fbd93524a39a22107c73df63516c643be711483aa0ca3fdb97941a9a41084802def7c6663824e7660908564f3ad96 SHA512 424512e8818ff56a9882806aa9879f4f5167ed02a19d01cffb42de620816318746898c27d9ccb857b466435d1a588d735ff51da45baa08f9b892dcef18ec34ce
+DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
 DIST c-stdaux-c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4.tar.gz 13054 BLAKE2B 9a550b2eece549f9e7dbc6c69aa58b940e933106cca931a503c12220b3632bf1d48bcd1a2d6fa3a9f3e29e34fbd5bc11eba1751d05a9db40d0c2af21d8e1e066 SHA512 a138d9a8672d63537e6c082946777bdd62d651e837121bf180d5ad0591d12fe2b13fc63499da39a68d2e3ca8da6a0826701ae4807ea78d5a7604e9f2d28760ca
+DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
 DIST c-utf8-8a8f07d623492d4b45532527f945b118a2b4299b.tar.gz 9331 BLAKE2B f5b380da37ba0fcef7f8324777180683748639dbbcaf8b16dcc3432cf69b58caed7b93c2de0ef590876ae7c2ee9fa02a26d8ae94c1fc58281812ccd9b705eb17 SHA512 04a3e4e744ae50e9e06080b05d4ad8bb08ced945dc42625a4c47e47feccd2dbae1205555a8857c98f344357c28846cc5d7273bd5fe2e13f454c4d11ee1303b28
-DIST c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz 9331 BLAKE2B 32b6da3f92e25d3971abea08f336856f44e9180e73d776058c473a8140ad519b7b614177445f4e143e56276795d04127ec8c8c01561935683227fb2c391a51cd SHA512 84ee285d90d1a899a75e1fc63931d10ff1b652bb06b19b0916afd0a3af5c359628e2ec2951ca987a8a6e6cdfbe73a286bd5a664c24e9998ada6c29f3c34752ce
-DIST dbus-broker-27.tar.gz 215070 BLAKE2B d7f12c588b3f11434e33c9eec603f2d3f8caa5ae892aa7951f98b533cbd05bbfdab93dd639c64975e79ffd8c7ca19185bf3e8b8f9546237a3686aea0a9f734fe SHA512 e33e48d7d29cb16f5aa10c7b5b98d85b9055adedcb2c4bda63113daa52597f9b322eeb1e128b7e6077378953b41914316485373b614a9a3a7f21cbbfcf5bec2b
 DIST dbus-broker-28.tar.gz 216484 BLAKE2B 8d8dd9d15efa8c276d6db5c4f50320c7d18498c93205f9cda2bb849b781def17c387d5768ef62963024ee99f163ea1a72e457098612a9e6cac39238f3eac533e SHA512 d8b8e0c665e3c0e33f50da99330ff4cfba8107bff2c7e03a9653bd89f740e69ed1dce750c7f737c78454e07294821ff545007f3927f12d7f35f53339e4747791
-EBUILD dbus-broker-27.ebuild 1830 BLAKE2B 8b7e73a05cc9fd084ae5d75033f66c48d5fd8c7e5768e3bef49e76b327dfc9cae190e62b20c30e9810a3a53464d940462de5ebfed221a9138cad54d13e953f73 SHA512 c4402e82c3e4018141d0800f380858b6490529cfef94cf3dd8ebaa5cbc3197889896fbd513751a0d3e3b8608c36cec4f39e0cbe5bffaf41ef9afbd83c7aff80c
+DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
 EBUILD dbus-broker-28.ebuild 1830 BLAKE2B b12f4e076b1744abfb216f5e37f6fd5f589d43546ad3b652fa181671d3ccbc865cf300cf720d4aa89ee72794c61650adaeab104c2b9340f51ad23ef65c580ae2 SHA512 9bc28978b7c72b6b22790cec8335ee9450c09a7cb73e3b4083227cbf9124eeebb7870c575f64dd133163fb81d9776dd264759111a315f96bdf940ed49296b7bf
+EBUILD dbus-broker-29.ebuild 1836 BLAKE2B 540f87666d77363175c649b9ddf09889a84ea100d141c3e7b4ffa0f4b8b1188b938ca0c1b263e06bd33506e16e3654b272159e41b554071efc74b300606330ea SHA512 8402b53054399a02940d077a4178a5a1072935f5e7be7063fc120eb815bb1e42124ce6d7a64b399495e035814a4ff4a11eb27ed22f9deec89a4ae0a0652e70db
 EBUILD dbus-broker-9999.ebuild 1830 BLAKE2B 092eea3b81cc65d389c477ed3c1c16473628b417bf262f6609ef62edab4ce1da2efab34a278b66b9704944f3f5e9ada19e37dac40a13051c3eac03094f543c5f SHA512 c6e8f582a8d26de067f0cea6399750c6b93cbc856282a09e76630d1614ea559117f513b7cc59dc2a1dcdd98800f9012d17f16be69f712dfc4d7673ffda43534f
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-27.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
similarity index 76%
rename from sys-apps/dbus-broker/dbus-broker-27.ebuild
rename to sys-apps/dbus-broker/dbus-broker-29.ebuild
index da12f461b58b..bd41cc4d1b87 100644
--- a/sys-apps/dbus-broker/dbus-broker-27.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-29.ebuild
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=70f0f21e86a34577e674e202d5d09ef167102f02
-		[c-ini]=867f06a12a702c6869924575503877caa0adde75
-		[c-list]=96455db9f04a6c9101a00957161551aea700b6aa
-		[c-rbtree]=a3b1f80548d1c736208c55e9251c49ada649dd62
-		[c-shquote]=95e4713a0de475688a5727a5d776dccbc69d3d28
-		[c-stdaux]=346623b40eb8137cae7568a69ee42253ff098ff7
-		[c-utf8]=af5bf7f330078d285e5f58584abd6de01c4cfd7d
+		[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
+		[c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
+		[c-list]=a0970f12f1f406a5578a5dedf3580cd682e55812
+		[c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
+		[c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
+		[c-stdaux]=8652c488b8f1c29629a5179d4551d0a691ae5901
+		[c-utf8]=0837214a9780b7d771a3b3ce9a49196ac0a9d52f
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
@@ -36,14 +36,14 @@ IUSE="audit doc +launcher selinux"
 
 DEPEND="
 	audit? (
-		>=sys-process/audit-2.7
+		>=sys-process/audit-3.0
 		>=sys-libs/libcap-ng-0.6
 	)
 	launcher? (
 		>=dev-libs/expat-2.2
 		>=sys-apps/systemd-230:0=
 	)
-	selinux? ( sys-libs/libselinux )
+	selinux? ( >=sys-libs/libselinux-3.2 )
 "
 RDEPEND="${DEPEND}
 	launcher? ( sys-apps/dbus )"
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 43b6bbef6456..215717ac07dd 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,7 @@
 DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
 DIST flatpak-1.10.2.tar.xz 1507856 BLAKE2B b19b04d536b43a7bbb7f479e495538137402ff46bee3be5d180d12983c4e69b8726628bb69aea64917163a4722a34987b631a073c94083cae50d79dd7d74db20 SHA512 c932b9aa2803aa5b453917174bf282d82924aca7341d72555e2557fc588ccefa0eaf32b956f75752c17cd8f73b687d4a688ebd64df36680b80b5ff5750468597
+DIST flatpak-1.11.1.tar.xz 1534700 BLAKE2B 811ac946fe6616d201ffc621881b396b6787ce435bdceb34c9fa3e162f20eba966d88695bcd6e3716b1f949976ac628a085249785c4e39989be5139cd89fdfaf SHA512 0121b4fcf159311c7480d1be29cd169a39ae61fcea9532f25b266b585038a07a930ff418a9c5b9645aab2510de78ad32c8ae8556991c8d2d7c08ab1e3cc819d1
 EBUILD flatpak-1.10.0.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
 EBUILD flatpak-1.10.2.ebuild 2346 BLAKE2B e74ae812d21e8d3eb73924c3b10818c502f5d072558206fcb8bda1e3491ca1f6bd52e7cdc1d51f222b7aeb5ec6bcc58dd1f3c890eae1e10508b686057bbd28f0 SHA512 01e277ddb3e6025dc856deb2f01d6ee50e4d2af37940b38fcea6c32a91c6b73a3590073880edc95bd18a3cc4d25d0c18e46ab9a11d6334737055d4aa1d9cec1e
+EBUILD flatpak-1.11.1.ebuild 2346 BLAKE2B e74ae812d21e8d3eb73924c3b10818c502f5d072558206fcb8bda1e3491ca1f6bd52e7cdc1d51f222b7aeb5ec6bcc58dd1f3c890eae1e10508b686057bbd28f0 SHA512 01e277ddb3e6025dc856deb2f01d6ee50e4d2af37940b38fcea6c32a91c6b73a3590073880edc95bd18a3cc4d25d0c18e46ab9a11d6334737055d4aa1d9cec1e
 MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d
diff --git a/sys-apps/flatpak/flatpak-1.11.1.ebuild b/sys-apps/flatpak/flatpak-1.11.1.ebuild
new file mode 100644
index 000000000000..6c69987f33c5
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.11.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc gtk kde introspection policykit seccomp systemd"
+RESTRICT+=" test"
+
+RDEPEND="
+	acct-group/flatpak
+	acct-user/flatpak
+	>=app-arch/libarchive-2.8:=
+	app-arch/zstd:=
+	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-glib-0.5.10:=
+	>=dev-libs/glib-2.56:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	dev-libs/libassuan:=
+	>=dev-util/ostree-2020.8:=[gpg(+)]
+	|| (
+		dev-util/ostree[curl]
+		dev-util/ostree[soup]
+	)
+	>=gnome-base/dconf-0.26:=
+	>=net-libs/libsoup-2.4:=
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	>=sys-fs/fuse-2.9.9:0=
+	sys-apps/xdg-dbus-proxy
+	x11-apps/xauth
+	x11-libs/gdk-pixbuf:2=
+	x11-libs/libXau:=
+	policykit? ( >=sys-auth/polkit-0.98:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13.4
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	sys-devel/bison
+	introspection? ( >=dev-libs/gobject-introspection-1.40 )
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		dev-libs/libxslt
+	)
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="
+	gtk? ( sys-apps/xdg-desktop-portal-gtk )
+	kde? ( kde-plasma/xdg-desktop-portal-kde )
+"
+
+python_check_deps() {
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~USER_NS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# This line fails because locales are in /usr/lib/locale/locale-archive.
+	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sandboxed-triggers
+		--enable-xauth
+		--localstatedir="${EPREFIX}"/var
+		--with-system-bubblewrap
+		--with-system-dbus-proxy
+		$(use_enable doc documentation)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable policykit system-helper)
+		$(use_enable seccomp)
+		$(use_with systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 90c12be2d8fc..f123f824d210 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,9 +1,9 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
-DIST less-586.tar.gz 351861 BLAKE2B fa3d4eadc740d751daf5303867c2ecf411663b64177e14544bdb30aa1b19c1414020b53e27a1a0666cc1922781a11c44ff1bac0adee4e784edf4ca82913596a4 SHA512 14579e1c682e0c30d614e85cdd969c007ecb613930376a46c0c5614e02c596ea0d0ab50211ed28095206ea70698fd1ccf6762888dfa149773d7b515cf3b2ca7c
 DIST less-589.tar.gz 352390 BLAKE2B d91eaf0e4a3c14bb8a1c1b820965922c9e795cc8c6489c04dad79d14bc634db1e8e20aae9578ca5375d4d1f1fb861a510527ee9433437457d653453eabf5dce9 SHA512 c2a610c894e98853e73d83cf2c7e94ff75a868280b2ab7fa01676c35d35fdbba808f3630fa4954eca40f0823e654df4c287885499bb24f4d0b7b4558fb91977e
+DIST less-590.tar.gz 352574 BLAKE2B 0f640f1b6b4d4925c4904ee77460e8becd2dae168fe5c1483bf6a9cfabe9eb0abdc4d4811507ba88a2b4cff6c238158bd8b4463b63d3d7863b44ce8538d32adb SHA512 426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903
 EBUILD less-581.2.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
-EBUILD less-586.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 EBUILD less-589.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
+EBUILD less-590.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 MISC metadata.xml 383 BLAKE2B 5f11eeb30186e0e73c0c06f244a6eef420b756f60a15fc992cab99deebd2b0d0056d4a12628e9a5ef9494838b1a81efa11567a99182976d7bbe3db048c058d8d SHA512 cf7a569bd5f70879f8c5d8a732213295d53a49c288143523723d6970a176e90fe678e2c2bd76eca630a31deee69a386c498884ffc4b24f8622cf8a60a80848b4
diff --git a/sys-apps/less/less-586.ebuild b/sys-apps/less/less-590.ebuild
similarity index 100%
rename from sys-apps/less/less-586.ebuild
rename to sys-apps/less/less-590.ebuild
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index a0d73a6ae268..95d7dda0a210 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,3 +1,5 @@
 DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
+DIST lsvpd-1.7.12.tar.gz 90806 BLAKE2B 1b55c463602105c36654f7baaf5d7c8f27ec045f35a648e87327f5b0b1c19ec62f5701a48d51114435dc5edfc503b78c35eb109a7982d6e6c10df4dd0d20e4a1 SHA512 0a37a580432004c359080edd2b07ea44a68dcf81621e0ec3a89cf7c4ca0f64a29143cee154a8d39c1411f64bf229a8a19f10d9f2c95971374b97a4c05b1c1523
 EBUILD lsvpd-1.7.11-r1.ebuild 582 BLAKE2B 34afe81d81a3a2a012a8c3f54eeca008a2cf2b9dc14bf8aa0b2f43a65c9b068370bf57a25655a378e39e4c1878460c0fec4d8f21edbc698d1d0154d7ca24e230 SHA512 ae5640d4f8fca09cf00d23e7d1accb9bc80cf809cdff7febdd1185e99043273f206bdd6e75569153f1b680e45dca78d8e719aa2d80eb5c6d3d011f9916abc79e
+EBUILD lsvpd-1.7.12.ebuild 599 BLAKE2B 1ad60516626735e8d159892fdc8afdf1864d8ec468eb3c192a84d739d8cef983d853444a21c84b7b949bdad360bdb42b504e36d361ca26f7ac39f13abad5e6cb SHA512 01daa8ec44f644ae5dae5a4729a46858e72c55a2c79eb6ec91a0c5e92ae58b50d390cadba8ccde3d6624f9723a4a9f098763741cbaab83f25e0c543bb85312d7
 MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.12.ebuild b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
new file mode 100644
index 000000000000..915b79c32135
--- /dev/null
+++ b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utility to List Device Vital Product Data (VPD)"
+HOMEPAGE="https://github.com/power-ras/lsvpd"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	sys-apps/hwids
+	sys-apps/sg3_utils:0=
+	sys-libs/librtas
+	sys-libs/libvpd
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+BDEPEND=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 31a70a880c5d..dd754814159e 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-20210426.tar.xz 118640 BLAKE2B 934e738ede6b261d59fcb30e3c12d64db86ece75977709cbd59b2e105297731e1bdb6687b0d4cda80972ba2a20cc445edeca289c49bc5d056668bee5066d1216 SHA512 b5c2ed444559dfd1903e16f6c29cfd55cd279a789db93e7b5a0dd450ee48a3bc07cf59ff057220b8ccf1097a04ca1be4cd77c10fea292570ac58893fd788c0fd
+DIST osinfo-db-20210531.tar.xz 118600 BLAKE2B 5068014ecfe5bf213e5dcdaca392701199362297bf7bea0793f7add21602285e53184a48a7743da3d02427bb5eb94062f222fc83e0b46d4052039b562a692d7f SHA512 59fed0d89865958338938b8129065f7416813602d190f41c06817c6ec7e634cede7a306f8cd3797cda37c276efb11598448fe1ce215a9ecb5df9135418cff932
 EBUILD osinfo-db-20210426.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
+EBUILD osinfo-db-20210531.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210531.ebuild b/sys-apps/osinfo-db/osinfo-db-20210531.ebuild
new file mode 100644
index 000000000000..b76468286d57
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20210531.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index cd64588b53ef..1ab6abc18e72 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -7,6 +7,6 @@ DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29ead
 EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
 EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
-EBUILD pkgcore-0.12.1.ebuild 1094 BLAKE2B 6ec36ecd65e23bd06903eebb6948bbbd1c663835d6d1663ade1b9918129b57324ae43b9b9d742c2d5ebc95ca789536b70b4296904fd8b60b64c1df71ecda84f3 SHA512 0ede3350b8b405e782b9a8371523af0de521bf10af6ac2dd4087d9b6729d23aa13a36a06e04253f63540a087d61cb5aee595f058674cce7bff18deea975ec6f6
-EBUILD pkgcore-9999.ebuild 1081 BLAKE2B f59f5bab0d4b3f26c2dddcdb8bebe550aa89462cbb9c4c7aadee461b17679dcd3fa39e37208a8853532592a235d959838af6c17bd6c807381db110a8c35a5205 SHA512 b6fb191a3d84a189f45f1ed6c4ebf2bc02fd729688b10ad98b7bc5767ac0dd16e07f052d015e93a84e21a0e3ed1d6c82f8328a926e24b21ee3204863a6ce1d07
+EBUILD pkgcore-0.12.1.ebuild 1095 BLAKE2B 917f74c8f372ca977fca3583b826c4be4133f6ee309974ccf5dbca85feaeedc4c60684a35e5ca181a8d704dbf893618b276f4dd4711d083766edc98c34d3104c SHA512 c092cd782306f476e1a71cb118a76fc53e8964b73b23a030eeb8c48ef73b12d69e2bda7803df6c356dacc6aff9b141b8c801e2739ac71875ec86780a2512da0f
+EBUILD pkgcore-9999.ebuild 1095 BLAKE2B 917f74c8f372ca977fca3583b826c4be4133f6ee309974ccf5dbca85feaeedc4c60684a35e5ca181a8d704dbf893618b276f4dd4711d083766edc98c34d3104c SHA512 c092cd782306f476e1a71cb118a76fc53e8964b73b23a030eeb8c48ef73b12d69e2bda7803df6c356dacc6aff9b141b8c801e2739ac71875ec86780a2512da0f
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.12.1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.1.ebuild
index 864adb52ae14..be4a8d5836a1 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index cdd33c35e9c6..be4a8d5836a1 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3a7f2091f3fe..1d6e98155145 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,6 +9,6 @@ DIST portage-3.0.19.tar.gz 1347687 BLAKE2B 86eea08c2559b2d5a3eac39d8f75233807697
 EBUILD portage-3.0.13.ebuild 8441 BLAKE2B 26181a21486c1bbe225c5fdc09989fe1f9bdfe9c35dcb4b1dce6ac27a9248eef59b5ad518a8b1b20e9debb61b7079d2b8e08e6c27a9431875fd64a5d56c2ae45 SHA512 e1d17faba9d4f2f8ae9506b119eb5ed5353f84e6d6bf583696d8d48722dbb539b88eb4d652fd68c29367cd1ddbdf721a0f470b4da3d45f21b8cca6e11a5a5291
 EBUILD portage-3.0.17-r2.ebuild 9209 BLAKE2B cacc19c415c8c8a7982752319f914c66cfcd6d49972e71056350ff6cce771b48ee39a41298510eb42e7a5d04d06a9a683f558166bfef3c4356fe4a529a3fe50c SHA512 f5764228b3d0503b28a3cf941712ce62bb0dffab044f2a7c3e7e7b4309d87286996a9be20e7db2da915ec8cd51f1761147e634de5a148cb00b2acd69bae05f6f
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B 27048b15c8fdcae36bd51d56edeb0838b43e77a284930071833901f1484e14617f06090cdd1ed2ce6a166a78d272d9a37193b4d52f93942e9df1203715e09ae2 SHA512 38525aed603cfc379ff01f48f3bf3aa040b5355576c46515724350401ff948772b9aeed2b088f7d93805776ef4a55d32e02afa24b47cdfc7f298437c9019920a
-EBUILD portage-3.0.19.ebuild 8511 BLAKE2B 9dbbc946749fe3a72a9349a2dcf9275f6a7c89605945347f3cc60acb74f2c5fe40dce2f276af2004e282c5d8727c40c09727a4b89358cf6800dd5f7cc53ffb44 SHA512 dfb2ef3fbbd814662f5745d2681b6c2113882c8480693d2487999aa4a7af044821c3980648c7052d5ac20cee6dba8cf104f3f517a128f800f0511dc0c530d974
-EBUILD portage-9999.ebuild 7776 BLAKE2B bef58d44947c861ca20767e5204ce67b51f7b63a7209b13e2761a97dce73b60ea153cee09b44769501796dcf50bc45943f3b3631f6c80f22a6545aee75de303d SHA512 0049bfc2225ee65073f56e498237b2862a688d083fdb6976bfe983b5c02722254f656e6571eb71c159b3e7b9daf400e513dea87bdb4001dbb55d2976a14458b8
+EBUILD portage-3.0.19.ebuild 8512 BLAKE2B cf8d97e8264830926303904e20b424a37f920d1431cbe3f4e352dd2416a1e7fc1546c8bca0b126da9ed1e111623557e4591b1c061df8a5aeabecaf94f90d74f9 SHA512 ff252978a99c5dc4fe7ab6cc8192eb9881d6b229d5933a0f10f57ca190b46c67f9899ff2ac16308b713ec43d3a01d4aac71bdc0f017d57e059c6c1a740c09083
+EBUILD portage-9999.ebuild 7782 BLAKE2B 807fe6fe4aef995e67d2a1af8e51f1564bb6598be720600943adcf41dacce4f22f1f7c6eff9d6f2a0a817d893b983460eee1578b6da402acf6d69ed2e6e7c23a SHA512 e99bb356b89ae7d00cf97c76d2a03145465a75e191f4a6039a2f3a082e553ee4ce6065580beecc7d6ce7470e8236b773cf40c9fc372786033ed30694deb05b10
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.19.ebuild b/sys-apps/portage/portage-3.0.19.ebuild
index e6511cf77da8..224927214274 100644
--- a/sys-apps/portage/portage-3.0.19.ebuild
+++ b/sys-apps/portage/portage-3.0.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 90088d7a92e7..43cd42a90737 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
diff --git a/sys-apps/ppc64-diag/Manifest b/sys-apps/ppc64-diag/Manifest
new file mode 100644
index 000000000000..b76692980cc9
--- /dev/null
+++ b/sys-apps/ppc64-diag/Manifest
@@ -0,0 +1,6 @@
+AUX fix-systemd-unit-path.patch 1539 BLAKE2B 78865aea8745102e34a0f29884d21efd768b59de7cca660af4d9866edd4755ab18b3563a37d2e184e3ec75c81378e06df9b06f764af6e2e851b693c017a0f4bf SHA512 2091c4d553c57b2a23dcf02d477c379c1ece870f572cfa12478fd339b8b5272320cd53f63ca4a22a911689ad3de73b011f0937dd8da5810e32ce6be2dfb0714a
+AUX opal_errd.initd 374 BLAKE2B b463e484e60ea63afd2c4f27a4e8330ae6733ecd3e6925b4c1e7333022ff1bd895da29343a7dbf1e92a88c9b204b691d64450c3847dacc8329678f2c9b55cb21 SHA512 1e6e363dbf59d3ef96e724d37d9dd6e764a145cbaf3cc18007d9da50dc5c2ef4effef50282daea93db62ae6722cb6857060896ab5ff76b7348d42d09926b2b04
+AUX rtas_errd.initd 371 BLAKE2B a5367e20d7732fc0b778349e740351fbd55049a08e456a859fc5d8a2e06418bc865b7ef5d27fb3ba420bb008ca7ee5b4781fc41393716d6e502cb691f602805b SHA512 a92128d9b5e31d1206999123734924e8e24833beba4e39b067fbb38bb16cbf174d1dbd51a1d27f294ba95da849020fd60e737ada35db98a7b6210cd06375c1de
+DIST ppc64-diag-2.7.7.tar.gz 423357 BLAKE2B b32def540811f383e401d352d17f2edce6a998a91a7b27bcab981e42469f44aaa505104ed2d2ced8a85485c0886525ff5128b36cdbad3a8eed90e8002877498c SHA512 42d94214345ab8deb7bd9ee8b145052fc2f733ba13d1567dbe6592fe9306670e3cd0ab6122e515464f7050753a992061c056e009673c7f8f6e554e9eaf75c550
+EBUILD ppc64-diag-2.7.7.ebuild 1557 BLAKE2B f2625c84268207eb112f92318383567e347b4b4286da37d2c5c5e5ce24078e54430617176cb9e22f0170663e5a36d13309fd18c4c2f2e0eac6243cdc690dc225 SHA512 d4d3b3ecf072c68a2122ebeab58e724a0b497c1911591f4a5ebc30c84fad819d0f6eb5e4c5c8ba5891f1600ad936e9a6e9af77a3049710723dabfec75376050f
+MISC metadata.xml 695 BLAKE2B 12340096c077aee8e8263122e2efd0faa820a59176e2de793a33bc5c8fffbcea0b35c64f4cfff1ee1d512d65c0f3ea3ab4db1f763026273e2301e944096e577d SHA512 e9d9a9c0ce46172df609a0e3a195060527da44141ecef0e2eeaa9555b20bf7aaa37a359af47dfa34ce77f297a8cda1348da699b14081c45469de98c635b7257a
diff --git a/sys-apps/ppc64-diag/files/fix-systemd-unit-path.patch b/sys-apps/ppc64-diag/files/fix-systemd-unit-path.patch
new file mode 100644
index 000000000000..e11feca7a49c
--- /dev/null
+++ b/sys-apps/ppc64-diag/files/fix-systemd-unit-path.patch
@@ -0,0 +1,38 @@
+From 60a26c23d2d385e62a006d68074ca25479e10639 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 15 Jan 2020 20:27:31 -0800
+Subject: [PATCH] fix systemd unit path
+
+---
+ scripts/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 29dcb78..36efcfb 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -16,8 +16,8 @@ install-exec-hook-scripts:
+ 	install -D --mode=644 $(CONFIG_FILE) $(DESTDIR)/etc/ppc64-diag
+ 	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
+ 	install -D --mode=755 $(INIT_FILES) $(DESTDIR)/usr/libexec/ppc64-diag/
+-	install -d --mode=755 $(DESTDIR)/usr/lib/systemd/system/
+-	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)/usr/lib/systemd/system/
++	install -d --mode=755 $(DESTDIR)/lib/systemd/system/
++	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)/lib/systemd/system/
+ 
+ uninstall-hook-scripts:
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_setup
+@@ -28,8 +28,8 @@ uninstall-hook-scripts:
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64-diag.config
+ 	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/rtas_errd
+ 	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/opal_errd
+-	rm -f $(DESTDIR)/usr/lib/systemd/system/rtas_errd.service
+-	rm -f $(DESTDIR)/usr/lib/systemd/system/opal_errd.service
++	rm -f $(DESTDIR)/lib/systemd/system/rtas_errd.service
++	rm -f $(DESTDIR)/lib/systemd/system/opal_errd.service
+ 
+ INSTALL_EXEC_HOOKS += install-exec-hook-scripts
+ UNINSTALL_HOOKS += uninstall-hook-scripts
+-- 
+2.25.0
+
diff --git a/sys-apps/ppc64-diag/files/opal_errd.initd b/sys-apps/ppc64-diag/files/opal_errd.initd
new file mode 100644
index 000000000000..ee420f1f9aca
--- /dev/null
+++ b/sys-apps/ppc64-diag/files/opal_errd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="opal_errd daemon"
+description="Daemon to read/parse OPAL platform error(s)/event(s)"
+command=/usr/sbin/opal_errd
+command_args="-w ${opal_errd_args}"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need localmount
+	use logger
+}
diff --git a/sys-apps/ppc64-diag/files/rtas_errd.initd b/sys-apps/ppc64-diag/files/rtas_errd.initd
new file mode 100644
index 000000000000..213f91cf0022
--- /dev/null
+++ b/sys-apps/ppc64-diag/files/rtas_errd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="rtas_errd daemon"
+description="Daemon to read/parse RTAS platform error(s)/event(s)"
+command=/usr/sbin/rtas_errd
+command_args="${rtas_errd_args}"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need localmount
+	use logger
+}
diff --git a/sys-apps/ppc64-diag/metadata.xml b/sys-apps/ppc64-diag/metadata.xml
new file mode 100644
index 000000000000..2b33921f7f90
--- /dev/null
+++ b/sys-apps/ppc64-diag/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>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
+	<use>
+		<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
+	</use>
+	<longdescription lang="en">
+		Various diagnostic tools for PowerLinux.
+		These tools	capture the diagnostic events from Power Systems platform firmware, SES
+		enclosures and logs serviceable event. It also provides automated responses
+		to urgent events such as environmental conditions and predictive failures.
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
new file mode 100644
index 000000000000..9c94baecc1f4
--- /dev/null
+++ b/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Diagnostic tools for PowerLinux"
+HOMEPAGE="https://github.com/power-ras/ppc64-diag"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="rtas"
+
+DEPEND="virtual/libudev:=
+	rtas? (
+		sys-libs/ncurses:0=
+		sys-libs/librtas
+		sys-libs/libservicelog
+		sys-libs/libvpd
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/fix-systemd-unit-path.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with rtas librtas)
+	# handle ncurses[tinfo]
+	sed -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/opal_errd.initd" opal_errd
+
+	if use rtas; then
+		newinitd "${FILESDIR}/rtas_errd.initd" rtas_errd
+		keepdir /var/log/ppc64-diag/diag_disk
+	else
+		# makefile installs it unconditionally
+		rm -rf "${ED}/lib/systemd/system/rtas_errd.service" || die
+		rm -rf "${ED}/usr/lib/systemd/system/rtas_errd.service" || die
+	fi
+
+	keepdir /var/log/opal-elog
+	keepdir /var/log/dump
+}
+
+src_test() {
+	# it assumes MKTEMP created dir in /tmp, add /var to the string.
+	# /varplatform.0x01 becomes platform.0x01, just as test expects
+	# so we sed a sed expression, don't judge me
+	sed -i 's%\/tmp/%\/var\/tmp\/%' opal_errd/tests/test-extract_opal_dump-000 || die
+	emake check
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 1f09a7f95e46..366ce9f924f1 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,5 +6,5 @@ DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f5016
 EBUILD sandbox-2.21.ebuild 1884 BLAKE2B 7fbf74c7bb4ed328c301f1f415b085f45b1e39992d730019fc598e8fe4864ca4b0ff570902b2ae970333c3e2af3e00f2d1d3258cd5372b0e3bf89a2a67f0f9ee SHA512 bb53ced577f1c449b84bf39fde7e2472a02df90d18ef1a2fef070dbc26d9cef995544c4289b2a9e0d49f876c2c0f970212a02e9e397ec22d45c4f790b939434d
 EBUILD sandbox-2.22.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
 EBUILD sandbox-2.23.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
-EBUILD sandbox-2.24.ebuild 1628 BLAKE2B 7457ec630192b03edde185b4a052e542c15913cf82d71e560ef273d6f7e2d9b5130d60293f843e53119c133df86922853bf1c94c23c3787f7d564abc1d0cf42b SHA512 b83eecd3347ee532591a51de2f7974e3615311c01750bb7613d24bbcc08c46d577c75e197abb05f9f6870d486958746cac444eef41af72a25249c46cf86cdb46
+EBUILD sandbox-2.24.ebuild 1623 BLAKE2B 974740d1bff0ee34bca317e0e3d791671db4f841b0d04da6d91c37ae0f6449cb850ddb187ab2750af264c3d5d2e19793024982c549d45284b79a7b1bf70bfe8f SHA512 4f6ace6dd17051b4c19f2e67bc32f7ddbd6ba9d5916eadc159f23eb451fa04cc6c154baf8659c43c3d45144917cc33723f094eee03a57d170be9c34469b692ee
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.24.ebuild b/sys-apps/sandbox/sandbox-2.24.ebuild
index fe66e82819fc..3a6e7ea22eec 100644
--- a/sys-apps/sandbox/sandbox-2.24.ebuild
+++ b/sys-apps/sandbox/sandbox-2.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 361f59ae110d..ad5aeb8c7eec 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,3 +1,3 @@
 DIST servicelog-1.1.15.tar.gz 29097 BLAKE2B a2ae131305ce466999536fca6734c006eafe70d8be16c5a8465f6ceb7ffb53cd06d82fe7229275f4e71ffddf7a572a214591aed59a6345f81c3f65dbe205cd1e SHA512 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6
-EBUILD servicelog-1.1.15.ebuild 520 BLAKE2B b94d9773d4dd5ae6a998b973e75411287fc2591a03178571375324b962b398ceab6c635773b8ab2a261306050f5f89796991af47cf35bd9de304c8e0f805e86f SHA512 4686394f0074f960c1e4d8d3ac0ca56e4c92ab7bf22ee748fdfaeb2695ff2d3bc2be315a41edcc52e25477beee8b99f8e0b8f4fb689038d59cb4bd0ca779c9e0
+EBUILD servicelog-1.1.15.ebuild 514 BLAKE2B 6c442aae127d952781ab50d1f460266b5f1e402bd68b1c0a3c446925d3d78d26d6b2b986a81d39d401c2e5eafee173085d89d249307f651c24941223abe5ee54 SHA512 64cd20c23a344df40306dfaf59b0278ee47519cbcd8fe11ba00768c798144efb1a755e480d4fcc5bcbba710001e548ab1290427e5a11b10286713526f46292a3
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-apps/servicelog/servicelog-1.1.15.ebuild b/sys-apps/servicelog/servicelog-1.1.15.ebuild
index 3cd80631048b..a5df5b06e685 100644
--- a/sys-apps/servicelog/servicelog-1.1.15.ebuild
+++ b/sys-apps/servicelog/servicelog-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Provides utilities for logging service-related events"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
+HOMEPAGE="https://github.com/power-ras/servicelog"
 SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 9bb1da6e7749..2c64816e494e 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -2,5 +2,5 @@ AUX xdg-desktop-portal-1.8.0-fix-doc-portal.patch 4954 BLAKE2B 3ba7ad250eaabc707
 DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
 DIST xdg-desktop-portal-1.8.1.tar.xz 473052 BLAKE2B a7d0aa2aa1e8220ced3e4abff8a8284c521b983ce807cd3e0d7b5d22f98f6428b6de9a193ae3aced9c13473617f453d13d0af83c677e3d077906b6cf8a138d45 SHA512 447d287d6627a1086d97dc5ebda20dfb1d0ca8643cbe54a7af5f6205a122a7be9d1643fded592f922c015561b7e2f4c6b6df555db3e0d3c02aad5bbe944077b6
 EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1060 BLAKE2B 81e3fc6eed93b4eedd09c2e126059e5d060ed113b4648389025c49e11b433ca9ff11d143ccf3b933e7113d3db06f5e9781c07aeaf7f6db199dab8ec71fe34f63 SHA512 37f53a187e24dd1cde5a2c8762b68ca8af3599ce4972b27caf99a4cd3cf5c7bdb0d1d133115ad29a97e632353e08c89bdb67ff328f032ced1f2477c282e634fe
-EBUILD xdg-desktop-portal-1.8.1.ebuild 983 BLAKE2B 1027688c72ec9652d55f8d89cea31b92ee13fd29709c8ec4016c842ac28b01e111efb6a87b23468101a9968f87368caf344eef1d66716b5a274e5d8e1ced26b5 SHA512 341501925233635295bbf77c4b7943db330e865d424fed3527bdd3b0ce7bb2c4f26f1d444aa9d4067395e8de61f950fd1011964368295a95178cf5235d604f0a
+EBUILD xdg-desktop-portal-1.8.1.ebuild 980 BLAKE2B bfe98db67b3a3982eed1f0dde0f5e48cd974d8e5bd68b72ca6217c4afcf6977e15aed3d3449d540473f314358ce7adbead6fcd797885f5833767ace43d0253a1 SHA512 450f6aedb3935ae5874167f7a2db1b003c9295ac92ccb59bbd0ace7a2de8d90f976cdbac0e3d886d43af667f407f5a6f4c437a3a843363491f67710fdea45c4a
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
index 4131ed399282..f144437d0ed6 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="geolocation screencast"
 
 BDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 7c71749a1653..b9c59b9ecca6 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 452222c8920f..ba388aa8ea51 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -6,6 +6,6 @@ AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
 DIST elogind-246.9.2.tar.gz 1534982 BLAKE2B 428def0f577cb92c8167f4400a59093ebf738d14b449e0dc59f1aa59da2c0f781db62bffc4bea2649edbfcc06ff5799ab24243dfb580eaa12c5cf0c41be8fc17 SHA512 b50d319793307a425d7542626e8cf27e56fb5e5c75cca9519cd3f5a1e7c387c4179310b95fa083f8bd8172384f16c0e45e7000b313d2bcf84ed8aba98dc775c1
-EBUILD elogind-246.10-r1.ebuild 4194 BLAKE2B 6edbcd5d1733f27def1398ac370d314048ead461acf53fb5c39f6257278a070c5ed56a055961782321408ded0f2b367943110965e3d0ac0e17530881d4b40202 SHA512 5655bd26b004d42ac1b2042ee75d1b26f082cc303267c33dc58f0ba25d7a2827952088c21f46826759a71a7dfcd7549bf36999b74fa0a0a2c4510abd347a05e2
-EBUILD elogind-246.9.2.ebuild 4136 BLAKE2B c02a85f4271d3fd3d0ef875d86e681cc0c1ed0e5d86b3c19399208d8e9826ae54e95a892d850c1ebda823b497cc3cba848eb689c67e637b548e27510c57124df SHA512 a7623ce84e631ee83c05373351f687bd7b962b56a73b9988c3c218b26a0fefea78948887c11ca5814001caaa15374aea7bea2b9a1cceacb539059ccc6593abdb
+EBUILD elogind-246.10-r1.ebuild 4194 BLAKE2B 9b5ab914a0ab5003540527936e94cce76b76cdb693000f079973c2ccf8b6efaad74dba87fc27d5f5ff85e8da5e5efe2b8d8bbece6c0f5e0bc866eb064fb9bded SHA512 4b4e0f6d61bea5f79d40bbb5630641098b9dcaa9b3b078ffbbbdd127b1929ad211cc79b80a8feb89ee7d1327ec924ebb3a0486a69f1c37e0980d5eaba6975c19
+EBUILD elogind-246.9.2.ebuild 4136 BLAKE2B 97d1b6f09c5b5a722c77a0a77e66b98401254cb6dc2463f93f9cecebeb316f9a30c49f6724f32f067740f024569da99b9b529fde02af0a156519369eadcce6ee SHA512 c03aa361af18b394e8abe28c16c17d78ef73da4dfc11d21ee785ebc83e21726a0e7be598ce0d7c6251f0ba82b3f531472857e0b9d71b8ac55f899014b9dd7352
 MISC metadata.xml 492 BLAKE2B 825e86df619311ed9abf5f64f274f783fa9b3523d455c0608a16c3a39b58db0bc52099a3aceb3e2c7fddf28a292a75733cc7e5f8694f1d1b2006c702946a8d30 SHA512 d1af1f988c3211ac6520b02193e9e1b1c0d9dd204a567f8468516ebf4e4d8dc1fab56de0e0031bdd58a2f1336f1b1c8662ab9f56753948f1dd297a336ae40187
diff --git a/sys-auth/elogind/elogind-246.10-r1.ebuild b/sys-auth/elogind/elogind-246.10-r1.ebuild
index 91b8f39f39c7..3b8faac4eea2 100644
--- a/sys-auth/elogind/elogind-246.10-r1.ebuild
+++ b/sys-auth/elogind/elogind-246.10-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
 
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	sed -e "s|@libdir@|$(get_libdir)|" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
 	newconfd ${PN}.conf ${PN}
 }
 
diff --git a/sys-auth/elogind/elogind-246.9.2.ebuild b/sys-auth/elogind/elogind-246.9.2.ebuild
index 62753f538d0e..bb0cc8f4ea3c 100644
--- a/sys-auth/elogind/elogind-246.9.2.ebuild
+++ b/sys-auth/elogind/elogind-246.9.2.ebuild
@@ -108,7 +108,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
 
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	sed -e "s|@libdir@|$(get_libdir)|" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
 	newconfd ${PN}.conf ${PN}
 }
 
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index bddc8b2ad22e..ee9dfb9b0623 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,6 +1,6 @@
 AUX pam_u2f-1.0.2-fix-Makefile.patch 324 BLAKE2B bc32459e011106e0f8516afe8e1afaa288e1bb53190b350467a12b9c6bbfaee9beb885bd78f1f1c3665b5f6907c1d7d99fb70d8d476b2dc3fe1fad2cba52f940 SHA512 eddf3c607e953b952ba91acb7d7bb1b8a43d6b70da86faece994011eb3eac43476c6ad9721be0a76805688dc9f9bab02ee5e13f58ce556bb68b8d574135ca44d
 AUX pam_u2f-1.1.0-include-limits_h.patch 929 BLAKE2B 8dae033c55d8299f72396cec45e3d1fdb121b5f36326ecdc55f7d84793c9409c3d96fa4beecfacbbac0fdd59f27893981fe99e9d46cab808a8f3e26056c037a6 SHA512 75d992031989a36ea558269f4d187a432adbb71d1a32d22b25e3020f1f6a0d56295b9344a1b6ba97f8dde6bf1918c7e3e530946b9fce9a98e315c798d4f07d87
-AUX pam_u2f-1.1.1-fix-Makefile.patch 320 BLAKE2B 7547e6e7c7c1c0ab56603a1aa2550afd1f2a5742d2c7f22c24ba820a581d52cc0471ae177d0e9f23122c04eff126bed3d5a15e59d2dec4b37d0957fa23b0f21f SHA512 931b7aa9ca7ebef3502fc23e9ac8c1bc9a4cd63955f89082e4d04e4a97277ae8e912183e585c3d4551c02673cac1a16e428125d3201c79d740c26f6afb036fc9
+AUX pam_u2f-1.1.1-fix-Makefile.patch 1174 BLAKE2B 274826e8af955fa2515c5b9a6e4de3357b5c8631324376ecfd2be8d8129c59d9a07764f4ad9594b7dfe4364f73a4b8035e5cbf04b97e5f966f087a555eb1551a SHA512 3d76994be0f17158e23c7e4b45c5994d720e01dd510313bdd3831a7d68cf91325f1c615466dc07452a98efdd21e5f368ad1d76d108c8ac1558b5ba7c387320ef
 DIST pam_u2f-1.1.0.tar.gz 415677 BLAKE2B dba5cd195d390ba4537752549fa5e0f4487930637fedd64b2750424d21d968bf8be54b75dccba92ac13a18b4e2d44825ec18089e9c4f5dc8e11ac12c36b8d28c SHA512 0ffcc32f0bbee279ad02f9c1cd928e2cf1df2fdebe718d869c16b7fece8edafd73cf08c5dfd6a2bc08434ed1970e16e4f89b6dae3b027a961ab43b26818b634f
 DIST pam_u2f-1.1.1.tar.gz 429822 BLAKE2B 8ed44f82295ea24fe30c5830971afd29a23b48e173c3cb69d3dcaf73b142de36f86087eaee69b1793a8846fdb2efc5530d52fa9f40e4357e6cd2ea9960b9bb39 SHA512 ca81c78e67c17c369117e9d38e50033eaa96e0b15673521db2c382de1aa2566f7406fb43801a5938758480966c5e7316943769db5be826983d3865710e0274c1
 EBUILD pam_u2f-1.1.0.ebuild 756 BLAKE2B 0eb66a1cb03a85d3ac99b86a8704e3535d96400b16c668372ddc31afc8994b7c4ce9a86cd8c6b14e59dc317bce4f6527e643694d7108b98c5a06913a8055df35 SHA512 c59cd3f29b302c65b9f7936dd9cc17c237fed0cee04252f0de9079a723cc49df5c8ad3963e9fc40515e349b19eb4cb150db224e29f23a303f59c620e35dda203
diff --git a/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch b/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
index 5ce95aa3b91b..68a9ae741004 100644
--- a/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
+++ b/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
@@ -1,13 +1,38 @@
+From 1475ea762deee61f4be8c33a0915039ff1fc9b5c Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Fri, 4 Jun 2021 12:09:30 +0200
+Subject: [PATCH] respect `DESTDIR`
+
+* Without `DESTDIR`, `make install` will try to delete files from the live filesystem.
+* Also, do not change `libdir`, create a separate prefix for the pam plugin instead.
+---
+ Makefile.am | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 896c3ff..560145a 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -43,8 +43,8 @@
+@@ -11,9 +11,8 @@ ACLOCAL_AMFLAGS = -I m4
+ AM_CFLAGS = $(CWFLAGS) $(CSFLAGS)
+ AM_CPPFLAGS = $(LIBFIDO2_CFLAGS) $(LIBCRYPTO_CFLAGS)
+ 
+-libdir = $(PAMDIR)
+-
+-lib_LTLIBRARIES = pam_u2f.la
++pampluginexecdir = $(PAMDIR)
++pampluginexec_LTLIBRARIES = pam_u2f.la
+ 
+ pam_u2f_la_SOURCES = pam-u2f.c
+ pam_u2f_la_SOURCES += util.c util.h
+@@ -43,8 +42,8 @@ endif
  # Release
  
  install-exec-hook:
 -	rm -f $(PAMDIR)/pam_u2f.la
 -	chmod -f 644 $(PAMDIR)/pam_u2f.so || true
-+	rm -f $(DESTDIR)/$(PAMDIR)/pam_u2f.la
-+	chmod -f 644 $(DESTDIR)/$(PAMDIR)/pam_u2f.so || true
++	rm -f $(DESTDIR)$(pampluginexecdir)/pam_u2f.la
++	chmod -f 644 $(DESTDIR)$(pampluginexecdir)/pam_u2f.so || true
  
  indent:
  	clang-format -i *.c *.h pamu2fcfg/*.c pamu2fcfg/*.h
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index b4bd34aca223..b829add79fe7 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -6,5 +6,5 @@ DIST polkit-0.119.tar.gz 1387409 BLAKE2B aeb605598393d1cab40f7c77954008a03926005
 EBUILD polkit-0.116-r1.ebuild 3296 BLAKE2B 0d6916767aeb703f713375112a6fe51855ce13b4250930b188b8d370a93db798efd5c1552ee69c7191e0ee24eaeafa34d38b77f3aa4c0893730ae7d5fc2daa19 SHA512 8b44935bfa8c9b39f1de493e79794faa8e26555fe15fa5225441f3f77fa592902487e708dd30e71902529efd1060cf5b610fd971ba89a16f981c361fb1656582
 EBUILD polkit-0.117.ebuild 3300 BLAKE2B faf6971601ff935b342269e18673556dea10a046771ea7e296126ac4f9abd7dd4f44833b0e24067337019df5c7249da29c8d133c4ee839b98bf0dcac2d0d00c8 SHA512 312bb02aa908627f82f2cdc2039b22e3da154bb8417cafa69413df8d2b0274a32805e690c59bbc10539d0f54908fff753c3a72f747d5c61c8a8390060090fc30
 EBUILD polkit-0.118.ebuild 3274 BLAKE2B 92687b82e0580955fe28e8d46a9cea325c8e9dd0c116e218c8979308839fb4fd7b8aff7cb7994095e852b2687e4a0616d4ca6a5366d397a4114205eba20f198a SHA512 ccfd5b2c8c2d9bd36cc95ff0823f246521f213aedd5a06421841dd539c17c4bcfe9acf24c817cbab3497da348113167c97149d969a96c1e3052791faf2016aae
-EBUILD polkit-0.119.ebuild 3275 BLAKE2B 1a8a6874ca004d61e26944018b65fdc327f8d4e16254f3d6665354b06326f9db79763b1b8c70de2d156a92091ad54545a8fb0aaeeb40c7f5f92aad4b10c00913 SHA512 62bc9b3ac79c29d603015acdd4e67a945127cf219730f121f86361db9a734ceff4f0c0f1e370353e88b6cebe7f8285323fae555866b62022d3e12c3f0271321f
+EBUILD polkit-0.119.ebuild 3274 BLAKE2B 124461b224689d37fab7445d37eb92f3db6566405ffcb08ef62c24a86b286da3fbf75f97009febb1c60400250f95f5250c91db8a26db3bd821e8be64568cfe18 SHA512 ad307bca69a9d4e78788aaa455c01d4735d01d97dd6a1c8553defdd54554b2114f5f0d8b114f76148d63429733d33e5cbe48503390635eaf3796156846887a07
 MISC metadata.xml 409 BLAKE2B 5460681a61f218f9347ddaaf9f4171aba5d270d9742588e9c2d9f78d4ba495a811062098ae65ce866ce6c5177adaf6b943db33739214ccaecc2a5e3914c67809 SHA512 e5a26398bdbc9251d175235e40477f20b814753e16565e6ca4f56a7d2f7b22c7238fcadd07519eecef7dee3428bd5b76b377ff19b24b7be5b0f52d4cfff32743
diff --git a/sys-auth/polkit/polkit-0.119.ebuild b/sys-auth/polkit/polkit-0.119.ebuild
index f047c46c16fe..8b7e0c4bb46a 100644
--- a/sys-auth/polkit/polkit-0.119.ebuild
+++ b/sys-auth/polkit/polkit-0.119.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="elogind examples gtk +introspection kde nls pam selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index da6313123c9a..8ba8a2fe636f 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index a1b247eb0bd4..055386c4f692 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,5 +1,7 @@
 AUX fio-2.2.13-libmtd.patch 398 BLAKE2B b1519ed240879f1260e3f5859c9cada3f41161457b7e06e5e764ac3a6656c3a6439fb5f0380cf90bbd6f2133f25e80419e108d725ea4672adfdd976bee94846f SHA512 18792d4ea3dbc2664d9e24541a07d82a50cd60bb7ff2d14bcdadd2207341c003ad2d298d99d65fd72c88813073b17d03a710a50db4df52ee72d49d9e9bcfe400
 AUX fio-3.20-fno-common.patch 1220 BLAKE2B dcfaac74241111cae75ebf956f34258ce883b6abb360b51eaa6bf80c91770d0d4307818e7daf63dc284c3b21a0869d54523d9b4c5cb4733fac898d05c17c8933 SHA512 04e435073204d158d6e8a5de87681cd70fa76c80c82b4c86e3e12650288c3bb2c0c457d64e05812e94f9e07172b5df36542f330306bdbab8222ec2464bda12f4
 DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
+DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
 EBUILD fio-3.20-r2.ebuild 4337 BLAKE2B cad2afe783c27e7e55fa8884d5fd8725ebf6f7900319970d7f837a999bc461e2cc8e882a7c86bdaeab3b60ecb07f11a2f1344122bcd0398e91602cf2852652c3 SHA512 b36adb5fa50b176031a63d4aa06bcf4bf2740b1daac62ddecdb542f437c03e858e43e332636eabcf9d3bf47c69e2e2192ee4549de95fded13a96aa48c03cc2a8
+EBUILD fio-3.27.ebuild 4301 BLAKE2B 39a92da79b7b5c5a7497ea0b0a9a38727347559da4c8540d800405db048efd97636a861a96de424e64a8686151b4bb011095749760e5f8fc5f74ea42277d1e56 SHA512 51c542ce693a402114af95b7411aac857ea5fa83b765dddc60a45eae100e63bd3f9ec35e64e7bdaf21bacce3ab676b6c367da26e3556b341d9bd86d1ed90e837
 MISC metadata.xml 1172 BLAKE2B e35bbaaa15c8cd095791a4a23a7344314a015ea42bb864b11bb165d340585ee667f969426282465b834a7d092ab6885736e55ec8d4fe950001fbb6336fdfdc14 SHA512 defbc7f932a5ab83b67da58a601ef62784b27f2268f8a8dd5057c02fb441b164bd0945217fa52a0e06803c74b5168dda3b4668de52f593d5cade428bd2f79e86
diff --git a/sys-block/fio/fio-3.27.ebuild b/sys-block/fio/fio-3.27.ebuild
new file mode 100644
index 000000000000..2fe78c1da6c3
--- /dev/null
+++ b/sys-block/fio/fio-3.27.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	gnuplot? ( python )
+	io-uring? ( aio )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+	curl? (
+		net-misc/curl:=[static-libs(+)]
+		dev-libs/openssl:0=[static-libs(+)]
+	)
+	glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+	gtk? ( dev-libs/glib:2[static-libs(+)] )
+	io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	rdma? (
+		sys-fabric/libibverbs[static-libs(+)]
+		sys-fabric/librdmacm[static-libs(+)]
+	)
+	tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+	zbc? ( >=sys-block/libzbc-5 )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( dev-util/cunit )"
+RDEPEND+="
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+	)
+	gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/fio-2.2.13-libmtd.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+	# Many checks don't have configure flags.
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e '/if compile_prog "" "-lzbc" "libzbc" *; *then/  '"s::if $(usex zbc true false) ; then:" \
+		-e '/if compile_prog "" "-lz" "zlib" *; *then/  '"s::if $(usex zlib true false) ; then:" \
+		-e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
+		-e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
+		configure || die
+}
+
+src_configure() {
+	chmod g-w "${T}"
+	# not a real configure script
+	# TODO: cuda
+	# TODO: libnbd - not packaged in Gentoo
+	# TODO: pmem - not packaged in Gentoo
+	set -- \
+	./configure \
+		--disable-optimizations \
+		--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+		--cc="$(tc-getCC)" \
+		--disable-pmem \
+		$(usex curl '' '--disable-http') \
+		$(usex glusterfs '' '--disable-gfapi') \
+		$(usex gtk '--enable-gfio' '') \
+		$(usex io-uring '--enable-libaio-uring' '') \
+		$(usex numa '' '--disable-numa') \
+		$(usex rbd '' '--disable-rbd') \
+		$(usex rdma '' '--disable-rdma') \
+		$(usex static '--build-static' '') \
+		$(usex tcmalloc '' '--disable-tcmalloc')
+	echo "$@"
+	"$@" || die 'configure failed'
+}
+
+src_compile() {
+	emake V=1 OPTFLAGS=
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+	local python2_7_files=(
+		"${ED}"/usr/bin/fiologparser_hist.py
+		"${ED}"/usr/bin/fiologparser.py
+	)
+	local python_files=(
+		"${python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_jsonplus_clat2csv
+	)
+	if use python ; then
+		sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
+		python_replicate_script "${python2_7_files[@]}"
+	else
+		rm "${python_files[@]}" || die
+	fi
+
+	local gnuplot_python2_7_files=(
+		"${ED}"/usr/bin/fio2gnuplot
+	)
+	local gnuplot_files=(
+		"${gnuplot_python2_7_files[@]}"
+		"${ED}"/usr/bin/fio_generate_plots
+		"${ED}"/usr/share/man/man1/fio_generate_plots.1
+		"${ED}"/usr/share/man/man1/fio2gnuplot.1
+		"${ED}"/usr/share/fio/*.gpm
+	)
+	if use gnuplot ; then
+		sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
+		python_replicate_script "${gnuplot_python2_7_files[@]}"
+	else
+		rm "${gnuplot_files[@]}" || die
+		rmdir "${ED}"/usr/share/fio/ || die
+	fi
+
+	# This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+	rm "${ED}"/usr/bin/genfio || die
+
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 7351f6f9a182..96d3294c7024 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 501d4d8195de..8f95b2c6e1aa 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,8 +1,9 @@
 AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300
 AUX lilo-24.2-add-nvme-support.patch 2779 BLAKE2B 0344624148e31dd9cd99e08f33e777e3a30f2bfc8321fe163a43329ae8c78e96fdb9a6a062648f06705919f89fd754a69a8cf6a2254d95bf7c5c6c78b9a3948e SHA512 14263591673f7486438416cb394f361593bd94da35fac643ae7938a241634aed41582532dcc7c3854c314c5bc68614d61c8099e12affe27c77a8a9a7473352bd
+AUX lilo-24.x-check-for-__GLIBC__.patch 712 BLAKE2B aca353ba185cf112a5557f931c7c6a61bc5d3a67cc4a31d279ab694bd4a1cb5d1b2f94713fd716b8c6ff5cbc1b297cbe1f4289d1ac0aeddd8129c9b811d36648 SHA512 723f9579a6bb3440aab0104a0146604c4a86157a52c6e38434a57509aef4ede50c59b7a706056dd8c894509e6f43348d867af3f91fbda35cc81bb1148c27537e
 AUX lilo-24.x-fix-gcc-10.patch 1020 BLAKE2B d434248d3f4ed4d591ada4d507e5ab80486228bfb4bd99d7597267355d2dfc70252b9f6a93e34f850f67a27698f94a70e0803310c81ffbc4c9d4f439f8155ae6 SHA512 0ef0ab379e787767bcee2c77eeb7bc5acce908850077dcc14a1d71f3a78761946e8e252089fecb441c26cbbee66c868021d42a300d05579d083e654026cf8682
-AUX lilo.conf 1613 BLAKE2B 746e05ed4a38f553d8534087d3889e3c136531752aa39f5de9404e58dcd520925f369a4300e9d16ba779b9cef0ae0ecfdde9221f064f42e6a5c812ee7effbbaf SHA512 be59f5b97cbf8eda744e8a7a281526b3262c80af7d3c61e5476697e1569e6e419c4055a8e7deaa4f65688769d941466043af81e159367bf893a88b77eb3732d5
+AUX lilo.conf 1613 BLAKE2B 0d1f1a67f270e6d0cfac6d6dbdd7468bee3405b455ab20d9095c3f63ffd608323cddcae13550799bb7cc8eb086069c38df65c501b9a3083f01c6b50383d40776 SHA512 27f544fe382f8b126b4bc45a2c60474c0bfd8ddacd7997af67c7263b98ad2eef856b687e9f36232db4cd5625be301a284f208d833aefccd04a01268993007d57
 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54
-EBUILD lilo-24.2.ebuild 4192 BLAKE2B 4d24ee4142c76361435f4b73d756d3526fdeb7aca9ba3a61178b2475a27aea05f3ef0ff3d4d374c0c6576e78a88e103c46b3ec14006a183a645b67bc1d390679 SHA512 a15815bb166ec8e6b1592ce1f225f0a1cc8f19c17e86d1c2ada81c4fb563006ae6829a17519d87df763fc4fc788b3bdc9a09e27e3ae569ff8ad083f1a7559628
-MISC metadata.xml 424 BLAKE2B b9b4058d9a2c63a294fa56b83dd239c672fe364cdbe4246d4a0f9b32f5ac8578e34c92ece1fabd8a114fd5b7bbe72218887e795203d16a4e4906f3374a38efef SHA512 6cb08eb1b1b9122e8f4ab6fa33a3e133a9fbbfa71d844b64d00a3186d0f7d74508cca18aba83a30f09f3bfd055c144c6a5122dd83b2bbf5b917fc41721d7b435
+EBUILD lilo-24.2.ebuild 4436 BLAKE2B f0f5e13abb580b1ad60576fda1de62de89654ae86a34d9e53133eefb923cef0b08cb0a85fd53cfdc7da9abc5bdc299d201ca5470d98b10afaffb2be5158def8e SHA512 63cc9019d65926bd3da1b049b32de35e979e89b382b87249ca7a9e2489bacaa4af9f8b4b1cb77bab148b0381dd164c84da0d8cda99bcf7e95b424538821430b4
+MISC metadata.xml 474 BLAKE2B 06c2267de10cc9107d2bdd99de5813366819864c8840d5b56b5f1f531c6b174b3cac9aae47a986f6e653a11a45eeb9b55bf545508544b285cadcbd23f1072308 SHA512 b59c4efd861fd83d73f8f24635cd8900c231fa98d61416a2c43581b16c0932140096db1308e17fb2db94231c36d441d55c35705f3cad33a42663894655bc4d2c
diff --git a/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch b/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch
new file mode 100644
index 000000000000..be3443629cfa
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch
@@ -0,0 +1,18 @@
+diff -Naurp lilo-24.2.orig/src/lilo.c lilo-24.2/src/lilo.c
+--- lilo-24.2.orig/src/lilo.c	2021-06-06 15:53:52.389730145 -0400
++++ lilo-24.2/src/lilo.c	2021-06-06 15:53:28.309159571 -0400
+@@ -182,7 +182,14 @@ extern int has_partitions_beta(dev_t dev
+                 printf("Without");
+ #endif
+                 printf(" device-mapper\n");
++#ifdef __GLIBC__
++		/*
++		 * __GLIBC__ is defined in features.h, which should be pulled
++		 * in by stdio.h, but this is not guaranteed nor apparently
++		 * documented anywhere.
++		 */
+ 		printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__);
++#endif
+ 		printf("Kernel Headers included from  %d.%d.%d\n",
+ 			LINUX_VERSION_CODE>>16,
+ 			LINUX_VERSION_CODE>>8 & 255,
diff --git a/sys-boot/lilo/files/lilo.conf b/sys-boot/lilo/files/lilo.conf
index 3848f779029b..a65ae24252dc 100644
--- a/sys-boot/lilo/files/lilo.conf
+++ b/sys-boot/lilo/files/lilo.conf
@@ -12,7 +12,7 @@ lba32
 #linear
 
 # MBR to install LILO to:
-boot = /dev/hda
+boot = /dev/sda
 map = /boot/.map
 
 # If you are having problems booting from a hardware raid-array
@@ -51,7 +51,7 @@ vga = normal
 # Linux bootable partition config begins
 #
 image = /boot/bzImage
-	root = /dev/hda3
+	root = /dev/sda3
 	#root = /devices/discs/disc0/part3
 	label = Gentoo
 	read-only # read-only for checking
@@ -62,10 +62,10 @@ image = /boot/bzImage
 #
 # DOS bootable partition config begins
 #
-other = /dev/hda1
+other = /dev/sda1
 	#other = /devices/discs/disc0/part1
 	label = Windows
-	table = /dev/hda
+	table = /dev/sda
 #
 # DOS bootable partition config ends  
 #
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index 475926764a55..9ae96a087bd0 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -3,17 +3,17 @@
 
 EAPI="7"
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DOLILO_V="0.6"
 IUSE="static minimal pxeserial device-mapper"
 
-DESCRIPTION="Standard Linux boot loader"
-HOMEPAGE="https://alioth.debian.org/projects/lilo/"
+DESCRIPTION="LInux LOader, the original Linux bootloader"
+HOMEPAGE="https://www.joonet.de/lilo/"
 
 DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
 SRC_URI="
-	http://lilo.alioth.debian.org/ftp/sources/${P}.tar.gz
+	https://www.joonet.de/lilo/ftp/sources/${P}.tar.gz
 	mirror://gentoo/${DOLILO_TAR}
 "
 
@@ -24,6 +24,10 @@ KEYWORDS="-* amd64 x86"
 DEPEND=">=sys-devel/bin86-0.15.5"
 RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
 
+# Bootloaders should not be using arbitrary CFLAGS without good reason.  A bootloader
+# is typically only executed once to boot the system, and it should work the first time.
+QA_FLAGS_IGNORED="/sbin/lilo"
+
 src_prepare() {
 	default
 
@@ -34,6 +38,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
 	eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
+	eapply "${FILESDIR}/${PN}-24.x-check-for-__GLIBC__.patch"
 
 	# Do not strip and have parallel make
 	# FIXME: images/Makefile does weird stuff
@@ -65,7 +70,6 @@ src_compile() {
 }
 
 src_install() {
-	keepdir /boot
 	emake DESTDIR="${D}" install
 
 	if use !minimal; then
diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index c3b7d03ba487..136f5734eb14 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>kumba@gentoo.org</email>
+	</maintainer>
+
 	<use>
 		<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
 		<flag name="minimal">Do not install the dolilo helper script</flag>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 695034a7cf75..e75bb24ebe09 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 03af79450380..cd8240a6a9ce 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,5 @@
 AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714
 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45
 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706
-EBUILD vzctl-4.9.4.ebuild 2008 BLAKE2B 3323b0687ac64f350951bf64e04832d9ac58c235e820e7a9096a278a718e3d269fae9128b878e9e87c6fa86a6ffb0f7d91797c98818b940c0293b4904a6de260 SHA512 92dfe7ad31eafb659faaf6eb5b73f4ed91c9ef8e450494790168a009cd9b23e6c02c9e11e181374a7ea6665486f51f16f967581a6e5967b3043759d420c03354
+EBUILD vzctl-4.9.4.ebuild 1995 BLAKE2B e8b3ca10f38102ebfca465e20febba768130cfa2f62c75e3c63d7e641c64eb58e896bfcc03c5523080a93b667b14ca16c3d7cd841c281623ba878f3e308323e6 SHA512 044b1a5eaa1e3fef173a37f09f41a66b15f13018cf4488ab006953fc6bd138113923fca444b1f7538656e9547575f2b2fc7860082cde3fd47ade0d71f9b08ec6
 MISC metadata.xml 476 BLAKE2B 6036f242ec8f7fe818244fd4d01d5d89b548c66fa2834127c66dadb4fe3a9d06643fab4ccd297c780e7f470eae8bc73a5d04a03ed15fd732c79c38a841373809 SHA512 0530fde605015304c81e13ae82da0fcd230a97766dcd775632515d7368d701b3ecae16988ad6447d0e77a1ae9d08f31bd28a3e0e3f5ce0f03b915ff2ad453389
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index 7c9536d71828..c81f292bc9d1 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit bash-completion-r1 toolchain-funcs optfeature udev
+inherit bash-completion-r1 optfeature udev
 
 DESCRIPTION="OpenVZ ConTainers control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+HOMEPAGE="https://openvz.org/"
+SRC_URI="https://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+ploop +vzmigrate"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 27d45737ede7..f658efeb768e 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 34ece61acd73..df36870b62b2 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -23,7 +23,7 @@ DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6
 DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31 SHA512 b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc
 DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
 EBUILD gcc-10.2.0-r5.ebuild 446 BLAKE2B 457a8d7dffd7b9e2838578b22e8aa3e1be75f93124ef0a018df1820970fa3fa11fa55b0c2d0c4819f6a7c407563163558ac8716bd468805fb17b91fb7b2fcbce SHA512 1223c8c71f1a6bb7f5d0862071593279708904e0c377134090c3ce3883e40471b49111f8740bb2042c38759c811cfda8b64250901a58a9246ad182d96ec293bf
-EBUILD gcc-10.3.0.ebuild 450 BLAKE2B 0ababecdf025ee74ecded70ffebad7acd3a0751e33fcf6389fa5721625980d22e0e98f736a1deaddb5cf2a8c93a83853f29220809464f423fa87170b188fed9c SHA512 aec49445c2714e1d77a15d5e30e3301c1758dec5025e7b2d98982732c604ead4c16dfe4b5eb8491721f32fe73af8028dfcdc18b34b873ef59182fc2357588a2d
+EBUILD gcc-10.3.0.ebuild 447 BLAKE2B ea4aa1b2beea36b702347947e95094e936c687404d7ae42061bb739a449f65acc887a2a57349cf21f470c856759523912751a32fe28bd2da84169ee12ab1ebce SHA512 b39876cce4822b1199ee4f62d2583e37f051f9d9b2d95e236076263399b07cf899cfc3b5e65218a8fe0e1bda13d9e0c26013986eb96d335b1026921fe20f7f1a
 EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b6022a503d2252d8371f699577eb289276897440113bc70745deb7057819d63890be8c0fd0022c02cc6d565fb1c1307e SHA512 eaca9dd9ac89a354beae99d38d7df2004289d281236f4a41457afbba563dcc8f6c1bfe24e8ea9219019c2b7e1c9abb67f428c96389fc9f6b8263db2af66ff3ef
 EBUILD gcc-11.1.0.ebuild 454 BLAKE2B fbe3eddd0a4daac59ae8dc821ffbf6fad2ce6cc84a2eb534c7ea3fd1cef6bd28e4c5e4b6fa30028e2a10daf18ef63046b8865f527c021fff5d7a2a57fb93daf6 SHA512 ef018491e72a13e18b28ab878c28db23a5c91af6b86102cc325651ecc20f27b840dbfb367b643c1203ef1f2ccdbe7a7fa84aff225c8b0b974c0321ce256f8fbd
 EBUILD gcc-11.1.1_pre9999.ebuild 649 BLAKE2B de4b651b108ff8d9923e377295d1fc5338bb86305200766e3ba922cc0266e14904feeeadd534ea953c8771bed0fe74dafb4a1b31fd0789d143b355def18ee0c4 SHA512 7ae3da7bc046186cebebf2e2217db6ea594a5b43af5cb201eecb754a64f324f7da7c0b99cc3696bf8ba8ffacad8dd7f813150d43d1b247d3f62b842efd3e9d0c
diff --git a/sys-devel/gcc/gcc-10.3.0.ebuild b/sys-devel/gcc/gcc-10.3.0.ebuild
index aecc347a0808..2d3e37390aa4 100644
--- a/sys-devel/gcc/gcc-10.3.0.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 0f6b78b458b9..fe066d1a6014 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -4,6 +4,6 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d2
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-10.2.tar.xz 21518900 BLAKE2B c5d31d80d2b454767d6f844e8471b012ad437c3872391b618fd7b14c5cf251b78e55d28c12e81382fd600f67e2f618ff5dbe3a7b737a5d5161ceb3542afbb90b SHA512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa
 EBUILD gdb-10.1.ebuild 7019 BLAKE2B 34dd10dad9c958e960775dbaa65e941448c096f52bd59dd16f214922f2b81fea84c80196cc59660fdc59a60297b23e5aae8de3d6b0453b7ab636862a9c760604 SHA512 7c132c6ee9aad5d683646b8bd9ed9179fcb3c59c40bd049745d4bde6366c4f75c36faa9184e72a5e82954e84a10fae049b907cdfcf4a55671b126f53d2322dc4
-EBUILD gdb-10.2.ebuild 7068 BLAKE2B 3c04b76d681b92d8a81457acd8a91b7b55a8239ccbf9bb8dabe6f733f00c73a695af90c4fc8368d084d84dbe7f931c1bf544399e57e6c976af077b5b97668e6d SHA512 50d6063b0c7d2a59aeeaa44780e1ab3ff97433ba70915fea9825ae70bad765cb981093bae5d86d6622fa7c58764b7e950617cc8ea7a7effceed9b38132b9d027
+EBUILD gdb-10.2.ebuild 7063 BLAKE2B 93bacd2f7e3f45c17d01f12a0302d9cf070a65ea4dc00c6c0d47a93b1a0e19ff2d092dd38b813bb43a405f58028f4c43be7e4fb3b1b9bc13d57d5b59aa1db643 SHA512 2ec5d372037d0d98d50d58f5bba03fda00d06fd46e7d11280e4b17a91435086ef288c46cbc5157a3ca4bbc288d4ff679845878e457c8e9e631fde606a85c741a
 EBUILD gdb-9999.ebuild 6990 BLAKE2B 4b35c8d7d109a74e98ca5bc9e6c7967f1f3a9d8ff508f14cd15bf752df8117f3355562bacb2a8bff4ccffe28971e428d9a209df83cb3dd6006d97489259686de SHA512 dbba8eb4feea97afd7ca3d90a9e48209facc426e4227792eb57dc3124ef64979440409382f0ad2ab9f05792ca5661505c46f0f563126bc33d05793af04d74357
 MISC metadata.xml 1102 BLAKE2B 76a586ca542d54f382f13416d53729e9a26f05d8ee2e592cf0b0aa1851d0a9546b20d2058107ca250986682c5f4f86c38939f4cd627f36d9223be3589337caad SHA512 047a745a15e2fd6ecbf22d52e3771e0982a10ed2eb41513e30946574e5b6e813088a31bb3c32832181f19fbd4f5061575389723f66b1821e75839a863e422c0e
diff --git a/sys-devel/gdb/gdb-10.2.ebuild b/sys-devel/gdb/gdb-10.2.ebuild
index 8b515ba573ac..9968e1b3e6af 100644
--- a/sys-devel/gdb/gdb-10.2.ebuild
+++ b/sys-devel/gdb/gdb-10.2.ebuild
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index d19adf37c188..3247c65325c2 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,9 +2,9 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
-EBUILD lld-10.0.1-r1.ebuild 1180 BLAKE2B 57351da8e2caf83758a607b1517a29e1d7ea0887d5ba6d58bb93da8208abf458c4c6185e7673a4da98a798cee82ed778a77c481f0eafcb866393ef0c0fac1851 SHA512 7435597d89ca5327f9aa80fff2874c9a86f8d8b8bbe33bb1f043ff4a0c73c0244249bb58285134e705a648223ba1ec4d35f79b6f81bb4430040ed439a8137011
+EBUILD lld-10.0.1-r1.ebuild 1179 BLAKE2B 5525df9462b93004d5fad0c45bb5f675447d4901dc354479e101c205ca7831cf53cf217ecace5a6aab18007abc06b41c35bdc60232601476741ff3ce72879e72 SHA512 c01e31c227974bc666711a69a1d9edc7652d7b003360aac57f39a644b996538cd6add10d2f0bf4cfee13f384600e8cf8ef8a7f343f809746fdd89ac4939e212e
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B c1933a141d5460f94cee3bdeac644760aec6d8e5906e3202e54a7a9da441a57d2de33b77d906dea4dcf6d7bac0bef97edd29c0a8d756093e9b56f81fbec07e01 SHA512 5901b7d0f5b2d07234d3287ab003e68b032a42e0887ab0d76fdd7a7af12feaea97a3ce07f06f3f1c428f7b5b4fa7f98daddf0909c8e3c0bf7ab2adc75363ed95
-EBUILD lld-11.1.0-r1.ebuild 1252 BLAKE2B 80f3bbdb8355e697eeb5951a76c67b04313aae078a80c40de22f2e2bb928501549ddbfe85a526e0c50f0a176c813f1362de3d1bf0a042da7fa7623696aa75a8b SHA512 e39de371e3a445fb99bb72f9841633d71ab4021d4a4b532f47d43c72379703025ac1dce06359e524788b00b8ded54d3718843bc72c2355a7c668e8ecbfe9241c
+EBUILD lld-11.1.0-r1.ebuild 1251 BLAKE2B ddc390d7bdd3bcc4b47bbad6f8a9c480c1b4d5f47cd6e03a269d2d52148d53bc139cb1f3db08745a1f7819bc1e2948dc2e7cc3cb14da10cbae2084a1b7fcffaf SHA512 70b81c9036411d376b8fa561fdcc58dbddb2b3f552aa7df93e70789f2e2d387ab57a49780f0ed60a7a6dc46401d897c653f122e7623f3aff76fad2e29c982227
 EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1d1a3e044be9da0c77a6ac71fce301ef3e6970cc520cb0c31abd9a81a668998b9c808852b157c91c3e398f4 SHA512 2ae031e69815ad5711567fc0ff5a7aa20d1cd49bb29dadb03f9754bc69da89d309d57996f3a67157be55c87c75cac7ab00ec53deb9b579ed74901c1789f7cf5b
 EBUILD lld-12.0.0.ebuild 1670 BLAKE2B 09569b42f03e6fe3bd962f8c951400f129acd9c6e080e74a0155bc3167a28976d5aa4428fe06654d34c49c8d96a11a94f2ff8cf7fc3f084a7a8482aad935a52b SHA512 08d5b7521b967233eaccd324607d97d41062dc424c2e659ffb8bb2ef60695962d9d32888d29c8dc0628b6b77f5cc0d932fd7d9394bc799107f5f24cf4de65814
 EBUILD lld-12.0.1.9999.ebuild 1628 BLAKE2B 0287a5e68645f48b08189ef850705bb3e161f42a384efad389ed7915f575f60e850c73087a4833257683e34d9acf2b4c7e930c02ef0cc34a6a1591454927cd2c SHA512 006e8a213d2517483a8c719c6634dcf1fe21281159737b40c4f50a2da51a730fe37e44b4d3b3f4fec0cff8c2055b57f49e94666180c7fd61046e8b60784d0e24
diff --git a/sys-devel/lld/lld-10.0.1-r1.ebuild b/sys-devel/lld/lld-10.0.1-r1.ebuild
index 3c3d5b7c1d14..c10cea125358 100644
--- a/sys-devel/lld/lld-10.0.1-r1.ebuild
+++ b/sys-devel/lld/lld-10.0.1-r1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-11.1.0-r1.ebuild b/sys-devel/lld/lld-11.1.0-r1.ebuild
index 710816f6d3d9..0f4726dda542 100644
--- a/sys-devel/lld/lld-11.1.0-r1.ebuild
+++ b/sys-devel/lld/lld-11.1.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index ce1782719db9..ba3a893b807a 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index d1c01dff4cae..a8ebdb8c26e5 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -1,6 +1,6 @@
 AUX 52-usx2yaudio.rules 971 BLAKE2B 1a8b0bf26b61694c95cbfd50e20096255dc0cf8c77b4f5bcf155ae6d163aaa1b6e8a658c864fc2391f5743b8f3a2702e7c03f1fcd7cab12877c5a5d607a42d56 SHA512 5c3ac0e03a496384ea58f6da479c932cb2d2f91f110703d71d0bea60329ebfba8a1a0e78eb951c9854b7fe0dcc9943d10f436fe9acd04848ea780e90ac274f17
 DIST alsa-firmware-1.2.1.tar.bz2 5146513 BLAKE2B c3d6047f484e78b3ddcfb23c30aaeb583088e025e4fae47e1a94cf987414524c1324b327f6679a0a8abc24e5c90b0c9454520714045bdaef11c5a01522803c81 SHA512 573bb13d47309253afa7d4d04ef13a7a5e4d18d8f89b1339630266f0ef6638cbb9381b3efce2604ea63fc9cf90a55ecaecf8eb2cccd58da04d0d283a245618b1
 DIST alsa-firmware-1.2.4.tar.bz2 5154366 BLAKE2B 0f844f6cc4859b72635f24d347b4c790469aee39aa60d9addb2c168dcf06b48e7e3cbba26ff21c7e1f5aa355641eec7ab934cb09bfac8ca116a6ac6a7db9d548 SHA512 041f54744fe30fa94781968c89c77ab9073fc9a828014d07a0f7e0f11c4185ace6846d5d2a313fcca6e9cda6e4837fd6f62e883b0fdb0a4e30a8c18ba7b2e05d
-EBUILD alsa-firmware-1.2.1.ebuild 2763 BLAKE2B 3a3f65021efb777a56e217b324009869fd2bf50ccc6bffcc0e21ffec10987ddd193660ec992795fcaa64279c4866e04b1b3c7087da1df04a87363327a6a913f4 SHA512 42d608060b00e034f0a9bd1579a807ae63c2c4fade2be9c88b1ef5a5b68a4bac9290b8b9b6154e3c9e8dc08ab21f5c4a679e95a5a5278a4c5bf6ec3e98a7e430
-EBUILD alsa-firmware-1.2.4.ebuild 2764 BLAKE2B 4838a5793e60f02abe336cca10dfb31c675488d49de61e5d4812494566140bce7ba3fc6e29a9128596dbb0f6a30808c71ab9c7193dbf39d043491fae0b7486b7 SHA512 55d4f9d84f8160c43ad14af17e42729a6171d2d8d4253954a27fbc1773b5e6f02bfcba54a13b1935c00ed0f808873978c063118df6214212d11b32582f2c2358
+EBUILD alsa-firmware-1.2.1.ebuild 2777 BLAKE2B 09b9ef8f36fa237a771cf9d4e18b427acdd75b160c96fe60d00d20cddc74281138b1b75812e248b87ad4f25e7f8765f222e2b0c446fdba7a0558d954fe970b08 SHA512 632b75ce8d7d2ca8e487c5e9c067e3cb0a32fab02eb6c6cd6cfc9fbf73bb73f49ae94e838c156e49b4a061e4559309ba11c0d08a1622057cbd6b3b3391a9d564
+EBUILD alsa-firmware-1.2.4.ebuild 2778 BLAKE2B 8da7d1f44c31f03f6af8e16d8dd6a2b96586e1ead2ad53b2bb0a093db832ddb7220e55dd34a7b0b4aefc6cdf72b2e2e0f978420dac87a68a661b836c6889d9a8 SHA512 e40588d0cc1e2521f7ecbbe7d5967f62744d4ce52a085ba39b9c2633bc41966b1d4b5752d6512e131dc2a1a20a032494834d1c369dafd69cb8c6a99344563d58
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
index 4a0a0a3e84d4..552d5e6ab89f 100644
--- a/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit udev
 
 DESCRIPTION="Advanced Linux Sound Architecture firmware"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/firmware/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
index c68813693fb6..da94a43de725 100644
--- a/sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit udev
 
 DESCRIPTION="Advanced Linux Sound Architecture firmware"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
 SRC_URI="https://www.alsa-project.org/files/pub/firmware/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b8630703e890..4e6a0250e53e 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index fd63fee286cf..592fbb450d3b 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,3 +1,3 @@
 DIST aufs-util-4.14_p20190603.tar.xz 104096 BLAKE2B 901c7405866cc8db490248b86e45e57375ea5d8db11505c0c15fd49f5bd9e7ea5a6c3d272bd8f001ac3db11665a9c3607565c7eb5be8cd5f45acf4b5f994ceb9 SHA512 803ce51a77c3e4942d3b8817be638c5e2440821088eeb58742eb0395b9c83f68975ed64a0410b6155b18edf0af47ef9df916be07d912fdb2bd4e94987a037fa7
-EBUILD aufs-util-4.14_p20190603.ebuild 1071 BLAKE2B 85a030937ab92dd37dc8d2f10da101c60ac1a75fa73fd3563a7c524fed5ea60a31f0433c5bed46434d243a7d444339a0d198d1599a9caac93b8c07b699847230 SHA512 c040caad3d02811f95cfae7c42df7dc879da0cd5c93c7e375fc70cf442f33d86af3e9f3968f2f42d373ec723b1d99527386d2041c40ec5ed3d25afe0b5ae8ab0
+EBUILD aufs-util-4.14_p20190603.ebuild 1051 BLAKE2B 040fc77c4aadd6add47ca89caa4ff209f6a325163de05bc5426f35a027ba4b0fd92820d7c29fffe3dac754b9929ea39778f38568efaf7dd58d2c2eff843f6816 SHA512 cbe27f86b772cad092f0eea51bac510f7513ca381993878ca78de9447a0c947517e0cd55e73d19155ed7b637814611607447c941a109bdc254373a2ffb1e452c
 MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
index 966a157684f5..65c39b7f1043 100644
--- a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info multilib toolchain-funcs
+inherit linux-info multilib toolchain-funcs
 
 DESCRIPTION="Utilities are always necessary for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -12,9 +12,8 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 # xz -ve9 *.tar
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	!sys-fs/aufs2
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index adbbf6cf19a5..96c52bf81d3a 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -5,5 +5,5 @@ AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d31
 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67
 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
-EBUILD dmraid-1.0.0_rc16-r5.ebuild 3386 BLAKE2B 451c7548c24f60ca32d2b99c0ae56a5109c6a1401489f939c4c69dbe5613a97ab5aa0eaeb2b859705ee598ef4b89e9ec02851fbfdb9613fa8d2a54688ae67981 SHA512 de1d6a4489dc5f16fbd1d3fa25b0d5d12a121e33b5f825bd93016f9f8c4ce8a0597a3304b83dca51ac7a7d75916760128dd8920447e136832040e614606b5358
+EBUILD dmraid-1.0.0_rc16-r5.ebuild 3373 BLAKE2B f99592578bf19d358fddbee013d95ed6c3b8b8c114f34c7ef0195bcd4ac50e925338af94b4441a532fc43e372471532adb09f7b7c57bf3f22dee6c2157eaacb3 SHA512 4662255b18607c09ab924aa81ed59abfd2e274ec7a53fecf13d3b9a1f764594ec3e20942135961f1cb8d613e06e05b7e17f567683aac7b2957984c2a5a4d290d
 MISC metadata.xml 544 BLAKE2B 8a100ed92851488b9a8c722769ea1d5a443ebf1220698b8de3de05f2b6cb282d4cf1d9849d5f86ceabfc6f70fab0d610853b084f8adaf938c48625be5db87191 SHA512 002f647c3c87349f1d56a1180e90e5746c5e94dc1b2e118aa2737b5d5b1dd72b4c3dbe808cdb56c2db6d47a6eb224784542ae7b005f100818979177c7e1d1898
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
index 0d180f48c84a..3032982b79b5 100644
--- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info flag-o-matic
+inherit autotools linux-info
 
 MY_PV=${PV/_/.}-3
 
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index d4fa3f968938..6547a957fb4d 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,6 +3,6 @@ DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe88
 DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c4233ddd54d3a0613199aa06f45124995c5a56d2e8d4551bf328ff26ae034fae42c39035148361cd2d99600f1 SHA512 7329dd26284a15309eafc2b8b3f29ed431a5ce9c927c5965a51c270718f4915c318b84e4cf4e7f7ee1913831ce943a2e1a378d0bd2a1215eba7b9bc65efb7942
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
-EBUILD fuse-3.10.3.ebuild 1696 BLAKE2B 1427c4e9fe86f2eec8578076381454619ebb49cff0899015ed439c2b441ae75dcdc5b451098a569f2a2fb8059d91169e6b5ae8a1110cf7ad62ec193b9600bc55 SHA512 d0b40c9c9b26c07477dd96488a7838920351cd5fc0480b0c6a471cf754e93991eb9070f5245d1732d07a31edc3912cb37da7ea7717c09076e4e85efba40e2b47
+EBUILD fuse-3.10.3.ebuild 1695 BLAKE2B ddaf9bde9834b4ff02d8155a2ba77e055fb959430f1bf763de42517062d1642ca44a0288448e676b8f8eb289e972430d95dc37d9fc3ba17f0f917eace3de3ef7 SHA512 9485425a10811c4a2a41bfa448b71e1f4333eb85d34e551b85c8c19d1187c675907498e625b5ce9f8c7a5d553653f0e29af51fca6cd271075508268a196bf456
 EBUILD fuse-3.9.3.ebuild 1823 BLAKE2B d4d0cc3939d07ecfa08c4c10fd21c8969e73d588043af680961765e09482d4cb6d5b6453a6fba8af1ddfe08f88932247015bb8317e4fcfdff298e61271efb79b SHA512 68f13b2185461fef0f8a1f804df628c7c668c9e78cf3f06ba5d92eaf85f8ada69d15fbe07bb5d8dd802716d313fbaa02a889b9cefd8d3abcad2b03c9d2079ec6
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 4621e41834f2..dd6b9a769ba5 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/growpart/Manifest b/sys-fs/growpart/Manifest
index bd2c70d08ac2..68c5284a7461 100644
--- a/sys-fs/growpart/Manifest
+++ b/sys-fs/growpart/Manifest
@@ -1,3 +1,5 @@
 DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58
+DIST growpart-0.0.32.gz 9525 BLAKE2B a7c7ca27ae237eb7d6e43decb16cba2c8a26b63bcfe1b1f74f63b116a9cc23fc5e54394df846c13de6caeb8433a4ad7e76046f2f4311e6fe7cb069fce588b6e3 SHA512 baa9e59581d2d9685d4b0e7563e6582130064881f6f9b9fcd3250a4bdceb7d03bcd1ce346218ce4395f82de948f85fd59339cc30417377feb61d5b444f3dde23
 EBUILD growpart-0.0.30.ebuild 512 BLAKE2B b9121f0240fb8b2eee6cf9e2b33ab2e678610a74c1bd295e06096b52b38d654cea9d82212a330cc48a1eafcb6350c546ccaca93f16710b226469fa6e7e28a6f8 SHA512 14148542f813a66c27c9a5b3fe5b2e3cc9a0a2fc1db0b773e9b091d8135a543023acd05a5e173fe43d9c42d0503b6dc2b4ffe667784a030c9c479d33ad6fafea
+EBUILD growpart-0.0.32.ebuild 516 BLAKE2B 97f06e399cf85e6522ccba6806043147badb6b5fee8bdd341beee5ff16b912dcb1868ad0fa54948b7cf604dba641f13d3165f1caf1c34cfffda9e7906fd93544 SHA512 dc21471f392fb18673a5fe149bdde03ea953f073be325e05b8a305eb6ccc91505cfcbe7074ae1f61695c1ef27eaad6e20c4087a25507694a6640c8c77d1fcc9a
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-fs/growpart/growpart-0.0.32.ebuild b/sys-fs/growpart/growpart-0.0.32.ebuild
new file mode 100644
index 000000000000..aa8ac8c42c28
--- /dev/null
+++ b/sys-fs/growpart/growpart-0.0.32.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A script that can grow your rootfs on first boot"
+HOMEPAGE="http://manpages.ubuntu.com/manpages/natty/man1/growpart.1.html"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.gz"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/gptfdisk"
+
+src_install() {
+	exeinto /usr/sbin/
+	newexe "growpart-${PV}" growpart
+}
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index acf91c6e096f..d7d6e020d740 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,4 +1,7 @@
 AUX libeatmydata-105-undpkg.patch 308 BLAKE2B a6ad730f191ae342217dd7f881bab503ae662d3fcc9d8f782e23765e9b2385ab5d8f30a3ffdb0180d2ef22f22f327b7c6b3189674d65ac1aaacf68a4466e8620 SHA512 1f90cd5637babf47139c30f0b3a1c96e4dfaceaba7617108b76ef68f69a47287e509284e318cbbe1c0c62fc4f2fb5792b0d0ad0dd977388fd90f3ed54ba35e28
 DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
+DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1
 EBUILD libeatmydata-105-r2.ebuild 706 BLAKE2B 14ee75e1d57bb91db40cdc3061941e6dffea7500056eb8dd65ac6865ad2e437f692e719c02e2741e8962fac26c3a52d27b41c7f89258997097ae3eabd6e6c1b9 SHA512 5dbf29d6f85a32561cbf005074fe53c2f928f82edbdfcfa0057434d73f4d15273b7b855e81b179ed692926b7da1b953e6935a51c114af6421be946a40d2b3a4f
+EBUILD libeatmydata-129-r1.ebuild 845 BLAKE2B f053a4f83e42ebab36ab199a86365317f31d83096a7b82b6b672e6c9d644157aefcef9aae5c3e35cff407eefc8d9a781875fe5a1c58f2a6f7ba46717cb71d6d4 SHA512 d81b90984fa1072628a77c20ee7595bfd8bf1b9c1418bf155f866fe80cbc85a760e79015b943e2d1610c37076fd9bc424410ada70d7b08cced7615e881d8b33c
+EBUILD libeatmydata-129.ebuild 771 BLAKE2B 775e2536ab971999cfac29e52b27d8c88577b808cfec077a41900c9c482fb53d68c81ba715f2c65e7b51b01e03196e5af384693ba6ee5c97d5517db0e9ae77d5 SHA512 f3aecb21d60f8bcfdbfe9482be919a38ee54ae23a0bcd90a7635409954037e85138250246b30ea7cf85370e7992d897b63dd3ce6f13a029fd38e3a7b3be2191e
 MISC metadata.xml 512 BLAKE2B 549d76a933090ccaf7100a6ae03b8a1f0c1c68454764018360184bcdce4e6628a38ac499bd8a568fc43240fa13596a6f0b4e108fff1c742d4e229aad59049b10 SHA512 4b436b230dfafd7554ffe9ef222fda5aa4e4132768f945c34cde4fed9359f2782e0f371617ecf52b55339f278fbd51f28fe58bf50ec600bef8644c82f594d363
diff --git a/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
new file mode 100644
index 000000000000..71b725cd15a6
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-129-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/"
+SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-util/strace )"
+
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-static
+}
+
+multilib_src_test() {
+	# sandbox fools LD_PRELOAD and libeatmydata does not get control
+	# feature of sandbox
+	SANDBOX_ON=0 LD_PRELOAD= emake -k check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dodoc AUTHORS README.md
+}
diff --git a/sys-fs/libeatmydata/libeatmydata-129.ebuild b/sys-fs/libeatmydata/libeatmydata-129.ebuild
new file mode 100644
index 000000000000..bb2148e907ef
--- /dev/null
+++ b/sys-fs/libeatmydata/libeatmydata-129.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
+HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/"
+SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-util/strace )"
+
+ECONF_SOURCE="${S}"
+
+multilib_src_test() {
+	# sandbox fools LD_PRELOAD and libeatmydata does not get control
+	# feature of sandbox
+	SANDBOX_ON=0 LD_PRELOAD= emake -k check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dodoc AUTHORS README.md
+}
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index fc5fca15d8dc..0a2159a3bd54 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -4,5 +4,5 @@ DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c
 DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27
 EBUILD reiser4progs-1.2.1.ebuild 1288 BLAKE2B 0b7ca382987ce89c562872041157c2cd3eeffee56efb8fb7ee0cb1ba895caeb0e9421e4e071f10dd46f453fefe0a1be21661bc13ea3e5e28d9d26d87b1e8b575 SHA512 425f5935fae4b159a56717e611df6bb2abcab657058ed96326d7858370554aafe37bc1c4b0744e7dd368aaa6423b1e2f481917d6bf5735b5a7adabb1cd7d4975
 EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
-EBUILD reiser4progs-2.0.5.ebuild 1344 BLAKE2B 0156fd59f0fb80e8b534a4a486e0c73f7b274ad6172a8ffd52bcaac11950fd76c10228a2fc5a29df9faa5effd892f1391dfb1eb07e4abaf025e37d7bb4a280b8 SHA512 4b9eb54b3f13abac2a15371711bf623384d5ef22b98e4142f2e2cd0fae4807b4a1da42d3bc7da3c89881549572a5f9f0dcd662f673fff98ee7d47ba594e921db
+EBUILD reiser4progs-2.0.5.ebuild 1343 BLAKE2B 096b9fb491117f98c6e4026b00f1e29037c526913d0c24ed8c6fcb8b45f532652b6338bf0f0e6440c3e4be9d869812c985be6956381228fad8140ac468010340 SHA512 5069c930aadb2de9cbe4e59c4905c876f1bfc9d1114f1dfd3150b9decedb58d6a75326317a56da292a381c04b33adb8fe9dfbf68e88a9ae4f7048fd13f978497
 MISC metadata.xml 240 BLAKE2B 0d7e3f2595807ed2a0e8708c7769497a8cd181b9256b3d5c15e41fef923bb9748d799325a038679fe78867ec4ae788c95a02d7ff178d8f5c095b866122b4acd5 SHA512 59f5b3dfcd9b7df8447be8b098b57a611e1e29e3fe023f531585f157c5f89508ec6e185dbb4e856aca651f88070f99c3c9c581ec3a1368ee4a9ae35af1aed43d
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
index 2740f0d35651..bc2336496e29 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 -sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 -sparc x86"
 IUSE="debug readline static static-libs"
 
 LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ba2080431486..3e2299373021 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 8ee170e0da2d..208c1c9b94e5 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,8 +3,10 @@ DIST patch-5.13-rc1.patch 60248581 BLAKE2B c105c2518de0ad29258262913226d44598f19
 DIST patch-5.13-rc2.patch 60699877 BLAKE2B b29e45aa17aefe5adff81bc803890200d810848122240b731fa27d1bc0b08448d8579d6bd2328d11ca67b78346fa2342881e838b9cd657803ce6714a93f8e383 SHA512 2d54f9920d1d639a363989e37aba1e82687e7d6848bb53c4936678f50f178678235e9f45671d9373b1b5e15cbb6837640002038fd8b74d72d0e55d70b54321ba
 DIST patch-5.13-rc3.patch 60916953 BLAKE2B 1a1a40b91cbe8ed65151931b1e309068c69ef45817e9bc526297fbbe59e8cb2c69176d71679b4f705a1071af5afc80e4f270f8bf7f089d483123550310b3abb0 SHA512 f0deb6c2482b1416d6e96bc4bdb9f9fe51654b6bd9317f0e68f3cfb252ade3c9c7950fa1f7eea09a61dffc109cb832c04fae6eff0a2178fe932f1bd42a7f17d9
 DIST patch-5.13-rc4.patch 61427853 BLAKE2B 7ce34ed0d43f79a193e549208114e0d5c648c965ed584b84959535867088c083227784b3db6b2072b238f73f10c39ce5e4ea8451dbeb107e0c24bcbb7ccac988 SHA512 39d352e6a32c47006492667aa552b92ca45a5a5919443dc00ee1b7ca2947398a4a2db59185df9e779a1b1a75ba93ea3d88ac07005e3072f24b31d1a6284bc131
+DIST patch-5.13-rc5.patch 61681306 BLAKE2B 541567d285b56080a572b3b62118288a4f1d817152512a89483043973bad89a64e27354a174b5ec6809df58b992e2a001c2e50d8d330ba356e41452f3304ed1e SHA512 47e03e9825c6ecc37778050319a58b5081ed562e2f8aa1bdc74bfb3a59422d2a81d3267603e5cdcad87dffe9ea2e434c453d4eb8a022fb9b12a3e8bd9ebf343f
 EBUILD git-sources-5.13_rc1.ebuild 1172 BLAKE2B 67b90c7f893fbdb84d4b4baa6dbb2596534052deddc59f93c339aef27b07278d9948d67c852e21a113f2cd340166d1a37ba55187a9c1b949d77dbb4bb6cf0683 SHA512 01c7806c1c3026ff99af2e3f2fc5d2f885f4427e4abedd2c556c36da819ececdb825fc03864a44257a27651683a4840986a23b9744fdb3f64cd25975387f5b82
 EBUILD git-sources-5.13_rc2.ebuild 1172 BLAKE2B 67b90c7f893fbdb84d4b4baa6dbb2596534052deddc59f93c339aef27b07278d9948d67c852e21a113f2cd340166d1a37ba55187a9c1b949d77dbb4bb6cf0683 SHA512 01c7806c1c3026ff99af2e3f2fc5d2f885f4427e4abedd2c556c36da819ececdb825fc03864a44257a27651683a4840986a23b9744fdb3f64cd25975387f5b82
 EBUILD git-sources-5.13_rc3.ebuild 1172 BLAKE2B 67b90c7f893fbdb84d4b4baa6dbb2596534052deddc59f93c339aef27b07278d9948d67c852e21a113f2cd340166d1a37ba55187a9c1b949d77dbb4bb6cf0683 SHA512 01c7806c1c3026ff99af2e3f2fc5d2f885f4427e4abedd2c556c36da819ececdb825fc03864a44257a27651683a4840986a23b9744fdb3f64cd25975387f5b82
 EBUILD git-sources-5.13_rc4.ebuild 1172 BLAKE2B 67b90c7f893fbdb84d4b4baa6dbb2596534052deddc59f93c339aef27b07278d9948d67c852e21a113f2cd340166d1a37ba55187a9c1b949d77dbb4bb6cf0683 SHA512 01c7806c1c3026ff99af2e3f2fc5d2f885f4427e4abedd2c556c36da819ececdb825fc03864a44257a27651683a4840986a23b9744fdb3f64cd25975387f5b82
+EBUILD git-sources-5.13_rc5.ebuild 1172 BLAKE2B 67b90c7f893fbdb84d4b4baa6dbb2596534052deddc59f93c339aef27b07278d9948d67c852e21a113f2cd340166d1a37ba55187a9c1b949d77dbb4bb6cf0683 SHA512 01c7806c1c3026ff99af2e3f2fc5d2f885f4427e4abedd2c556c36da819ececdb825fc03864a44257a27651683a4840986a23b9744fdb3f64cd25975387f5b82
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.13_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.13_rc5.ebuild
new file mode 100644
index 000000000000..5279e1b05efd
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.13_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.12"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index acbc0fab8915..8adf214264ce 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -5,10 +5,10 @@ DIST mips-sources-4.14.0-patches-v3.tar.xz 287468 BLAKE2B 24212e2d6ca784986d0e3e
 DIST mips-sources-4.19.0-patches-v3.tar.xz 289136 BLAKE2B 9c77c641d4c4603983c0bc11cba5d83337c7373f67bc5870b8b02d6d4a537c8c02f21fe47fd64f13c5e10d37100654857d0b598be6d8c429f5fe1d7332b6b6bd SHA512 7199a20f20f9d0a4eae38279335d8c9da20940fb37f0ba38cb6b68fdd5c9d4d2e2b65efff5383065e685c0fb5ad639c6d79d74989a5b4200b987f175de7da422
 DIST mips-sources-5.4-patches-v4.tar.xz 195208 BLAKE2B 3f68af3e2c7c344436e351319a8f148b27f346f3cdc0a7f60dbb6a8b8a4c17a14a4fe3f1b9ed0984aeb1f80279a5aac43d14a3947c0f0c6eb5fc6aebc0ac857b SHA512 144863448d760ce3a5a9fa3a23204a5384d0d145b3a87ed6a283728a0c5cb605d4bd74b125b9ff0535e8689f10cd05b22b1abb4d0ea12d6d8f05fb9fc58c2017
 DIST mipsgit-4.14.0-20180128.diff.xz 1008 BLAKE2B 2a317ff97aab096883680c6b653e993aee31994e6caec52c52dfbbb61f1dc1f25d03ebd3182fa122923a67aeee0aa598b36e603692333e4c9ccdc741fd456d96 SHA512 378deb1bc1d10a6b4912e5e4a0d6fcab28952e2e59c35fc879601841cf8160081b318a2598ef74db225e95f0f26483f6b9a56a348811b1ee7b8934391dd271ae
-DIST patch-4.14.232.xz 4228268 BLAKE2B 259de6445dcfd1d407bbe0d2d0489e8b7fb2a99a58886aa55a414b6ba37f5d20cec58693eb034592914acd729da410032dcf5924843943530db07d8f1f55b4cc SHA512 c3b18afbe83c279ecb856b8332f613311a96955b101cc9e5fc1c82fa0a741a91778f5ef4490ec00554ee83907866e935958962a31f78f5d8617664b904ff251a
-DIST patch-4.19.190.xz 3933168 BLAKE2B 301dcd17bfc0c94ad09bdcf6261da09ad9f1c36c1a047df94e7040d1b2c2b6224b08b596c3b4583a884ea7d5a70b9d3652ccd72e49aff54f61ee4afb30e514d7 SHA512 cf70f27725e3c9e4b9a5a0062734ebf20672bc4378f33dc882b3ed3abfccf31ed70c211c3e13a8b1d3971d7f0a71b089e080a49083cb39e738b80f77d0215a65
-DIST patch-5.4.120.xz 2952144 BLAKE2B 7c0a8bce55dea410ee6d6590aa92f6c1bc506dd0dc6822471527025ce5940df1912b0fb8af73cf9c9de0116d6d332dd97474364a862f5b0f8c8934171ca151bb SHA512 2d41d66a1426ba6d25ec692d6f5df0ead367cf4194cd75bea8159af21a1301125dd7b94907ccf3bef17d2d52982a259e25f5c09dbf386438b01a0b5b0e442d4c
-EBUILD mips-sources-4.14.232.ebuild 13168 BLAKE2B ecbc5826544f704f296e153f10643bbe03c8d3d2047708d0a788ea0fffe1e8d6abc9c7e4ad50bd2e1033cd375d780ac5c3a12b99be4883ffa7f3661faee2613a SHA512 2cac1e8702fc308f56c5396832cb94172861f24e6ec2baea9e7ecd5976c3da88dad984044f040c9eba7e447c66082f6b1abf374862d1194e09d9a581e9fd2cc8
-EBUILD mips-sources-4.19.190.ebuild 12766 BLAKE2B 605c4ce73326f64d73ba8ea444ea73fd3d8e92e501581ed725358aaf13e4a0de1dff018dc35df961b1f0facf647b4c0b0628a40b997d8913102cdaf33db71ccb SHA512 e2d146ae4f715ad5d407bec4b01bae8122f63a9b09b4491201ae05c04bfef40c003b91a18f68daa34e9b4e65d90878a6bd0d6734ff8f6021cd1db99d93203db0
-EBUILD mips-sources-5.4.120.ebuild 12766 BLAKE2B 0ceb6549ea44e950074d68ee9a9ef843937ee1fe2ce70d46f94a1cb9bce960e336456e55af2014518da4fba1d683fa15af05b72fea96450aaaab07e7cd5fb5b6 SHA512 83924d42489f2804a47c3d24be8db39182802de1519e0b78af3706bc9077bca89a7b7441e44ba92f34ea1ceda652adaaf4427aa8690aa7237a6362ec27007cab
+DIST patch-4.14.235.xz 4299416 BLAKE2B 456b70cac19e7638dfa826983c9be8addb5a18e7b9827be84b0478a0dfed1d4997ece82b1960dc3dfba5a7bb8d17adf33e62916fb823bc19ffddf335a33e6b38 SHA512 a0ad98d60bebad099e82a40ff3a3661e4284a080aa4ed1b4a059a3de97362ccdf78e19744a0a9531bf179d5d7375547c42eeb9420780226a98109f95ca1750c2
+DIST patch-4.19.193.xz 4028404 BLAKE2B 4eb96c41384b244ab40f3c47080151ae8b9a194bbb378737e804cc30a416a83f3a21af6b3fb5dfa79435efd6344c2b2fa32c81bb7daa218f212b64d208dd41d9 SHA512 b2382a705df90cf450ee516c60ff69b8557e046b825e85a96aab9eec2cd6179f142363f6d6d644e7ce48be167ce2dcec68f76ea29521eadda1297685764e8011
+DIST patch-5.4.124.xz 3006220 BLAKE2B 394645f0cf7898c98d416e93858b3effe171d5bdbc968bccd876c41de527ce0221331a06744cc081a05407d3b539d7ab83ae526ff1cc99e9e17629af7b968932 SHA512 9a8a5388d921c55a6f620f2da0528c4d0ed4487cfa58ac876b7b9625247860e3b25bbfcd39b4ae73f34c2d2b8a45b155a149613a650a1306bdab4bad57f8f9e9
+EBUILD mips-sources-4.14.235.ebuild 13079 BLAKE2B 3429c0ac48472d5487dba3cb4f872633e25eef893ef5061bb5750e47530696ebec0c7636c7ee672a6575149f90a7b8710e99f2f39d3b39a6d5951da0f9630225 SHA512 c34e774d1677961a1dd8cfb4e602dc0c828450988382c0606c9376160f5fd1c625ae9fe1436fe30cd21c4995306344721de47ea65fc6893863f8a500e7ad9d26
+EBUILD mips-sources-4.19.193.ebuild 12677 BLAKE2B 54b7d6eb298d3eba8033309bde4c2b6191c186067e95bbe74067642e431b992a52ef259f83198af7924afe6074b7216be53b8160e91a8e22cb07305d00494867 SHA512 327bb9fee04e933c7020fc089b2c9f5675e9a833807bb9f71baf9591910a9a79abfcfb630a37eace665e6772d716bc89ce6158b9bcd3c05966848e91574d31ab
+EBUILD mips-sources-5.4.124.ebuild 12677 BLAKE2B d68af63c9d874f0c3339d5d2dd2c052fa131618051647a801e7b9488362a82f2b35ee8d12f57ba9953431ce48197542c0f8d1338f606ab72b24a2c94de1062f2 SHA512 366a834d4432a970f7156bac03bf175d634b93fc2b502410f73f45ce572b6742dea393fa3a9c880cfd3c07610d0423c2efbf41da86509da3f1d17007b0e51c63
 MISC metadata.xml 659 BLAKE2B 0a4de62c5b7f4b11765e722d0cb95491d8502bacb0ac3265192c87398482fda7425fdc6d74db3c30d28782bd739b4f10b12a20b90722be96a41d350c9a211d7f SHA512 16b3055ff4e57c8cd0c5f393450095bd30f6f8da580bd82fce200715c023add333a8055a1c67303a6f7f7fed2bfea287f695c825a7d328ecab147b44ff6845e1
diff --git a/sys-kernel/mips-sources/mips-sources-4.14.232.ebuild b/sys-kernel/mips-sources/mips-sources-4.14.235.ebuild
similarity index 99%
rename from sys-kernel/mips-sources/mips-sources-4.14.232.ebuild
rename to sys-kernel/mips-sources/mips-sources-4.14.235.ebuild
index 9c03742acf36..26b69af1b402 100644
--- a/sys-kernel/mips-sources/mips-sources-4.14.232.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.14.235.ebuild
@@ -24,7 +24,7 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit kernel-2 eapi7-ver
+inherit kernel-2
 detect_version
 
 # Version Data
@@ -36,10 +36,6 @@ BASE_KV="$(ver_cut 1-2).0"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	>=sys-devel/patch-2.7.4"
 
 # Specify any patches or patch familes to NOT apply here.
 # Use only the 4-digit number followed by a '*'.
diff --git a/sys-kernel/mips-sources/mips-sources-4.19.190.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.193.ebuild
similarity index 99%
rename from sys-kernel/mips-sources/mips-sources-4.19.190.ebuild
rename to sys-kernel/mips-sources/mips-sources-4.19.193.ebuild
index ab158261cc19..f8b3da0cf245 100644
--- a/sys-kernel/mips-sources/mips-sources-4.19.190.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.19.193.ebuild
@@ -23,7 +23,7 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit kernel-2 eapi7-ver
+inherit kernel-2
 detect_version
 
 # Version Data
@@ -35,10 +35,6 @@ BASE_KV="$(ver_cut 1-2).0"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	>=sys-devel/patch-2.7.4"
 
 # Specify any patches or patch familes to NOT apply here.
 # Use only the 4-digit number followed by a '*'.
diff --git a/sys-kernel/mips-sources/mips-sources-5.4.120.ebuild b/sys-kernel/mips-sources/mips-sources-5.4.124.ebuild
similarity index 99%
rename from sys-kernel/mips-sources/mips-sources-5.4.120.ebuild
rename to sys-kernel/mips-sources/mips-sources-5.4.124.ebuild
index b2007bdad26a..c297256ee21d 100644
--- a/sys-kernel/mips-sources/mips-sources-5.4.120.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-5.4.124.ebuild
@@ -23,7 +23,7 @@ K_FROM_GIT="yes"
 ETYPE="sources"
 
 # Inherit Eclasses
-inherit kernel-2 eapi7-ver
+inherit kernel-2
 detect_version
 
 # Version Data
@@ -35,10 +35,6 @@ BASE_KV="$(ver_cut 1-2)"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MIPS"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-6.5.0
-	>=sys-devel/patch-2.7.6"
 
 # Specify any patches or patch familes to NOT apply here.
 # Use only the 4-digit number followed by a '*'.
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 576190296a18..444649891817 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 f976717fef65..06836dade404 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 2451 BLAKE2B b94f3860235a034a2913f9a976babc84a35fe7398dad26df4861915d15d5a66718aa81900bfcbdf8400e574d1ad022cdb0170a5128a8728c8495cf663bb47295 SHA512 03eeaeb10a4168e53b71b89c5b336faae0bb1f573bb02b2e2824bec2ce991aa7680d5d8493fd44783c1a79ccfb799fd42d604d4fabda459dd2819fe5603e6f7d
+EBUILD freeipmi-1.6.8.ebuild 2458 BLAKE2B 931110983c1913944d47d968d16aae2d35a7f32ae4bbee4ee159d9f4855da26a711cac67e849dc70607436e46534af92d7a7a3fe38fedf9c9041cf0509f06eb5 SHA512 857891113c1eb9c419daf1ad6f948d6412c1c44cc6a28800a35a1c5bbe3921ad5e9bb306fcb509bfb197d26dcaab6500282a840b3b571e298da7e41203a142d8
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.6.8.ebuild b/sys-libs/freeipmi/freeipmi-1.6.8.ebuild
index 2778e0c06997..55bbd2399070 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 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
 IUSE="debug nagios"
 
 RDEPEND="dev-libs/libgcrypt:0="
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 0fcfe158c7e0..3e6bbf5c15af 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,7 +1,4 @@
-AUX gdbm-1.18.1-gcc-10.patch 1243 BLAKE2B d956231e7df353c203e37054438aa9c50f875e83afbefad5de5d150ee272131a2f4825f330b25a2eaf8aa0e2977645e827934778f77f9752aaa887fe99917b86 SHA512 23dd6edcad930bfffd8248015862674fa12402693a24dea65ba61819d81c9e4eb594223c85483cb6ca5b908967f3509ace2753702118db3e79e7d137b63c00b2
 AUX gdbm-1.18.1-gettext.patch 444 BLAKE2B 43496bf0e950e1af452439f881bca4fe5e318717c27692639196884405b0b6ed8e32e056afeda2040f651d26ff1607e69e7f482d023c2b98b7c080b67f3392b2 SHA512 fd033d7de3a1bc53c10115fd27d7001ce1b376126c11f934adf8a25c9df195754835fd707f40c540539553c091fa196115e02bb56cc41702a12a1d4fb1724a52
-DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495
-EBUILD gdbm-1.18.1-r1.ebuild 1357 BLAKE2B aa2a7ab93463f3400b8760ebde02bd1a93164c96c3d7b68807fad6d68002373470583f9e9f9dab78b7171b7579940a171ba688330d3f679431b37b5054ac6e2e SHA512 3e86f0cf3eff1e4c5a8aad315992efd2cb452ef117b1b961612db186144ef42c2158adea2d998e2c2ac58472c379a3553abac0613419884c57922a8fb433eed4
 EBUILD gdbm-1.19.ebuild 1316 BLAKE2B 93f38c5f423af1033a05b2225589ce5643941b7bb158b9369d58494356333017ce0eea2e74fdd64b2beccf6754bc192729bdaab24ae703be268fc61ffdb757f4 SHA512 2198bd55c2d87547d3fa4eed0893947b6e33c11299bcbeca744c45c5df5ccb770a66c441c717d3b908e5d72c2a5ce4d9842e962f82bdd2d86b40fdc519724f69
 MISC metadata.xml 359 BLAKE2B f58b008f8cd663d499052f6d3ea0f658b3816d28c044a4fb8a341a8ce7382104962f58b5ba881bb1dcfc8835cbfc22782471eb48088c547706caa63c35e21e97 SHA512 12da6a0492c269ebff68bf1b1d5ea44b9e011a9197c353157da04283fe865ffff01d6f6c28ecc73b5985ec39959c1c7911b2aa5c3e905929f41521b7cae0b169
diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch
deleted file mode 100644
index 9b3e3d736c15..000000000000
--- a/sys-libs/gdbm/files/gdbm-1.18.1-gcc-10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab05ea727942b5c1469e2e86548581264c6e2de4 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 2 May 2020 12:39:39 +0100
-Subject: [PATCH] gdbm: fix link failure against gcc-10
-
-Before the change on gcc-10 link failed as:
-```
-  CCLD     gdbmtool
-ld: ./libgdbmapp.a(parseopt.o):(.bss+0x8): multiple definition of `parseopt_program_args';
-  gdbmtool.o:(.data.rel.local+0x260): first defined here
-ld: ./libgdbmapp.a(parseopt.o):(.bss+0x10): multiple definition of `parseopt_program_doc';
-  gdbmtool.o:(.data.rel.local+0x268): first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-    https://gcc.gnu.org/PR85678.
-
-The fix is to avoid multiple definition and rely on
-declarations only.
-
-Bug: https://bugs.gentoo.org/705898
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/parseopt.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/src/parseopt.c
-+++ b/src/parseopt.c
-@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin)
- }
- 
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
- 
--- 
-2.26.2
-
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
deleted file mode 100644
index 87ad4ca3a375..000000000000
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="https://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6" # libgdbm.so version
-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="+berkdb nls +readline static-libs"
-
-DEPEND="
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.1-gcc-10.patch
-	"${FILESDIR}"/${PN}-1.18.1-gettext.patch #696838
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# gdbm doesn't appear to use either of these libraries
-	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
-	local myeconfargs=(
-		--includedir="${EPREFIX}"/usr/include/gdbm
-		$(use_enable berkdb libgdbm-compat)
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with readline)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-	mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 02bee9a5481e..c052d28b1a97 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -34,7 +34,7 @@ EBUILD glibc-2.30-r9.ebuild 43278 BLAKE2B 836802d5e28a4202964e13f708f61bd65be495
 EBUILD glibc-2.31-r7.ebuild 44397 BLAKE2B c43a3104751b92239d2bba5121d2d03d0c1279ea5b84e6c62a3e23d5ef9f76cad1fe5177baec2085db75c5a5f9d8005acd85b9fa470589142c3974b5c1206163 SHA512 2b96b8b1fac60df14d6f4853380356d87715fca652f575b163e9e06541dc6b80c3cd9add0022ffcac4aa9aa6ff113e55866575422882333f197a8b0e7aa89720
 EBUILD glibc-2.32-r6.ebuild 44725 BLAKE2B d1bbd4f9362d42c262ccd2f2f99802d000fab7268347056bffcd9af24646bf8f9d64f24ac6efea50189cecb26c8b011853b1775ac7e070e8a4dd87072ecf0c68 SHA512 8127942411ae8494552f75a2134221df085c5d1330a1671173acae951c880786c8da4293fc23d206736cffd821c40e5a28eae862318b4c1983cb1fdefb45f3c8
 EBUILD glibc-2.32-r7.ebuild 44728 BLAKE2B 56b47e092aab1918b0a9b5bf6b804322a7045a2d17522411312204b82911514e5278aa4b6d063b158ab29d5501c44de62033834debe5ccc1ccb9c40844128c7a SHA512 aa741cb727653c6896b8d3c4382eb232d1847ba54244f7a644d2c07ec393d7edd97e77acd6cd73252f3d44ced99ce637a291047e9ba4b4ff4dff117ca4cce10b
-EBUILD glibc-2.32-r8.ebuild 44729 BLAKE2B 41208b65bfef1fe25f3423c018c01e40d89466d1e269a78703df3c15f6d6a16c6d639fbcd1c8cf94e4333fb5012ffeb90be869fc1e4f7e7bddd60ee972ebbde7 SHA512 37ff18d88bd6ecf340fc2c5428f608fa61b3d670084f4f87350b367fbee6fe9ca9636ea6252967e5f5dfdb20fba44fdfe5041c35e99f3ebbb79d158df8830e57
+EBUILD glibc-2.32-r8.ebuild 44728 BLAKE2B 32dad24e14089fea9c4d055400f1b3a6917173d46255ab14cca1687bc0b3bd8e39ca952ec117fcee7f608a11c2851a830d881ca0c75b403b22848273407064fb SHA512 974df75bb17f6291b80e2692253aa1d4c20fa1ca92c36620a69dcc8526a18ac1dde87694983a360bc5d26373dd111d3e074ea7e00fde0d4b8e9253fc8f5e801f
 EBUILD glibc-2.33.ebuild 43868 BLAKE2B 8f68bc1f6e458a767bd653061b9889ba3a3868f525366eba10cf288a91b10db02d22f4f5102f652b95948089bfa633a24eb24d1ff642f6d548e7af7105d63e1b SHA512 9277970ee3998b7de7aa06472a775b9c4fd9ffa96c07e902669c557f38d323b209c0ff36324dd21c89c6ea66bc3a05ae94a1669a91d99413d88d19c5dc0a2bdc
 EBUILD glibc-9999.ebuild 43887 BLAKE2B 760b8d67d86cc1f7f10c2c955deadeb82b7e7d2d8a84c687bc9b264a3264aed63941028e1191a6ed227c8286acceb9099c3db1a21f8ba72ffcb378529ef1a811 SHA512 35a11056f3faff6df0fdc7beebdb3ce17562012b2cd3dc799efa1ec4b67f3cea0abc4810451d9d063fa5e2d47009f67c3ece50c26757ebd47cd178839643d294
 MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild
index d8f0fe717964..f02000d318d4 100644
--- a/sys-libs/glibc/glibc-2.32-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r8.ebuild
@@ -23,7 +23,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 	SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index c01321bc70cd..874051f1b5b6 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,9 +1,4 @@
-AUX libapparmor-2.10-symbol_visibility.patch 219 BLAKE2B 37bb9ceabfedde6f21e313fcc6a85563fdeca86863e681fa40689b5ce8cb5bdf87947c19b176d7f96edac562b6420a0ae6aae717967782e1bd1bb6ffd4782671 SHA512 93c5e19a6cdfce232a71f9b33b1e96dff44b947c06fc6e348a31038ef78bec7b90e49698681a4010bffd4274ff17a304542b549a8840458b3ab17d4ef1b53d36
 AUX libapparmor-3.0.0-symbol_visibility.patch 354 BLAKE2B 292bb70c043908943ddc553395ccd2a7b61b6d1643b3f9e659057f65065b448e83f821ad6f86abd00aeb96a1dd701864b5491e03a6802b7cc05141594da67c5f SHA512 0fceef027707056b7a22b0782c761c672735bc663d7e0d0200a445ed388f71a646841c3f72bac1f261c0a9fa3c3c0ff239397d53b56b1ef6080a1400c97f89ba
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
-DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD libapparmor-2.13.4.ebuild 2129 BLAKE2B c1cb757b4df3b1c0d285d6f22d43c921aff5ae091f27de6c1bd87273ab4bbddc8a0bcf073ed9183bf0f922ab9742b5a1533d71aad4eb4cfe4984ef0a3272e3ba SHA512 efb43e0bec424fe05204721f9361c5b1f51645f22ec617cc5e1e60e62b165ba61cb748c318f371fd86695e2198b496efdaa2e8ccf90f76f4a0c2786ae188ccd7
-EBUILD libapparmor-3.0.0.ebuild 2164 BLAKE2B 96091697a0d90ef481687b928e062946cef57e7f681146dd7587d909cedd969f4be2afd7391032ddfca4ea96dfd7c1f2d3f7873578e6cb8ca74c8488f1e7f1f8 SHA512 43ac5f822a3f764fb51296bc33b6da85530d64dd5c3171b8f0885ac01950d5ba918ab35e5ebac40e38f3ab375ffd8359fc09cefc568327ca58484fd3040a86a3
 EBUILD libapparmor-3.0.1.ebuild 2099 BLAKE2B 78917701ade725899091e4e76d5bec62dc9cc61d0f678d182764434ea91e515a98f8413413e184747c5e9863fe829860e1e9d1b23fd4c5ac5a06eb007b946659 SHA512 c56a65ab1ca44c0bbbe46eeb6e82ae0eea681c8f12f96dc9569c4a5d842b6a3537517ea3578e04e0a6b07fa39c81d0882a199642159819d1a3f8e82d4ea32cec
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/files/libapparmor-2.10-symbol_visibility.patch b/sys-libs/libapparmor/files/libapparmor-2.10-symbol_visibility.patch
deleted file mode 100644
index fa2c384b014f..000000000000
--- a/sys-libs/libapparmor/files/libapparmor-2.10-symbol_visibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Adds an aditional symbol to allow dynamic linking.
-
---- a/src/libapparmor.map
-+++ b/src/libapparmor.map
-@@ -94,6 +94,7 @@
- 		_aa_autoclose;
- 		_aa_autofclose;
- 		_aa_dirat_for_each;
-+		_aa_asprintf;
- 	local:
- 		*;
- };
-
diff --git a/sys-libs/libapparmor/libapparmor-2.13.4.ebuild b/sys-libs/libapparmor/libapparmor-2.13.4.ebuild
deleted file mode 100644
index e87d5f295ebc..000000000000
--- a/sys-libs/libapparmor/libapparmor-2.13.4.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
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools distutils-r1 perl-functions
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-2.10-symbol_visibility.patch" )
-
-# depends on the package already being installed
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	default
-	eautoreconf
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with perl) \
-		$(use_with python)
-}
-
-src_compile() {
-	emake -C src
-	emake -C include
-	use doc && emake -C doc
-	use perl && emake -C swig/perl
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C src install
-	emake DESTDIR="${D}" -C include install
-	use doc && emake DESTDIR="${D}" -C doc install
-
-	if use perl ; then
-		emake DESTDIR="${D}" -C swig/perl install
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild b/sys-libs/libapparmor/libapparmor-3.0.0.ebuild
deleted file mode 100644
index a3bba356f5d0..000000000000
--- a/sys-libs/libapparmor/libapparmor-3.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{7,8} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools distutils-r1 perl-functions
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-symbol_visibility.patch" )
-
-# depends on the package already being installed
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	default
-	eautoreconf
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with perl) \
-		$(use_with python)
-}
-
-src_compile() {
-	emake -C src
-	emake -C include
-	use doc && emake -C doc
-	use perl && emake -C swig/perl
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C src install
-	emake DESTDIR="${D}" -C include install
-	use doc && emake DESTDIR="${D}" -C doc install
-
-	if use perl ; then
-		emake DESTDIR="${D}" -C swig/perl install
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index a9da9438e3a4..7b367b6e0f15 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,11 +1,4 @@
-DIST libcap-ng-0.7.11.tar.gz 450541 BLAKE2B 66217f7fb9e3b3876ada6f355a2b69f16fda4ab3ab490e524358c4120583280ce6497770ec6452596426594b877d79c0e03db10d6413c1cf20bd01e996f7347b SHA512 150c4f48d7334966aa7af683e46bc3b8b4d4a2e80be826e6f6a61a0ea0666e2f4dafcd012c536fa321c4954c00059c689cc8d6dc089000ca1dca2fd52e3efe9c
-DIST libcap-ng-0.8.1.tar.gz 454950 BLAKE2B d2d8902526f1cb6f1f579ec4ca1ca33bf45db325eac07a94b97dcee58411f8657591a840cb7420a94617bf8c21858c4b31138ca3126f6cfaff6b8c82b991149f SHA512 cd28ceb43e2cf5d3a0140fddbd2ea13dfda8eeea8a6de1817f3cc3b38df874ab8653917dbd405ad7aaaa71bcb9ec246d995079aa3cb0af1cffbdb37dfdd99232
 DIST libcap-ng-0.8.2-apply-disable.patch 723 BLAKE2B 70d9959c55119c02bbc4ea605251491c04c477511c20b9fe93e6527ffd3fe2f35a72fabab5ca149c4aaf536c6cd8dceb15375297158f8827a0c676744381bbc1 SHA512 8c9317bdd4fde7d6a4618ec613bce46bed7646891bd16bc3fa307e9a814e38601bf3c6ad13102389d4596d9ed6a7ad853cca58624e724fe07383007e386c51f8
-DIST libcap-ng-0.8.2-apply.patch 2898 BLAKE2B 4c388bc2a61646639a78b6b3038a1027df7807076b9d0bef7c850e8c86e354260eaee47b4f3d10a1db3d961584935005e155eba04a38decbe4256fc3e5fab968 SHA512 1d3d443c524fb4b885702b460f7ec7eda6377ed571528ca679add9494eb8172ead607ba32e139d4150672e81e79e12687a5b09c93d4f24eb2edb1381c2ced76d
 DIST libcap-ng-0.8.2.tar.gz 456066 BLAKE2B 7e721d05b92fd3708b970527e76b1898daa91bde3ab6ed5d8f23b1435404fbe7d15731461c6d9d2c791738e5498d1f5eaba727413480d34b7edea13c8691c32b SHA512 0ac6e55c03b1fba3a849048b721e250951afb59190d9646704d4fd9938eccc3bd0767380fbddc42f186b4f55695475e31f34f537ae91c04a37662577a5b7a19b
-DIST libcap-ng-0.8.tar.gz 453181 BLAKE2B 8f4b2e13e5c2c21f1ac1455ebdaf04b42e07fa79d9026651f41eab041cdf99bd40d91b8ce2262e58bc2de3e2a793f676df8c69d832ccadfa4b486ebefeb4b128 SHA512 d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2
-EBUILD libcap-ng-0.7.11.ebuild 2049 BLAKE2B 35338ba2407a07b2477a12064c41573de88eb24bc8b237b329c007f7d3958c2d0b1af1eba4ff5f928aea566a33ac966acc6df08052df69de0df21319891b7d18 SHA512 e8a66b995343cabcf000bfbcae83a66e638c12be38b628a669429c603909e6868497309c2e66538dc34c6a84b8a874ab9b11a2783505baa45072d55c5b49b633
-EBUILD libcap-ng-0.8.1-r1.ebuild 2648 BLAKE2B 7575eefdfdd2a62e973cd1485523fa2247665babcb858c78ba30036ff46b97dcea644e9be672d64a509e112dd07b61586ea92ba0f7c3100b5aad2778fe079931 SHA512 3778f3ebff0e4e9e2f1ed91159700a7db9e3529ab31de4c9bc0d597d92706be57a03451cb4ad82dd5b8da22e376758dc733bbecbfdb02f1c4d189a4d364f8e2b
 EBUILD libcap-ng-0.8.2-r1.ebuild 2360 BLAKE2B 80205b9fe7bace9bf26e569c1c07d91eae2e07afb619697d2f62d84a0ae2b520d688225fcf897e8e33aee9b989e01fd39b55a9bde2e13ff806d379138ea683bd SHA512 b941ffc08d3c9bd1018ece53bd42e548697c48999250a5e76d71b6b51bbddd63e750061aeed65b6175265e04353dd9e4f04be23038771184a239f9ad714b5217
-EBUILD libcap-ng-0.8.ebuild 2057 BLAKE2B 6d9b1f73c76c72c698f497ac602d149ca8ad673142ab698a84382e8e273e1ba6805fd856947102db03fbc038675f6faf291a38d123a085d4ba8b182132b862a4 SHA512 6aef3e5a87aa6e6bec3dabd1c4259a8b0bb13fd31defecd4ff36957171ef292ba63314542c861d5768802721badb90bca4cd2a87edc021a68f3fca1889522de9
 MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild
deleted file mode 100644
index a8cccecf3c6a..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.11.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	default
-	if use prefix ; then
-		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
-		eautomake #668722
-	fi
-}
-
-src_configure() {
-	use sparc && replace-flags -O? -O0
-
-	local ECONF_SOURCE="${S}"
-
-	local myconf=(
-		$(use_enable static-libs static)
-	)
-
-	local pythonconf=( --without-python --without-python3 )
-
-	# set up python bindings build(s)
-	if use python ; then
-		setup_python_flags_configure() {
-			pythonconf=( --without-python --with-python3 )
-			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
-		}
-
-		python_foreach_impl setup_python_flags_configure
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir emake
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}"
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}" check
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
deleted file mode 100644
index 4e348e781af4..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-# Fedora 0.8.1 https://src.fedoraproject.org/rpms/libcap-ng/c/49e3114cf75fabe9919300e42f7b151eee9e37d1?branch=master
-# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master
-SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz
-		https://src.fedoraproject.org/rpms/libcap-ng/raw/49e3114cf75fabe9919300e42f7b151eee9e37d1/f/libcap-ng-0.8.2-apply.patch
-		https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="python? ( >=dev-lang/swig-2 )"
-
-PATCHES=(
-	"${DISTDIR}"/libcap-ng-0.8.2-apply.patch
-	"${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch
-)
-
-src_prepare() {
-	default
-	if use prefix ; then
-		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
-		eautomake #668722
-	fi
-}
-
-src_configure() {
-	use sparc && replace-flags -O? -O0
-
-	local ECONF_SOURCE="${S}"
-
-	local myconf=(
-		$(use_enable static-libs static)
-	)
-
-	local pythonconf=( --without-python --without-python3 )
-
-	# set up python bindings build(s)
-	if use python ; then
-		setup_python_flags_configure() {
-			pythonconf=( --without-python --with-python3 )
-			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
-		}
-
-		python_foreach_impl setup_python_flags_configure
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir emake
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}"
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}" check
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.ebuild
deleted file mode 100644
index 0885295ff35b..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	default
-	if use prefix ; then
-		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
-		eautomake #668722
-	fi
-}
-
-src_configure() {
-	use sparc && replace-flags -O? -O0
-
-	local ECONF_SOURCE="${S}"
-
-	local myconf=(
-		$(use_enable static-libs static)
-	)
-
-	local pythonconf=( --without-python --without-python3 )
-
-	# set up python bindings build(s)
-	if use python ; then
-		setup_python_flags_configure() {
-			pythonconf=( --without-python --with-python3 )
-			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
-		}
-
-		python_foreach_impl setup_python_flags_configure
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir emake
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}"
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}" check
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	else
-		local BUILD_DIR=${WORKDIR}/build
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 66a9bd53db68..0d0ae4d77201 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,16 +1,11 @@
 AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520c4694178aa1d85bf0c48abfca4c77f940b4fbb9bd08464edc31af657960fc41cab71d112ebf3573d1aa1f23148 SHA512 637f5dc2d7ead44a19a57db436ddf7e8afa1b368c72e5520a1ac77633c20b0f9a2af9defdafed1edb7209474798d1bcd236c712a160b5c6920d8864411baefed
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032b843ff7cb704c9880cfca4db5083d05d479c71dd12925d729f22a4900c2ae277a20399d58830eaca969842d587a2ae0a646809d6b659a75d13678312 SHA512 ba573ce68858c1370f3d25ad03678a534e6f3052076694d09e795d1febf2f3d76a6a170658b71d9e31105521fd5d22dd72095585a5402286dba424937064b389
 AUX libcap-2.38-no_perl.patch 3049 BLAKE2B 77fdcda75b273fd69695161d48f37fda40375f5f36acdb31e9f9e5b7585e6933733586c6ad96673efb79a6657dbbffd4431612ed723905e9f4d595a9dd8c49c4 SHA512 f3938a8a78407639bfdda4d9c4b4096025f956430f9efbce438689aabbea74915c55c6afbd45a7af4ecc0c437ee72e9aa8335da52d3237c928702e62824e537a
-AUX libcap-2.42-build-system-fixes.patch 6518 BLAKE2B 138347d98901a0a41c36a3f3e1ff7c539836ba00e0cb1c80005d1e261c35f822bee51a4ca86be324f84b29fc6362e9b891ef105b2142f22be4e8896731b3ee16 SHA512 fbe8fe06ab3650b3247811b04b4afa1d56fc641de0b90c448b99904816b7d4e02d30c5dc54cd038d57c16f828a671c73f3c176e1e5826e6b9c69e2d3085015ff
 AUX libcap-2.48-build-system-fixes.patch 6274 BLAKE2B 4c81eb50b0a682ca9df03145a53e884589e0961e1b754b522f40d48fca60fe983ae93349d256e62977bf28c99c8c25763d05aa8483aebfc436664756a220d70a SHA512 5b88a5c5ea14d2270ed4018249ceb32b0c91db03ed18a6989cc44250da91887385dc3f37087f716771ddbaa90c7e3d733a64063507465eb354252d9f64b85f80
 AUX libcap-2.50-build-system-fixes.patch 6687 BLAKE2B d46b6f0734a5acd930248b29c17850447d87f4e554b4d3e79cb35d978b17552e84e27e036c3b0c4ae6573f94e9e7033a9264b646d61dc8c441c04bc6d9b12af8 SHA512 0fd3b5463dcbbaca41d7c1099be7dd370945408f3763dad68d128a650cbf62c23c653a971b07ed4cdc1b56d425caeec3775b91912635c6a2539534bd20e00756
 AUX libcap-2.50-install_capsh_again.patch 991 BLAKE2B f9260fe8d3045e7d4408d5c2ba976a7c22031f174a14c282c31df8e4ac9a7a9cfe8207bdacd0b10d4ed741030319f2524edfc6ca28abdc0040118f2e3286b350 SHA512 891f690440b6d67a2d1f32bb1a8fc51048ba2b6d8c5e0cc1543d741e1ed0b32898a7df7641382698b23056b279c7cf7ed1cfa162a1908ff6362cf011e22d632b
-DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
-DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
 DIST libcap-2.50.tar.xz 143792 BLAKE2B be83dfe1e55a4363936f53afb13edd2c1fd8c9bc27f7946bfda1eb8fb3046d0370997dcf85ba9dab7de10673527b4e8d15f104a75eaf407cba8ed0fc42465790 SHA512 6ac2df1ea9a9154e082c0595d343380ff8abed953b53c635a9297683289f2fa708eff488a42c6053e5ac556a5d90faa8709b3d98a47b2911f05bf80f2663a543
-EBUILD libcap-2.43.ebuild 2164 BLAKE2B dce446ad76deb296dd6c526ada8b15e6d0965dae57acd3599a84fc28295ab1d30ebe9f3de7b346d8247ee782235037a30c60599c06a0db444aa6d4ab0434a0d6 SHA512 112e5c6fae86a2e3a01681853515eca16fd65e42d6c9857f451b5e6188259daf6d7e80a23371d3a97b4af3688a3e13cf339daa938381eae6206d7b4a63d720e3
-EBUILD libcap-2.48.ebuild 2202 BLAKE2B dec34ea59189902fec1554dd51f425a86c1cc74484b8ac8c5c8c3fbacd878a5c671db1c7028349cfadaf2e69ddd3947e854f0fc58bcc1936566b9d0ab63a3927 SHA512 1389c09e6dfda0a790b0974240de29ea958acc2cbb38b23e10408007a1feb19d58999f8c964a54f470f4dc630215cdf16ac8b9b48611e8da81862239ad3d5c2c
 EBUILD libcap-2.49.ebuild 2195 BLAKE2B b5950f22f86e8ee2008751b9ab76013d603c201e5b1c1665c34f4d7e31bb2102ad1e3ad1c0ad67b2ca48ae5f76ba4c12169f61493a3861e97f1744a3d5355133 SHA512 2a84719633d35cd16a301cbdcde67dc1ee4e7f1f04c043303404d1b088529491fdfdfadd29c3eb5f8a2afbfe7dede105885063322645bca986ffcdf002bb42ee
 EBUILD libcap-2.50-r1.ebuild 2263 BLAKE2B c05c69b56c92c537dbfa49a48ce1090552c274e638638c6e934ed8b97fb872169d077b07a73e7439210ce9d7a0a3cd935692ae766669603d9482a64f0e3d7eaa SHA512 5f667e05321f15f55ced0dc98520429085808cbbc751f9c7aeab2e75067512fc03fe04bb0f41d27390ea634cc0a2f8a30856142bbd8cbc633042e41163082f07
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
deleted file mode 100644
index 10959cf93395..000000000000
--- a/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 8599fc87e91b7903cfb1877983615dadcbcc1b29 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 5 May 2020 09:52:40 +0200
-Subject: [PATCH] build system fixes
-
-This touches up the homebrewed build system to work much better "out of the
-box" for people.  Specifically:
-        - allow toolchain vars to be set via environment
-        - CC / BUILD_CC / AR / RANLIB
-        - CFLAGS / CPPFLAGS / LDFLAGS
-        - split CPPFLAGS out of CFLAGS
-        - break -fPIC out of global CFLAGS and only use where needed
-        - use LDLIBS for libraries, not LDFLAGS
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-Forward ported from libcap-2.24 to libcap-2.25
-Forward ported from libcap-2.25 to libcap-2.28
-Forward ported from libcap-2.28 to libcap-2.29
-Forward ported from libcap-2.29 to libcap-2.33
-Forward ported from libcap-2.33 to libcap-2.34
-Forward ported from libcap-2.34 to libcap-2.37
-Forward ported from libcap-2.37 to libcap-2.39
-Forward ported from libcap-2.39 to libcap-2.42
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- Make.Rules       | 12 +++++++-----
- Makefile         |  1 -
- libcap/Makefile  |  7 ++++---
- pam_cap/Makefile |  8 +++++---
- progs/Makefile   |  2 +-
- tests/Makefile   |  6 ++++--
- 6 files changed, 21 insertions(+), 15 deletions(-)
-
-diff --git a/Make.Rules b/Make.Rules
-index 8440e18..67fd4a6 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -52,13 +52,12 @@ GOMAJOR=0
- # Compilation specifics
- 
- KERNEL_HEADERS := $(topdir)/libcap/include/uapi
--IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
- 
- CC ?= $(CROSS_COMPILE)gcc
- DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS ?= -O2 $(DEFINES)
- BUILD_CC ?= $(CC)
--BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH)
-+BUILD_CFLAGS ?= $(CFLAGS)
- AR ?= $(CROSS_COMPILE)ar
- RANLIB ?= $(CROSS_COMPILE)ranlib
- DEBUG = -g #-DDEBUG
-@@ -73,16 +72,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
- 
- BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
- 
--SYSTEM_HEADERS = /usr/include
-+LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
-+CPPFLAGS += $(LIBCAP_CPPFLAGS)
-+BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
- INCS=$(topdir)/libcap/include/sys/capability.h
- LDFLAGS += -L$(topdir)/libcap
--CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
-+CPPFLAGS += -Dlinux
-+CFLAGS += $(WARNINGS) $(DEBUG)
- PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
- INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
- DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
- 
- GO := go
--GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
-+GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
- ifeq ($(GOLANG),yes)
- GOROOT := $(shell $(GO) env GOROOT)
- GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
-diff --git a/Makefile b/Makefile
-index 03d7748..4437468 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes)
- 	$(MAKE) -C go $@
- 	rm -f cap/go.sum
- endif
--	$(MAKE) -C tests $@
- 	$(MAKE) -C progs $@
- 	$(MAKE) -C doc $@
- 	$(MAKE) -C kdebug $@
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 81b089e..63fe555 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
- MAJLIBNAME=$(LIBNAME).$(VERSION)
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
- GPERF_OUTPUT = _caps_output.gperf
-+CFLAGS += -fPIC
- 
- all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME)
- 
-@@ -50,7 +51,7 @@ libpsx.pc: libpsx.pc.in
- 		$< >$@
- 
- _makenames: _makenames.c cap_names.list.h
--	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
- 
- cap_names.h: _makenames
- 	./_makenames > cap_names.h
-@@ -82,10 +83,10 @@ $(MINLIBNAME): $(CAPOBJS)
- 	ln -sf $(MAJLIBNAME) $(LIBNAME)
- 
- %.o: %.c $(INCLS)
--	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
--	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
- 
- cap_test: cap_test.c libcap.h
- 	$(CC) $(CFLAGS) $(IPATH) $< -o $@
-diff --git a/pam_cap/Makefile b/pam_cap/Makefile
-index 56604fd..2da4674 100644
---- a/pam_cap/Makefile
-+++ b/pam_cap/Makefile
-@@ -3,6 +3,8 @@
- topdir=$(shell pwd)/..
- include ../Make.Rules
- 
-+CFLAGS += -fPIC
-+
- all: pam_cap.so
- 	$(MAKE) testlink
- 
-@@ -16,16 +18,16 @@ install: all
- # written (and you know why it fails), email me and explain why. Thanks!
- 
- pam_cap.so: pam_cap.o
--	$(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
-+	$(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
- 
- pam_cap.o: pam_cap.c
--	$(CC) $(CFLAGS) $(IPATH) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- test_pam_cap: test_pam_cap.c pam_cap.c
- 	$(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
- 
- testlink: test.c pam_cap.o
--	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
- 
- test: pam_cap.so
- 	make testlink
-diff --git a/progs/Makefile b/progs/Makefile
-index 076e44f..fd13351 100644
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -23,7 +23,7 @@ $(BUILD): %: %.o $(DEPS)
- 	$(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
- 
- %.o: %.c $(INCS)
--	$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- install: all
- 	mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
-diff --git a/tests/Makefile b/tests/Makefile
-index bfedbc2..2b9a801 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test
- 
- sudotest: test run_libcap_launch_test run_libcap_launch_test
- 
-+CFLAGS += -fPIC
-+
- install: all
- 
- run_psx_test: psx_test
- 	./psx_test
- 
- psx_test: psx_test.c $(DEPS)
--	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
- 
- run_libcap_psx_test: libcap_psx_test
- 	./libcap_psx_test
- 
- libcap_psx_test: libcap_psx_test.c $(DEPS)
--	$(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
- 
- run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
- 	sudo ./libcap_launch_test
--- 
-2.28.0
-
diff --git a/sys-libs/libcap/libcap-2.43.ebuild b/sys-libs/libcap/libcap-2.43.ebuild
deleted file mode 100644
index e167daea97bc..000000000000
--- a/sys-libs/libcap/libcap-2.43.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs pam usr-ldscript
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="pam static-libs"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	${PDEPEND}
-	sys-kernel/linux-headers"
-
-# Requires test suite being run as root (via sudo)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.42-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.38-no_perl.patch
-	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
-	"${FILESDIR}"/${PN}-2.21-include.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG=no
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	if ! use static-libs ; then
-		# Don't remove libpsx.a!
-		# See https://bugs.gentoo.org/703912
-		rm "${ED}"/usr/$(get_libdir)/libcap.a || die
-	fi
-
-	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
-		rm -r "${ED}"/usr/$(get_libdir)/security || die
-	fi
-
-	if use pam; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.notes
-}
diff --git a/sys-libs/libcap/libcap-2.48.ebuild b/sys-libs/libcap/libcap-2.48.ebuild
deleted file mode 100644
index 9cfc5eb049ed..000000000000
--- a/sys-libs/libcap/libcap-2.48.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs pam usr-ldscript
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="pam static-libs"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	${PDEPEND}
-	sys-kernel/linux-headers"
-
-# Requires test suite being run as root (via sudo)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.48-build-system-fixes.patch
-	"${FILESDIR}"/${PN}-2.38-no_perl.patch
-	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
-	"${FILESDIR}"/${PN}-2.21-include.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG=no
-		CC="$(tc-getCC)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export AR CC RANLIB
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	gen_usr_ldscript -a psx
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
-	fi
-
-	if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
-		rm -r "${ED}"/usr/$(get_libdir)/security || die
-	fi
-
-	if use pam; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.notes
-}
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 5431d52b9e67..5251638a3ec8 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1,6 @@
 DIST libselinux-3.1.tar.gz 204703 BLAKE2B 72ff2d99dd6640405e804f58bdfbf05e152615ea92f902b3942602af13dc17080afeabb942ed33ae6b3f528870f4b11584e533848e455a97bf8f7151a8d44646 SHA512 57730cddd2d4751556d9e1f207c0f85119c81848f0620c16239e997150989e3f9a586a8c23861fd51ed89f7e084ad441190a58a288258a49a95f7beef7dbbb13
 DIST libselinux-3.2.tar.gz 206380 BLAKE2B 544eaaa87b9738c61929abe48713b530a8909eaea017890040f2fe299af86f09b6eb2cf4c9a68e06268ba09923b2b67703ac7a2b973906acb45f698e9ccaeed2 SHA512 18129ac0b9936e1f66021f1b311cf1c1e27a01e50cb70f08a3e1c642c5251e4538aec25a8427778569dfecf5333cf1fb84f1a59afdce8019328d0cff7e5833c5
 EBUILD libselinux-3.1-r1.ebuild 4215 BLAKE2B 36d801acf1836645c710ba451aee245317c85dca7452ee990b1ae4f409e758d1cbdd3e47bd839e642e04e6d0cc30a4413060470a47a613a503361182d51128d6 SHA512 1e62339dd7530ce1eed4884024960e2012b533bc7d1160ce3a821956c502af7eaefee69dddb166df44a5d2a26940d5357400f5019c7b62cfc0209161cfa33af5
-EBUILD libselinux-3.2.ebuild 4235 BLAKE2B 907af15311f4f5e94583ecd32a097021feb022ef997d95eaddf046c6d36c384f6d9ad4de9f2a58cdeb8a65a2993ea5faf4060a840a2af23fe7fd7c5c1e42fef0 SHA512 83b2dca2f27d387db7ce337a217ff3cc25f2271b9a57d0017aec52f4dbed53aab7bbdea3f5f930ad033dcb9bfa1ac3bd3f37ccaa72b31f4b2341919d0d739e65
+EBUILD libselinux-3.2.ebuild 4236 BLAKE2B f80952681363234b36d8e6427a799b952c7c9a880d02d6fd445338043bf371e8e353e6a228f638adec2d3b00f44443a3136845522bc0bbf251050126f5d497da SHA512 49256ada8e1fad4bc3b8d630cbec1952bd6c0e220a9b1aa4322d76a0e3e213b5bc1004c02bfdfa25573c973c3ab264de5bc96961aed60c0eee8bc6897a51d43e
 EBUILD libselinux-9999.ebuild 4235 BLAKE2B 907af15311f4f5e94583ecd32a097021feb022ef997d95eaddf046c6d36c384f6d9ad4de9f2a58cdeb8a65a2993ea5faf4060a840a2af23fe7fd7c5c1e42fef0 SHA512 83b2dca2f27d387db7ce337a217ff3cc25f2271b9a57d0017aec52f4dbed53aab7bbdea3f5f930ad033dcb9bfa1ac3bd3f37ccaa72b31f4b2341919d0d739e65
 MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/libselinux-3.2.ebuild b/sys-libs/libselinux/libselinux-3.2.ebuild
index e2b8d9f65ed0..bb2db991f95e 100644
--- a/sys-libs/libselinux/libselinux-3.2.ebuild
+++ b/sys-libs/libselinux/libselinux-3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 USE_RUBY="ruby25 ruby26 ruby27"
 
 # No, I am not calling ruby-ng
diff --git a/sys-libs/libservicelog/Manifest b/sys-libs/libservicelog/Manifest
index b01e058b8aff..e1d6fea9df51 100644
--- a/sys-libs/libservicelog/Manifest
+++ b/sys-libs/libservicelog/Manifest
@@ -1,3 +1,5 @@
 DIST libservicelog-1.1.18.tar.gz 453645 BLAKE2B bacbd3c24d97a563cc3d51872dd349780416914c8f300ba63cf43b666e18f3fc7693556ecfbb21cbb2d66e14ac2d26259f0a587a21cc70ad660626838fd4281f SHA512 a9c4a8c778c257cf9df3d35652d707ef5ff1df1bf40484a7c23bd547127d2eb0f3465ae524e2c4ab3cd67946431ed98ec876e8b4332b5f27df2e927309fd05f2
+DIST libservicelog-1.1.19.tar.gz 90198 BLAKE2B 1abeb831fe2103c19e8e7d2969c9749d7aa7f77ee87b2423b11ca13c717c9d026df60a9cd9c7067e484b4b6cf890ab1d3db1aba6c1071c0dc2583d350dad61e2 SHA512 71ecd7ef59a30fff6336621d279d33520d2d772445af0382609cbe4f311dbe31f35b4e03b3cfe918a9793b065400e0004188f5a5635a0ff71e62cd4d2e78ad66
 EBUILD libservicelog-1.1.18.ebuild 598 BLAKE2B 7c439d2a239e8731eacdfc4a1e843dac44c3247ce7d61f464f5ec6cc1fc5c4d903e93fff73c4aae44ae3e3615cc9d983da34e498dd3e246e5d5814dec2ff9255 SHA512 9f495838877049069be55a8a1a45de57fa855453c3a64c3767e60b5559fcb7c6633ee790c8b8d72045a508523333b1e782235c59a01cd9797a604b4b2a0e86e2
+EBUILD libservicelog-1.1.19.ebuild 688 BLAKE2B 5b7bcbafa2bd6819e7551196597f4252953e39d592a36aab97ae94f173b3c226dfe6fdb05c56d23c556f361e9db003e48254ee8fed0b7b96d0e1f6673e1d5fc1 SHA512 ea27d8b5102a63ded9c0894f86fe253aa03bb4bb6487e291ca7584e5fb3c610cd7def182b3bc76c9dd5d564538fce24ffefd32d34c0e25b31ad3c4fc2c5214da
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libservicelog/libservicelog-1.1.19.ebuild b/sys-libs/libservicelog/libservicelog-1.1.19.ebuild
new file mode 100644
index 000000000000..8d3fc3d75d9c
--- /dev/null
+++ b/sys-libs/libservicelog/libservicelog-1.1.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Provides a library for logging service-related events"
+SRC_URI="https://github.com/power-ras/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/power-ras/libservicelog"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~ppc ~ppc64"
+IUSE="static-libs"
+
+DEPEND="
+	dev-db/sqlite:=
+	sys-libs/librtas
+"
+RDEPEND="
+	${DEPEND}
+	virtual/logger
+"
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	local DOCS=( ChangeLog README )
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b2e82bf3ecc7..8ab1adf59fe4 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,6 +4,6 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.2.2.tar.gz 1055220 BLAKE2B a000357ed52e417d8cebe5537df658dc0f8f02f2da3efcd79125544ad63e11e05fa96136551d0bfeb09a3f6c9a2260bffcfbd329ea92e6a7b62aa690f48968aa SHA512 5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee
-EBUILD musl-1.2.2-r2.ebuild 3690 BLAKE2B 8ad2838c095828d5effda9fb200f6848d6877753f78d766cb784a17f069ccaeb4e3b9cb1d3a9a6eb60a65bf667ae4d763adf1fa24cc4f0332766012a908cff35 SHA512 66ce996146a15d02118f964d4ecbd22791aa42896cc0a004f532d9b31c0605f265a1c2d8f66829ee39f50ddbecd91d60465d1b8afcd4fe61075727c161be2cd4
-EBUILD musl-9999.ebuild 3696 BLAKE2B 0d613ea0b6812cc8c45939d7fe042db78a455cabc0f7b35f4f1d159930a382dd649d742e86026a0a22d25c09edcddd2b0334d066c22569d2562111f863729f37 SHA512 3fe236b993113f890ac25abf0761a1df8278a24bf65b442b8ce3bda328a28a0aad2e6712624b20ff47b12ca4015a5c0b8678c597c1580da5a61efd04b008cba8
+EBUILD musl-1.2.2-r2.ebuild 3686 BLAKE2B 66d760890b32b593cb681b8c6d2ef8cfa314d540cdb0bac165acb35b13b9a69b43820fe6c8a5f8eeab555d72066e62a3dba6426b56140e534ac9a12a5e720d07 SHA512 e7f1ee6262e1f7d249086541addea444540671f135c78f84731500ff7b3b1f8b59e8219616e949b3fd167a1d520291e62ddbea16c0202233d36b797b5fd31d66
+EBUILD musl-9999.ebuild 3692 BLAKE2B 1c5437d46c9c246d3f618416f07e209af31c1dae22abdfd7a5afd25a49f163511e9de93679d89edaf553646b10d349ab3b41f652b54270bad65e0f0461c893a9 SHA512 00d876467974f641804e1a27560c348c3eb25d7b9d776160fd505810e68a7c7afb82b228acd5d2787e3bb05c3878e6bf26912efa4c5ad8f38fc7635b04302270
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild b/sys-libs/musl/musl-1.2.2-r2.ebuild
index 732b5c5364b5..905348ba854e 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -28,7 +28,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 fi
 
 DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
+HOMEPAGE="https://musl.libc.org"
 LICENSE="MIT LGPL-2 GPL-2"
 SLOT="0"
 IUSE="headers-only"
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index b4f43dbfc2b4..56a2bbbc42f6 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 fi
 
 DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="http://www.musl-libc.org/"
+HOMEPAGE="https://musl.libc.org"
 LICENSE="MIT LGPL-2 GPL-2"
 SLOT="0"
 IUSE="headers-only"
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 2aa05428e817..cdf10b9a4998 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -3,14 +3,7 @@ AUX readline-6.2-rlfe-tgoto.patch 379 BLAKE2B 363dee5501fa9449eeee0647f1ae65106e
 AUX readline-7.0-headers.patch 550 BLAKE2B 82949940cda6d042923b3dde777fbd66643d80f4c2fd984eb11ef7f0fb48776ba8938d1c8be23087b328ce9b3ad0acd668f5bb4f0bda77b4a992119688a37191 SHA512 fec3d20e1581f35609a9d9f9ee1f48df8f9aa781e1a2cdcde2edf7d149624b5770867feb65a7ba142276d95a3133b768f5589e8041049aa0cf30068d0637b938
 AUX readline-8.0-darwin-shlib-versioning.patch 1888 BLAKE2B 8263c3b593150e6d31ed877195597a830ab7c8e905a285835a982b0a1c317ac27d6fbbec76f926d0bfdec4b5f36a9549d150b49c2103cd13724e38e231c40398 SHA512 73213d415bd876401e3c4ef52187171117016d9a41c621e2931067369cb2dc4975c43e7acbdb3eaba623685a076374c4c9187adcbe5941ea356514f603c9d3f8
 AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb4cd0cd0b25afa82d6fe8697dcb34aa541279010b308427c411a7133c481dd778551069893ad965ce6d3a4a9ff83 SHA512 81695abab2e9fba1b17a4c194b7c72eeb23bbc3ab84cb0716c08388c0ee60adb770ae8efcbbb6a2c7c6adab93dcff12e3a16d0423cf52a0166b38c9efee5c221
-DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
-DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
-DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
-DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
-DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
-EBUILD readline-8.0_p4.ebuild 4853 BLAKE2B 824ab50dd5f2c7ad40349ba4c13060cc70eadc7cb0a78c45a399206f0fda71659d1c75824662757f66ef221e3ef0c2e21a856f9cb0feaac55ff116e097a225f0 SHA512 f8cd28033c92c430de345a1c8bcf73a50c61557a7e4332bfe1023510d5915e14a62ccb7aeb1056a8cb9b120c176229dcb9f0edffa4c4a74ee1604e5a56db7e21
-EBUILD readline-8.1.ebuild 5384 BLAKE2B 9015a53e47b6e4817c55e35f74c27ba2d342867278f75213724995ae36bcacab7c5116f1c6cd7e96f568b150013c3167b2342aefd35dfeb126a19ba3f3228f7d SHA512 dd794ef79438984744cfee22bb5d67030ac027337e7c354b75d7537a922ab7a1dfcbda2bf3bfe7a230eb367eef4bd1ae591fb7c9af2964ca530fbbb76311a33a
 EBUILD readline-8.1_p1.ebuild 5375 BLAKE2B caeb17536a6fb372ca472aa89acc9888e101f5fa2bc126778b9a57d74a61167c3875642201c671868015937fd799b285fae6a98e370aecfa77b35d17c55132e3 SHA512 6d3b8d7e6b57689d45c5615c494cc226880e29e04a19223205bbc7c69e85a8e2af4e82cea4bf43e4ed652b8cf075db35d8de0a7eaca2c7ab83c04e01d700897a
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
deleted file mode 100644
index 3918add9dde6..000000000000
--- a/sys-libs/readline/readline-8.0_p4.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
-}
diff --git a/sys-libs/readline/readline-8.1.ebuild b/sys-libs/readline/readline-8.1.ebuild
deleted file mode 100644
index 4a4f8c7b6f2c..000000000000
--- a/sys-libs/readline/readline-8.1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-[[ "${PV}" == *_rc* ]] || \
-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="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 042611910e4e..46faca62add7 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 970a4e3139ef..20ca82973a62 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,8 +1,6 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-DIST thermald-2.4.1.tar.gz 455735 BLAKE2B ee4d6bc590bc50639c0b19adbba7e243358174a837b2ff155dea060b1cd09171d4fb77b18b785dc9f64a633f680358cb1d7b36e3bd438e5267e0a0a27e18497e SHA512 2dab7d57e028037208034ab4be95dc138ce028d4a47a0151c69816e1502065d801d52990641544b5d246144e654c15c663fa78af6cea094cf9a107f2fb29c1ef
-DIST thermald-2.4.2.tar.gz 455797 BLAKE2B 5be01fa67defe738d2e9109388ab440ee93fea63e2fb56c2f5294095b14077330f1af4cba454e0f39bde69726f358513bec123f1eb7815afac469fb2385b6c9a SHA512 96d5cb9bf4f04b6ec5763d499416c246077b2d6dbc623de3fbb2b1fb8dc8b702d417852119240496f28f0a69c52be1b2a47e5d9ee7e952a123c621bda4d809ef
 DIST thermald-2.4.3.tar.gz 455850 BLAKE2B 2348a5ce9175049e3cb2436ee6d7773af50ace9693956f5a0e64f9fbb28826004f5cf599887d7b4a8405680ecdf90dc04c054082bcca484151373e91d64eab1b SHA512 eda313aa91235ae024a673e9933267c3aa97a3a8e3e6501bf7daac24be747174b223c2f297e7b301477899d099878aa46c58cda936507c8d4683c4f14df009c0
-EBUILD thermald-2.4.1-r1.ebuild 1243 BLAKE2B c605e7c2f943184a9bf9c7ef71996601030211db219e72b6f1f30a50e4354fe5a0305adecbc6f39a40d395db92d7e2b8cb2c3085da6a8d22eeb83a45a56af8c0 SHA512 020218d8d67499e1bde6f69a640d8e2f3d972f30ea3e4ecff070c428f779a8e6e991931bf1c92552ff5168816e42b38eadf23dcac18a60a435589e2cba3320e2
-EBUILD thermald-2.4.2.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
-EBUILD thermald-2.4.3.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
+DIST thermald-2.4.5.tar.gz 455875 BLAKE2B f080dc065f5a0227cabed8e88d44c85c6e8ac932a6042b095a91840ea586213fe1b8ca93a04ee872f3e971d1efdd95c0f50357727d70b8e4fecd735e9c840f73 SHA512 8b7d75b3f1d7a98a9985c7552963cde19c81053d12fa39974c1129315fc23e66a432d9ada5d9e385989976453a83cf6418f410d3ce3317e23133d15d2ec37695
+EBUILD thermald-2.4.3.ebuild 1243 BLAKE2B c605e7c2f943184a9bf9c7ef71996601030211db219e72b6f1f30a50e4354fe5a0305adecbc6f39a40d395db92d7e2b8cb2c3085da6a8d22eeb83a45a56af8c0 SHA512 020218d8d67499e1bde6f69a640d8e2f3d972f30ea3e4ecff070c428f779a8e6e991931bf1c92552ff5168816e42b38eadf23dcac18a60a435589e2cba3320e2
+EBUILD thermald-2.4.5.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-2.4.1-r1.ebuild b/sys-power/thermald/thermald-2.4.1-r1.ebuild
deleted file mode 100644
index 093c0f2a0eb6..000000000000
--- a/sys-power/thermald/thermald-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source systemd
-
-DESCRIPTION="Thermal daemon for Intel architectures"
-HOMEPAGE="https://01.org/linux-thermal-daemon https://github.com/intel/thermal_daemon"
-SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/dbus-glib:=
-	dev-libs/glib:=
-	dev-libs/libxml2:=
-	dev-libs/libevdev
-	sys-power/upower
-	sys-apps/dbus:="
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/glib-utils"
-
-S=${WORKDIR}/thermal_daemon-${PV}
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_prepare() {
-	sed -i -e "/group=/s/power/wheel/g" \
-		data/org.freedesktop.thermald.conf || die
-
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-werror \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	rm -rf "${ED}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}
-
-pkg_postinst() {
-	if ! has_version sys-power/dptfxtract; then
-		elog "dptfxtract can be used to generate a more specific"
-		elog "thermald configuration for your system"
-	fi
-}
diff --git a/sys-power/thermald/thermald-2.4.3.ebuild b/sys-power/thermald/thermald-2.4.3.ebuild
index 2683a9652ea6..093c0f2a0eb6 100644
--- a/sys-power/thermald/thermald-2.4.3.ebuild
+++ b/sys-power/thermald/thermald-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-power/thermald/thermald-2.4.2.ebuild b/sys-power/thermald/thermald-2.4.5.ebuild
similarity index 100%
rename from sys-power/thermald/thermald-2.4.2.ebuild
rename to sys-power/thermald/thermald-2.4.5.ebuild
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index d8587cd2f1d4..6b52655a15e2 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c46c2267c4d8..21b844d8b662 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,11 +2,9 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
-DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca
 DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
 DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4
 EBUILD passenger-6.0.6.ebuild 4069 BLAKE2B f644fe935ff16ea908a7f6580d5fd12740b82ccfa26fae074d94df6f4ea46dec16ffab107ce9ef113e210f7eb90d5c9af4a92491f787271088b5c12a6811edbb SHA512 17357f9f346368021aca4acd3cb7516e7d1b340b5838c62fc7b43c3f7125d6fd2cfb5e116b3ca3ab7070c8203f6790a5c23beeea42fff0255337dab42b6df483
-EBUILD passenger-6.0.7.ebuild 4071 BLAKE2B 88556cba75e710275d64a50df6b2c9bc2721736240a0c6f2f611255093ce02d9b902fe14f33da152eba4069152c26d52b04b3962ed191fbc1bda82405c2d66f8 SHA512 e9e03814a511829b317f6c3c26ee6429f1dff106b80d4f1a088dfcc7ebdb615b93410ce1f8b7b5ed034956d2347bdb6e7582939c43de1168351e4f0fa5887dcf
 EBUILD passenger-6.0.8.ebuild 4076 BLAKE2B c715fd27326957b5398514c2288562ab600628cf00d37c7bd8309859587ae3d7a5da6f3d9e5ba339bd0c44c2ec67afeefa080399591eb4ae4616599bb70c8665 SHA512 ab6c553a6a1850915e70228e31f48867fe6e825089a350a7cfa30eab7bf04db3258e9848ff62012a925dc714e8fe0b2612deef577e50d0315b357a2aa9a96fc6
 EBUILD passenger-6.0.9.ebuild 4032 BLAKE2B 323cef5a46100ef17eac571e87047e2458aa5f20796f6f1f40930bb87ce8f586724ac4971759623c888106eacaedffb7a814f0a662f32534be5f481cf38b754d SHA512 4aeaa508c085c0a2478c72301f9d0da0183445864b0af6242ae889615e1ff30889488d368aac77d6cf1af4042757e17b10de1ae66a8519dda01f85994405591e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.7.ebuild b/www-apache/passenger/passenger-6.0.7.ebuild
deleted file mode 100644
index 70b997581603..000000000000
--- a/www-apache/passenger/passenger-6.0.7.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 RANLIB=$(tc-getRANLIB) \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	RANLIB=$(tc-getRANLIB) \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	RANLIB=$(tc-getRANLIB) \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6038a3078045..5ef3faaa6937 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 38c1cbef19ea..ac1957968288 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,5 +1,4 @@
-DIST owncloud-10.5.0.tar.bz2 23471398 BLAKE2B 6566df51474a22d36da868ab45a7cb679528aecc9a95e0ad20f06adda587563e16c98ee1e942a5fef62e633b132469a6a775d5893754f553aea8a33043daafc3 SHA512 b77183146ee27c97a7f472e1debaec6f5dad168f204a243a65f431cade28ed0551d0db88ff799776bfd26db60357a2216a35cd1b4af6e7e98fc933f325e4336c
-DIST owncloud-10.6.0.tar.bz2 24569416 BLAKE2B f20890262551f2996d39566f63f79439921f41bfa3a82cecc5fdf771be93e403f5a273e76498421ec7e29a03f00326844003c3adb3f927f2c1c8fc82c26c23de SHA512 ec4de23b4cd0dc08dde66802285a00c817cc8ccc79237e4ae454af5fecba102fdc892ed24e62b246deebba536728d312f43dcfea9f2f490ba8847a54ac962885
-EBUILD owncloud-10.5.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
-EBUILD owncloud-10.6.0.ebuild 1252 BLAKE2B cc2efc5b7bc9121b94a034b017cf4f4da390fc1cd0fdf1106b94972c4584cbfccc220f679b6e5d41623294c373343f285158e81fc9381189610607eb86e27f32 SHA512 48268b8e9ed8dc56520b589b36b1749cbf9639080c0de876a3791e68c86421c1817ec956f6fedb4dfb4506aa7aec607fcc531ec31947e6d83aa256bd9d5724e2
+AUX owncloud-10.7.0-share_data_exposure.patch 3470 BLAKE2B 3a908d1909c776f2c8ccee17fda16fb91e199468b48b5359bd9ebf0bbb0f087d834cbddb54aba5b60af71afa01f1984ce580bb5b91aeeb0156a71f93ef65643b SHA512 2dfe05754cd6ea97a3bd014e7769d4106b90d6740e975778cd291bd7f74aa64c27d4b913847addec0c184e477bbdef07a09a59160dfc8c413e8af1229147e682
+DIST owncloud-10.7.0.tar.bz2 24129028 BLAKE2B 47ce3584f8123cc0a315c7d88847df5844c951e354fcecd7a876ca01f0fa24823a86bdd950dd885f3bbb46f60d8a39271e31d43ac6dac8f3df506d6cdc531231 SHA512 ebb636b8ffd06d4ceb1dd0d50c15ab393b8c7bf2f0e23c61ba957add6ac4d4ba4cdefb9cda2c703f337c82a295e2c40a467a602227728e9506f9a150c9f2fd3c
+EBUILD owncloud-10.7.0.ebuild 1310 BLAKE2B 2ac6337614fa8d2d50fa54cd2335629b6a4f87cd917e915419ee4e7089b82d46dcbb0168628481d414bcccbaebb5b177a215b8be5789a5066e3833224dacad50 SHA512 b88e53ab8b631b6d0c7cc9958adfdb89a2f01616a564d7c1907de5d832991e3a38de1287a971f3c99d43fa3cde3cec7805292008b01d34ea99044b13b9ad9fb7
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/files/owncloud-10.7.0-share_data_exposure.patch b/www-apps/owncloud/files/owncloud-10.7.0-share_data_exposure.patch
new file mode 100644
index 000000000000..bab6ffed11ed
--- /dev/null
+++ b/www-apps/owncloud/files/owncloud-10.7.0-share_data_exposure.patch
@@ -0,0 +1,78 @@
+From b552f84eedb5d2a113028d7859e82352699fb427 Mon Sep 17 00:00:00 2001
+From: JanAckermann <jackermann@owncloud.com>
+Date: Tue, 4 May 2021 11:51:29 +0200
+Subject: [PATCH 1/3] Throw generic exception to overcome, senstitive exception
+ data exposure
+
+---
+ .../lib/Controllers/ShareController.php       | 26 ++++++++++++-------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/apps/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controllers/ShareController.php
+index da9832e105b..02bd3553067 100644
+--- a/apps/files_sharing/lib/Controllers/ShareController.php
++++ b/apps/files_sharing/lib/Controllers/ShareController.php
+@@ -400,6 +400,7 @@ public function showShare($token, $path = '') {
+ 	 * @param string $path
+ 	 * @param string $downloadStartSecret
+ 	 * @return NotFoundResponse|RedirectResponse|void
++	 * @throws \Exception
+ 	 */
+ 	public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
+ 		\OC_User::setIncognitoMode(true);
+@@ -530,16 +531,21 @@ public function downloadShare($token, $files = null, $path = '', $downloadStartS
+ 		}
+ 
+ 		// download selected files
+-		if ($files !== null && $files !== '') {
+-			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+-			// after dispatching the request which results in a "Cannot modify header information" notice.
+-			OC_Files::get($originalSharePath, $files_list, $server_params);
+-			exit();
+-		} else {
+-			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+-			// after dispatching the request which results in a "Cannot modify header information" notice.
+-			OC_Files::get(\dirname($originalSharePath), \basename($originalSharePath), $server_params);
+-			exit();
++
++		try {
++			if ($files !== null && $files !== '') {
++				// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
++				// after dispatching the request which results in a "Cannot modify header information" notice.
++				OC_Files::get($originalSharePath, $files_list, $server_params);
++				exit();
++			} else {
++				// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
++				// after dispatching the request which results in a "Cannot modify header information" notice.
++				OC_Files::get(\dirname($originalSharePath), \basename($originalSharePath), $server_params);
++				exit();
++			}
++		} catch (\Exception $e) {
++			throw new \Exception();
+ 		}
+ 	}
+ }
+
+From a94f67a4857447e36e205043c55f29737a0bc57d Mon Sep 17 00:00:00 2001
+From: JanAckermann <jackermann@owncloud.com>
+Date: Tue, 4 May 2021 12:01:17 +0200
+Subject: [PATCH 2/3] enhanche if statement
+
+---
+ lib/private/Files/Storage/Local.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
+index d5ae0e3794b..d499079da98 100644
+--- a/lib/private/Files/Storage/Local.php
++++ b/lib/private/Files/Storage/Local.php
+@@ -384,7 +384,7 @@ public function getSourcePath($path) {
+ 		}
+ 		$pathToResolve = $fullPath;
+ 		$realPath = \realpath($pathToResolve);
+-		while ($realPath === false) { // for non existing files check the parent directory
++		while (!\is_string($realPath)) { // for non existing files check the parent directory
+ 			$pathToResolve = \dirname($pathToResolve);
+ 			$realPath = \realpath($pathToResolve);
+ 		}
+
diff --git a/www-apps/owncloud/owncloud-10.5.0.ebuild b/www-apps/owncloud/owncloud-10.5.0.ebuild
deleted file mode 100644
index 97ad6449db05..000000000000
--- a/www-apps/owncloud/owncloud-10.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/owncloud/owncloud-10.6.0.ebuild b/www-apps/owncloud/owncloud-10.7.0.ebuild
similarity index 95%
rename from www-apps/owncloud/owncloud-10.6.0.ebuild
rename to www-apps/owncloud/owncloud-10.7.0.ebuild
index cecbee423d8e..0b560a4d0fee 100644
--- a/www-apps/owncloud/owncloud-10.6.0.ebuild
+++ b/www-apps/owncloud/owncloud-10.7.0.ebuild
@@ -18,6 +18,8 @@ DEPEND=""
 RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
 	virtual/httpd-php"
 
+PATCHES=( "${FILESDIR}"/${P}-share_data_exposure.patch )
+
 S=${WORKDIR}/${PN}
 
 pkg_setup() {
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 11fbbc7cafe5..54656a20ac8c 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 4b8d3f691f3b..b70d4da6a464 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -12,8 +12,11 @@ DIST chromium-91-ppc64le-5.tar.xz 28988 BLAKE2B 7c574626546c9b8c67879277a9b06b95
 DIST chromium-91.0.4472.77.tar.xz 949848268 BLAKE2B 6d32b7334399325046f4b6c8d2a766b2f42ff7cc74adf68da880113ebede13dbbeb52c2f7ffcdea8c8934ec16f2161300a0b727cec112463def5eb6e772fafec SHA512 06113c3627c1ccd390f078a52e0eaaf9c1d7178d568d6d2e37c96e1eb09fc0e872ac2b2d7ebe55e4da87eebee4965816bbba2f6ea53047f86cd5d0ad1d260a25
 DIST chromium-92-patchset-6.tar.xz 3764 BLAKE2B a7149940b1371e4bd295e6038b87cc13f4edf8d8ed286d9d8d0e63144c2546de39564fc203a4b2e185267e46398efd0414c1f695ee31c78d33a6cd8d7b434016 SHA512 2f104901271d42762ea27f7c8a017307bde7348ec6b84d0c85875a07bf3783ba43bdb886fb3c6376753b6a14102b495a28bdc7adc611992440d2c1345aea035b
 DIST chromium-92.0.4515.40.tar.xz 962588216 BLAKE2B 070f8591fcf03d523dda5863f3231070979bdc051075deb086e798f97e9e0f9b8c63d44c86631ac89549540f091bce3c587eae88c52d9538bc1e31257e73689f SHA512 73e1dd101601e1508554f59d81e7ce2b842603edda195452f0286edc35f91fde2f8a4639a96dabbfdb049e2b05c947ef35a67a8656faed032cf17164ee682626
+DIST chromium-93-patchset-1.tar.xz 3668 BLAKE2B 6784cdd023d3f43a1587e8248784fddbfd1d3cd9a8d68b294b3babc3b4394169e504bfd8ccff5b03d5d71293c1ec501000c70ed03bd378c9f946d9cb9663a779 SHA512 37df41620594c963badc049f67422e79bf11c337cde5d098b5a08074df9f2270c2c0c8f50070209a412365374ae1a9d43e395ad985a62c58f9e1e30b4d80f007
+DIST chromium-93.0.4530.5.tar.xz 965229588 BLAKE2B 4cfe11955abde7cf76cca45baa7fbb6a6a4d69b474423ab0e4ca3564a7369a281fb2cc5347c5f3423d4e04f9f3ac9c6362b992717c23af74c9e572bf5daee219 SHA512 0feb34b8d8efa19a0a9002991adf3dae85e62496e77fe742cc7fcc623828a639a3bb628d0211c5ef4479d2d0b9e3de8e5e01fe10ad46c07fe381cb0c18ff46dd
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-91.0.4472.77.ebuild 30004 BLAKE2B c7b8c8f9650cb78a2dec0b8080108a4aca05ebc8abac507741e1a4a19c91e69cc202e2b91408f0c4db3abcba6e92f0f0f82af03051e714e462a721023d8c2ce9 SHA512 4d641af2dd5d63727acfdba0f16a0d9b0f97ca25c75ee5809fa15299e014d31a8cf2cfc1490876d3110d39e5a807c3b5484f4f6ba2fdbbcbca0c0370eaa2e9d5
 EBUILD chromium-92.0.4515.40.ebuild 30140 BLAKE2B 87e82af3627de888e8cc2956e5442f8bd54e6e65539419f3eb2534cd6030a5f8eabb40f958daaafaad386a7a53161efcdd245fc74b45b84c2d69cf4f0452d766 SHA512 78dc38de9d7f2758672be53ae480c3c432048dbd92ccc883036ec09b3fc97e9fdd4eb6484182327e7af9917c5e2ba062b67258e9e2dc9ce70bf60ce9a4288715
+EBUILD chromium-93.0.4530.5.ebuild 30143 BLAKE2B 02cd32a2130e00c5adbf1bfd547aa617e0bb68e989c383568b176e5c8e98930cd13d491feeee4100dfe6e6db6845c853fabc98969e26126dc33c9c7e07539c3f SHA512 e0f65dbd1bc5d297f51bf02870fc4ef306ab92f4f711028d9a4f40a23c20ab940a8a20defd29918afb521772e22d9114c3ff1abc343778fa1635d6967c72b0f0
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-93.0.4530.5.ebuild b/www-client/chromium/chromium-93.0.4530.5.ebuild
new file mode 100644
index 000000000000..81b376331100
--- /dev/null
+++ b/www-client/chromium/chromium-93.0.4530.5.ebuild
@@ -0,0 +1,948 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="xml"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="1"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid )
+	screencast? ( wayland )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxcb:=
+	x11-libs/libxshmfence:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libxkbcommon:=
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:0/0.3 )
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	dev-lang/python:2.7[xml]
+	>=dev-util/gn-0.1807
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-12"
+	DEPEND+=" >=sys-libs/libcxx-12"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-69.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			CPP="${CHOST}-clang++ -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="8G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-92-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+	)
+
+	# seccomp sandbox is broken if compiled against >=sys-libs/glibc-2.33, bug #769989
+	if has_version -d ">=sys-libs/glibc-2.33"; then
+		ewarn "Adding experimental glibc-2.33 sandbox patch. Seccomp sandbox might"
+		ewarn "still not work correctly. In case of issues, try to disable seccomp"
+		ewarn "sandbox by adding --disable-seccomp-filter-sandbox to CHROMIUM_FLAGS"
+		ewarn "in /etc/chromium/default."
+		PATCHES+=(
+			"${FILESDIR}/chromium-glibc-2.33.patch"
+		)
+	fi
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter versions
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+	sed -i -e "s|python2|python2\.7|g" buildtools/linux64/clang-format || die
+
+	# bundled highway library does not support arm64 with GCC
+	if use arm64; then
+		rm -r third_party/highway/src || die
+		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
+	fi
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/khronos
+		third_party/dawn/third_party/tint
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/fusejs
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/harfbuzz-ng/utils
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/tcmalloc
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/tflite-support
+		third_party/ruy
+		third_party/ukey2
+		third_party/unrar
+		third_party/usrsctp
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false) rtc_pipewire_version=\"0.3\""
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# highway/libjxl relies on this with arm64
+	if use arm64 && tc-is-gcc; then
+		append-cxxflags -flax-vector-conversions
+	fi
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use wayland || use headless; then
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=false"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# https://bugs.gentoo.org/717456
+	# don't inherit PYTHONPATH from environment, bug #789021
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0"
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/crashpad_handler
+
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if use vaapi; then
+		elog "VA-API is disabled by default at runtime. You have to enable it"
+		elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+		elog "in /etc/chromium/default."
+	fi
+	if use screencast; then
+		elog "Screencast is disabled by default at runtime. Either enable it"
+		elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+		elog "inside Chromium or add --enable-webrtc-pipewire-capturer"
+		elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+	fi
+}
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 0da1f5de4b6a..8bb842c339af 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,4 +1,6 @@
 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
 DIST epiphany-40.1.tar.xz 5374236 BLAKE2B 71508de3554ef646061ab7ff62df8892fed0b7add112309d2660ed3795fee3e2e9460bbc80c7cec402e1922eafffcffae7845761a23b13f3245f5a688599e7ba SHA512 8598ae77f8ba446e132a82a256a346ef9b3c1f9b786d24f0fd4f891f75aba476197f3b155e1aa08ffd0b0a9357604b46bea6b9da34d138ff21bc41a46fa24c7f
+DIST epiphany-40.2.tar.xz 5372180 BLAKE2B cd75f645980c37b0cdd92133505cf7961168bf5d67ad0bdf3140f155c737a070f7ffafa63bb8a0e5de175826b79b2ca380a2851e7f1f0454d4f372d48f48c9c7 SHA512 29a5b7e65f7e5decb3c370fc9ae654727cce30f397ffd3289a9f77f3527f0471c821e3bea0f1a5ab9c1ab44e670898b46e66e41de5cb8c76fabd23b135a4a1a9
 EBUILD epiphany-40.1.ebuild 1940 BLAKE2B 0fac9b3f893367358e5fbc3b4ddd8a40526dbed4e2251fc65af7cc5d6446d8508bad30f668c497fff67c08bcdf67d98e33e462e968d144f389839c3362d711c5 SHA512 c359a1d655fae27b0e705c5321c68741a9d2e1b3da691c16df3e9b3fbb959fe2a9420781e32e84f731d3d725958e9208394d2da813c7bf57113b3ba08a6830f1
+EBUILD epiphany-40.2.ebuild 1942 BLAKE2B 37afd50ee92da95c5164ba000cf6eb7e4d31516605b4dba6b2f6d8f0209eb4eb933694cb4f257121b292b87c356a05c465edd0a1c1692c766c10bfeb217d22e3 SHA512 699a0583f33aa92ff06b6017f90b2efa5a899ee2a72239723dad1edfe43b7a3564281c1caab809afc3bbd190717e960c38bb8513c972e9d9e1fefd9ff218028e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-40.2.ebuild b/www-client/epiphany/epiphany-40.2.ebuild
new file mode 100644
index 000000000000..1f8745203fcf
--- /dev/null
+++ b/www-client/epiphany/epiphany-40.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.64.0:2
+	>=x11-libs/gtk+-3.24.0:3
+	>=dev-libs/nettle-3.4:=
+	>=net-libs/webkit-gtk-2.31.1:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.2.4
+	app-arch/libarchive:=
+	>=dev-libs/libdazzle-3.37.1
+	>=gui-libs/libhandy-1.1.0:1=
+	>=x11-libs/libnotify-0.5.1
+	>=app-crypt/libsecret-0.19
+	>=net-libs/libsoup-2.48.0:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-db/sqlite-3.22:3
+	dev-libs/gmp:0=
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# appstream-glib needed for appdata.xml gettext translation
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
+	"${FILESDIR}"/var-tmp-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Dlibportal=disabled
+		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
+		# is commented out upstream anyway
+		-Dnetwork_tests=disabled
+		-Dtech_preview=false
+		$(meson_feature test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version net-libs/webkit-gtk[jpeg2k]; then
+		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
+		ewarn "Various image galleries/managers may be broken."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 19afe96f9a0e..e829ca0627d5 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -398,7 +398,7 @@ DIST firefox-89.0-zh-CN.xpi 584729 BLAKE2B 14b90888a13e25810bfc47374941fc1ada1b3
 DIST firefox-89.0-zh-TW.xpi 585191 BLAKE2B 61325e7e8d70b5c8337084e4a950275566703909e3712bd53dd50345f1ad956563aa84db7aab0430211d070bdfffb781d9218ae59c8c9ace96b51ff1b6eedc04 SHA512 b38831845954791b1f60421a97356e31f7479f1d803e50946fcc86c925c1c25ad09db557a3936de1b94c736a0753b3b78227e6044fb7574c7ee7f0184e1fb512
 DIST firefox-89.0.source.tar.xz 371153536 BLAKE2B da5d1347149664c2da3315f9ede38c576d64a532daf10a46dfd2f7cb226110aaec84ce9285e50c151c8665fe2bf3df1d8de8e744b0b8ccfb41103920c10a6b3e SHA512 5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3
 EBUILD firefox-78.10.1.ebuild 34070 BLAKE2B 15895ee2fa0e3af0a95267fe866334eff99dd5b11a63ac06a19aa0f6a64c14586a5427b0adfc460f40b800e2b09589d24285570e96dbb0ca4281030644838a0c SHA512 71c544dc80f7b8528fe1a43f0273b5479bc8f0aff839e41045d7768bd4d536f6598a8783fa123f205d35654c6ddb68a1d9485b16af50cd9e15708d258b24541a
-EBUILD firefox-78.11.0.ebuild 34073 BLAKE2B fd1506b2b03dfe6d32b9dbc6c83e01ab6408964850ca5db5f4ece9dcad39af5a30c4f711fb0e7404a902b846c67d96415a4446c3d8ff303faaa2b0d699992a67 SHA512 745e9cf19a35a2d8ef5964974a52056c34d64fc815b42b7515d2548e68c3fdd757208c511da433b40e9ec97c3b1d25d54ff2916f1bdbf437db5c5e6cc1731323
+EBUILD firefox-78.11.0.ebuild 34071 BLAKE2B ab401c0b60ebd9c782c2724c0c0763515dea414934fe571ae3f45d8340d1df4f21d0c5a2fe676794c1dc809721a3a6e6e3a09b3cf7ac4f1455cb6e95ca09995b SHA512 4b0c8da7a8d483ce85528d056db693a84c9540eab1edfe49cb4b105db81835ab2d4aa662612e7f2b0ad049caaf49c8eb049d66fd12bea92589417f3e54950325
 EBUILD firefox-88.0.1.ebuild 33789 BLAKE2B 949bde21c78201f5cb27be64aa9f35013221f498f88f03cceeee86f29ca51628e146995620dee1fb1d05ffe2f2ba95b0f54f13cc60dcd26435e06847581bc9f9 SHA512 4907fd8b5f195a2e5424c459f865bad589437ff43d661057b56b07a1a51671108244010cd4135487622cfc4b8dcba1b47dd7bdbede3c20b9c3bb5ddb236dceb6
 EBUILD firefox-89.0.ebuild 34087 BLAKE2B ce7444269154d92c92311f1ac22cec0a1d08545c9e706f665236dbb9db357c51942c04bc48e05785f8df09863b11672ec2f541cc04d1565d36376562fb999932 SHA512 624d2ff7a355ea39b2a43f2fb68f59113845025aafb9e5a3a9938677926206d79795dcbc054afe373b2c6a78c294c32f45676c0fe37b12ca29ceceaeedf14d94
 MISC metadata.xml 2150 BLAKE2B cd105f3b1d98b1fde124c6362c2e23563c03086a507bdc0eb0e4944f2050787f96967c4cba6f4605e4adcdb200d0c0fded6cc2bcda7ea7720d270e1fd6f33525 SHA512 a588a09ad3481522b44097b3c5e51211d5fc918a6733f3b6f1b1cd7994523894917fa737de944c235d45bfb9b57def205ce645ff1ac62ef7d6c3f3c51d387556
diff --git a/www-client/firefox/firefox-78.11.0.ebuild b/www-client/firefox/firefox-78.11.0.ebuild
index 381cde648637..8343b5e0f2da 100644
--- a/www-client/firefox/firefox-78.11.0.ebuild
+++ b/www-client/firefox/firefox-78.11.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 SLOT="0/esr$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index a6f8ae684579..3e822e98273f 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_92.0.4515.40-1_amd64.deb 80196800 BLAKE2B fe2f3d7d35a380cd3f39318e642bc6441703013a05f91e757b4ff5ba52ceefedf42d0679c6ebb61cf4ec1828a44ab136b12ac81b19acbc38a3f5b09bf7357906 SHA512 353f3903d04097ec7a098f0e887e85dc056623006213059c7ac5d0e71c703e50aadb2738614087fc5c5ab5a02c4027cb2131b5fcf7a8a1d1441f5de6d8a781de
-EBUILD google-chrome-unstable-92.0.4515.40.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
+DIST google-chrome-unstable_93.0.4530.5-1_amd64.deb 81337172 BLAKE2B ac83a6a77e520ee505f47d7772ad107d05e8eca843d070d16479f70297d82424e4fb6141b03fddc6101f5bfbcf2e70a7dcdea79c649160dbf0bf273c49a1701f SHA512 e56e987db18966546c814a8e93ecc8598be08c0e899e565a5e6feeaf3074eeebef8bbd71948893338a00f4711d611ea7147125736463836439392fec38b2eecd
+EBUILD google-chrome-unstable-93.0.4530.5.ebuild 2712 BLAKE2B 8533d960c56cf84f095c017b6daac712adc1fbb64c6ae44ae80a8f0d81cabcd8a83d2f78f52d9bf28eb06f7ec9f5de69f76ceeafa863677bc701f58bd78b50d4 SHA512 8d37002748f13ff5b7121efb70bf79ccddd7df42f9a9132eae98a208cabd775b0a70bc02f89b169e5dacac55abeb7372b60c943affb7b2ee9bb077e3a3aa8fcb
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-92.0.4515.40.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-93.0.4530.5.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-92.0.4515.40.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-93.0.4530.5.ebuild
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index d31970a60962..4b3eee71c609 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,6 +1,8 @@
 AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2
-AUX surf-9999-gentoo.patch 1082 BLAKE2B 6884164a69609c432976c87dbb470394786c7d85328e3a6e0b7e29f471a1b7b8f03212c1cbf101ca5deb4e4c4e63fabf5f0b2963f2494e95316e696875890f12 SHA512 7befff3259b4aa8887de238d2a3fd61e536cecb3bb944e64105e4ad1f56c1a3b0b060abccbeb258efe45d901e20fba40fd5af69c3058941f57f4de6e415f442b
+AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3cda8c4a386f8f4a4e5a40ce40c82736b33619f14c770031366aecfb0df4404982b834df8013845ff3f392de SHA512 2dbcdbbc869780a5b265dd909164e9764771e9a6c20664927f7df358daaadc83f65a915aabe65559756f6fedfcebad5496433ecb555ed0de55ced988102681ef
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
+DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
-EBUILD surf-9999.ebuild 1331 BLAKE2B 0181a924a03247c3a60aece43b5029702162df785c208082df610f38b8d499ba33d4824b2b5f99985f7de45dcca68028fe7dd4d1b4037fcd9cfa978acd679af0 SHA512 ffefee4fe16bd708b8c09ffe590a39553a53266797a92509df108faf495a83f6da5e509bf8a8d743dd2a29bd5f4f836f87a93256a5e1a958c12ea3b807c3ba6c
-MISC metadata.xml 463 BLAKE2B 1c11d2d7ca09b28800b060f289acb8250669d30792765d89f5afe8372150efea49317db94bd0b8ba7a40fb46c38778cfe519d4081270dc77976650b9d99417db SHA512 22d63cb756b13ed0f054a91c9c202ea71aed493f9eb41344eb80ae8fd9d6c9effd1df5d636d50021be10afec6d2f67a4982cfdfd1acc43cdcc9a276ef4d420e6
+EBUILD surf-2.1.ebuild 1403 BLAKE2B 927a745af173f49f4c33c2d47f087611f457eb5281423b6076b282fe1a99174d38457e98a234ccee933161c03994fe19a3f487e05e55a4ae68d4b52c1f20e515 SHA512 266442cc185292cd2751e95f252f56e86d743d5b3dcb0ceac6460b77c1c9c5908a8b667d6877062227b80296c9e8c2f50f21a4f0e4d9fe34e16a49fe84793999
+EBUILD surf-9999.ebuild 1408 BLAKE2B 249f77689e9884282f0ceeebe759c2a3c145563e3117e0a8b1e90fc76d3df03a19220fec0821986843d87a2382e177d67e72036a2d529d2611ab0ea0c0189509 SHA512 c63155a275f7e57e163f4a46424c6d96e2cbf776616291b6aa874925d4a038d423315582e55883d974d4a66050609b7e888e2ef3d18466778273f05112e9de19
+MISC metadata.xml 697 BLAKE2B 80822c37adf6994ccf8277a1f618ade740bdadd90040adf5e5f4a2662da26c6be937796d991754bb420eebb9cae8cc320366ec4c76e838fc19aa4e45178048a3 SHA512 eedcd0841b7d3994c675240fcb812c16b0f1a5032a7a6d828880a039aa60090668fae92ac6d54252c50f7492bc439c0da48018b2defffadb89bf563444474c27
diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-2.1-gentoo.patch
similarity index 97%
rename from www-client/surf/files/surf-9999-gentoo.patch
rename to www-client/surf/files/surf-2.1-gentoo.patch
index fe6324ddbc9f..9ef89da23668 100644
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ b/www-client/surf/files/surf-2.1-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -4,18 +4,18 @@ VERSION = 2.0
+@@ -4,18 +4,18 @@ VERSION = 2.1
  # Customize below to fit your system
  
  # paths
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 52593948c041..7f6462d4bbc0 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person" proxied="yes">
+    <email>arkamar@atlas.cz</email>
+    <name>Petr Vaněk</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
     <flag name="tabbed">Install surf-open.sh script for running surf in <pkg>x11-misc/tabbed</pkg></flag>
diff --git a/www-client/surf/surf-2.1.ebuild b/www-client/surf/surf-2.1.ebuild
new file mode 100644
index 000000000000..15922a19958a
--- /dev/null
+++ b/www-client/surf/surf-2.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a simple web browser based on WebKit/GTK+"
+HOMEPAGE="https://surf.suckless.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/surf"
+	EGIT_BRANCH="surf-webkit2"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="tabbed"
+
+DEPEND="
+	app-crypt/gcr[gtk]
+	dev-libs/glib:2
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!sci-chemistry/surf
+	!savedconfig? (
+		net-misc/curl
+		x11-apps/xprop
+		x11-misc/dmenu
+		x11-terms/st
+	)
+	tabbed? ( x11-misc/tabbed )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+pkg_setup() {
+	if ! use savedconfig; then
+		elog "The default config.h assumes you have"
+		elog " net-misc/curl"
+		elog " x11-terms/st"
+		elog "installed to support the download function."
+		elog "Without those, downloads will fail (gracefully)."
+		elog "You can fix this by:"
+		elog "1) Installing these packages, or"
+		elog "2) Setting USE=savedconfig and changing config.h accordingly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	restore_config config.h
+
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	default
+
+	if use tabbed; then
+		dobin surf-open.sh
+	fi
+
+	save_config config.h
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index d6b737a623dc..2b48a07f1c22 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -2,42 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"
 HOMEPAGE="https://surf.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/surf"
-EGIT_BRANCH="surf-webkit2"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/surf"
+	EGIT_BRANCH="surf-webkit2"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="tabbed"
 
-COMMON_DEPEND="
+DEPEND="
 	app-crypt/gcr[gtk]
 	dev-libs/glib:2
 	net-libs/webkit-gtk:4
 	x11-libs/gtk+:3
 	x11-libs/libX11
 "
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="
+RDEPEND="${DEPEND}
 	!sci-chemistry/surf
-	${COMMON_DEPEND}
 	!savedconfig? (
-		>=x11-misc/dmenu-4.7
 		net-misc/curl
 		x11-apps/xprop
+		x11-misc/dmenu
 		x11-terms/st
 	)
 	tabbed? ( x11-misc/tabbed )
 "
+BDEPEND="
+	virtual/pkgconfig
+"
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-gentoo.patch
+	"${FILESDIR}"/${PN}-2.1-gentoo.patch
 )
 
 pkg_setup() {
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 34fc9cf69d85..c22ed6e59438 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,9 +2,13 @@ DIST vivaldi-snapshot_3.9.2289.3-1_amd64.deb 83539836 BLAKE2B d8a9dcc850dbd4d15f
 DIST vivaldi-snapshot_3.9.2289.3-1_arm64.deb 79023788 BLAKE2B 163adf52c555f47ea1ac6b9f6e6ef457cf901a4be0b04590da482b22c330381437de9c23016759d5eb6d8da82061b451067840ffe097de3e273b569067d5d939 SHA512 5c8596448bdffd22bf6837b0fa966b049af8efa22a4da009f953e17743bd9497dc825589ea92bb672ebe1ce8a0003ace6f9a91f3d5e2c8d9092f9049d59ccc80
 DIST vivaldi-snapshot_3.9.2289.3-1_armhf.deb 75093252 BLAKE2B 0deaff270b851a9febdbae29102d5e5e0e221ddee7e285db1fe13fbb3ba8b44d82cab61220a66d12ab31fb36300236b107848c401e2e1203bfd5330be254ac78 SHA512 1fc4a6f6b5abca3e45b7208c8416029c40641c5213fc472bf54ef6ea5284c7bfccfe1cdf66c623c88b7fe200fe8d7356c99a9baacd85944b0818006d9d54fe02
 DIST vivaldi-snapshot_3.9.2289.3-1_i386.deb 82584664 BLAKE2B f5447df81bf87b128cf9e65443913f61b29417e2ade09407c4131a0211006b7779816d28ae777aaf8792bd3745e9669dbce03bdda83616e5a669333f9e520a06 SHA512 dedfa2249ebeae7a5f55a26235f25a351988e9ae9d6d6a383d4e5c2a0680eafeb3e30603e6476b0d814a9f5b1958b7e0894a4b60b47e5bb72d2af2e577ae35aa
-DIST vivaldi-snapshot_4.0.2312.3-1_amd64.deb 84153620 BLAKE2B 689ac4debfc54e8d3512ddaecd7b785d51aebcac77b72cde33770a4f9c7431eac1cd7fd3955c15dacd6d1fd1075c37ad6d56a76845ae59e3c8940737cdcbe319 SHA512 a8e56a24d0dbfa6814d3950ca5b3e592be545ebc9ec71de3c78bcd3ca8e70b8f2f1442d89ae72ca9636e4442805a153e72b058a3e43a87152a102f0f5405f188
-DIST vivaldi-snapshot_4.0.2312.3-1_arm64.deb 79579564 BLAKE2B f0e58331139ae6df6268b34d8b799291199fc9edf6c5b4d4137061f9a0d7f600f674965970f4355848b4e2763d0c5b44b6518f5a4a05b7f2cbc2f7d4ff33d708 SHA512 668ec750cfe20ac4b827ccbb2d8eca987b10471e387245e4e14a3500865c30b0339845b60b7da86d8fafc5686b50adaeb9c684ad9868bb3bcabf864502047890
-DIST vivaldi-snapshot_4.0.2312.3-1_armhf.deb 75737268 BLAKE2B 867f5c717b016bf0e7136a62a7bef1dd97a15b655c377eaa5093e8c79bc5e7c9a93befdd7f6ad74f939f5ddabbbd2f16c70720c5c728be167ae3c639dcc3bcd5 SHA512 3836f99ca787764c7f365eaf9c1fd3a767ec1a8467c45cc7524df42cff2fed371bfc11ba0b9eef39b2065f12aa061d1a32daf2740ed5b821032f5934fc5bf2ba
+DIST vivaldi-snapshot_4.0.2312.11-1_amd64.deb 84160524 BLAKE2B 2247fbc94c9717af723d40968d5e23297e1327ae536f309e1c249a71425e1200b75df90696cb90eddab116ada965e5fd84edac14af4259e681636f350e304b4a SHA512 5b0866f3f557896ac87f324572df1f451cb7eea5d09d5e0eb32bca4fc10e0f59b5005c7507ef9a2b56797a8a4358d23e50b2f8afaa535fff26e4e8b111c69863
+DIST vivaldi-snapshot_4.0.2312.11-1_arm64.deb 79588788 BLAKE2B ec904a9960a61f40deef741e8154b2c926a24a154d310d2d1e18337fca1ca0938df500dea52f5d8dcf9c39265e2981c99c300f477a899f8f27df33faa774af32 SHA512 d0916f2170d516cf5ec608e3cbd0635abd250ba023a2d3007c77f32b52a77f75076df331843327377a4ca506b4f1a0f6469762aba76665c3acdfe2c9d9a2e394
+DIST vivaldi-snapshot_4.0.2312.11-1_armhf.deb 75730272 BLAKE2B ee52c052dd9231eda447a9ddf860884fa769a5faca97580a4400cfe9b4423f9cd9ea516fe91f0927750964c9cffcf98892b67c1d9853c255a62741430b470acc SHA512 27d041a74625a9867fb5830dd373be836ed41f002183d24219d7c8cea71d68aaa855cc73e47f377c63180fdb3ff9e3ca5bd7619ee3c7ad482d51a53fb81a4df4
+DIST vivaldi-snapshot_4.0.2312.13-1_amd64.deb 84211088 BLAKE2B 61165d76cb8892ad269598f2f34252792fc9241811dc9452b7a65466f9e5fad457eeeca2d0d5cf489399dba66898e90fdab83a33f6d1dba25e22017d31034649 SHA512 86c0e08ec392a236b476c712a4f0fba17bd80e271a4c9819cabc6aa8d1d77dd4cb889143abffd9a337f19daaa6074f00d4a4595d5f3be126219c4c1e51065317
+DIST vivaldi-snapshot_4.0.2312.13-1_arm64.deb 79638308 BLAKE2B 41722e6c3065b610e6d59d8dd83d3c7e920b2d37f195e0f6583f57c5c5d9f501d41be6a7fd8f5433585676842efb9041d6de170a40ba627e77612ce723c1b926 SHA512 0e605ea62e64064563b287be08366254b1fa1578d5cb44a4578bbd17ed1b876a6d648c36fe584c7ea799aa7a5163be7f1413ffe32a454682d092bce9ce2065c1
+DIST vivaldi-snapshot_4.0.2312.13-1_armhf.deb 75769556 BLAKE2B 7fbcc2f0fc309218c3b46ed905fb3704fa7c52f762a974e225ccb0b9a4692e74a1cbc56c6d192ccced312936e0f615e521841d3572c9626d17449ed696effee1 SHA512 0eec9ba838af6f64e6f768fc6fa148ae0fbbfd5af171968e72d24528458dd271d2f305ce3f1c3caf855ffc95458debcc498834ef43219a040c48d70c229153b9
 EBUILD vivaldi-snapshot-3.9.2289.3.ebuild 3342 BLAKE2B 6cedcc20db6fef8468a74fa7b0102b7e0de08029e179dfac685f636184a7250f7494d2a5b52ea2e3ecb9f73321e9cb8f57e2aa8ff0a7c86901c7ca1f6639f301 SHA512 8a2ead0fe7aa024f0565e6ed4effba0dc47d51da8c79fea96f7ada0deb504115140b3ef4e97d8a97e65fdea479b27019ee34ac11f31c87e5233067ec6af0db0d
-EBUILD vivaldi-snapshot-4.0.2312.3.ebuild 3299 BLAKE2B 193954a5de47e83ec163773a2e32418e851aba1a53a85602d0b74809ec5d180412f7e9a5b8ab12ab18bcef56121ceb3c3ade8eb4fc5c0a2fd954f805c024024d SHA512 17a62c808e17ce142559cf9e99abed4d373b2d42e2b9a53bc9be51ce15f810e34a1a7c61f79ae4013cbd80c0f1d3773dcb64f15a338a184f7a63330a6a44bb98
+EBUILD vivaldi-snapshot-4.0.2312.11.ebuild 3299 BLAKE2B 193954a5de47e83ec163773a2e32418e851aba1a53a85602d0b74809ec5d180412f7e9a5b8ab12ab18bcef56121ceb3c3ade8eb4fc5c0a2fd954f805c024024d SHA512 17a62c808e17ce142559cf9e99abed4d373b2d42e2b9a53bc9be51ce15f810e34a1a7c61f79ae4013cbd80c0f1d3773dcb64f15a338a184f7a63330a6a44bb98
+EBUILD vivaldi-snapshot-4.0.2312.13.ebuild 3299 BLAKE2B 193954a5de47e83ec163773a2e32418e851aba1a53a85602d0b74809ec5d180412f7e9a5b8ab12ab18bcef56121ceb3c3ade8eb4fc5c0a2fd954f805c024024d SHA512 17a62c808e17ce142559cf9e99abed4d373b2d42e2b9a53bc9be51ce15f810e34a1a7c61f79ae4013cbd80c0f1d3773dcb64f15a338a184f7a63330a6a44bb98
 MISC metadata.xml 484 BLAKE2B 8c52aa5485213206999f40c7f99771713b3252cb6bf535bbe41e72da75f3075af1745cc9b44666cbee69b5fad3715bcbd540353980cf6ff302752dffdfa379e9 SHA512 89ad56615e6e82251ce8e04eb081cab53e6656a379622fffaa11bd21426f536ac5632ac7df6df270257112b7f81ed5b5babda6a99fbd1f2657daaa883f3f099f
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.11.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.3.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.11.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.13.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.13.ebuild
new file mode 100644
index 000000000000..922779ca6f6f
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-4.0.2312.13.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	az
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kab
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pa
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sr-Latn
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 65d2581fc04a..551c86a1b340 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 0eb098a03c42..4c4ada3df263 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_92.0.4515.40-1_amd64.deb 80212704 BLAKE2B e0754a0ae681e5976d602312abe936fc2e817e5828e40bb273b920fa185ff6a121d82dbdd839143f389f49b2ddc15da6f5b1014a3d7454ec5c56ad718b121875 SHA512 46926ec6a17324e04b71da8782e0acbfe3bb5b9a12b3a89d607a2c2f87858ab5b3fc72ed5e48e28df1476f3ea28a98e7f81e08dd659aef8b7a6d73ebd30881c9
 DIST google-chrome-stable_91.0.4472.77-1_amd64.deb 83335940 BLAKE2B fc56be3cb0d71bc21fb60538383b2148d56ccb4ec111b82dadf19f6d81536d2f6f4ee94f09968772251cb03ba34905ca28c80eccba7f3ba48f092306fdea52e1 SHA512 a7d6c1f66afbd7668c135c90857adc78ad3fbe8b53188200086a6ae41bd7433e25f8169b5f436e809a0048076ffbb5fdee2480b9141840f2e15124fd2b2a7d69
-DIST google-chrome-unstable_92.0.4515.40-1_amd64.deb 80196800 BLAKE2B fe2f3d7d35a380cd3f39318e642bc6441703013a05f91e757b4ff5ba52ceefedf42d0679c6ebb61cf4ec1828a44ab136b12ac81b19acbc38a3f5b09bf7357906 SHA512 353f3903d04097ec7a098f0e887e85dc056623006213059c7ac5d0e71c703e50aadb2738614087fc5c5ab5a02c4027cb2131b5fcf7a8a1d1441f5de6d8a781de
+DIST google-chrome-unstable_93.0.4530.5-1_amd64.deb 81337172 BLAKE2B ac83a6a77e520ee505f47d7772ad107d05e8eca843d070d16479f70297d82424e4fb6141b03fddc6101f5bfbcf2e70a7dcdea79c649160dbf0bf273c49a1701f SHA512 e56e987db18966546c814a8e93ecc8598be08c0e899e565a5e6feeaf3074eeebef8bbd71948893338a00f4711d611ea7147125736463836439392fec38b2eecd
 EBUILD chrome-binary-plugins-91.0.4472.77.ebuild 1171 BLAKE2B e81b97fb2023b7dca16db3eb99b30a844f31546669b0e95a972777acbd37aa8765c3a5a40123d8c7f93dd2ec627d1417100c4cdcac6f013e9402c2ff392f13eb SHA512 7fbadae792a71fd25142c1fea11f26af0508be8d29b3e59c349a0e3d02d3c5f9898f9ad2914bc7b4d8bfe0ac53544ae87fd7367cf1b008774fbd3490169c1900
-EBUILD chrome-binary-plugins-92.0.4515.40_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 EBUILD chrome-binary-plugins-92.0.4515.40_beta.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
+EBUILD chrome-binary-plugins-93.0.4530.5_alpha.ebuild 1172 BLAKE2B dfbf5b0e9d4b875977368f733cdda3ef19bb79a61cdb57d854dcf0050f6315818fc95d7ae77246a1d69510dc8ec9471bae5f4c386104973de1ec3475f0c3a159 SHA512 d9ad4418d53f592431b14da8ee1e300072a8e049ae0c092a2e96d76ff679a00adbbd06b12cef9a976c0cb681538f914fd6f639249401d0516d672dedacf1bd9c
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.40_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4530.5_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-92.0.4515.40_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-93.0.4530.5_alpha.ebuild
diff --git a/www-plugins/gosuslugi-plugin/Manifest b/www-plugins/gosuslugi-plugin/Manifest
new file mode 100644
index 000000000000..75fbb1c90670
--- /dev/null
+++ b/www-plugins/gosuslugi-plugin/Manifest
@@ -0,0 +1,5 @@
+DIST gosuslugi-plugin-3.1.1.0_amd64.deb 5264616 BLAKE2B 0aadd08a26ae70e9a73611de3faccceb8bb53f8f36df34398d72f2a3d34ad5d0efa6a9bc0b05daf6b4a1fe7e2a498506df7a8bc094eae002ae7e7f532b24f98f SHA512 7152b08b22d93dee63aaed61012ed53f07a52beee113a0fbd639a435d57f251885947c2e874fb1e799f5db36340093024641f504f95d5ef788bfc30c4e9030aa
+DIST gosuslugi-plugin-3.1.1.0_mac.pkg 9712969 BLAKE2B f9234cb5283f27e680d448f6c4edf298495451c4b1af6bb6cdf5cf9e016877ce587a9dbfa9f78631d28f9d9fb1bb5d1aa505ecd947549bf0818e2662be6197c8 SHA512 e22530e72ce769fdee10fc63e140d7b294a3a9067e3ae113de1267745c16f0eb1c526f2a9f9d693263de92230c0e132362e3ed6c8653903addff47920f5632e0
+DIST gosuslugi-plugin-3.1.1.0_x86.deb 5198728 BLAKE2B 68bcd5745e14a13fe13cc0dbcf3c66c6471a405a5a6957f112b843fa935cefc27fd60effdffba86593175deed1eb66a091558c2766b3fb5a2f7b8c860e61ee09 SHA512 2a49778f94421b5827d52725a72745482eaafb825dbadb2696a1bccbcf491a775ff1b1eefebba565906c7c7bce8d7106003999a1e0dc69e69781e5a639597223
+EBUILD gosuslugi-plugin-3.1.1.0.ebuild 1596 BLAKE2B 0516cc550db19526c8b3f8695665f5ea7af6a4f17506cf705ef6412e0a97efd7e0d0771c8ef41b2ec85c28e3263679ca63a6aba00b7c2ffd4c8c32e5c3836f14 SHA512 5375aa2c7f3b09ba4ddb17665b829003c83518797338dec66be962545653b3116ef92e0ad45752bf5517b74e50b3d203c949a785aa61e2f1f8cb0a9f14f08347
+MISC metadata.xml 419 BLAKE2B a0d7c2098f48e9babb8d1922e955cde986abe24a2b6c62209c27def20ddaa05c745fce0dbe5c9bf2a00cfa8065bdadf9bab2b274b990237befdbcb730d671fc9 SHA512 ff3a126f33bc4047028503cc766dbc569ee33e85d57ead56ebbaf8c87d9074008c9f80d75b2ef655aa160e878284cf68385b2f047ec5025cf9cdf666163c0c09
diff --git a/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild b/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
new file mode 100644
index 000000000000..c3b258570dc3
--- /dev/null
+++ b/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils unpacker
+
+DESCRIPTION="Crypto-provider browser plugin for russian e-gov site https://gosuslugi.ru/"
+
+SRC_URI="
+	amd64? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-x86_64.deb -> ${P}_amd64.deb )
+	x86? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin-i386.deb -> ${P}_x86.deb )
+	x64-macos? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin.pkg -> ${P}_mac.pkg )
+"
+#	x86-macos? ( https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib/IFCPlugin.pkg -> ${P}_mac.pkg )
+#	x86-winnt? ( https://ds-plugin.gosuslugi.ru/plugin/htdocs/plugin/IFCPlugin.msi )
+#	x64-winnt? ( https://ds-plugin.gosuslugi.ru/plugin/htdocs/plugin/IFCPlugin-x64.msi )
+
+HOMEPAGE="http://gosuslugi.ru/"
+LICENSE="EULA"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 x64-macos x86-macos"
+IUSE="multilib"
+
+REQUIRED_USE="amd64? ( multilib )"
+
+# TODO: minimal useflag (I can't do it now, since
+# it seems like I brake my token and it is uninitialized now)
+RDEPEND="
+	dev-libs/libxml2:2
+	sys-apps/pcsc-lite:0
+	virtual/libusb:0
+"
+DEPEND="${RDEPEND}"
+
+QA_PREBUILT="*"
+QA_SONAME_NO_SYMLINK="usr/lib32/.* usr/lib64/.*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+	rm usr/lib/mozilla/plugins/lib/libcapi_engine_linux.so
+}
+
+src_install() {
+	insinto /
+	doins -r usr etc opt
+	dobin usr/bin/ifc_chrome_host
+	keepdir /var/log/ifc
+	fperms 777 /var/log/ifc
+}
+
+pkg_postinst() {
+	cd /etc/update_ccid_boundle
+	sh ./update_ccid_boundle.sh
+}
diff --git a/www-plugins/gosuslugi-plugin/metadata.xml b/www-plugins/gosuslugi-plugin/metadata.xml
new file mode 100644
index 000000000000..7579a29b5ee1
--- /dev/null
+++ b/www-plugins/gosuslugi-plugin/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>mva@gentoo.org</email>
+    <description>Also, you can find me on IRC (FreeNode) as mva, or in Telegram as @mva_name</description>
+    <name>Vadim A. Misbakh-Soloviov</name>
+  </maintainer>
+  <longdescription>FIXME</longdescription>
+  <use/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 4fbf7b584f11..01d425413d02 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 2a7f6be15af0..fcf38892ae66 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,15 +1,5 @@
 AUX puma-3.12.1-ruby26-waitpid.patch 1722 BLAKE2B cee9b9e89cf098a387481d754732f54274ce0f9580568e62496513d58d46578f81c13df2aa98d2da218bf9d8ad581e8728ff60be488905493e9acc6b88012a88 SHA512 86f826d7f9ac8a50d62f8cf2b87b0df5f7ce55c1a5e4ac7b928b756ece809e30750bb2a7c3c50dc95f9edcb463e9c453b5d3eb84ffe44952904200b5337351ad
 AUX puma-3.12.5-cve-2020-11077.patch 3490 BLAKE2B 08f103ed5a5cf9878404f04c139476c730f7a663681aa6cc0107c033317826ed803b72b384034b08b361ed7c99683fe3d90d51c5f97708647750db9edf59e15c SHA512 25f26889e74c98e5ee45dbdb2dad356099d15c70027f32fa2500e0f5b40d742d376b7f29560dde985c3652064f6bdec8dd411154301f6c89b1ef356632570c29
-DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec
-DIST puma-5.1.1.tar.gz 284807 BLAKE2B 59ba17129e55e79aa2f8092d60a5643840bd996b7832d421cb72538fc48b0fb302353bedef56cc9b115bdfb15b33b0f453bfbf759b2e9552a9490a8b0cef3090 SHA512 8653c622c21dca2116219702e801d7aa3272f0771fd5c2d5149927edbd504a9838fb0d442bfc5dc523035a94dad25946738a5dda954fdaa74a9a00c85ed9f86e
-DIST puma-5.2.2.tar.gz 293551 BLAKE2B ba7ba9d8a2dcf9ea9716624f712d6b569472e8bfd8d7501a5807007ccdc6b6b36a8fc6f65f47f5898907adb3d3b85e2630194d5527c96ed655ce6a52192ec36a SHA512 b2d4f711cd1ad4f4557991ba26d7b940573b413e6a4c589d8447e78135d8d47e7222de4c865919981b677891cb2b57e3a3cf015d1f9a637b671f4f221c7ea77f
-DIST puma-5.3.0.tar.gz 297273 BLAKE2B c8377b32a0bcdc175f043327d09e107cc2bbc4fd8f38eaf7015da7b0f715cff304c0ee5b9913e19bbf63aa9e4319ee8bce19d01e3439b2a492fff69fea5f7b15 SHA512 00d41e2549911233d3c9744610bd557803ad049f85c180d0ddd88e6f01352d4f79e728b12cd335cb38f9c56e969644bccafa82b8cce0b8f91b677333e53d9584
-DIST puma-5.3.1.tar.gz 297464 BLAKE2B b33e0d57059f4f7e4f04fb142ee5e4a1719aa75f074d3b0a45107ed0dfd2b80e3ce4c370e44337580a673142b3af00f3be982c3dac5054535ccca772166324b3 SHA512 ded559899c77a5d1f90fcb26bff5d35691aa86b98419879059940c9e9220a62244e88933628e56004354873fe3ee4230c128e3e0328a69be76361404bac2f9c4
 DIST puma-5.3.2.tar.gz 297673 BLAKE2B e3bfa38347526063587db966d20ea68f32cd88616d89b5f2d9152228d5d420b50c2918e24304c1bc8119af5790a2464f0a055ab92862a56262013ddbba006a1f SHA512 32e80b413184d371d451a35985a371a7655df0f7e81624f2a05e3cf65c2e1b035275a8e25ab03d13c9c1f921ec30cdeb3659e1201baae5940dcb3edcb525ff25
-EBUILD puma-3.12.5-r1.ebuild 2159 BLAKE2B 9890e397dd8966c4f1480cc435cca1235a87d317d37fd7879a32b03a8ad8b1ec1a6898f7cf5731c8f80a0014ad8dc7b01bc3c10a46f817269101f641101d12a3 SHA512 f922181874ab1c8cd685f1837d3631682aaacc2c316bffe8918fd35f1c8a2f879d5b199a3a4bb9346017bb5e5faec51135ec47a0f502c300413d6a5c9389631a
-EBUILD puma-5.1.1.ebuild 1939 BLAKE2B cd4fa1f381dff7fe659e1371ecdbab746c8ba8ed46aaa07c269e0f41fdb9ee7e1aef7bcf339cc1b0ea2682ad9ac968312b20228e509aa972a200705d3d60f26c SHA512 1da86cd7e917532ca9456a13f10d321c56cac38a0132d76a611fc64997ec5e90c614c5f924e6fd507a01eb9963686974cf69669b1e071823da811b4e45ade5dd
-EBUILD puma-5.2.2.ebuild 1845 BLAKE2B 451cb646c9c831294c1c2c51378453b4bc7f5676d4da82741afb246379d9b6f3aa0205bdace9e0443ff686267af7f997fc2e3a8e32e5cf30df143b8d1d6f12ea SHA512 4a066b6071666275ab712c51ebf3b92318eb99738f03d008faad53cbec42c69ac26b8acee9e699bd70c7dc4d798455b6f49b4a8d31305e93e7eaade374cca82f
-EBUILD puma-5.3.0.ebuild 1845 BLAKE2B 451cb646c9c831294c1c2c51378453b4bc7f5676d4da82741afb246379d9b6f3aa0205bdace9e0443ff686267af7f997fc2e3a8e32e5cf30df143b8d1d6f12ea SHA512 4a066b6071666275ab712c51ebf3b92318eb99738f03d008faad53cbec42c69ac26b8acee9e699bd70c7dc4d798455b6f49b4a8d31305e93e7eaade374cca82f
-EBUILD puma-5.3.1.ebuild 1845 BLAKE2B 451cb646c9c831294c1c2c51378453b4bc7f5676d4da82741afb246379d9b6f3aa0205bdace9e0443ff686267af7f997fc2e3a8e32e5cf30df143b8d1d6f12ea SHA512 4a066b6071666275ab712c51ebf3b92318eb99738f03d008faad53cbec42c69ac26b8acee9e699bd70c7dc4d798455b6f49b4a8d31305e93e7eaade374cca82f
-EBUILD puma-5.3.2.ebuild 1845 BLAKE2B 451cb646c9c831294c1c2c51378453b4bc7f5676d4da82741afb246379d9b6f3aa0205bdace9e0443ff686267af7f997fc2e3a8e32e5cf30df143b8d1d6f12ea SHA512 4a066b6071666275ab712c51ebf3b92318eb99738f03d008faad53cbec42c69ac26b8acee9e699bd70c7dc4d798455b6f49b4a8d31305e93e7eaade374cca82f
+EBUILD puma-5.3.2.ebuild 1843 BLAKE2B f99b1dca753b97702ac0fcb457ea4ac639309829d51116827325a44b1b614fa467cd8610748fbcd96476616b3b58c3d826ecd035472d0791a47a55ed155d59f9 SHA512 0135fc8c4295020ae29d620caeeafd3308705e5f0ffef0e67299c980635109d6909a2110d7de09bd982df24136261a286ac9753e96772c2859c63fdd436c481e
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.12.5-r1.ebuild b/www-servers/puma/puma-3.12.5-r1.ebuild
deleted file mode 100644
index 063d1408eda7..000000000000
--- a/www-servers/puma/puma-3.12.5-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}/${PN}-3.12.1-ruby26-waitpid.patch"
-	eapply "${FILESDIR}/${PN}-3.12.5-cve-2020-11077.patch"
-
-	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Avoid test failing inconsistently
-	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
-
-	# Fix FORWARDED_PROTO
-	sed -i -e '127 s/443/80/' test/test_puma_server.rb || die
-
-	# Avoid test that trigger a bug in ruby very easily and lead to
-	# failure. This affects all current puma versions in combination
-	# with the latest ruby versions, so we add this new version anyway
-	# while allowing these tests to fail.
-	# https://github.com/puma/puma/pull/1345
-	rm -f test/test_puma_server_ssl.rb || die
-
-	# Use correct ruby version
-	sed -i -e 's/ruby -rrubygems/#{Gem.ruby} -rrubygems/' test/shell/t{1,3}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
-		-e 's/localhost/127.0.0.1/' test/shell/* || die
-	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/puma_http11
-	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-
-	einfo "Running integration tests"
-	pushd test/shell
-	#sh run.sh || die
-	popd
-}
diff --git a/www-servers/puma/puma-5.1.1.ebuild b/www-servers/puma/puma-5.1.1.ebuild
deleted file mode 100644
index 1c8d8a3bd411..000000000000
--- a/www-servers/puma/puma-5.1.1.ebuild
+++ /dev/null
@@ -1,65 +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_GEMSPEC="puma.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/puma_http11
-	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.2.2.ebuild b/www-servers/puma/puma-5.2.2.ebuild
deleted file mode 100644
index 5d0f1ef44559..000000000000
--- a/www-servers/puma/puma-5.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.3.0.ebuild b/www-servers/puma/puma-5.3.0.ebuild
deleted file mode 100644
index 5d0f1ef44559..000000000000
--- a/www-servers/puma/puma-5.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.3.1.ebuild b/www-servers/puma/puma-5.3.1.ebuild
deleted file mode 100644
index 5d0f1ef44559..000000000000
--- a/www-servers/puma/puma-5.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/puma_http11/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/puma
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="https://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-ruby_add_rdepend "dev-ruby/nio4r:2"
-
-all_ruby_prepare() {
-	sed -e '/bundler/ s:^:#:' \
-		-e '/prove/ s:^:#:' \
-		-e '/stub_const/ s:^:#:' \
-		-i test/helper.rb || die
-
-	# Avoid tests failing inconsistently
-	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
-
-	# Avoid launcher tests since they make assumptions about bundler use
-	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
-
-	# Skip integration tests since they make a lot of assumptions about
-	# the environment
-	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
-
-	# Avoid test that uses unpackaged stub_const
-	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
-
-	sed -e 's/git ls-files --/find/' \
-		-e 's:_relative ": "./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-}
diff --git a/www-servers/puma/puma-5.3.2.ebuild b/www-servers/puma/puma-5.3.2.ebuild
index 5d0f1ef44559..16d68ebcbc73 100644
--- a/www-servers/puma/puma-5.3.2.ebuild
+++ b/www-servers/puma/puma-5.3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b549340ec83c..fd7fe294985d 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2cd6b9b4e5c8..0bc15e5847f6 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,5 +1,7 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
+DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD libX11-1.7.0.ebuild 879 BLAKE2B 86220953f41861753950b58fea111d9f7023514f9d8af00520d67753ab84ca7c9ea4d04be650c7fabf40a560c9ed60a0d4e9b6b29bd983c388622ddabfc2b657 SHA512 f276e0a0894432c99d6c16b4cd86501c83d141d1cf1301105a53bce3910cf0611576c9b748b4d3a95957ec9409d738dff2bab944b5637d1ab0cde89b8cb9d3ed
 EBUILD libX11-1.7.1.ebuild 933 BLAKE2B 3f04d4391f7a64679b7a10aeb3f68b1178ad9bf6389bd6607fda2cb654694a9b862da89856dc7e60e951a11908f065ca269a829f7181bf7b20300ba7dee73fba SHA512 8dc77dae5065e805a0f8af0c0f2c95c3c2541fc9b5cc19decc064cda661640673ecc2d8ca56daeb95e0ff1618fdd109376f6d0b13f7d54022789afe051e76ff7
+EBUILD libX11-1.7.2.ebuild 940 BLAKE2B ea5def42121b86284e0e2b5bf5f8aa65d05d39eeb5c15f90b86a2dff0fb164b8d4b4e640f0688a9d615ac910ba87edc325e5f008463833459dc7dc57a9e1d7bd SHA512 ad1d7ba5efde59606e7d9a7904d3cadbe5f7b45d21d57ce39266703524192bd0c0ea126c82453d0d0b01bd40068fa8fd05f2c703493e56ee62a719b458aa461b
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
new file mode 100644
index 000000000000..bf033e3cc6be
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+# Note: please bump this with x11-misc/compose-tables
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	!<x11-base/xorg-proto-2019.2
+	x11-misc/compose-tables"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+		CPP="$(tc-getPROG CPP cpp)"
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -rf "${ED}"/usr/share/X11/locale || die
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index d01b98d83857..cde2208ba0e2 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,6 +6,8 @@ AUX vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch 1375 B
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
 DIST vte-0.64.1.tar.bz2 486720 BLAKE2B bd8fb1f471a43aadf015cce8ae38c646521ca66e37652b72f7e94cec15a2a0a844d67116e9123ede44ba1b6ee569d1ecd0ff5e83067f6231802f5a77a798e446 SHA512 38bbbb4ed3d86740091c9ddee83f97bf5cb5c69c48e8a78592dd46e8f9334859a6c523e7b16dce110de71cd4a9a3b8b99a11816b61eae6e251dfc20cdbee6716
+DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.64.1.ebuild 2519 BLAKE2B 8bc513c5b6b024735dc09dd72c10d3a45020470a0ee1221750e249e2afacce105c833360cf812086af95eb774c5f99e46701627b5ba92de433281783d4ed973e SHA512 fcf3ed398d972b5e661d0396995e9cdd4d9d15dfc4a88e441084f8805673d6f933da05618ab80c5babd7c689883129976e9b8d9c4f9439c367ef6d00ead66bee
+EBUILD vte-0.64.2.ebuild 2526 BLAKE2B 95aacd09bc88b0b14012db2c647e9fd09dea5f25aeb13858d3f960e9e418dd921e4bde5b42d7c8504bd85041d1f6a826f9b856d2b6afe1eb6976e25ec99f666f SHA512 a745d9c6f8f0a252328a984338915c0965f93ae60a7515055f3b10da52542ada554fe9bd174ea1181131cc3d0532c68e61ab20d4de27299693087843e3d58d22
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
new file mode 100644
index 000000000000..66065238917a
--- /dev/null
+++ b/x11-libs/vte/vte-0.64.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.64.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.24.14:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+)
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.64.1-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index fd148e4d5a8f..bd746ce533b1 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index bf2d9577e225..d47eb7ddc649 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,5 +1,7 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
 DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
+DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
 EBUILD compose-tables-1.7.1.ebuild 921 BLAKE2B 17b09ddcc3e3edb7f3680b303de817b1fa68e0b092b81e574bce64c738673a7406d412413f89f46fb5cd99b62e5f0e1db48ebfea0f7eaf0bf84d818820f959a5 SHA512 529bdff9f93c80a549f2dbee98aa78b5e4063ab4edf4dbcd93825b9fde10a847ff4a7af95b42cd71f56b9db39319331869101f3eb000daa65ef8d0cab07cd1b0
+EBUILD compose-tables-1.7.2.ebuild 928 BLAKE2B 306c0bde8c01204acf186e4f5dfac859bb382f4f6a1059d806ab41c86dbe836bea8935f461639c83f3796759f6c1401b155b16d20794638cfc039b81f6eaa6bf SHA512 117ef2953a815b3ffdf102c8e7ea8724b2f26ef19f930dad449e46eeba2a598bee22ba3fb59fb1096da7685a05b8d331a27411cff7f2153492f04d730b14a790
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
new file mode 100644
index 000000000000..759d3b58ed5b
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xmlto
+	--without-fop
+	--disable-specs
+	--disable-xkb
+)
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index 6887cbc4ad3a..d3abb1508c1e 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,3 +1,3 @@
 DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a
-EBUILD dex-0.8.0.ebuild 759 BLAKE2B d4ca740372c62e72c37d171f0cead803e26f0402119234ecb80a2658637ae54a05771281eb907892e3a5a676449e1cbf22649393dd191a82bfe3c230cb532268 SHA512 bbd521ece4e5ec59017df9fc154376b31faf2e0fe3609679622edb6fb1b5fc5d5af5e8aad24bc9e5279c17e5fcda81e4efaa83ed23c2a8369743e0c5441d53d3
+EBUILD dex-0.8.0.ebuild 764 BLAKE2B 777b79ead4f0fcb6283507afcbacde064f94337df2cf9c3b4ad0105dd67abd373812f30d6136d29ea1a47ef820045523e70688172466dc425c55fe27d26fcd60 SHA512 09c9691897e70c3b9a3ee2294d85e55314aa2d22f7f26d5f43aeab12e291ecbf037fa0bb96fc231931def057b78b5e1055c659360d63d5ae4b18acdf18887620
 MISC metadata.xml 320 BLAKE2B 13f35e27d7da69c6167f9187b75cf012fe33359467336f422478e113814b062bbbde0fe5bd4d25b3eac41cde9a45e55b61f912425049365e82afc0557371e818 SHA512 18ef7b2115ecf22f12afbeb064823e3cf2faba91730748d53fc182e557d5f1efa371fca86266fa58ce88d5c249785e2b6b6c9b29f7d504ac3867cebc55860fb6
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 02c2927fb3d4..0b4cd2340dbf 100644
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ b/x11-misc/dex/dex-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 
 inherit python-r1
 
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index fc204059ecd7..eb6459e6f366 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,3 @@
 DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
-EBUILD menulibre-2.2.1-r2.ebuild 1761 BLAKE2B 5dc0fc0863d530f33ae1f9b70c5ab6d86f328acf914083a7fc3996cf4e891aa448b610b9f3ea652cc2e5e22cc5e5057ee635f98e50932b5bb8ef8f32c2d194be SHA512 ba5e223b3addb51f2f13dba4075908f50805e9e9ff9670be48a2d727d93b223246f2a8e019d767a8e0dc8b18dfb04d028dda4225c344cea48b2fe6f51334a6ad
+EBUILD menulibre-2.2.1-r2.ebuild 1744 BLAKE2B 094183062103b05c28d3fdcfb4f59d09acad077f0e9b46e0f0b7a2709222534e511ca8f5eafc5867765171677c5ccac0ab716e631e53cf8eb2e7ced996a89698 SHA512 f2c2a23b362528a2a32241d1130cac6a91c354ed47689ce1859beee74efb3acfa4638b676c8a5243b3278ab1774ee9a2d57fc9d04fe0c7d65d86c1c6c7cd8c83
 MISC metadata.xml 244 BLAKE2B 074f1e921f4d984a8bb58f3ff2800ddc85868c9d33c331dfd7a19503c02563f9e291876e99a3f4bc9afd171fcd8299e5c22d46bc24ec9ca475fa88d1535fb112 SHA512 0929c8d7177ffd5ac6e346f4bbfcafa764105312388307b7a8cf240d72f385437beb275aa530b4ad0248e807e5f42fa4f5437affdc94557baa1ece5a9f5586fc
diff --git a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
index addb2bb8bd7f..49bff656b3a7 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,10 +6,10 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit desktop distutils-r1 xdg-utils
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="Advanced freedesktop.org compliant menu editor"
-HOMEPAGE="https://bluesabre.org/projects/menulibre/"
+HOMEPAGE="https://bluesabre.org/menulibre/"
 SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 8d83f157d02d..8b0ea9de10c7 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,4 +1,4 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
 EBUILD nitrogen-1.6.1-r1.ebuild 1010 BLAKE2B 99479182b095994a923a392b5f13663d54a573eb91314e8859ac5535754aa85cf8975b36720b35021f02834812e21441650362119719d1ed073b8bac951a61a9 SHA512 4a11b6fac49eecf94e1abd4605184c88fadc8b3938d47a854deff9fec4637c476901e423f3cd1e02fa7cd6446f1cf66bec7c764b7c2634aea325b5b8e328f629
 EBUILD nitrogen-99999.ebuild 948 BLAKE2B 168dbbb5637c1f431f2445b60d418c9349c0113f8cccab5059f58d57f4e259876336730c7d7dd4cee0e347abb164c8e9456f0fa861a4114bb702c198bb67e4d3 SHA512 22b99582b6a06275f88539dd0bebabddb704bd3ba6ef12ebb0921e03a23505f4c514e57620089270f904817e41c6d3584b7ae3fa749b82ea1f00bc04d470b4de
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
index bc1b97e1eb76..6f49eba8f496 100644
--- a/x11-misc/nitrogen/metadata.xml
+++ b/x11-misc/nitrogen/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index eaed887485e8..2e8a2ac76ddc 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,6 +1,3 @@
-DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
-EBUILD read-edid-1.4.2.ebuild 398 BLAKE2B b148b8369304073919a5af6b03aa2376400246edddc0357572d5c155d6029c2feef0599252a8e700f5708c4bbe87319879344d7a948e291fdf0d7efefc105739 SHA512 67b788582eed4a5fff82932ca8a10e0aeee71f4bd3e3d8e14821cdc8fd99881bb1f2cf255f4bcbed9510144206bd3b28b69dc3c508e6e24d912e882d8a59274d
-EBUILD read-edid-3.0.2-r1.ebuild 1019 BLAKE2B 837f398a39cdfd15a9fee4ae7a9bd4cb68c5044868cbf9c17c19595525ebb11792c6a8337af0672b0a86da4e50f5b7bd07b91a596427e0d0a736746ac7537d9c SHA512 ead4772dfb2cb0dbdc36bf921374a3d19983e518f8f22089a9db9f895a6a0d375e433f4582a9ba9f01789dcdddd75efe5823861100b283bd8f19efd7a1c5735d
-EBUILD read-edid-3.0.2.ebuild 629 BLAKE2B ef065bcab0c70fa24c771c7a07949652d6c4b97b0e210915bbe4cdb109f115765102db2754f10fdede931a9c66938c55f3aba3bddb346432b67da4cab6d2398e SHA512 9d07fd2d4045c9d73c3f422dbf6a1dce609568c58a666ae2e7e3a548cda236f79f30b3f0b493df1710ada9b2541293fe1d9154362bc84a31b74e3e302d588708
+EBUILD read-edid-3.0.2-r1.ebuild 1016 BLAKE2B 3c1d26ff0c431df955817a45ba80db976611e5a397a72837937b3969da8d1f0c82fba2ccec985b9d0e159412c956fba0885caea1f6c18174dab8cd5c6f27dc1f SHA512 c45105555bf17975a9ce7bf1be37a4599e271c295bf1cc108f598ed34014993707cafaad472908f4f9e5968098190052c8bebe3fc0d8424e660ca0e96e36cb9c
 MISC metadata.xml 392 BLAKE2B d9477711f154ae3dd3b22254d6e8117c27840af5629a7296a3a2dae88bbed00174d30dc8a658eb5c0400b7db2b9b38d9f598916256b40ddae0dd33830e532f89 SHA512 76a7b26f9af8ae7ca060114b5aa077610916880c4d75b565bbe766beaf0ef7a86f92f0c71dec57f9f7aee07c003dc2455f12e1b9c4529b505466d904ba0eb5f1
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
deleted file mode 100644
index e21cc086c588..000000000000
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Get EDID information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-
-src_configure() {
-	econf --mandir=/usr/share/man
-}
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
index a0505646508a..66c7ab83c0b2 100644
--- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="vbe-mode"
 
 DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
deleted file mode 100644
index b0e3a798eb3c..000000000000
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Program that can get information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-libs/libx86-1.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \
-		CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-cflags -fcommon
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a6d6ecbd35a7..6c308f1ffb4d 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -10,6 +10,6 @@ AUX xscreensaver-5.45-remove-libXxf86misc-dep.patch 1879 BLAKE2B 2e4f8e39b557cf3
 AUX xscreensaver-remove-libXxf86misc-dep.patch 1879 BLAKE2B fa3f562edf921dded7a1b3e9644d79d10a768baea64fbbed6301dba0fdaa1d575b85b2e8322eda251030a79835f7476020680a8b5a05354d279db8aa06943475 SHA512 6e55932f6be85042eb6f88a79d32b90fe51734b90f9e15aeebfefcdfe087af85b6cf5bed8c3c4212c1e8a91a77dda49eb6fbb64b829dcd02230710b803863a7d
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
-EBUILD xscreensaver-5.44-r4.ebuild 3809 BLAKE2B 92f6ea9bc641d75c47dab18a4e0339f68f8ae9c3f621efb306a874155b5aefdd7a08f09edcd4c047972ed982df6ca432647c934d9ae2baf3d488e1c678c9cbd6 SHA512 c076b5263170f3ce709971a1a65468a475d9b5d511c28e41ec47c7b3fe8cec179cc4c0ed8f78a132ade7e23afcd08d685220adf78a3abc2321e4209f0de5a9c0
-EBUILD xscreensaver-5.45.ebuild 4091 BLAKE2B 3d6281d6a5b320a10d2496e009a6742b07938c04555754203f42ae7366aa759132c723078df5739542a8111b2a85a6d3de2ef2bbdacca263ab37f219f7689229 SHA512 b3e2d732f8cae62065f13a54f76eee810ac09efa90a334e4d291747b447588b7c47e6bb1a7041df1dbd59496945e35bc3069c88d5d99c3f97e54a5acdbc03dfa
+EBUILD xscreensaver-5.44-r4.ebuild 3795 BLAKE2B e1f0783ca6eb3fae893485ff550f62d3cc857227484a360e8a9669063871a3484b0d5f2d26e8f9d6d0982cab54a1043c76cf41017126c9eb206f8408b1e00c1d SHA512 a20f37974a78ed2c0188fcd46f5897c298d4bcb3718c40f15a6c4fd7a7231c50763358c92a9ba91c43a3c82e34c153a6ad582aef2ef436d5a676ddd7a23dce8f
+EBUILD xscreensaver-5.45.ebuild 4076 BLAKE2B 8a71b6cc5aca2703fb5b89c362b440e29b11dec541326fc8746edff47a32056a43f63a60f0b66a67e19c8b5b581196f4687df12f2e2e510ad4694b1edaf72c9b SHA512 ea009548ac3612791aa97aa6066b890c44a7995f804b69aa046c964879802acb55145b874922523b7599bb4f9d64010b244ec34a601e4f822405f564e8cdf6ff
 MISC metadata.xml 789 BLAKE2B 9f4d6ec06c763d685b8c6006747fd6482ae5199c4eeeac8ba1bc13f34eaeb8d1dfd67ee0762edd0d4d0199759b26bddd077c07bafa7373f4e6c4069c893757ed SHA512 5f839da92e2f2564d22a93d14ae62b0fecb70be706b89ba2829196859cebd11cfe2d4745e34a33a767d5efe92135fc0fc9686c175dc2774278a3dc944ffa515a
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
index 46e166226f08..12806ff149d0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
 
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+inherit autotools flag-o-matic l10n multilib pam
+
+DESCRIPTION="modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
index 593985b9f95e..424a629aec61 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
@@ -2,13 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib optfeature pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
 
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+DESCRIPTION="modular screen saver and locker for the X Window System"
 HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	https://www.jwz.org/xscreensaver/${P}.tar.gz
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 44a404d3aa8e..449f0ea77c8c 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index f1454af5e2d1..61a16ae7fb3d 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,5 +1,7 @@
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a6a5758b500665aed21b95d8b4295240e24ea69dd806321a32338aeb904c60cd7dbb713d3d456bdc9199c7c4b4e2d65bc7078fa9bbf6a7d94c227265 SHA512 0efc106b35c25199ed8d4edc5c36a10a1013e62100c0b3397a5bb04386d7d2f548e811451c8577bc123ffbe935cea2a8f10d08473de5fadc4d07db0f301ab3bc
 DIST gnome-terminal-3.40.1.tar.xz 2596912 BLAKE2B 6b199941a2d30a8bd06d779d8d5a1fc9096b7183718705b74842566033ddd36c18a32a68014b5c7ab545bf0bb4f780fa950c7d6d04149f89f640f0db6f105b59 SHA512 8e16b3c8513cf3c503a4a35e2c238ea41b087d426787402e0db5ef7e4bc5303d5a34a6455f651760327560f73edf3256177bbe3633e8a5b8abe8edab2bda7698
+DIST gnome-terminal-3.40.2.tar.xz 2608032 BLAKE2B 8d7a355623d6eee9f4e3d4ff219dbd12c34987ea1ab1b7dc960c5bf19772d57de3bd81f63ceae61e87e932f05d47208390738dd8df30cbca71d8d0ad5d4b7887 SHA512 d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100
 EBUILD gnome-terminal-3.40.1.ebuild 2709 BLAKE2B af7fe18e29037aed64c447c0b6534273ec302b45bea17add41c00d02551b5542a220901d80d1f423e87d60cd4fa338b797bf1f24639ee22f881cf836f4a1932d SHA512 3af557dea4ff3098ecaad69594c6f500d211837112574183c939bfbdfe7b5ef7dab1cef1c65d2c646b969b8b72e9fa1a2cf5d54b07d1d4de7a1cfdccf4ef1dea
+EBUILD gnome-terminal-3.40.2.ebuild 2711 BLAKE2B 762e695dfbac737ef21648c7081dc6b3800f356ed6a9cf5574dd8ab1afc08b0a53871dfe693d0e17625e3571b557c9268b05d91aa3a362693e621a14049bf013 SHA512 65924ea97931d3760555e63862b6b27bbfbf5e2d4182c0eaa1a96e315ed42fd76664aeed88d27947dcb2f897d3d50d5e84868cd7231f22578498f6053348b1b5
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
new file mode 100644
index 000000000000..b16c95d6f7e6
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.27:3
+	>=x11-libs/vte-0.64.0:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore "Set title" support
+		# Automatic title updating based on currently running foreground process
+		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
+		eapply "${WORKDIR}"/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch
+	fi
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable gnome-shell search-provider) \
+		$(use_with nautilus nautilus-extension)
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog HACKING NEWS )
+	gnome2_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index c777c43ca106..5eceb910bbb8 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,4 +1,4 @@
 AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
-EBUILD sakura-3.7.1.ebuild 1303 BLAKE2B b89e1fc1bd46dbebf14b56675738597d8bb78f71e3fbeae026543aeeee5bcd6b19ad1e517dedb3eb71803fe340521cbf95c412044414faf9d3130ac337b440fa SHA512 4e310ac97a923613c52ecb0dd65dff1289f6079377221e8c1480bd65a44c0eedd5086082fb424e161290052e581b2679b4a8b2f0bf32a564230a5ea6dd955eb5
+EBUILD sakura-3.7.1.ebuild 1302 BLAKE2B 03a1829427e11081656d2a3c3f6ae7e3b41d25598f1640c55f86548f585905533cbc9a4bdd03db8acb4d0214b62864e0af53e87ee3dafa215567946d88f3a954 SHA512 3ef8444f54ccb7b6b4d90d3e356bd79979ee81d5b4e3a776c3542d10f503b64d7cee3bd2e75101b9e200471b8f79327efb1111c0a8a0bb3d9862b02db1465115
 MISC metadata.xml 779 BLAKE2B cc8a0feadbc92e64a47c0d7c1b80c1211fc9f0cfed2d7e386d2225143b51e1d03d32eaef68ddf67525cec3ba409cd86cd652af1fdb4bb733e03b278eccad3c92 SHA512 c091185594b457e8e803b65d5a85cad5e9454fba6ce762350d7156fc8ab2b8e1168d21583e7093534f414a4cf5607b1355d4dae6ee7c353d6b90edbe4f036ca1
diff --git a/x11-terms/sakura/sakura-3.7.1.ebuild b/x11-terms/sakura/sakura-3.7.1.ebuild
index ab800b36599e..104d146b9851 100644
--- a/x11-terms/sakura/sakura-3.7.1.ebuild
+++ b/x11-terms/sakura/sakura-3.7.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake eutils flag-o-matic xdg-utils
+
+inherit cmake flag-o-matic l10n xdg-utils
 
 DESCRIPTION="sakura is a terminal emulator based on GTK and VTE"
 HOMEPAGE="https://www.pleyades.net/david/projects/sakura"
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 865610ac0867..dd8cae5ca5f2 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -7,5 +7,5 @@ DIST terminator-2.1.1.tar.gz 1033153 BLAKE2B f92235bacf34ec5bfe2400c6bbfc8bbdee3
 DIST terminator-2.1.1.tar.gz.asc 866 BLAKE2B d7362ce47f0cba18a3d10c54dca40b23001c818784cf5b5e4c98fbbd13983cf46e6ce631c4a4f5464c2badbb21e6052ce31456bf8b2d2c2deea6a647ad184b5c SHA512 ab171e0538686599fd86a35d0f5455aa9763c5f29c2c6bd5677cfd678beaeaad4dc141553e0abfecd19279a1a1653f12e07ed20f03ee09ee8ec10edbd63d6c14
 EBUILD terminator-2.0.1.ebuild 1539 BLAKE2B d586a61aad2771cd87b7c1cb161e45d59c292a008b98c02daf7471ebb10115583015c86ba986f2b12264bf55675f02e60cca343e525b07b7745aa735ecbfe71f SHA512 f4fa2cd2459997ac49bf6264170f96b28f7d3d19aeee94b1effd60cc135f697867c3604dd8ed27ceb59ba11c5b50c45475deff21bd97cca7ca0db04d1b1b74a6
 EBUILD terminator-2.1.0.ebuild 1787 BLAKE2B a6ce1383476457de519f6eefad0d3d605b41673dbb8f79854d2d0ba96954054f554ee6c7536a04cbeb2d32a7df3318b9ca9f0c691b805b505ae38c297e2c0f2f SHA512 ea638caa15d269593ab3d9c2717dd0bc557bad2fe3162764c3045d2514ed466fc13674d0495c419488c15dc06b586362f52a167aeb0fa89c1dd35ebf49728de2
-EBUILD terminator-2.1.1.ebuild 1677 BLAKE2B 7f472a73e990585bc65cce785ab19463f05bcb056b72bdc42882244bf505905e9191671da5d3f72f444d2e47482f1d0c31c738e2c5982a01e30132c5c97d8c09 SHA512 d3aeb13e038a6a8295dab3c1e69d07e6725bdf1891c07be86ff28364cc134ee1c5c9199669d455054c4ef28420c89304fd601fb1c205f34db01bd07e76555eb3
+EBUILD terminator-2.1.1.ebuild 1675 BLAKE2B 33ee917015d29b78e8ec509c4bd1b0418894f6c7542af277e9bdf3c6ae96dcfa419479a0161cb59aecf3388aa2ad0adda963cbbd9c38fbe18e59246e3caf1e6d SHA512 a80582155cbf175ef76da4708b919c1bba277c47d6507b94dd64a9b911fe255b1b615a152c0b58920f1c31a6e10beb90743626cc7f596dfe177b6a2afe7f588d
 MISC metadata.xml 858 BLAKE2B 27a8420382f3ed119d3c31bd628c2357d552f79c5361b76446a7ad093f2fca5fd0e9ec1f6b16ab6d2863264993eee52c25e7d1c468f2ec23d99e82d9df3362f3 SHA512 9c058afed38eee38a1bb793ed2a8c2253a729ccd79801365c7cb596aa3402e9e24bd04c71547aa93a550290e07b71c1f5c0f9d9bd41bf886c9935700f3a2d3d7
diff --git a/x11-terms/terminator/terminator-2.1.1.ebuild b/x11-terms/terminator/terminator-2.1.1.ebuild
index a792fa24fec7..67ffbfbf2919 100644
--- a/x11-terms/terminator/terminator-2.1.1.ebuild
+++ b/x11-terms/terminator/terminator-2.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ec86e815bb47..32c372425582 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index bcfcaea4bb20..6953a04f148f 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,6 +1,5 @@
-AUX QGnomePlatform-0.6.1-qt5.15.patch 682 BLAKE2B 418b0c478d191e58186625cd2a307daa8f3771ee284283d84b25be2af797116f991ceac819a9e5f0258a6c3f6933c13ae66bd6912979f8d8bd847c5b7aa8d873 SHA512 c0f364f9aae6d268b410a9aa97d9442f9ec949b0dedb19836146ba9c600e2fde9bd645613c7a2bd35c960746986172258bf3fbe315e42c37be9dc14f2df8b3cb
-DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
 DIST QGnomePlatform-0.7.1.tar.gz 33633 BLAKE2B 167039a7de4bbd3cae163022adb94a2bd4764f5a862b8334600f2bc5b7cfe09b6a5facfe656438d05bbf150e10caab9f1aeb910d0aa8d55fbe8995393e89b0d8 SHA512 7e3ba774ee1387604f4c66bd75f9fb4c5305f4553886132e8e3991a3e42564844a7eafb1361e0e8c64743746e315c07b22c11c133be95c1c53afb62c062bfc6e
-EBUILD QGnomePlatform-0.6.1-r1.ebuild 697 BLAKE2B ea7d467da40c27d288cb803bcad0146cc10d4564f87e267d59af94716cc9fedab98b84e23cc77010310c8240a6af5679934053f4776c28e059bcd6c15dbe4b8c SHA512 4a7c1e0559ca73ca961fc00e8b68663b37e62bec019875ce4e4b921fb7730e935dce5b2dad77198d6c6b6e607d4e7d0dba1421322a15222aceccac3128a190fa
+DIST QGnomePlatform-0.8.0.tar.gz 37381 BLAKE2B 04aeb04f08441aa4964ddb7a3f0b6afbceead82abb5399d36731c77c6de6b303a7db188094857c8346381940deeb8bcd9c6d24e0521cb10b649209e1f6b8d0a0 SHA512 e862b84024ad77976b52cbacf1f920acaa60d2bfcb8f261f1215f2e5fb2dbe6d99e10aa425be70fa2dd324ac4d8c5b85958d68fae4fb7f9728caf097aa1bd102
 EBUILD QGnomePlatform-0.7.1.ebuild 713 BLAKE2B 3b78b95ac2542193532a5d8c913ed15ad225f10bc9454cb8e4504205d19a8cd54fd6bfb5fc79646ff4d43f9f6ac3f18d675bba0677311495d49c5239afddb7dc SHA512 95323882c5941ab6ff30aeabdc212ea7e8a344622f5b46b618ce3041532d463122becdbcf50df757f37d786a97c43b0e4fa55e3b7ff53ca13066cde3464e87c9
+EBUILD QGnomePlatform-0.8.0.ebuild 631 BLAKE2B 0d98afe0c3e07777a858f39148a2fec78e6106a3413352004e41656760a2e4ff1436cca29404ce8a3d637c1d0898a2628e879499cc96daf7d5536b136372d1a0 SHA512 15c64dcc3837fa3f08d9abfa678e4daabdf531cda9ad59ef68985372b0508a1bdea640aa13b0c5b038eb7bd1d064b0b8711b8c7c321021c2ac641947a61ef4c7
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
similarity index 66%
rename from x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
rename to x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
index b35f4ef865d1..15a2311f5546 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.0.ebuild
@@ -1,34 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit qmake-utils
+inherit cmake
 
 DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
 HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
 SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-qt/qtdbus:5=
-	>=dev-qt/qtwidgets-5.6:5=
+	>=dev-qt/qtwidgets-5.12:5=
 	dev-qt/qtwayland:5=
 	dev-qt/qtx11extras:5=
+	sys-apps/xdg-desktop-portal
 	x11-libs/gtk+:3[X]
+	>=x11-themes/adwaita-qt-1.3.1
 "
 DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt5.15.patch" )
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	INSTALL_ROOT="${D}" default
-}
diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
deleted file mode 100644
index b0927d12e79e..000000000000
--- a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c835c9e80cfadd62e01f16591721d2103d28a212 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Wed, 27 May 2020 13:38:49 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
----
- decoration/qgnomeplatformdecoration.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/decoration/qgnomeplatformdecoration.cpp b/decoration/qgnomeplatformdecoration.cpp
-index 61c2af9..c8b381c 100644
---- a/decoration/qgnomeplatformdecoration.cpp
-+++ b/decoration/qgnomeplatformdecoration.cpp
-@@ -46,6 +46,7 @@
- #include <QtGui/QCursor>
- #include <QtGui/QLinearGradient>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPalette>
- #include <QtGui/QPixmap>
- 
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index d153eb63953b..5fbbd5755223 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,7 +1,5 @@
-DIST adwaita-qt-1.1.4.tar.gz 436392 BLAKE2B 2a8ab80a2189cc7bbc21bb83c409b16c8824364cc768765246876dedab8ac4073f0325d28dd916b2173bb3cd7396bb2c4b19b07c8932d589200d91f3ea48e2b9 SHA512 78390787c4b080608036605c6c713bbd5d482b039796e76974ca8c034e0d8af694704e063d53f99a3e5e7ac4d48f6325ff1c90d67fbeb4bc9e49792485e11cb1
 DIST adwaita-qt-1.2.1.tar.gz 438614 BLAKE2B 783372158d67e51cf869b3f4c0732735c68ccf6d43ce354de41609878e582509becd97348c749c1e3b4ef1c73a5b1acda1dd3251d8d567a720d0b8286d154fb6 SHA512 a4482d9ae8e9f1ae4f6baa411d68f5f7b2ccafd157635c5e142723414f28bd0a5b3331d3ba16e17404159d410fff029b779447e8832d69c020a1fa1d40d926da
-DIST adwaita-qt-1.3.0.tar.gz 438816 BLAKE2B d362a619481c4bbf1aa08286390e91a4028f79dcda20ca27443e50ee32f5de89a01e0dfc5df153b6f1b4dfc5185b7de54e8614a4559b2511b83a174ed09ae144 SHA512 77f2554826ceb31f2972f272424a8626b83085df4638cdde707837671479ed3bb28c86fae3cd878daefc0c887aca1a58f8b30d0eed9577f9a306af6db703261b
-EBUILD adwaita-qt-1.1.4.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
+DIST adwaita-qt-1.3.1.tar.gz 438788 BLAKE2B 8c5585f51eeca86225f9162d47e6d7bee6e912120af0a692a85417b9d7c95b32a08e9329e3a60190148832cceeb154fcca932dafc84b4e9d26ced3a661c3eca4 SHA512 2f6f0e76a7ea35151ea6a2c7f6d8f4714b738935bfecf10be9abb243bee6f297bbe7a31593ca2a17eea1767b26d4d420aadb5ba2c4c11792169579eab4bdd439
 EBUILD adwaita-qt-1.2.1.ebuild 581 BLAKE2B a2ca77941bc43e72c247fe5f18ebb555acd3e789c1de38b2278f72f8dc88086ebfe0eaf21613a0f29c3e0a387e752869c1ddaefddeb497b5be350b89e805763b SHA512 72e5376fcd755fb99c32cc7932151802e84dfe510e39a5a33de7ae21c8b141b07a8d8e78f515a51e0966f61c63f8c152faf30d772655170f0beca28c9ee9cb8d
-EBUILD adwaita-qt-1.3.0.ebuild 583 BLAKE2B 31ef4fadf0887d5926585b11731d65b9048c064c043d9c451e871f44c6459fbc5340bc472fc409002ed52bfef2c99d7a8a1c1128dcca002cce1e0d74fc0131d4 SHA512 237f0c254619affb7d7c778483e085a5b9a2b0d00bd51520a7049673dfaf0038d427fc0122d112741950cd53fd68fd353520af0a0ab2a9284f1e8e560575564f
+EBUILD adwaita-qt-1.3.1.ebuild 583 BLAKE2B 31ef4fadf0887d5926585b11731d65b9048c064c043d9c451e871f44c6459fbc5340bc472fc409002ed52bfef2c99d7a8a1c1128dcca002cce1e0d74fc0131d4 SHA512 237f0c254619affb7d7c778483e085a5b9a2b0d00bd51520a7049673dfaf0038d427fc0122d112741950cd53fd68fd353520af0a0ab2a9284f1e8e560575564f
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
deleted file mode 100644
index 662921101d5a..000000000000
--- a/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
-HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
-SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gnome"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	gnome? ( x11-themes/QGnomePlatform )
-"
-
-src_configure() {
-	BUILD_DIR="${WORKDIR}/${PN}_qt5"
-	local mycmakeargs=( -DUSE_QT4=OFF )
-	cmake_src_configure
-}
-
-src_compile() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake_src_compile -C "${_d}"
-	done
-}
-
-src_install() {
-	local _d
-	for _d in "${WORKDIR}"/${PN}_qt*; do
-		cmake_src_install -C "${_d}"
-	done
-}
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.3.0.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
similarity index 100%
rename from x11-themes/adwaita-qt/adwaita-qt-1.3.0.ebuild
rename to x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 9e3c713f8a30..3188bbd6b2db 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,7 +1,7 @@
 DIST papirus-icon-theme-20210401.tar.gz 27153786 BLAKE2B 95f8b10cd13540f3d2b9f1b1febf0649764d8761f1b4a9d6a2038073b1e8e73e331226ee8c6a4069ac7d26052d49db3b18565ecfd08edd197d4f729769ddca9d SHA512 317eed658897dd55d8393669cb62b2a8f9211120b8e132263c70ddd2f5710973c78230f37bd0f60c75b7b67912d7d2cff2d048dd7b29ffb9c68c73c2ab89ee2b
 DIST papirus-icon-theme-20210501.tar.gz 27320777 BLAKE2B 4839189681e898eacc873a4077d92200085a1dbfb8e4d3298c8e6da0cc9966c9ceea903957abf8f4106538764fa73d27ec8375b8011b1196a4c97c6f8b23ce15 SHA512 65f096428756e52a4c373c206a320e2185fc176238100fd2e8dc9281c7772e3a3381a6ce2d4642be9ff0ea97f5e5292b1a5b631c07459d5863ee7e5cfcced8ac
 DIST papirus-icon-theme-20210601.tar.gz 27817563 BLAKE2B 3f0be519dfdba08f1cc4e43f7ca92e117185ec18b48fa7fb037db686449ffb4f7b4bff949b55d914620d2b29676e43f05542db31daf18ddd8f175ee64328e449 SHA512 30b59e4f05718efb7790fa4e734d91886408adeb7e0adc9d98e7572ba5f4163fa81574ac8811b88106eebefd1b0dc71ffb4be07aac8f4720aa7b2a206a00150a
-EBUILD papirus-icon-theme-20210401.ebuild 512 BLAKE2B b3b941de55fb1a427595c1c1260a0e8be31f0c85c75262bad585ba60ce4cd1ec11908ed422c87e475fc3f0f92ee7bad95174268497196fd62bd4fe2cd50a9fa8 SHA512 6f2c96d74746a79b2074d617ef449b974e3066c6454c83c2eccffeb8dd9de3eb3180c4d09c9ac04e4c0cc003f6eeea65dbb0674d1266e5551bfcce1bcf880c9f
-EBUILD papirus-icon-theme-20210501.ebuild 514 BLAKE2B f2bbca3cfc276732e8179cf60066c21aa6e773a27f3ed718de0f3fa8f8861ce1e2a9863d34ffd6a4d051136ebc213951cd06c8620bc4bf2443d9d839c85a73b2 SHA512 2960e8ffc6e7303d3ae9296574a27e9bc1565d0846babe1bab8d1d9c7ca01c6bc9ba3e27e6e9d588f155c03fb0976acdbea54f0b848f1643dd4f1f2c36d70e3c
-EBUILD papirus-icon-theme-20210601.ebuild 514 BLAKE2B f2bbca3cfc276732e8179cf60066c21aa6e773a27f3ed718de0f3fa8f8861ce1e2a9863d34ffd6a4d051136ebc213951cd06c8620bc4bf2443d9d839c85a73b2 SHA512 2960e8ffc6e7303d3ae9296574a27e9bc1565d0846babe1bab8d1d9c7ca01c6bc9ba3e27e6e9d588f155c03fb0976acdbea54f0b848f1643dd4f1f2c36d70e3c
+EBUILD papirus-icon-theme-20210401.ebuild 526 BLAKE2B e2d070dfe2862e3567eea4a27de10b02bd512361bcc10a320932dc9ca6d0569f87f13fc9382fabb387f0cb19c46266b938a8c2d5de0c0bdca169753ada0ace82 SHA512 003c299b5e41a702e059bf289ce95123e90df76340b9f39be0e2476d4e04aa9aff1327ad11c926a42b711903514a8877a1850860f0ac8c22719fb25c374f5ea3
+EBUILD papirus-icon-theme-20210501.ebuild 526 BLAKE2B e2d070dfe2862e3567eea4a27de10b02bd512361bcc10a320932dc9ca6d0569f87f13fc9382fabb387f0cb19c46266b938a8c2d5de0c0bdca169753ada0ace82 SHA512 003c299b5e41a702e059bf289ce95123e90df76340b9f39be0e2476d4e04aa9aff1327ad11c926a42b711903514a8877a1850860f0ac8c22719fb25c374f5ea3
+EBUILD papirus-icon-theme-20210601.ebuild 528 BLAKE2B fa548e79eaf5dc78baa49423599053003e2c29f3141277160a7e83efd9e490bf84ddedce4d9c0f47df783972638d874f08e9131e8dc99e7fec565f5c5c66995d SHA512 68fcb1553d7ec3bad175ab2ffea2de4d6b30a3490febc3f26542b79fbcb43f889ee4181b3c34c5b0774374077bcb5f85089eeaa57cdb954ac636f8244064fc79
 MISC metadata.xml 614 BLAKE2B 267c9f0f783830dfb301b27762e98525ee0acef15b6b11aba2d6d21418e9e0c114a0d9893583d4c98120bc6f96d8730034a1af9461517c1d429358a42c445b7c SHA512 a9099c1f35dd984fa9364aaba6ee943102a2165c141e1977d018ec9460e12cda70655871029d834fd4cc59886b1e4b556c4c8fe612aa6dcd73bd09fb1ba99433
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
index 79c7a6099fa6..fa344b3837b2 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 src_compile() { :; }
 
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild
index cdc7ac948197..fa344b3837b2 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 src_compile() { :; }
 
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
index cdc7ac948197..27d277b2e336 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 src_compile() { :; }
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index bace5e48bf8a..4556a1a3caef 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index cc4dd579362b..d84854edc2e3 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,5 @@
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d
 EBUILD ctwm-4.0.2.ebuild 866 BLAKE2B 9f99f0b22eb8ed4b850539a4c68acb7f0dde58751d5966999a50f4c24e1286106e2c8101160481bbc50dc622e3069eeff6012de263608a930b2ec370e0223552 SHA512 8912b11b2c0e233e295ff59127e40d6fcedad4f0fc94cacf2753cc7fa7beb4c98d37d7cf5185f433d21ad88399af7c024faef03360ef02ba1a39777be3b02422
-EBUILD ctwm-4.0.3.ebuild 1270 BLAKE2B 732d501719539fc113467ef780b5fbbcd782caa38dec716f8dd49486dcf9150182814c636465b8872b070d2fb3dead4571f9e7877ae984c7c1eaf84eb9a04332 SHA512 47174eda91abc199eb3bc7758d42713db68bdfe7a7629763d0582bb02f8291c51abcc959af81f14952eb6158275e7fc41f0971c41c9af3f1310f99b79f04ab3d
+EBUILD ctwm-4.0.3.ebuild 1269 BLAKE2B 1b0ee37a15447f558fe13aaa9650a115dca35780499d38837c0a51afc20278d3df41cea7725762b9f6e9e285975e2757854f1e56084cc5aba28216c8ab1f8546 SHA512 e16eb3d03d9e9f9e3ab6441d960aec582447762212ae723a7f5e13ed2268c4a5d2f490fd1e1f71eebbe6309c5e4600de5ccf81688d2b749a36124a3d7df58b2b
 MISC metadata.xml 856 BLAKE2B 426cfc4d6e71b0e227ae36597f0a80bc69c20a423952287cb8013b7444aaa699efd5782a6a7ec05703cad50a2c1f19520b6211cd60c896af06382e84a01ca258 SHA512 53fcd34f01714d98356b63928c76c5f115cb2ee5002c80e38ce103377ea15029b2b92ab157bb58de98047b650206a3468bcd891038c7067c40d48646140750ec
diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 86968cd029ff..27fb610aba73 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="jpeg rplay test xpm"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 8560c845901c..115c8263fffd 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,8 +1,6 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.1.tar.gz 432926 BLAKE2B 38f8626f3f8957cae32d71202b03515c26a4e174ce550ed6b31e7e024c3a3095374ad68f5aecc55c608c0a8565063ff39f85596444884557f38ff39043bd1d7d SHA512 c69cc5a77e98e2e0a1c84938394fe97cd985bfedb8bb1e2dceddb0268f30597cdf9b30048aa3618c20ec549f2113b7a6bbbb94f2fbcc578b8f0117bdd8cac85d
-DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc SHA512 5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c
+DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
 EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
-EBUILD herbstluftwm-0.9.1.ebuild 1055 BLAKE2B b3d76f81274b4019a10bfee919de68c5c52f391025514dbe0c6ffcadf84e50db7a5173e15d553c86dfd206b594483da32f383b866b81bbd14e58757536f5a769 SHA512 db8fb6e23a86b722c3ea779cffe2a13167330e8be46fc07e770d87361ba76ce4b51c4773966a8730da2f2182eb60605daf5a7a79c82056f872ba1012e97c4e97
-EBUILD herbstluftwm-0.9.2.ebuild 1735 BLAKE2B a5e0199e4253a12cd99788cbd8c5ad26bd2270c0b454e688d3c4e758d18bf693d132f9214d5d13a0f9d88d06976696800724d6327c447073f8be958077ee7cf9 SHA512 c5124e231d7eecf9d0f00260164c61e2469854e93b38d2285e987686ff37806435adac9894abffd5376e9a37e2ec50472385a2ecf2e6093c94060e61cd21b740
-EBUILD herbstluftwm-9999.ebuild 1044 BLAKE2B e65193b1bd6c7b42ba0976b298dd8e2df2bbdf18fb5a623224a2184c897e70db2a14124729fa81753f6fd73105f3dc65711305a94d2de04d5140a127da08744d SHA512 94d9732c9805962a2144d9fa1ac9b4f136f7960cca790b3059a6aa2f76e157eba13ed291d113429e942e1858e8a90e40da76883b9ed5b964ee304e78f0b4e9a8
+EBUILD herbstluftwm-0.9.3.ebuild 2371 BLAKE2B ea74b3fc645e04598d92bad6891be61b71125c14379e752bdd5cd252bce95eef86c1eab5721486496ef86ba43db372b00bfc9e7f8a10f7c10d585a3b8f5b20ba SHA512 5ec164cb648e2aa32c46f441082a766259887542178cea8cbea1d650095e8091793640249c2c80fd2088e54bc7c0384739ab5c2e1a64f455307cca5d5f70d913
+EBUILD herbstluftwm-9999.ebuild 2371 BLAKE2B ea74b3fc645e04598d92bad6891be61b71125c14379e752bdd5cd252bce95eef86c1eab5721486496ef86ba43db372b00bfc9e7f8a10f7c10d585a3b8f5b20ba SHA512 5ec164cb648e2aa32c46f441082a766259887542178cea8cbea1d650095e8091793640249c2c80fd2088e54bc7c0384739ab5c2e1a64f455307cca5d5f70d913
 MISC metadata.xml 565 BLAKE2B 8a6246f89ec1a463c527d2daff5dc31ec574d6d41bc026255fe4a09e4fc5f1d7136df89364ed3bb6bf46a3848ad19f3737261481f4c217c2bf6004e0ad5072f9 SHA512 08a447578d4b0d98efc301024b182e4f1407040b4c37de73fab0e65990e834a38b3ea7dc17f15e96ea8bde5336d45d30d881f9169ccd461763d7d4fd8d098e99
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
deleted file mode 100644
index cd6435359276..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-any-r1 toolchain-funcs
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/"
-SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc examples"
-
-DEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
-"
-
-src_prepare() {
-	sed -i \
-		-e '/^install.*LICENSEDIR/d' \
-		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
-		CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Ensure that 'python3' is in PATH. #765118
-	python_setup
-
-	mycmakeargs=(
-		-DWITH_DOCUMENTATION=$(usex doc)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use examples; then
-		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
similarity index 68%
rename from x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
rename to x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 31f1710a7b3e..f374bfa2fc7a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit cmake distutils-r1 toolchain-funcs
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc examples python"
+IUSE="+doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
@@ -40,10 +40,16 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
 "
 
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+	# Herbstluftwm tarballs ship with pre-compiled documentation, only
+	# if we build from git asciidoc is needed.
+	BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
 src_prepare() {
+	# Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
 	sed -i \
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
@@ -80,7 +86,7 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
-	if ! use examples; then
+	if ! use doc; then
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 
@@ -90,4 +96,18 @@ src_install() {
 		popd > /dev/null || die
 	fi
 
+	# The man pages exists in src_install either in non-live ebuilds,
+	# since they are then shipped pre-compiled in herbstluftwm's
+	# release tarbal. Or they exist in live ebuilds if the 'doc' USE
+	# flag is enabled.
+	if [[ "${PV}" != 9999 ]] || use doc; then
+		local man_pages=(
+			herbstluftwm.1
+			herbstclient.1
+			herbstluftwm-tutorial.7
+		)
+		for man_page in "${man_pages[@]}"; do
+			doman "doc/${man_page}"
+		done
+	fi
 }
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 28d103f5405a..f374bfa2fc7a 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -3,40 +3,64 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL=1
 
-inherit cmake git-r3 python-any-r1 toolchain-funcs
+inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
-EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
+
+if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
+	inherit git-r3
+else
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc examples"
+IUSE="+doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
+	media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 "
 RDEPEND="
 	${DEPEND}
 	app-shells/bash
+	python? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
 "
 
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+	# Herbstluftwm tarballs ship with pre-compiled documentation, only
+	# if we build from git asciidoc is needed.
+	BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
 src_prepare() {
+	# Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
 	sed -i \
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
 		CMakeLists.txt || die
 	cmake_src_prepare
+
+	if use python; then
+		pushd "${S}"/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
 }
 
 src_configure() {
@@ -49,10 +73,41 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_compile() {
+	cmake_src_compile
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
 src_install() {
 	cmake_src_install
 
-	if ! use examples; then
+	if ! use doc; then
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	# The man pages exists in src_install either in non-live ebuilds,
+	# since they are then shipped pre-compiled in herbstluftwm's
+	# release tarbal. Or they exist in live ebuilds if the 'doc' USE
+	# flag is enabled.
+	if [[ "${PV}" != 9999 ]] || use doc; then
+		local man_pages=(
+			herbstluftwm.1
+			herbstclient.1
+			herbstluftwm-tutorial.7
+		)
+		for man_page in "${man_pages[@]}"; do
+			doman "doc/${man_page}"
+		done
+	fi
 }
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 1b7b960b5dfa..a0fed90f967b 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-2.2.1.tar.lz 1697220 BLAKE2B a1c236c5aa3f2b958f3ad53c6d757abbce344da3c1c9c8f49bd4c986c68aef7421e799100dfabcb03e612d4c6a44af6a063080730b054e96ee054c85c21d5d1e SHA512 700122ace9a120300a06f17f334b76c12395154693583587527254903f53d12feb6e991754fc714960cc78b0d7809202879e43f2508f4d7ffa3fc7af84e628d6
-DIST icewm-2.3.3.tar.lz 1704180 BLAKE2B d9aa332b8fd1de0731d27eaa9e894258616f02093af1e4b9f67caf6361665c4e38fe8a6312cad85af59f0de1b23e8c20eb684cc1901860222db3c2cf1ba0eced SHA512 1ec96357d961bfa922f54390e8aa980b0e4326edf8091b4db37756d08c9931c2f41a1dc657131a32435847cb5cfe95f6d2fff03cbb9b78f90e3e04a1b22012d8
 DIST icewm-2.3.4.tar.lz 1708239 BLAKE2B d19a7864642795b93a8d30a63c6ba0dcac4ee9b9e3a2b9e314e115aea8200f688ed46f70268f16d09c8c7a02c4ac9653c3937d1b029bdc5b69ddd5d3fba658c9 SHA512 97d613c3dda84bc52d6b31772df5422aef84b6055b7240e90e5e1a5433d0250ad8fde7a01c4d5c3e714265fed4a3feefde3d6e6b4e1433896c16d2b4708edb1a
+DIST icewm-2.4.0.tar.lz 1718250 BLAKE2B 6ed4893d11ba7957c34585ec345d2ceaf23ceecf1d87e59c73cae0d730104a1f4850744d097cd4f00eb29cbfa413b9933d840cee55c36831f7acad571929b76f SHA512 2ac7509ce64a7d7772e12220f935f2511f8a9160bc9672421d81c49dcabc90d22559558811a11697f4e7c45a23a788b4d73032d2e1201c1dc502897ba6e9c965
 EBUILD icewm-2.2.1.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
-EBUILD icewm-2.3.3.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 EBUILD icewm-2.3.4.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.4.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-2.3.3.ebuild b/x11-wm/icewm/icewm-2.4.0.ebuild
similarity index 100%
rename from x11-wm/icewm/icewm-2.3.3.ebuild
rename to x11-wm/icewm/icewm-2.4.0.ebuild
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index da3851f1badd..3ba87f5c41f8 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,6 +5,6 @@ DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d8
 DIST mutter-40.1-r1-patchset.tar.xz 25312 BLAKE2B bcb58a50d63076ec012a2866dcbabaf417c094c3d7811f59e58273f7966f132fd51587b9374cee49b10e02207edc89bc0a4176de236330f4d9d9467f23a1d997 SHA512 511c9a315e29175109a8341ff608c94535579bc7e3145990405286fb47ee050a9ad90977ac18cd69f9baeeac283d3b94b1a0d4324ba3cc73fbb405443d82eb4d
 DIST mutter-40.1.tar.xz 2680816 BLAKE2B 924fd977e1c6669abd5adea1855c3a0a4027ae7e96ab3c6ccbe3d54da5f431e386f9c2f8f060dc9cd066c7414a2bb90a05760fa3413c6805cd8b73cb5d3aed90 SHA512 c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118
 EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125c91bc878f715a1430d90996bf4183c2281c88b935ca44b8940ddf4f7850f5a42d7550f138ddead7eb6ddd62a4a8e SHA512 c2a5b423e410bb6a8a9304acea03fbefba0ce3385d3dabb8adc46baa63d9daef02a59b051a371b62acdc6acfed3c443a8cc229928a2305a11766005ded637c2a
-EBUILD mutter-40.1-r1.ebuild 4798 BLAKE2B 21a6b51b5663747f217c4f73e3288909bc59d16aa6bbcd08c4307d00f9e257b8e16a1b2707f6d8a8e64beda281bc68c14420018416a420c30e6db435dc58b987 SHA512 47dfd9d174b0d5cfc0d07cf63d403d35c1301a5b117ae7bebddc18e7f62f78f918d3a5f04805ef4b9fb89fc49d12340b5e68d48d976721312429d5e78863a0c1
+EBUILD mutter-40.1-r1.ebuild 4797 BLAKE2B 41a945a7f1a05088d77cabf668e5adbaee70e070a524362c245a2212e11680520a23da19bdd8056649fdb74a68ec780823ff5a4d2615dd8c5d1124ebb47b6605 SHA512 b98a3077615947832d47f7c0c263ae912a12fd05417d60be9cdc0e1fddc0db9b0091cb4ad1d5e93dd952075f26bb117cc5229e962e1630a1e7652a0e1024d1e7
 EBUILD mutter-40.1.ebuild 4700 BLAKE2B e6498ffe667fe0e6eff76268a70dfcb84cfd774460d9cdf5df24d88f10fc75d85b189bf0df038af323642d9f3c30fad09b561b22b3e10d18b0c40a5e07130ab5 SHA512 290435cabe676c6bcec9a5199a16cb232d1fde4f12545337845beb039361e73c6200acc2775c872e3cbeeeafceded6c646333aa37bbcb84b61492d939296d8d4
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-40.1-r1.ebuild b/x11-wm/mutter/mutter-40.1-r1.ebuild
index a473f7896cd7..2ba282c99ccb 100644
--- a/x11-wm/mutter/mutter-40.1-r1.ebuild
+++ b/x11-wm/mutter/mutter-40.1-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland